rattail/tailbone
2
0
Fork 0
Code Issues2 Pull requests Projects Releases Packages Wiki Activity Actions

Remove all deprecated use_buefy logic

Browse source 
also remove some static files no longer used, etc.
This commit is contained in:
Lance Edgar 2023-02-03 12:05:17 -06:00
parent 01e5eee981
commit 9faaea881d
112 changed files with 2079 additions and 7039 deletions
tailbone/views/purchasing
ordering.py

17
tailbone/views/purchasing/ordering.py
View file

@ -2,7 +2,7 @@
################################################################################
#
# Rattail -- Retail Software Framework
# Copyright © 2010-2022 Lance Edgar
# Copyright © 2010-2023 Lance Edgar
#
# This file is part of Rattail.
#
@ -24,12 +24,9 @@
Views for 'ordering' (purchasing) batches
"""
from __future__ import unicode_literals, absolute_import
import os
import json
import six
import openpyxl
from sqlalchemy import orm
@ -313,9 +310,7 @@ class OrderingBatchView(PurchasingBatchView):
if not order_date:
order_date = localtime(self.rattail_config).date()
buefy_data = None
if self.get_use_buefy():
buefy_data = self.get_worksheet_buefy_data(departments)
buefy_data = self.get_worksheet_buefy_data(departments)
return self.render_to_response('worksheet', {
'batch': batch,
@ -334,8 +329,8 @@ class OrderingBatchView(PurchasingBatchView):
def get_worksheet_buefy_data(self, departments):
data = {}
for department in six.itervalues(departments):
for subdepartment in six.itervalues(department._order_subdepartments):
for department in departments.values():
for subdepartment in department._order_subdepartments.values():
for i, cost in enumerate(subdepartment._order_costs, 1):
cases = int(cost._batchrow.cases_ordered or 0) if cost._batchrow else None
units = int(cost._batchrow.units_ordered or 0) if cost._batchrow else None
@ -433,7 +428,7 @@ class OrderingBatchView(PurchasingBatchView):
self.handler.update_row_quantity(row, cases_ordered=cases_ordered,
units_ordered=units_ordered)
except Exception as error:
return {'error': six.text_type(error)}
return {'error': str(error)}
else: # empty order quantities
@ -469,7 +464,7 @@ class OrderingBatchView(PurchasingBatchView):
worksheet.append([])
worksheet.append(['vendor_code', 'upc', 'brand_name', 'description', 'cases_ordered', 'units_ordered'])
for row in batch.active_rows():
worksheet.append([row.vendor_code, six.text_type(row.upc), row.brand_name,
worksheet.append([row.vendor_code, str(row.upc), row.brand_name,
'{} {}'.format(row.description, row.size),
row.cases_ordered, row.units_ordered])