' + '
'.join([variation.name for variation in self.variations]) + '
' + return preview + def get_str_list_ids_variation(self): + if self.variations is None or len(self.variations) == 0: + return '' + return ','.join([str(variation.id_variation) for variation in self.variations]) + """ +class Product_Variation_Type_Temp(db.Model, Store_Base): + __tablename__ = 'Shop_Variation_Type_Temp' + __table_args__ = { 'extend_existing': True } + id_temp: int = db.Column(db.Integer, primary_key=True, autoincrement=True) + id_type: int = db.Column(db.Integer) + code: str = db.Column(db.String(50)) + name: str = db.Column(db.String(255)) + name_plural: str = db.Column(db.String(256)) + active: bool = db.Column(db.Boolean) + display_order: int = db.Column(db.Integer) + guid: str = db.Column(db.String(36)) + + def __init__(self): + super().__init__() + self.id_temp = None + @classmethod + def from_product_variation_type(cls, product_variation_type): + row = cls() + row.id_type = product_variation_type.id_type + row.code = product_variation_type.code + row.name = product_variation_type.name_singular + row.name_plural = product_variation_type.name_plural + row.active = 1 if av.input_bool(product_variation_type.active, cls.FLAG_ACTIVE, f'{cls.__name__}.from_product_variation_type') else 0 + row.display_order = product_variation_type.display_order + return row + def to_json(self): + return { + 'id_type': self.id_type, + 'code': self.code, + 'name': self.name, + 'name_plural': self.name_plural, + 'active': self.active, + 'display_order': self.display_order, + 'guid': self.guid, + } + def __repr__(self): + return f''' + {self.__class__.__name__} + id_temp: {self.id_temp} + id_type: {self.id_type} + code: {self.code} + name: {self.name} + name_plural: {self.name_plural} + active: {self.active} + display_order: {self.display_order} + guid: {self.guid} + ''' \ No newline at end of file diff --git a/controllers/store/__pycache__/product.cpython-312.pyc b/controllers/store/__pycache__/product.cpython-312.pyc index 91790748..982af07b 100644 Binary files a/controllers/store/__pycache__/product.cpython-312.pyc and b/controllers/store/__pycache__/product.cpython-312.pyc differ diff --git a/controllers/store/__pycache__/product_category.cpython-312.pyc b/controllers/store/__pycache__/product_category.cpython-312.pyc index e6c48d09..f1473424 100644 Binary files a/controllers/store/__pycache__/product_category.cpython-312.pyc and b/controllers/store/__pycache__/product_category.cpython-312.pyc differ diff --git a/controllers/store/__pycache__/product_permutation.cpython-312.pyc b/controllers/store/__pycache__/product_permutation.cpython-312.pyc index d0073f6c..d1c7ed14 100644 Binary files a/controllers/store/__pycache__/product_permutation.cpython-312.pyc and b/controllers/store/__pycache__/product_permutation.cpython-312.pyc differ diff --git a/controllers/store/product.py b/controllers/store/product.py index be96ecdf..2c831e36 100644 --- a/controllers/store/product.py +++ b/controllers/store/product.py @@ -126,7 +126,7 @@ def filter_product(): Model_View_Store_Product.FLAG_STATUS: Model_View_Store_Product.FLAG_FAILURE, Model_View_Store_Product.FLAG_MESSAGE: f'Form invalid.\n{form_filters.errors}' }) - model = Model_View_Store_Product(form_filters = form_filters) + model = Model_View_Store_Product(form_filters_old = form_filters) if not model.is_user_logged_in: raise Exception('User not logged in') return jsonify({ @@ -165,7 +165,7 @@ def save_product(): Helper_App.console_log(f'objsProduct={objsProduct}') save_errors = Model_View_Store_Product.save_products(data.get('comment', 'No comment'), objsProduct) - model_return = Model_View_Store_Product(form_filters=form_filters) + model_return = Model_View_Store_Product(form_filters_old=form_filters) if not model_return.is_user_logged_in: raise Exception('User not logged in') Helper_App.console_log('nips') diff --git a/controllers/store/product_category.py b/controllers/store/product_category.py index 9f071102..70859e84 100644 --- a/controllers/store/product_category.py +++ b/controllers/store/product_category.py @@ -72,7 +72,7 @@ def filter_category(): }) # ToDo: manually validate category, product # filters_form = Filters_Product_Category.from_form(form_filters) - model = Model_View_Store_Product_Category(form_filters = form_filters) + model = Model_View_Store_Product_Category(form_filters_old = form_filters) if not model.is_user_logged_in: raise Exception('User not logged in') return jsonify({ @@ -110,7 +110,7 @@ def save_category(): Helper_App.console_log(f'objsCategory={objsCategory}') Model_View_Store_Product_Category.save_categories(data.get('comment', 'No comment'), objsCategory) - model_return = Model_View_Store_Product_Category(form_filters=form_filters) + model_return = Model_View_Store_Product_Category(form_filters_old=form_filters) if not model_return.is_user_logged_in: raise Exception('User not logged in') return jsonify({ diff --git a/controllers/store/product_permutation.py b/controllers/store/product_permutation.py index 87e70084..d4baef8c 100644 --- a/controllers/store/product_permutation.py +++ b/controllers/store/product_permutation.py @@ -29,68 +29,13 @@ from urllib.parse import quote, urlparse, parse_qs routes_store_product_permutation = Blueprint('routes_store_product_permutation', __name__) -""" - -@routes_store_product_permutation.route('/store/permutations', methods=['GET']) -def permutation(): - filters = Parameters_Product.get_default() - model = Model_View_Store_Product_Permutation(filters_product=filters) - return render_template('pages/store/_product_permutations.html', model = model) - -@routes_store_product_permutation.route('/store/permutation_filter', methods=['POST']) -def permutation_filter(): - data = Helper_App.get_request_data(request) - form_filters = None - try: - form_filters = get_Form_Filters_Permutation(data) - if not form_filters.validate_on_submit(): - return jsonify({Model_View_Base.FLAG_STATUS: Model_View_Base.FLAG_FAILURE, Model_View_Base.FLAG_MESSAGE: f'Form invalid.\n{form_filters.errors}'}) - # ToDo: manually validate category, product - filters_form = Parameters_Product.from_form(form_filters) - model = Model_View_Store_Product_Permutation(filters_product=filters_form) - return jsonify({Model_View_Base.FLAG_STATUS: Model_View_Base.FLAG_SUCCESS, 'Success': True, Model_View_Base.FLAG_DATA: model.category_list.to_permutation_row_list()}) - except Exception as e: - return jsonify({Model_View_Base.FLAG_STATUS: Model_View_Base.FLAG_FAILURE, Model_View_Base.FLAG_MESSAGE: f'Bad data received by controller.\n{e}'}) - -def get_Form_Filters_Permutation(data_request): - data_form = data_request[Model_View_Store_Product_Permutation.FLAG_FORM] - form_filters = Filters_Product_Permutation(**data_form) - form_filters.is_out_of_stock.data = av.input_bool(data_form['is_out_of_stock'], 'is_out_of_stock', 'permutations_post') - return form_filters - -@routes_store_product_permutation.route('/store/permutation_save', methods=['POST']) -def permutation_save(): - data = Helper_App.get_request_data(request) - form_filters = None - try: - form_filters = get_Form_Filters_Permutation(data) - if not form_filters.validate_on_submit(): - return jsonify({Model_View_Base.FLAG_STATUS: Model_View_Base.FLAG_FAILURE, Model_View_Base.FLAG_MESSAGE: f'Filters form invalid.\n{form_filters.errors}'}) - - permutations = data[Model_View_Store_Product_Permutation.FLAG_PRODUCT_PERMUTATION] - if len(permutations) == 0: - return jsonify({Model_View_Base.FLAG_STATUS: Model_View_Base.FLAG_FAILURE, Model_View_Base.FLAG_MESSAGE: f'No permutations.'}) - objsPermutation = [] - for permutation in permutations: - objsPermutation.append(Product_Permutation.from_json(permutation)) - - # ToDo: manually validate category, product - filters_form = Parameters_Product.from_form(form_filters) - model_save = Model_View_Store_Product_Permutation(filters_product=filters_form) - model_save.save_permutations(data.comment, objsPermutation) - - model_return = Model_View_Store_Product_Permutation(filters_product=filters_form) - return jsonify({Model_View_Base.FLAG_STATUS: Model_View_Base.FLAG_SUCCESS, 'Success': True, Model_View_Base.FLAG_DATA: model_return.category_list.to_permutation_row_list()}) - except Exception as e: - return jsonify({Model_View_Base.FLAG_STATUS: Model_View_Base.FLAG_FAILURE, Model_View_Base.FLAG_MESSAGE: f'Bad data received by controller.\n{e}'}) -""" - @routes_store_product_permutation.route(Model_View_Store_Product_Permutation.HASH_PAGE_STORE_PRODUCT_PERMUTATIONS, methods=['GET']) def permutations(): Helper_App.console_log('permutations') + data = Helper_App.get_request_data(request) try: - form_filters = Filters_Product_Permutation.from_json(request.args) + form_filters = Filters_Product_Permutation.from_json(data) except Exception as e: Helper_App.console_log(f'Error: {e}') form_filters = Filters_Product_Permutation() @@ -111,7 +56,7 @@ def filter_permutation(): Model_View_Store_Product_Permutation.FLAG_STATUS: Model_View_Store_Product_Permutation.FLAG_FAILURE, Model_View_Store_Product_Permutation.FLAG_MESSAGE: f'Form invalid.\n{form_filters.errors}' }) - model = Model_View_Store_Product_Permutation(form_filters = form_filters) + model = Model_View_Store_Product_Permutation(form_filters_old = form_filters) if not model.is_user_logged_in: raise Exception('User not logged in') return jsonify({ @@ -150,7 +95,7 @@ def save_permutation(): Helper_App.console_log(f'objsPermutation={objsPermutation}') Model_View_Store_Product_Permutation.save_permutations(data.get('comment', 'No comment'), objsPermutation) - model_return = Model_View_Store_Product_Permutation(form_filters=form_filters) + model_return = Model_View_Store_Product_Permutation(form_filters_old=form_filters) if not model_return.is_user_logged_in: raise Exception('User not logged in') Helper_App.console_log('nips') diff --git a/controllers/store/product_variation.py b/controllers/store/product_variation.py new file mode 100644 index 00000000..f1b99325 --- /dev/null +++ b/controllers/store/product_variation.py @@ -0,0 +1,109 @@ +""" +Project: PARTS Website +Author: Edward Middleton-Smith + Precision And Research Technology Systems Limited + +Technology: App Routing +Feature: Store Product Variation Routes + +Description: +Initializes the Flask application, sets the configuration based on the environment, and defines two routes (/ and /about) that render templates with the specified titles. +""" + +# internal +from business_objects.store.product_variation import Product_Variation, Parameters_Product_Variation +from business_objects.store.product_variation_type import Product_Variation_Type +from datastores.datastore_store_product_variation import DataStore_Store_Product_Variation +from forms.store.product_variation import Filters_Product_Variation +from models.model_view_store_product_variation import Model_View_Store_Product_Variation +from helpers.helper_app import Helper_App +import lib.argument_validation as av +# external +from flask import Flask, render_template, jsonify, request, render_template_string, send_from_directory, redirect, url_for, session, Blueprint, current_app +from extensions import db, oauth +from urllib.parse import quote_plus, urlencode +from authlib.integrations.flask_client import OAuth +from authlib.integrations.base_client import OAuthError +from urllib.parse import quote, urlparse, parse_qs + + +routes_store_product_variation = Blueprint('routes_store_product_variation', __name__) + + +@routes_store_product_variation.route(Model_View_Store_Product_Variation.HASH_PAGE_STORE_PRODUCT_VARIATIONS, methods=['GET']) +def product_variations(): + Helper_App.console_log('product_variations') + try: + form_filters = Filters_Product_Variation.from_json(request.args) + except Exception as e: + Helper_App.console_log(f'Error: {e}') + form_filters = Filters_Product_Variation() + Helper_App.console_log(f'form_filters={form_filters}') + model = Model_View_Store_Product_Variation(form_filters) + if not model.is_user_logged_in: + return redirect(url_for('routes_core.home')) + return render_template('pages/store/_product_variations.html', model = model) + +@routes_store_product_variation.route(Model_View_Store_Product_Variation.HASH_GET_STORE_PRODUCT_VARIATION, methods=['POST']) +def filter_product_variation(): + data = Helper_App.get_request_data(request) + try: + form_filters = Filters_Product_Variation.from_json(data) + if not form_filters.validate_on_submit(): + return jsonify({ + Model_View_Store_Product_Variation.FLAG_STATUS: Model_View_Store_Product_Variation.FLAG_FAILURE, + Model_View_Store_Product_Variation.FLAG_MESSAGE: f'Form invalid.\n{form_filters.errors}' + }) + model = Model_View_Store_Product_Variation(form_filters_old = form_filters) + if not model.is_user_logged_in: + raise Exception('User not logged in') + return jsonify({ + Model_View_Store_Product_Variation.FLAG_STATUS: Model_View_Store_Product_Variation.FLAG_SUCCESS, + Model_View_Store_Product_Variation.FLAG_DATA: model.convert_list_objects_to_json(model.variation_types) + }) + except Exception as e: + return jsonify({ + Model_View_Store_Product_Variation.FLAG_STATUS: Model_View_Store_Product_Variation.FLAG_FAILURE, + Model_View_Store_Product_Variation.FLAG_MESSAGE: f'Bad data received by controller.\n{e}' + }) + +@routes_store_product_variation.route(Model_View_Store_Product_Variation.HASH_SAVE_STORE_PRODUCT_VARIATION, methods=['POST']) +def save_product_variation(): + data = Helper_App.get_request_data(request) + try: + form_filters = Filters_Product_Variation.from_json(data[Model_View_Store_Product_Variation.FLAG_FORM_FILTERS]) + if not form_filters.validate_on_submit(): + return jsonify({ + Model_View_Store_Product_Variation.FLAG_STATUS: Model_View_Store_Product_Variation.FLAG_FAILURE, + Model_View_Store_Product_Variation.FLAG_MESSAGE: f'Filters form invalid.\n{form_filters.errors}' + }) + # filters_form = Filters_Product_Variation.from_form(form_filters) + Helper_App.console_log(f'form_filters: {form_filters}') + + product_variation_types = data[Model_View_Store_Product_Variation.FLAG_PRODUCT_VARIATION_TYPE] + if len(product_variation_types) == 0: + return jsonify({ + Model_View_Store_Product_Variation.FLAG_STATUS: Model_View_Store_Product_Variation.FLAG_FAILURE, + Model_View_Store_Product_Variation.FLAG_MESSAGE: f'No Product Variations.' + }) + objs_product_variation_type = [] + for product_variation_type in product_variation_types: + objs_product_variation_type.append(Product_Variation_Type.from_json(product_variation_type)) + # model_save = Model_View_Store_Product_Variation() # filters_product_variation=filters_form) + Helper_App.console_log(f'objs_product_variation_type={objs_product_variation_type}') + save_errors = Model_View_Store_Product_Variation.save_product_variations(data.get('comment', 'No comment'), objs_product_variation_type) + + model_return = Model_View_Store_Product_Variation(form_filters_old = form_filters) + if not model_return.is_user_logged_in: + raise Exception('User not logged in') + Helper_App.console_log('nips') + return jsonify({ + Model_View_Store_Product_Variation.FLAG_STATUS: Model_View_Store_Product_Variation.FLAG_SUCCESS, + Model_View_Store_Product_Variation.FLAG_DATA: model_return.convert_list_objects_to_json(model_return.variation_types) + }) + except Exception as e: + return jsonify({ + Model_View_Store_Product_Variation.FLAG_STATUS: Model_View_Store_Product_Variation.FLAG_FAILURE, + Model_View_Store_Product_Variation.FLAG_MESSAGE: f'Bad data received by controller.\n{e}' + }) + \ No newline at end of file diff --git a/datastores/__pycache__/datastore_base.cpython-312.pyc b/datastores/__pycache__/datastore_base.cpython-312.pyc index ba38235c..c9eb0f7e 100644 Binary files a/datastores/__pycache__/datastore_base.cpython-312.pyc and b/datastores/__pycache__/datastore_base.cpython-312.pyc differ diff --git a/datastores/__pycache__/datastore_store_base.cpython-312.pyc b/datastores/__pycache__/datastore_store_base.cpython-312.pyc index ee74182a..00118c7b 100644 Binary files a/datastores/__pycache__/datastore_store_base.cpython-312.pyc and b/datastores/__pycache__/datastore_store_base.cpython-312.pyc differ diff --git a/datastores/__pycache__/datastore_store_basket.cpython-312.pyc b/datastores/__pycache__/datastore_store_basket.cpython-312.pyc index d5c5b561..42ac518c 100644 Binary files a/datastores/__pycache__/datastore_store_basket.cpython-312.pyc and b/datastores/__pycache__/datastore_store_basket.cpython-312.pyc differ diff --git a/datastores/__pycache__/datastore_store_product_category.cpython-312.pyc b/datastores/__pycache__/datastore_store_product_category.cpython-312.pyc index 3f5ea886..ac70acbc 100644 Binary files a/datastores/__pycache__/datastore_store_product_category.cpython-312.pyc and b/datastores/__pycache__/datastore_store_product_category.cpython-312.pyc differ diff --git a/datastores/datastore_base.py b/datastores/datastore_base.py index fad8f9e4..bf8deff9 100644 --- a/datastores/datastore_base.py +++ b/datastores/datastore_base.py @@ -29,7 +29,6 @@ from business_objects.sql_error import SQL_Error from business_objects.store.stock_item import Stock_Item from business_objects.unit_measurement import Unit_Measurement from business_objects.user import User, User_Filters, User_Permission_Evaluation -# from business_objects.store.product_variation import Product_Variation, Product_Variation_Filters, Product_Variation_Container # from helpers.helper_db_mysql import Helper_DB_MySQL # from models.model_view_store_checkout import Model_View_Store_Checkout # circular! from extensions import db @@ -189,7 +188,6 @@ class DataStore_Base(BaseModel): else: expected_columns = set(column.name for column in db.inspect(table_object).columns) Helper_App.console_log(f'expected_columns: {expected_columns}') - try: for i in range(0, len(records), batch_size): batch = records[i:i+batch_size] diff --git a/datastores/datastore_store_base.py b/datastores/datastore_store_base.py index e7802e6d..576d2975 100644 --- a/datastores/datastore_store_base.py +++ b/datastores/datastore_store_base.py @@ -24,7 +24,8 @@ from business_objects.store.product import Product, Product_Permutation, Paramet from business_objects.sql_error import SQL_Error from business_objects.store.stock_item import Stock_Item from business_objects.user import User, User_Filters, User_Permission_Evaluation -from business_objects.store.product_variation import Product_Variation_Type, Product_Variation, Product_Variation_Filters, Product_Variation_Container +from business_objects.store.product_variation import Product_Variation, Parameters_Product_Variation +from business_objects.store.product_variation_type import Product_Variation_Type from datastores.datastore_base import DataStore_Base from extensions import db from helpers.helper_app import Helper_App @@ -255,7 +256,7 @@ class DataStore_Store_Base(DataStore_Base): def get_many_product_variation(cls, variation_filters): _m = 'DataStore_Store_Base.get_many_product_variation' Helper_App.console_log(_m) - av.val_instance(variation_filters, 'variation_filters', _m, Product_Variation_Filters) + av.val_instance(variation_filters, 'variation_filters', _m, Parameters_Product_Variation) guid = Helper_DB_MySQL.create_guid() # now = datetime.now() @@ -284,14 +285,14 @@ class DataStore_Store_Base(DataStore_Base): # Product_Variation Types # variation_container = Product_Variation_Container() variation_types = [] - variation_types_dict = {} + index_variation_type = {} for row in result_set_vt: new_variation_type = Product_Variation_Type.from_DB_get_many_product_variation(row) # variation_container.add_product_variation_type(new_variation_type) + index_variation_type[new_variation_type.id_type] = len(variation_types) variation_types.append(new_variation_type) - variation_types_dict[new_variation_type.id_type] = new_variation_type - Helper_App.console_log(f'variation_types_dict: {variation_types_dict}') + Helper_App.console_log(f'index_variation_type: {index_variation_type}') # Product_Variations cursor.nextset() @@ -300,8 +301,9 @@ class DataStore_Store_Base(DataStore_Base): variations = [] for row in result_set_v: new_variation = Product_Variation.from_DB_get_many_product_variation(row) - new_variation.variation_type = variation_types_dict[new_variation.id_type] + # new_variation.variation_type = variation_types_dict[new_variation.id_type] # variation_container.add_product_variation(new_variation) + variation_types[index_variation_type[new_variation.id_type]].variations.append(new_variation) variations.append(new_variation) errors = [] diff --git a/datastores/datastore_store_basket.py b/datastores/datastore_store_basket.py index 1b07a576..e7731cbb 100644 --- a/datastores/datastore_store_basket.py +++ b/datastores/datastore_store_basket.py @@ -14,18 +14,7 @@ Datastore for Store Baskets # from routes import bp_home import lib.argument_validation as av from business_objects.store.basket import Basket, Basket_Item -from business_objects.store.product_category import Product_Category_Container, Product_Category -from business_objects.currency import Currency -from business_objects.store.image import Image -from business_objects.store.delivery_option import Delivery_Option -from business_objects.region import Region -from business_objects.store.discount import Discount -from business_objects.store.order import Order -from business_objects.store.product import Product, Product_Permutation, Product_Price, Parameters_Product from business_objects.sql_error import SQL_Error -from business_objects.store.stock_item import Stock_Item -from business_objects.user import User, User_Filters, User_Permission_Evaluation -from business_objects.store.product_variation import Product_Variation, Product_Variation_Filters, Product_Variation_Container from datastores.datastore_store_base import DataStore_Store_Base from helpers.helper_app import Helper_App # from helpers.helper_db_mysql import Helper_DB_MySQL diff --git a/datastores/datastore_store_product_category.py b/datastores/datastore_store_product_category.py index 14107b5d..b7cd2f50 100644 --- a/datastores/datastore_store_product_category.py +++ b/datastores/datastore_store_product_category.py @@ -12,19 +12,8 @@ Datastore for Store Product Categories # internal import lib.argument_validation as av -from business_objects.store.basket import Basket, Basket_Item from business_objects.store.product_category import Product_Category_Container, Product_Category, Product_Category_Temp -from business_objects.currency import Currency -from business_objects.store.image import Image -from business_objects.store.delivery_option import Delivery_Option -from business_objects.region import Region -from business_objects.store.discount import Discount -from business_objects.store.order import Order -from business_objects.store.product import Product, Product_Permutation, Product_Price, Parameters_Product from business_objects.sql_error import SQL_Error -from business_objects.store.stock_item import Stock_Item -from business_objects.user import User, User_Filters, User_Permission_Evaluation -from business_objects.store.product_variation import Product_Variation, Product_Variation_Filters, Product_Variation_Container # from datastores.datastore_base import Table_Shop_Product_Category, Table_Shop_Product_Category_Temp from datastores.datastore_store_base import DataStore_Store_Base from helpers.helper_app import Helper_App diff --git a/datastores/datastore_store_product_variation.py b/datastores/datastore_store_product_variation.py index 2e3171e6..5265df82 100644 --- a/datastores/datastore_store_product_variation.py +++ b/datastores/datastore_store_product_variation.py @@ -13,20 +13,10 @@ Datastore for Store Product Variations # internal # from routes import bp_home import lib.argument_validation as av -from business_objects.store.basket import Basket, Basket_Item -from business_objects.store.product_category import Product_Category_Container, Product_Category -from business_objects.currency import Currency -from business_objects.store.image import Image -from business_objects.store.delivery_option import Delivery_Option -from business_objects.region import Region -from business_objects.store.discount import Discount -from business_objects.store.order import Order -from business_objects.store.product import Product, Product_Permutation, Product_Price, Parameters_Product -from business_objects.sql_error import SQL_Error -from business_objects.store.stock_item import Stock_Item -from business_objects.user import User, User_Filters, User_Permission_Evaluation -from business_objects.store.product_variation import Product_Variation, Product_Variation_Filters, Product_Variation_Container +from business_objects.store.product_variation import Product_Variation, Parameters_Product_Variation, Product_Variation_Temp +from business_objects.store.product_variation_type import Product_Variation_Type, Product_Variation_Type_Temp from datastores.datastore_store_base import DataStore_Store_Base +from helpers.helper_app import Helper_App from helpers.helper_db_mysql import Helper_DB_MySQL # from models.model_view_store_checkout import Model_View_Store_Checkout # circular! from extensions import db @@ -46,4 +36,42 @@ from datetime import datetime class DataStore_Store_Product_Variation(DataStore_Store_Base): def __init__(self, **kwargs): - super().__init__(**kwargs) \ No newline at end of file + super().__init__(**kwargs) + + @classmethod + def save_product_variations(cls, comment, variation_types): + _m = f'{cls.__class__}.save_product_variations' + av.val_str(comment, 'comment', _m) + + guid = Helper_DB_MySQL.create_guid_str() + user = cls.get_user_session() + rows = [] + for variation_type in variation_types: + row = Product_Variation_Type_Temp.from_product_variation_type(variation_type) + row.guid = guid + rows.append(row) + Helper_App.console_log(f'rows: {rows}') + + DataStore_Store_Base.upload_bulk(Product_Variation_Type_Temp.__tablename__, rows, 1000) + Helper_App.console_log('bulk uploaded product variation types') + + rows = [] + for variation_type in variation_types: + if variation_type.variations is not None: + for variation in variation_type.variations: + row = Product_Variation_Temp.from_product_variation(variation) + row.guid = guid + rows.append(row) + Helper_App.console_log(f'rows: {rows}') + + DataStore_Store_Base.upload_bulk(Product_Variation_Temp.__tablename__, rows, 1000) + Helper_App.console_log('bulk uploaded product variations') + + argument_dict_list = { + 'a_comment': comment, + 'a_guid': guid, + 'a_id_user': user.id_user, + 'a_debug': 0, + } + cls.db_procedure_execute('p_shop_save_product_variation', argument_dict_list) + Helper_App.console_log('saved product variations') diff --git a/datastores/datastore_store_stripe.py b/datastores/datastore_store_stripe.py index c86b3b16..93da1d13 100644 --- a/datastores/datastore_store_stripe.py +++ b/datastores/datastore_store_stripe.py @@ -14,18 +14,8 @@ Datastore for Store Stripe service # from routes import bp_home import lib.argument_validation as av from business_objects.store.basket import Basket, Basket_Item -from business_objects.store.product_category import Product_Category_Container, Product_Category -from business_objects.currency import Currency -from business_objects.store.image import Image -from business_objects.store.delivery_option import Delivery_Option -from business_objects.region import Region -from business_objects.store.discount import Discount -from business_objects.store.order import Order from business_objects.store.product import Product, Product_Permutation, Product_Price, Parameters_Product from business_objects.sql_error import SQL_Error -from business_objects.store.stock_item import Stock_Item -from business_objects.user import User, User_Filters, User_Permission_Evaluation -from business_objects.store.product_variation import Product_Variation, Product_Variation_Filters, Product_Variation_Container from datastores.datastore_store_base import DataStore_Store_Base # from helpers.helper_db_mysql import Helper_DB_MySQL # from models.model_view_store_checkout import Model_View_Store_Checkout # circular! diff --git a/forms/store/product_variation.py b/forms/store/product_variation.py new file mode 100644 index 00000000..33efd993 --- /dev/null +++ b/forms/store/product_variation.py @@ -0,0 +1,38 @@ +""" +Project: PARTS Website +Author: Edward Middleton-Smith + Precision And Research Technology Systems Limited + +Technology: Backend +Feature: Forms - Product Variation Filters data input + +Description: +Defines Flask-WTF forms for handling product variation filter input. +""" + +# internal +from business_objects.store.store_base import Store_Base +from forms.base import Form_Base +from helpers.helper_app import Helper_App +import lib.argument_validation as av +# external +from flask_wtf import FlaskForm +from wtforms import StringField, TextAreaField, SubmitField, BooleanField, IntegerField, SelectField, FloatField, DateField +from wtforms.validators import InputRequired, NumberRange, Regexp, DataRequired, Optional +from flask_wtf.recaptcha import RecaptchaField +from abc import ABCMeta, abstractmethod + + +class Filters_Product_Variation(Form_Base): + is_not_empty = BooleanField('Not empty only?') + active = BooleanField("Active only?", default = True) + def __repr__(self): + return f'Filters_Product_Variation(is_not_empty={self.is_not_empty.data}, active={self.active.data})' + @classmethod + def from_json(cls, json): + _m = f'{cls.__name__}.from_json' + Helper_App.console_log(f'{_m}\njson={json}') + form = cls() + form.is_not_empty.data = av.input_bool(json[Store_Base.FLAG_IS_NOT_EMPTY], Store_Base.FLAG_IS_NOT_EMPTY, _m) + form.active.data = av.input_bool(json[Store_Base.FLAG_ACTIVE], Store_Base.FLAG_ACTIVE, _m) + return form \ No newline at end of file diff --git a/lib/__pycache__/argument_validation.cpython-312.pyc b/lib/__pycache__/argument_validation.cpython-312.pyc index dd476cef..a2b110fc 100644 Binary files a/lib/__pycache__/argument_validation.cpython-312.pyc and b/lib/__pycache__/argument_validation.cpython-312.pyc differ diff --git a/lib/argument_validation.py b/lib/argument_validation.py index dc1746ba..ba9e4e56 100644 --- a/lib/argument_validation.py +++ b/lib/argument_validation.py @@ -447,13 +447,13 @@ def input_bool(v_input, v_name, method, suppress_errors = False, suppress_consol # v_arg_type if not val_str(v_arg_type, 'v_arg_type', my_f, 1, -1, suppress_errors, suppress_console_outputs): return None # METHODS - if not val_bool(v_input, v_name, my_f, True, suppress_console_outputs): - if not val_int(v_input, v_name, my_f, 0, 1, True, suppress_console_outputs): + if not val_bool(v_input, v_name, my_f, True, True): + if not val_int(v_input, v_name, my_f, 0, 1, True, True): # if str(type(v_input)) == "| Display Order | +Code | +Name | +Name Plural | +Variations | ++ + | +
|---|