rattail/tailbone-corepos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tweak some importers, per upstream changes

Browse source 
also some python3 tweaks
This commit is contained in:
Lance Edgar 2020-03-03 23:27:17 -06:00
parent 02a3a4b11b
commit 1dcb22a865
10 changed files with 24 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tailbone_corepos/views/corepos/coupons.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2019 Lance Edgar # Copyright © 2010-2020 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -24,9 +24,7 @@
CORE POS coupon views CORE POS coupon views
""" """
import six from corepos.db.office_op import model as corepos
from corepos.db import model as corepos
from corepos import enum as corepos_enum from corepos import enum as corepos_enum
from rattail.time import localtime from rattail.time import localtime
@ -97,7 +95,7 @@ class HouseCouponView(CoreOfficeMasterView):
if not value: if not value:
return "" return ""
value = localtime(self.rattail_config, value) value = localtime(self.rattail_config, value)
return six.text_type(value.date()) return str(value.date())
def configure_form(self, f): def configure_form(self, f):
super(HouseCouponView, self).configure_form(f) super(HouseCouponView, self).configure_form(f)

4
tailbone_corepos/views/corepos/customers.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2019 Lance Edgar # Copyright © 2010-2020 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -24,7 +24,7 @@
CORE POS customer views CORE POS customer views
""" """
from corepos.db import model as corepos from corepos.db.office_op import model as corepos
from .master import CoreOfficeMasterView from .master import CoreOfficeMasterView

4
tailbone_corepos/views/corepos/departments.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2019 Lance Edgar # Copyright © 2010-2020 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -24,7 +24,7 @@
CORE-POS department views CORE-POS department views
""" """
from corepos.db import model as corepos from corepos.db.office_op import model as corepos
from .master import CoreOfficeMasterView from .master import CoreOfficeMasterView

4
tailbone_corepos/views/corepos/employees.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2019 Lance Edgar # Copyright © 2010-2020 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -24,7 +24,7 @@
CORE-POS employee views CORE-POS employee views
""" """
from corepos.db import model as corepos from corepos.db.office_op import model as corepos
from .master import CoreOfficeMasterView from .master import CoreOfficeMasterView

8
tailbone_corepos/views/corepos/members.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2019 Lance Edgar # Copyright © 2010-2020 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -24,9 +24,7 @@
CORE-POS member views CORE-POS member views
""" """
import six from corepos.db.office_op import model as corepos
from corepos.db import model as corepos
from webhelpers2.html import HTML from webhelpers2.html import HTML
@ -118,7 +116,7 @@ class MemberView(CoreOfficeMasterView):
items = [] items = []
for dates in member.dates: for dates in member.dates:
items.append(HTML.tag('li', c=six.text_type(dates))) items.append(HTML.tag('li', c=str(dates)))
return HTML.tag('ul', c=items) return HTML.tag('ul', c=items)

4
tailbone_corepos/views/corepos/parameters.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2019 Lance Edgar # Copyright © 2010-2020 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -24,7 +24,7 @@
CORE POS parameter views CORE POS parameter views
""" """
from corepos.db import model as corepos from corepos.db.office_op import model as corepos
from .master import CoreOfficeMasterView from .master import CoreOfficeMasterView

6
tailbone_corepos/views/corepos/products.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2019 Lance Edgar # Copyright © 2010-2020 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -24,9 +24,9 @@
CORE-POS product views CORE-POS product views
""" """
from webhelpers2.html import HTML from corepos.db.office_op import model as corepos
from corepos.db import model as corepos from webhelpers2.html import HTML
from .master import CoreOfficeMasterView from .master import CoreOfficeMasterView

4
tailbone_corepos/views/corepos/subdepartments.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2019 Lance Edgar # Copyright © 2010-2020 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -24,7 +24,7 @@
CORE-POS subdepartment views CORE-POS subdepartment views
""" """
from corepos.db import model as corepos from corepos.db.office_op import model as corepos
from .master import CoreOfficeMasterView from .master import CoreOfficeMasterView

6
tailbone_corepos/views/corepos/transactions.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2019 Lance Edgar # Copyright © 2010-2020 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -24,9 +24,9 @@
CORE-POS transaction views CORE-POS transaction views
""" """
from corepos.trans.db import model as coretrans from corepos.db.office_trans import model as coretrans
from rattail_corepos.corepos.importing.square import FromSquareToCoreTrans from rattail_corepos.corepos.importing.db.square import FromSquareToCoreTrans
from .master import CoreOfficeMasterView from .master import CoreOfficeMasterView
from tailbone_corepos.db import CoreTransSession from tailbone_corepos.db import CoreTransSession

4
tailbone_corepos/views/corepos/vendors.py
View file

@ -2,7 +2,7 @@
################################################################################ ################################################################################
# #
# Rattail -- Retail Software Framework # Rattail -- Retail Software Framework
# Copyright © 2010-2019 Lance Edgar # Copyright © 2010-2020 Lance Edgar
# #
# This file is part of Rattail. # This file is part of Rattail.
# #
@ -24,7 +24,7 @@
CORE-POS vendor views CORE-POS vendor views
""" """
from corepos.db import model as corepos from corepos.db.office_op import model as corepos
from .master import CoreOfficeMasterView from .master import CoreOfficeMasterView