diff --git a/README.md b/README.md index 37bef582..7d8050b3 100644 --- a/README.md +++ b/README.md @@ -14,3 +14,27 @@ python -m flask run host for local network: python -m flask run --host=0.0.0.0 + + +files dedicated to each page: +CSS + page +HTML + page + row +JavaScript + page + api + router +MySQL + get + save + table + staging table + audit table +Python + business object + controller + datastore + form + model \ No newline at end of file diff --git a/__pycache__/__init__.cpython-312.pyc b/__pycache__/__init__.cpython-312.pyc index 11e03992..83b8f224 100644 Binary files a/__pycache__/__init__.cpython-312.pyc and b/__pycache__/__init__.cpython-312.pyc differ diff --git a/__pycache__/app.cpython-312.pyc b/__pycache__/app.cpython-312.pyc index ffee5ff7..96d52adf 100644 Binary files a/__pycache__/app.cpython-312.pyc and b/__pycache__/app.cpython-312.pyc differ diff --git a/__pycache__/config.cpython-312.pyc b/__pycache__/config.cpython-312.pyc index f5face55..1e511593 100644 Binary files a/__pycache__/config.cpython-312.pyc and b/__pycache__/config.cpython-312.pyc differ diff --git a/__pycache__/extensions.cpython-312.pyc b/__pycache__/extensions.cpython-312.pyc index 80f2d10d..6006f0ab 100644 Binary files a/__pycache__/extensions.cpython-312.pyc and b/__pycache__/extensions.cpython-312.pyc differ diff --git a/app.log b/app.log index 383ef3ea..631dea86 100644 --- a/app.log +++ b/app.log @@ -1,46 +1,65 @@ -Traceback: Traceback (most recent call last): - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 1473, in wsgi_app - response = self.full_dispatch_request() - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 882, in full_dispatch_request - rv = self.handle_user_exception(e) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask_cors\extension.py", line 178, in wrapped_function - return cors_after_request(app.make_response(f(*args, **kwargs))) - ^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 880, in full_dispatch_request - rv = self.dispatch_request() - ^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 865, in dispatch_request - return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args) # type: ignore[no-any-return] - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\controllers\store\product.py", line 114, in products - return render_template('pages/store/_products.html', model = model) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\templating.py", line 150, in render_template - return _render(app, template, context) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\templating.py", line 131, in _render - rv = template.render(context) - ^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\jinja2\environment.py", line 1304, in render - self.environment.handle_exception() - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\jinja2\environment.py", line 939, in handle_exception - raise rewrite_traceback_stack(source=source) - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\pages\store\_products.html", line 1, in top-level template code - {% extends 'layouts/layout.html' %} - ^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\layouts\layout.html", line 316, in top-level template code - {% block page_body %}{% endblock %} - ^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\pages\store\_products.html", line 89, in block 'page_body' - {% include 'components/store/_row_product.html' %} - ^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\components\store\_row_product.html", line 38, in top-level template code - - ^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\jinja2\environment.py", line 487, in getattr - return getattr(obj, attribute) - ^^^^^^^^^^^^^^^^^^^^^^^ -jinja2.exceptions.UndefinedError: 'permutation' is undefined - +Request: 127.0.0.1 GET http /store/stock_items?id_category=3&id_product=&is_out_of_stock=false&quantity_min=&quantity_max= Host: 127.0.0.1:5000 +User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:131.0) Gecko/20100101 Firefox/131.0 +Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/png,image/svg+xml,*/*;q=0.8 +Accept-Language: en-GB,en;q=0.5 +Accept-Encoding: gzip, deflate, br, zstd +Referer: http://127.0.0.1:5000/store/stock_items?id_category=3&id_product=3&is_out_of_stock=false&quantity_min=&quantity_max= +Dnt: 1 +Connection: keep-alive +Cookie: session=.eJytVlnPqzgS_SutSN1PnVz25ZOuZsgGJIEkhLC9ILBZzB6WLPTc_z4m3-2-_dCzSSOFYLtMnVOuclX9NguGPq1b1EXw2kXt7OO3GQgqP4Alqvyur9to9tG3Q_Trn5aH98bP1agMUDH7mEXwEbRwUSIIi6ivq65Effr3ZJIuQF3Ofp3FqO36KiixwpkZQfjCawj6YGjbqAIvH0ZxMBT97KMaiuItaqME1dVfCD4JkH-M_ckIAut9v__BsQIViiwQRBYSYsATYUAScRRPgJ3_ZuzfoxbFKIKzjzgouugtQRUoBhhB35LMH6ifdmJxNzQY6s_Gd0P73SDtd7vnl8nw2Td8Xl0b-32dRxWWg1gAbMCIPA0ZhuBogqZCigAEB4OQJ7kwZCkYEhyHKQ7f3RAAEHXdHxqi1y4NZYCOaJcHjooOq10Rlto0X2rZlTIIXVfRAwWOPqpZjQLFIICicYeXmHuO24cVTINRfeiZV3iZVx_lggkRS4IXm0LHqLUVm2FKd7UiFgtn617dFzzsYq1Rzr26GJ8usLan_Fjvjp4S3kxnpUgyw87l89Vlo-3TlTJ_v2eq_c7Ir-y-7kb_DC-I2SRjv_GsRD8YZbvpu7AW2uU6NIqIu7KR4kXD7gga1iSSw3wv1kbp1-d-wzV3F6zmNrKeCsk37E0E-gPUQxhc-tS3SjkOLTeu9sXa4q5ZtexW_mEfS-5yL9-qOIOsHDUKhGDeHQebvMQrD5zkKyqsjFyVjO3UaJNzohNJqIwAyJJUURgakRfZv_hldqiGuRdJr3oEFSuU0s1FibD3hbBORZvZjfd4GOLVSVyGYyfuHF7zGN3oLdZkD-yqY5e677rg8MwZP7mE5dgHQx1LOcvMx_MT1OeKJ-nt3k6s8C4sYihlxHlT6KlkeU8arNC51iQcBtGzQW3U-QEOQZKnBJ4UaI77sY5wUAgcQxDvW_AXUXK5jiqpI7VTK4MFK5VT88axVnhe9o03zSvrHjne1cgZJsx2d09JSCvfHrRtShqvnbjAyobA1tuw3PbeBX9QWjmkti9vxfaBbeShbBEhxY6hXRDBWzGbhvZ1Ai88BaagPA9Ylnvys4CyOACKbKCcSh5FpoH9GFxK7KeQBXKRQcV6fWKkBFSW4xEJdxyaFSi3lOsYKUCf4ek6Xgrl7eswXkdvrZdadia0Ncx1ExtLuYwuuy-d0lNtDRh9NJC3dokTrYn6OnnsKlUEMii9NVlDxXiA13U8X64vA-Gn1HN8Hf58FQotx1jllnCd3bgzd7Jnnwcgs9XEGTrLHPMqvK2YwukwM_WBufSaKeFne8X4nDaqnL6-DtqoMfbkiNLqXbvopuvp2QaN9eaHkmw82eg8x7iHld4HGP8sw_e-Q6nfw8uP7xzaK0BZlIFt5WrWlK79HL3L_-HKY3tcZ9KJeRHwFjnG08xJ50ylZuCkT3PEJ1VsOStPnbO9LS55w13LfEpBjeuc0THb0FqWUNq4YfUsmfgyU8BpJngd1y6ljzl1XGE_0xaaMDAWEayXgp5dGa1UWd3WmKNp5dq6SPVxiVxz8_BKq3zHBlW8ecEirUy7aU277o-bdONO53BVRzfzYpOAO6tqKLcydlrZTbwGHJfZO54yiIwcHi-K4WpKTXvYnx4FV1pmyVOqK1VFE2nHUXtOl-ICzTd519W2RUXkvXkMSJLofhWkdXTv6tNecCVkPG8X59CsvdMmlKvhUt5O7fa0fOmdq8DTQRt3FP-6w_acZE7S8HwzJKRGMZleWKvLvHavr7ZLU_VxN24A5_4BBu7QydSZXy2TU0EmIfNMLdY1IuuiNHWqMawEmqcSn7a-cpwvg7CshgHFxT60IYVW0m0jP4bLGvDpeLmC-W3r1KqrFkldtKaYWanVgKbjHXNfKQdWMh8rKSmgy0XQJtf9PeoFUeK0ZfUMVXtvnqBc7SFhioW-dLqWOfm0aD3sQLzKD8xTTG1PbY-7ka-OzjLMeOtCL4W56C0FV3N3hHhEp3lLJDh_daBupsqI_ysEf2raOkZF9NNnv_Dr7J2w_P713rOMghYXvc_ah6q4fte_ARfnWSJnr_6ma_YqvaDn7chTxnm0FFsKot0O3-_Z_9KC_IvSj1PqZ47lOF7kBJxQf0-6HE1-LnQdBkj7vuk-vnyB0X1ePYKcwgU7irlUQM9qMXSLd_cxQX3BWN8bg_9MqkIg_3ebpy11BSY5H25lXekdYuTjoE-SJcVusbhBoB-mRu0Pht0iaYN70Aftm87n8AtLQzqmcP_BQ5Zi-VhgYooHAcELPBNCjvlb95URiF_ar03yC_z61vUzLf1MbfEPwOqHfXj-qbLDowgumurtcTQ57O4kWpZr2VxQ1iE-5yUdcv5RVq3xHvYqlU8bh_C_6dWGBgY97sYmZ8wogmLmJDEnSZPgP2jqg2EXNC14s2_fvv0TX22jag.ZwjUoA.pitPRgpTPJyCaDMIr0TPpBG_lIc +Upgrade-Insecure-Requests: 1 +Sec-Fetch-Dest: document +Sec-Fetch-Mode: navigate +Sec-Fetch-Site: same-origin +Sec-Fetch-User: ?1 +Sec-Gpc: 1 +Priority: u=0, i + + +Request data: b'' +Traceback: Traceback (most recent call last): + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 1473, in wsgi_app + response = self.full_dispatch_request() + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 882, in full_dispatch_request + rv = self.handle_user_exception(e) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask_cors\extension.py", line 178, in wrapped_function + return cors_after_request(app.make_response(f(*args, **kwargs))) + ^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 880, in full_dispatch_request + rv = self.dispatch_request() + ^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 865, in dispatch_request + return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args) # type: ignore[no-any-return] + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\controllers\store\stock_item.py", line 45, in stock_items + return render_template('pages/store/_stock_items.html', model = model, datetime = datetime) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\templating.py", line 150, in render_template + return _render(app, template, context) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\templating.py", line 131, in _render + rv = template.render(context) + ^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\jinja2\environment.py", line 1304, in render + self.environment.handle_exception() + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\jinja2\environment.py", line 939, in handle_exception + raise rewrite_traceback_stack(source=source) + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\pages\store\_stock_items.html", line 1, in top-level template code + {% extends 'layouts/layout.html' %} + ^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\layouts\layout.html", line 316, in top-level template code + {% block page_body %}{% endblock %} + ^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\pages\store\_stock_items.html", line 100, in block 'page_body' + {% include 'components/store/_row_stock_item.html' %} + ^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\components\store\_row_stock_item.html", line 78, in top-level template code + {{ model.ATTR_VALUE_CURRENT }}="{{ currency.id_currency_cost }}" + ^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\jinja2\environment.py", line 487, in getattr + return getattr(obj, attribute) + ^^^^^^^^^^^^^^^^^^^^^^^ +jinja2.exceptions.UndefinedError: 'currency' is undefined + diff --git a/app.log.1 b/app.log.1 index c31f5f8b..82d34c9e 100644 --- a/app.log.1 +++ b/app.log.1 @@ -1,4 +1,47 @@ -Exception on /store/products [GET] +Request: 127.0.0.1 GET http /store/stock_items?id_category=3&id_product=3&is_out_of_stock=false&quantity_min=&quantity_max= Host: 127.0.0.1:5000 +User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:131.0) Gecko/20100101 Firefox/131.0 +Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/png,image/svg+xml,*/*;q=0.8 +Accept-Language: en-GB,en;q=0.5 +Accept-Encoding: gzip, deflate, br, zstd +Referer: http://127.0.0.1:5000/store/stock_items?id_category=3&id_product=&is_out_of_stock=false&quantity_min=&quantity_max= +Dnt: 1 +Connection: keep-alive +Cookie: session=.eJytVlnPqzgS_SutSN1PnVz25ZOuZsgGJIEkhLC9ILBZzB6WLPTc_z4m3-2-_dCzSSOFYLtMnVOuclX9NguGPq1b1EXw2kXt7OO3GQgqP4Alqvyur9to9tG3Q_Trn5aH98bP1agMUDH7mEXwEbRwUSIIi6ivq65Effr3ZJIuQF3Ofp3FqO36KiixwpkZQfjCawj6YGjbqAIvH0ZxMBT97KMaiuItaqME1dVfCD4JkH-M_ckIAut9v__BsQIViiwQRBYSYsATYUAScRRPgJ3_ZuzfoxbFKIKzjzgouugtQRUoBhhB35LMH6ifdmJxNzQY6s_Gd0P73SDtd7vnl8nw2Td8Xl0b-32dRxWWg1gAbMCIPA0ZhuBogqZCigAEB4OQJ7kwZCkYEhyHKQ7f3RAAEHXdHxqi1y4NZYCOaJcHjooOq10Rlto0X2rZlTIIXVfRAwWOPqpZjQLFIICicYeXmHuO24cVTINRfeiZV3iZVx_lggkRS4IXm0LHqLUVm2FKd7UiFgtn617dFzzsYq1Rzr26GJ8usLan_Fjvjp4S3kxnpUgyw87l89Vlo-3TlTJ_v2eq_c7Ir-y-7kb_DC-I2SRjv_GsRD8YZbvpu7AW2uU6NIqIu7KR4kXD7gga1iSSw3wv1kbp1-d-wzV3F6zmNrKeCsk37E0E-gPUQxhc-tS3SjkOLTeu9sXa4q5ZtexW_mEfS-5yL9-qOIOsHDUKhGDeHQebvMQrD5zkKyqsjFyVjO3UaJNzohNJqIwAyJJUURgakRfZv_hldqiGuRdJr3oEFSuU0s1FibD3hbBORZvZjfd4GOLVSVyGYyfuHF7zGN3oLdZkD-yqY5e677rg8MwZP7mE5dgHQx1LOcvMx_MT1OeKJ-nt3k6s8C4sYihlxHlT6KlkeU8arNC51iQcBtGzQW3U-QEOQZKnBJ4UaI77sY5wUAgcQxDvW_AXUXK5jiqpI7VTK4MFK5VT88axVnhe9o03zSvrHjne1cgZJsx2d09JSCvfHrRtShqvnbjAyobA1tuw3PbeBX9QWjmkti9vxfaBbeShbBEhxY6hXRDBWzGbhvZ1Ai88BaagPA9Ylnvys4CyOACKbKCcSh5FpoH9GFxK7KeQBXKRQcV6fWKkBFSW4xEJdxyaFSi3lOsYKUCf4ek6Xgrl7eswXkdvrZdadia0Ncx1ExtLuYwuuy-d0lNtDRh9NJC3dokTrYn6OnnsKlUEMii9NVlDxXiA13U8X64vA-Gn1HN8Hf58FQotx1jllnCd3bgzd7Jnnwcgs9XEGTrLHPMqvK2YwukwM_WBufSaKeFne8X4nDaqnL6-DtqoMfbkiNLqXbvopuvp2QaN9eaHkmw82eg8x7iHld4HGP8sw_e-Q6nfw8uP7xzaK0BZlIFt5WrWlK79HL3L_-HKY3tcZ9KJeRHwFjnG08xJ50ylZuCkT3PEJ1VsOStPnbO9LS55w13LfEpBjeuc0THb0FqWUNq4YfUsmfgyU8BpJngd1y6ljzl1XGE_0xaaMDAWEayXgp5dGa1UWd3WmKNp5dq6SPVxiVxz8_BKq3zHBlW8ecEirUy7aU277o-bdONO53BVRzfzYpOAO6tqKLcydlrZTbwGHJfZO54yiIwcHi-K4WpKTXvYnx4FV1pmyVOqK1VFE2nHUXtOl-ICzTd519W2RUXkvXkMSJLofhWkdXTv6tNecCVkPG8X59CsvdMmlKvhUt5O7fa0fOmdq8DTQRt3FP-6w_acZE7S8HwzJKRGMZleWKvLvHavr7ZLU_VxN24A5_4BBu7QydSZXy2TU0EmIfNMLdY1IuuiNHWqMawEmqcSn7a-cpwvg7CshgHFxT60IYVW0m0jP4bLGvDpeLmC-W3r1KqrFkldtKaYWanVgKbjHXNfKQdWMh8rKSmgy0XQJtf9PeoFUeK0ZfUMVXtvnqBc7SFhioW-dLqWOfm0aD3sQLzKD8xTTG1PbY-7ka-OzjLMeOtCL4W56C0FV3N3hHhEp3lLJDh_daBupsqI_ysEf2raOkZF9NNnv_Dr7J2w_P713rOMghYXvc_ah6q4fte_ARfnWSJnr_6ma_YqvaDn7chTxnm0FFsKot0O3-_Z_9KC_IvSj1PqZ47lOF7kBJxQf0-6HE1-LnQdBkj7vuk-vnyB0X1ePYKcwgU7irlUQM9qMXSLd_cxQX3BWN8bg_9MqkIg_3ebpy11BSY5H25lXekdYuTjoE-SJcVusbhBoB-mRu0Pht0iaYN70Aftm87n8AtLQzqmcP_BQ5Zi-VhgYooHAcELPBNCjvlb95URiF_ar03yC_z61vUzLf1MbfEPwOqHfXj-qbLDowgumurtcTQ57O4kWpZr2VxQ1iE-5yUdcv5RVq3xHvYqlU8bh_C_6dWGBgY97sYmZ8wogmLmJDEnSZPgP2jqg2EXNC14s2_fvv0TX22jag.ZwjUoA.pitPRgpTPJyCaDMIr0TPpBG_lIc +Upgrade-Insecure-Requests: 1 +Sec-Fetch-Dest: document +Sec-Fetch-Mode: navigate +Sec-Fetch-Site: same-origin +Sec-Fetch-User: ?1 +Sec-Gpc: 1 +Priority: u=0, i + + +Request data: b'' +Traceback: Traceback (most recent call last): + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 1473, in wsgi_app + response = self.full_dispatch_request() + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 882, in full_dispatch_request + rv = self.handle_user_exception(e) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask_cors\extension.py", line 178, in wrapped_function + return cors_after_request(app.make_response(f(*args, **kwargs))) + ^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 880, in full_dispatch_request + rv = self.dispatch_request() + ^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 865, in dispatch_request + return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args) # type: ignore[no-any-return] + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\controllers\store\stock_item.py", line 40, in stock_items + model = Model_View_Store_Stock_Item(form_filters) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\models\model_view_store_stock_item.py", line 90, in __init__ + print(f'product: {product}\n{product[Stock_Item.ATTR_ID_PRODUCT_CATEGORY]}\{nself.form_filters.id_category.data}') + ^^^^^ +NameError: name 'nself' is not defined. Did you mean: 'self'? + +Exception on /store/stock_items [GET] Traceback (most recent call last): File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 1473, in wsgi_app response = self.full_dispatch_request() @@ -15,9 +58,9 @@ Traceback (most recent call last): File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 865, in dispatch_request return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args) # type: ignore[no-any-return] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\controllers\store\product.py", line 114, in products - return render_template('pages/store/_products.html', model = model) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\controllers\store\stock_item.py", line 45, in stock_items + return render_template('pages/store/_stock_items.html', model = model, datetime = datetime) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\templating.py", line 150, in render_template return _render(app, template, context) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -28,38 +71,20 @@ Traceback (most recent call last): self.environment.handle_exception() File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\jinja2\environment.py", line 939, in handle_exception raise rewrite_traceback_stack(source=source) - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\pages\store\_products.html", line 1, in top-level template code + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\pages\store\_stock_items.html", line 1, in top-level template code {% extends 'layouts/layout.html' %} ^^^^^^^^^^^^^^^^^^^^^^^^^ File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\layouts\layout.html", line 316, in top-level template code {% block page_body %}{% endblock %} ^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\pages\store\_products.html", line 89, in block 'page_body' - {% include 'components/store/_row_product.html' %} + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\pages\store\_stock_items.html", line 100, in block 'page_body' + {% include 'components/store/_row_stock_item.html' %} ^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\components\store\_row_product.html", line 38, in top-level template code - + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\templates\components\store\_row_stock_item.html", line 78, in top-level template code + {{ model.ATTR_VALUE_CURRENT }}="{{ currency.id_currency_cost }}" ^^^^^^^^^^^^^^^^^^^^^^^^^ File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\jinja2\environment.py", line 487, in getattr return getattr(obj, attribute) ^^^^^^^^^^^^^^^^^^^^^^^ -jinja2.exceptions.UndefinedError: 'permutation' is undefined +jinja2.exceptions.UndefinedError: 'currency' is undefined Server Error: 500 Internal Server Error: The server encountered an internal error and was unable to complete your request. Either the server is overloaded or there is an error in the application. -Request: 127.0.0.1 GET http /store/products? Host: 127.0.0.1:5000 -User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:130.0) Gecko/20100101 Firefox/130.0 -Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/png,image/svg+xml,*/*;q=0.8 -Accept-Language: en-GB,en;q=0.5 -Accept-Encoding: gzip, deflate, br, zstd -Dnt: 1 -Connection: keep-alive -Cookie: session=.eJytVlmzqkgS_isdRnQ_9fGyKyfixoyKAh5BQWR7IaCqkGJXQIGe-9-n8Nzu2w89W8REuFCVReaXlV8uv83Crk2qO24QvDToPnv_bQbCMghhgcugaas7mr239w79-qft7nXwcxcVIc5n7zMEn-EdzgsMYY7aqmwK3CZ_v07SOaiK2a-zGN-btgwLonBmIQgHsodhALr7HZVgCCCKwy5vZ-9ll-cv0R1dcVX-heATAP3HczA5QRG9r_9_CPySiUQeLEUeUmK4oKKQpmIUTwab4IU4eKA7jjGCs_c4zBv0kuAS5B1EMLBX1g-rn34ScdPVxNSfnW-6-3eHtN_9fjtPjs--kftq7nHQVhkqJ2AxRECkKQQBtVjwUBRYCjIAiSwLUMwxgAc8omiRQOy-hyEEADXNHxrQsE8iGeAj3mehq-LDZp9HhTat11p6YUxK11X8xKGrj2pa4VAxKaBowmEQM9_12qiESTiqTz31cz_1q6OccxHmaTDwCXTNStvwacRQD7Wk5nP69pEeN63Xs9qCtY7SPNPvelBJyWjCRoVL5xS_qcch6jvTfFv64zBIvtZq7DFmesA01INmH8M1UvcX6oPpRemNH24tqHUlTNHxKGin8-3UFH2lItye1Kpiec9glm9e6Ny2fT_y8IFF-Tgm0nmzUFSLSx4XvEykeC1KciuiJyuBvJIr1ts-ojI5yZuyP-XVclPvW1PHhxJFHYkuXgyHoaUT0fKTzEhE1m-kYH3gtos8o07W6iOV2coJ-BAd1K0aLJPuiQqVF_L1QU7PV1_sKnUXMzGIrxqDW3e4sSPd2HveXudvzaa63xB73nXJ5ZwPmmr2sd0v8rTJ8JA8alzRwZFyVsYQO81eFV0uyNvjkG9OaprWhwwgq8TRfC3rqwh_SLorJ9ytrKWjtpQNQgPU1_iOmiAkFKQXzIJb8Cwl_NjHhBRLgaOoVxb8BUvOl1Gldaw2amnyYKMKala79oasi7b2p3VpP5DrX8yM46J0__CVK21nu4O2S2hz2ItzoqwLHf0eFbvWP5MXCjuDzG7wN3wbOmYWyTYVMfwYOTkVvhTzSeRcJuO5r8AEFEZHZJkv9zmUxQ4wdA3lZOUzdBI6z85jxHaiLJDzFCr28GkjoaCyHo94-SDULEGxYzzXTAD-pKfn-gmUd8NhvIy-pBdaalCaBDPdIs4yHqfL3qAzeqJJgNNHE_uSR51YTdSl63NfqiKQQeFLdAUV8wmGy2icL4OJybfQM5IOf06FXMuIrWJHee5-3Ft72XeMDsh8OWGG7jojuHJ_JyZwusxUfRIsrSZlrZb6Fy1VBc26CJqkdZqljs4UiMJuPSdvpvT0HZMlerNDQde-bDa-axIq621I7BsyfJ07FPojOv94z2X9HBR5ETp2pqZ14Tn96J__DylP_PHcSSfBRcEbcs3eymjXYBIrdJPeGslN5TvBzhLXcHb5OauFS5FNJaj2XAMf0y2rpWA8Slee-Dvh5SbCaRYY9NEYdCl7agOJM2vjyQaxRYXSeqmnF04jCac7Gne07EyT8kQf19iztk-_sIsXN5j8E5eja2gLlShLSv3SmtEWjkamF7aUqOedeNEKj7HovW6UYMLVEV6mLz5luu3IKuXRJqex9tYo7Ifv7lL74vVTqasUVbPtymBpJ6WuPCmoSu4bT4aT1Nj4uLjMVcq8K7nM5Iykw5PnYLg2WXtVNxQ2Y1nBNAu45hQssjcufabSJUJ8TDJsOCtKCarTIj6p5rgZF0bAhdZtw36sFXf4WIVUsQKatH8AihMUwHCHmw2b2CrDTblqgnO81LitVfHr5NzXYXuWRy5ERd3E-TVZ9fx221egdsL6Lm8Fz1oeOit-eLlB6tSmaSk6CPEu_bAt2G0dUX-uFS4By_gSX_lYZy05FAWmk-W3Rx7oMtrwxoe9Pev1oQ8_qrRopdUTq3WlC8qyHMaTE-_larMbvVawbCE7DXfTrg8nuiL9mKSgnqzMnbq-YWXTNGi8Bt6T1K8GVPXUGclvieFP9b2KcY5--pwXfp29ClbQDq8zaxTeSdP77H24jKtX_-tIc55d5XRob7rmbJIz7m_HBWMao604qxDt9yS_Z__LCPIvWj8pqd9rLMOJFEsK6u9Fl10uPzeahhhI2rZu3r98gejxVj7DjKEEAcVCssR9Oe-a-Wv6mEx9Iba-Dwb_GVSJQfbvDk9HqhJM8s3FjThg9WwnrVGFbuCyo4m4xqDtpkHtD4TN_HoPH2Eb3l9wPh-_8CxkY4bjqAXkGX4RL7mYWYCQWiwXXAQF7m_NV25J_XL_Wl9_gV9fun5mVz8zO_IBsPzhH1l_qmzIE4LzurxOEcdTwBA49LJcKlf-w8jlZr2JraWiBBYTC0dTW7-o0UX_zazW1TBsyTQ2BWPGUAz3RolvjGAxzDvNv1PsnGZYf_bt27d_Agdyo3I.ZvXc6g.WpR0PQjTMWhM_qBkpa9CVzq95M8 -Upgrade-Insecure-Requests: 1 -Sec-Fetch-Dest: document -Sec-Fetch-Mode: navigate -Sec-Fetch-Site: none -Sec-Fetch-User: ?1 -Sec-Gpc: 1 -Priority: u=0, i - - -Request data: b'' diff --git a/app.log.2 b/app.log.2 index b5df9777..54248294 100644 --- a/app.log.2 +++ b/app.log.2 @@ -1,58 +1,16 @@ -Exception on /store/products [GET] -Traceback (most recent call last): - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 1473, in wsgi_app - response = self.full_dispatch_request() - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 882, in full_dispatch_request - rv = self.handle_user_exception(e) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask_cors\extension.py", line 178, in wrapped_function - return cors_after_request(app.make_response(f(*args, **kwargs))) - ^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 880, in full_dispatch_request - rv = self.dispatch_request() - ^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 865, in dispatch_request - return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args) # type: ignore[no-any-return] - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\controllers\store\product.py", line 113, in products - model = Model_View_Store_Product(form_filters) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\models\model_view_store_product.py", line 101, in __init__ - self.category_list_filters, errors_filters = datastore_store.get_many_product( - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\datastores\datastore_store_base.py", line 110, in get_many_product - category_list.add_product(new_product) - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\business_objects\store\product_category.py", line 337, in add_product - self.categories[index_category].add_product(product) - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\business_objects\store\product_category.py", line 100, in add_product - raise ValueError(f"{av.error_msg_str(product, 'product', _m, Product)}\nProduct already in category.") -ValueError: Invalid Category.add_product argument product. Type = . Value = Product - id_product: 1 - id_category: 1 - name: Braille Keyboard Translator - display_order: 1 - can_view: False - can_edit: False - can_admin: False - has_variations: True - permutations: [] - variation trees: [] - -Product already in category. -Server Error: 500 Internal Server Error: The server encountered an internal error and was unable to complete your request. Either the server is overloaded or there is an error in the application. -Request: 127.0.0.1 GET http /store/products? Host: 127.0.0.1:5000 -User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:130.0) Gecko/20100101 Firefox/130.0 +Request: 127.0.0.1 GET http /store/stock_items?id_category=3&id_product=3&is_out_of_stock=false&quantity_min=&quantity_max= Host: 127.0.0.1:5000 +User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:131.0) Gecko/20100101 Firefox/131.0 Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/png,image/svg+xml,*/*;q=0.8 Accept-Language: en-GB,en;q=0.5 Accept-Encoding: gzip, deflate, br, zstd +Referer: http://127.0.0.1:5000/store/stock_items?id_category=3&id_product=&is_out_of_stock=false&quantity_min=&quantity_max= Dnt: 1 Connection: keep-alive -Cookie: session=.eJytVlmzqkgS_isdRnQ_9fGyKyfixoyKAh5BQWR7IaCqkGJXQIGe-9-n8Nzu2w89W8REuFCVReaXlV8uv83Crk2qO24QvDToPnv_bQbCMghhgcugaas7mr239w79-qft7nXwcxcVIc5n7zMEn-EdzgsMYY7aqmwK3CZ_v07SOaiK2a-zGN-btgwLonBmIQgHsodhALr7HZVgCCCKwy5vZ-9ll-cv0R1dcVX-heATAP3HczA5QRG9r_9_CPySiUQeLEUeUmK4oKKQpmIUTwab4IU4eKA7jjGCs_c4zBv0kuAS5B1EMLBX1g-rn34ScdPVxNSfnW-6-3eHtN_9fjtPjs--kftq7nHQVhkqJ2AxRECkKQQBtVjwUBRYCjIAiSwLUMwxgAc8omiRQOy-hyEEADXNHxrQsE8iGeAj3mehq-LDZp9HhTat11p6YUxK11X8xKGrj2pa4VAxKaBowmEQM9_12qiESTiqTz31cz_1q6OccxHmaTDwCXTNStvwacRQD7Wk5nP69pEeN63Xs9qCtY7SPNPvelBJyWjCRoVL5xS_qcch6jvTfFv64zBIvtZq7DFmesA01INmH8M1UvcX6oPpRemNH24tqHUlTNHxKGin8-3UFH2lItye1Kpiec9glm9e6Ny2fT_y8IFF-Tgm0nmzUFSLSx4XvEykeC1KciuiJyuBvJIr1ts-ojI5yZuyP-XVclPvW1PHhxJFHYkuXgyHoaUT0fKTzEhE1m-kYH3gtos8o07W6iOV2coJ-BAd1K0aLJPuiQqVF_L1QU7PV1_sKnUXMzGIrxqDW3e4sSPd2HveXudvzaa63xB73nXJ5ZwPmmr2sd0v8rTJ8JA8alzRwZFyVsYQO81eFV0uyNvjkG9OaprWhwwgq8TRfC3rqwh_SLorJ9ytrKWjtpQNQgPU1_iOmiAkFKQXzIJb8Cwl_NjHhBRLgaOoVxb8BUvOl1Gldaw2amnyYKMKala79oasi7b2p3VpP5DrX8yM46J0__CVK21nu4O2S2hz2ItzoqwLHf0eFbvWP5MXCjuDzG7wN3wbOmYWyTYVMfwYOTkVvhTzSeRcJuO5r8AEFEZHZJkv9zmUxQ4wdA3lZOUzdBI6z85jxHaiLJDzFCr28GkjoaCyHo94-SDULEGxYzzXTAD-pKfn-gmUd8NhvIy-pBdaalCaBDPdIs4yHqfL3qAzeqJJgNNHE_uSR51YTdSl63NfqiKQQeFLdAUV8wmGy2icL4OJybfQM5IOf06FXMuIrWJHee5-3Ft72XeMDsh8OWGG7jojuHJ_JyZwusxUfRIsrSZlrZb6Fy1VBc26CJqkdZqljs4UiMJuPSdvpvT0HZMlerNDQde-bDa-axIq621I7BsyfJ07FPojOv94z2X9HBR5ETp2pqZ14Tn96J__DylP_PHcSSfBRcEbcs3eymjXYBIrdJPeGslN5TvBzhLXcHb5OauFS5FNJaj2XAMf0y2rpWA8Slee-Dvh5SbCaRYY9NEYdCl7agOJM2vjyQaxRYXSeqmnF04jCac7Gne07EyT8kQf19iztk-_sIsXN5j8E5eja2gLlShLSv3SmtEWjkamF7aUqOedeNEKj7HovW6UYMLVEV6mLz5luu3IKuXRJqex9tYo7Ifv7lL74vVTqasUVbPtymBpJ6WuPCmoSu4bT4aT1Nj4uLjMVcq8K7nM5Iykw5PnYLg2WXtVNxQ2Y1nBNAu45hQssjcufabSJUJ8TDJsOCtKCarTIj6p5rgZF0bAhdZtw36sFXf4WIVUsQKatH8AihMUwHCHmw2b2CrDTblqgnO81LitVfHr5NzXYXuWRy5ERd3E-TVZ9fx221egdsL6Lm8Fz1oeOit-eLlB6tSmaSk6CPEu_bAt2G0dUX-uFS4By_gSX_lYZy05FAWmk-W3Rx7oMtrwxoe9Pev1oQ8_qrRopdUTq3WlC8qyHMaTE-_larMbvVawbCE7DXfTrg8nuiL9mKSgnqzMnbq-YWXTNGi8Bt6T1K8GVPXUGclvieFP9b2KcY5--pwXfp29ClbQDq8zaxTeSdP77H24jKtX_-tIc55d5XRob7rmbJIz7m_HBWMao604qxDt9yS_Z__LCPIvWj8pqd9rLMOJFEsK6u9Fl10uPzeahhhI2rZu3r98gejxVj7DjKEEAcVCssR9Oe-a-Wv6mEx9Iba-Dwb_GVSJQfbvDk9HqhJM8s3FjThg9WwnrVGFbuCyo4m4xqDtpkHtD4TN_HoPH2Eb3l9wPh-_8CxkY4bjqAXkGX4RL7mYWYCQWiwXXAQF7m_NV25J_XL_Wl9_gV9fun5mVz8zO_IBsPzhH1l_qmzIE4LzurxOEcdTwBA49LJcKlf-w8jlZr2JraWiBBYTC0dTW7-o0UX_zazW1TBsyTQ2BWPGUAz3RolvjGAxzDvNv1PsnGZYf_bt27d_Agdyo3I.ZvXc6g.WpR0PQjTMWhM_qBkpa9CVzq95M8 +Cookie: session=.eJytVlnPqzgS_SutSN1PnVz25ZOuZsgGJIEkhLC9ILBZzB6WLPTc_z4m3-2-_dCzSSOFYLtMnVOuclX9NguGPq1b1EXw2kXt7OO3GQgqP4Alqvyur9to9tG3Q_Trn5aH98bP1agMUDH7mEXwEbRwUSIIi6ivq65Effr3ZJIuQF3Ofp3FqO36KiixwpkZQfjCawj6YGjbqAIvH0ZxMBT97KMaiuItaqME1dVfCD4JkH-M_ckIAut9v__BsQIViiwQRBYSYsATYUAScRRPgJ3_ZuzfoxbFKIKzjzgouugtQRUoBhhB35LMH6ifdmJxNzQY6s_Gd0P73SDtd7vnl8nw2Td8Xl0b-32dRxWWg1gAbMCIPA0ZhuBogqZCigAEB4OQJ7kwZCkYEhyHKQ7f3RAAEHXdHxqi1y4NZYCOaJcHjooOq10Rlto0X2rZlTIIXVfRAwWOPqpZjQLFIICicYeXmHuO24cVTINRfeiZV3iZVx_lggkRS4IXm0LHqLUVm2FKd7UiFgtn617dFzzsYq1Rzr26GJ8usLan_Fjvjp4S3kxnpUgyw87l89Vlo-3TlTJ_v2eq_c7Ir-y-7kb_DC-I2SRjv_GsRD8YZbvpu7AW2uU6NIqIu7KR4kXD7gga1iSSw3wv1kbp1-d-wzV3F6zmNrKeCsk37E0E-gPUQxhc-tS3SjkOLTeu9sXa4q5ZtexW_mEfS-5yL9-qOIOsHDUKhGDeHQebvMQrD5zkKyqsjFyVjO3UaJNzohNJqIwAyJJUURgakRfZv_hldqiGuRdJr3oEFSuU0s1FibD3hbBORZvZjfd4GOLVSVyGYyfuHF7zGN3oLdZkD-yqY5e677rg8MwZP7mE5dgHQx1LOcvMx_MT1OeKJ-nt3k6s8C4sYihlxHlT6KlkeU8arNC51iQcBtGzQW3U-QEOQZKnBJ4UaI77sY5wUAgcQxDvW_AXUXK5jiqpI7VTK4MFK5VT88axVnhe9o03zSvrHjne1cgZJsx2d09JSCvfHrRtShqvnbjAyobA1tuw3PbeBX9QWjmkti9vxfaBbeShbBEhxY6hXRDBWzGbhvZ1Ai88BaagPA9Ylnvys4CyOACKbKCcSh5FpoH9GFxK7KeQBXKRQcV6fWKkBFSW4xEJdxyaFSi3lOsYKUCf4ek6Xgrl7eswXkdvrZdadia0Ncx1ExtLuYwuuy-d0lNtDRh9NJC3dokTrYn6OnnsKlUEMii9NVlDxXiA13U8X64vA-Gn1HN8Hf58FQotx1jllnCd3bgzd7Jnnwcgs9XEGTrLHPMqvK2YwukwM_WBufSaKeFne8X4nDaqnL6-DtqoMfbkiNLqXbvopuvp2QaN9eaHkmw82eg8x7iHld4HGP8sw_e-Q6nfw8uP7xzaK0BZlIFt5WrWlK79HL3L_-HKY3tcZ9KJeRHwFjnG08xJ50ylZuCkT3PEJ1VsOStPnbO9LS55w13LfEpBjeuc0THb0FqWUNq4YfUsmfgyU8BpJngd1y6ljzl1XGE_0xaaMDAWEayXgp5dGa1UWd3WmKNp5dq6SPVxiVxz8_BKq3zHBlW8ecEirUy7aU277o-bdONO53BVRzfzYpOAO6tqKLcydlrZTbwGHJfZO54yiIwcHi-K4WpKTXvYnx4FV1pmyVOqK1VFE2nHUXtOl-ICzTd519W2RUXkvXkMSJLofhWkdXTv6tNecCVkPG8X59CsvdMmlKvhUt5O7fa0fOmdq8DTQRt3FP-6w_acZE7S8HwzJKRGMZleWKvLvHavr7ZLU_VxN24A5_4BBu7QydSZXy2TU0EmIfNMLdY1IuuiNHWqMawEmqcSn7a-cpwvg7CshgHFxT60IYVW0m0jP4bLGvDpeLmC-W3r1KqrFkldtKaYWanVgKbjHXNfKQdWMh8rKSmgy0XQJtf9PeoFUeK0ZfUMVXtvnqBc7SFhioW-dLqWOfm0aD3sQLzKD8xTTG1PbY-7ka-OzjLMeOtCL4W56C0FV3N3hHhEp3lLJDh_daBupsqI_ysEf2raOkZF9NNnv_Dr7J2w_P713rOMghYXvc_ah6q4fte_ARfnWSJnr_6ma_YqvaDn7chTxnm0FFsKot0O3-_Z_9KC_IvSj1PqZ47lOF7kBJxQf0-6HE1-LnQdBkj7vuk-vnyB0X1ePYKcwgU7irlUQM9qMXSLd_cxQX3BWN8bg_9MqkIg_3ebpy11BSY5H25lXekdYuTjoE-SJcVusbhBoB-mRu0Pht0iaYN70Aftm87n8AtLQzqmcP_BQ5Zi-VhgYooHAcELPBNCjvlb95URiF_ar03yC_z61vUzLf1MbfEPwOqHfXj-qbLDowgumurtcTQ57O4kWpZr2VxQ1iE-5yUdcv5RVq3xHvYqlU8bh_C_6dWGBgY97sYmZ8wogmLmJDEnSZPgP2jqg2EXNC14s2_fvv0TX22jag.ZwjUoA.pitPRgpTPJyCaDMIr0TPpBG_lIc Upgrade-Insecure-Requests: 1 Sec-Fetch-Dest: document Sec-Fetch-Mode: navigate -Sec-Fetch-Site: none +Sec-Fetch-Site: same-origin Sec-Fetch-User: ?1 Sec-Gpc: 1 Priority: u=0, i @@ -75,29 +33,36 @@ Traceback: Traceback (most recent call last): File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 865, in dispatch_request return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args) # type: ignore[no-any-return] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\controllers\store\product.py", line 113, in products - model = Model_View_Store_Product(form_filters) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\models\model_view_store_product.py", line 101, in __init__ - self.category_list_filters, errors_filters = datastore_store.get_many_product( - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\datastores\datastore_store_base.py", line 110, in get_many_product - category_list.add_product(new_product) - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\business_objects\store\product_category.py", line 337, in add_product - self.categories[index_category].add_product(product) - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\business_objects\store\product_category.py", line 100, in add_product - raise ValueError(f"{av.error_msg_str(product, 'product', _m, Product)}\nProduct already in category.") -ValueError: Invalid Category.add_product argument product. Type = . Value = Product - id_product: 1 - id_category: 1 - name: Braille Keyboard Translator - display_order: 1 - can_view: False - can_edit: False - can_admin: False - has_variations: True - permutations: [] - variation trees: [] - -Product already in category. + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\controllers\store\stock_item.py", line 40, in stock_items + model = Model_View_Store_Stock_Item(form_filters) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\models\model_view_store_stock_item.py", line 89, in __init__ + if product.id_category != self.form_filters.id_category.data and self.form_filters.id_category.data != '': + ^^^^^^^^^^^^^^^^^^^ +AttributeError: 'dict' object has no attribute 'id_category' +Exception on /store/stock_items [GET] +Traceback (most recent call last): + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 1473, in wsgi_app + response = self.full_dispatch_request() + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 882, in full_dispatch_request + rv = self.handle_user_exception(e) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask_cors\extension.py", line 178, in wrapped_function + return cors_after_request(app.make_response(f(*args, **kwargs))) + ^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 880, in full_dispatch_request + rv = self.dispatch_request() + ^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 865, in dispatch_request + return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args) # type: ignore[no-any-return] + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\controllers\store\stock_item.py", line 40, in stock_items + model = Model_View_Store_Stock_Item(form_filters) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\models\model_view_store_stock_item.py", line 90, in __init__ + print(f'product: {product}\n{product[Stock_Item.ATTR_ID_PRODUCT_CATEGORY]}\{nself.form_filters.id_category.data}') + ^^^^^ +NameError: name 'nself' is not defined. Did you mean: 'self'? +Server Error: 500 Internal Server Error: The server encountered an internal error and was unable to complete your request. Either the server is overloaded or there is an error in the application. diff --git a/app.log.3 b/app.log.3 index c9275d8f..f3930331 100644 --- a/app.log.3 +++ b/app.log.3 @@ -1,58 +1,16 @@ -Exception on /store/products [GET] -Traceback (most recent call last): - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 1473, in wsgi_app - response = self.full_dispatch_request() - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 882, in full_dispatch_request - rv = self.handle_user_exception(e) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask_cors\extension.py", line 178, in wrapped_function - return cors_after_request(app.make_response(f(*args, **kwargs))) - ^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 880, in full_dispatch_request - rv = self.dispatch_request() - ^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 865, in dispatch_request - return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args) # type: ignore[no-any-return] - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\controllers\store\product.py", line 113, in products - model = Model_View_Store_Product(form_filters) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\models\model_view_store_product.py", line 101, in __init__ - self.category_list_filters, errors_filters = datastore_store.get_many_product( - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\datastores\datastore_store_base.py", line 109, in get_many_product - category_list.add_product(new_product) - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\business_objects\store\product_category.py", line 337, in add_product - self.categories[index_category].add_product(product) - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\business_objects\store\product_category.py", line 100, in add_product - raise ValueError(f"{av.error_msg_str(product, 'product', _m, Product)}\nProduct already in category.") -ValueError: Invalid Category.add_product argument product. Type = . Value = Product - id_product: 1 - id_category: 1 - name: Braille Keyboard Translator - display_order: 1 - can_view: False - can_edit: False - can_admin: False - has_variations: True - permutations: [] - variation trees: [] - -Product already in category. -Server Error: 500 Internal Server Error: The server encountered an internal error and was unable to complete your request. Either the server is overloaded or there is an error in the application. -Request: 127.0.0.1 GET http /store/products? Host: 127.0.0.1:5000 -User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:130.0) Gecko/20100101 Firefox/130.0 +Request: 127.0.0.1 GET http /store/stock_items?id_category=3&id_product=3&is_out_of_stock=false&quantity_min=&quantity_max= Host: 127.0.0.1:5000 +User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:131.0) Gecko/20100101 Firefox/131.0 Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/png,image/svg+xml,*/*;q=0.8 Accept-Language: en-GB,en;q=0.5 Accept-Encoding: gzip, deflate, br, zstd +Referer: http://127.0.0.1:5000/store/stock_items?id_category=3&id_product=&is_out_of_stock=false&quantity_min=&quantity_max= Dnt: 1 Connection: keep-alive -Cookie: session=.eJytVlmzqkgS_isdRnQ_9fGyKyfixoyKAh5BQWR7IaCqkGJXQIGe-9-n8Nzu2w89W8REuFCVReaXlV8uv83Crk2qO24QvDToPnv_bQbCMghhgcugaas7mr239w79-qft7nXwcxcVIc5n7zMEn-EdzgsMYY7aqmwK3CZ_v07SOaiK2a-zGN-btgwLonBmIQgHsodhALr7HZVgCCCKwy5vZ-9ll-cv0R1dcVX-heATAP3HczA5QRG9r_9_CPySiUQeLEUeUmK4oKKQpmIUTwab4IU4eKA7jjGCs_c4zBv0kuAS5B1EMLBX1g-rn34ScdPVxNSfnW-6-3eHtN_9fjtPjs--kftq7nHQVhkqJ2AxRECkKQQBtVjwUBRYCjIAiSwLUMwxgAc8omiRQOy-hyEEADXNHxrQsE8iGeAj3mehq-LDZp9HhTat11p6YUxK11X8xKGrj2pa4VAxKaBowmEQM9_12qiESTiqTz31cz_1q6OccxHmaTDwCXTNStvwacRQD7Wk5nP69pEeN63Xs9qCtY7SPNPvelBJyWjCRoVL5xS_qcch6jvTfFv64zBIvtZq7DFmesA01INmH8M1UvcX6oPpRemNH24tqHUlTNHxKGin8-3UFH2lItye1Kpiec9glm9e6Ny2fT_y8IFF-Tgm0nmzUFSLSx4XvEykeC1KciuiJyuBvJIr1ts-ojI5yZuyP-XVclPvW1PHhxJFHYkuXgyHoaUT0fKTzEhE1m-kYH3gtos8o07W6iOV2coJ-BAd1K0aLJPuiQqVF_L1QU7PV1_sKnUXMzGIrxqDW3e4sSPd2HveXudvzaa63xB73nXJ5ZwPmmr2sd0v8rTJ8JA8alzRwZFyVsYQO81eFV0uyNvjkG9OaprWhwwgq8TRfC3rqwh_SLorJ9ytrKWjtpQNQgPU1_iOmiAkFKQXzIJb8Cwl_NjHhBRLgaOoVxb8BUvOl1Gldaw2amnyYKMKala79oasi7b2p3VpP5DrX8yM46J0__CVK21nu4O2S2hz2ItzoqwLHf0eFbvWP5MXCjuDzG7wN3wbOmYWyTYVMfwYOTkVvhTzSeRcJuO5r8AEFEZHZJkv9zmUxQ4wdA3lZOUzdBI6z85jxHaiLJDzFCr28GkjoaCyHo94-SDULEGxYzzXTAD-pKfn-gmUd8NhvIy-pBdaalCaBDPdIs4yHqfL3qAzeqJJgNNHE_uSR51YTdSl63NfqiKQQeFLdAUV8wmGy2icL4OJybfQM5IOf06FXMuIrWJHee5-3Ft72XeMDsh8OWGG7jojuHJ_JyZwusxUfRIsrSZlrZb6Fy1VBc26CJqkdZqljs4UiMJuPSdvpvT0HZMlerNDQde-bDa-axIq621I7BsyfJ07FPojOv94z2X9HBR5ETp2pqZ14Tn96J__DylP_PHcSSfBRcEbcs3eymjXYBIrdJPeGslN5TvBzhLXcHb5OauFS5FNJaj2XAMf0y2rpWA8Slee-Dvh5SbCaRYY9NEYdCl7agOJM2vjyQaxRYXSeqmnF04jCac7Gne07EyT8kQf19iztk-_sIsXN5j8E5eja2gLlShLSv3SmtEWjkamF7aUqOedeNEKj7HovW6UYMLVEV6mLz5luu3IKuXRJqex9tYo7Ifv7lL74vVTqasUVbPtymBpJ6WuPCmoSu4bT4aT1Nj4uLjMVcq8K7nM5Iykw5PnYLg2WXtVNxQ2Y1nBNAu45hQssjcufabSJUJ8TDJsOCtKCarTIj6p5rgZF0bAhdZtw36sFXf4WIVUsQKatH8AihMUwHCHmw2b2CrDTblqgnO81LitVfHr5NzXYXuWRy5ERd3E-TVZ9fx221egdsL6Lm8Fz1oeOit-eLlB6tSmaSk6CPEu_bAt2G0dUX-uFS4By_gSX_lYZy05FAWmk-W3Rx7oMtrwxoe9Pev1oQ8_qrRopdUTq3WlC8qyHMaTE-_larMbvVawbCE7DXfTrg8nuiL9mKSgnqzMnbq-YWXTNGi8Bt6T1K8GVPXUGclvieFP9b2KcY5--pwXfp29ClbQDq8zaxTeSdP77H24jKtX_-tIc55d5XRob7rmbJIz7m_HBWMao604qxDt9yS_Z__LCPIvWj8pqd9rLMOJFEsK6u9Fl10uPzeahhhI2rZu3r98gejxVj7DjKEEAcVCssR9Oe-a-Wv6mEx9Iba-Dwb_GVSJQfbvDk9HqhJM8s3FjThg9WwnrVGFbuCyo4m4xqDtpkHtD4TN_HoPH2Eb3l9wPh-_8CxkY4bjqAXkGX4RL7mYWYCQWiwXXAQF7m_NV25J_XL_Wl9_gV9fun5mVz8zO_IBsPzhH1l_qmzIE4LzurxOEcdTwBA49LJcKlf-w8jlZr2JraWiBBYTC0dTW7-o0UX_zazW1TBsyTQ2BWPGUAz3RolvjGAxzDvNv1PsnGZYf_bt27d_Agdyo3I.ZvXc6g.WpR0PQjTMWhM_qBkpa9CVzq95M8 +Cookie: session=.eJytVlnPqzgS_SutSN1PnVz25ZOuZsgGJIEkhLC9ILBZzB6WLPTc_z4m3-2-_dCzSSOFYLtMnVOuclX9NguGPq1b1EXw2kXt7OO3GQgqP4Alqvyur9to9tG3Q_Trn5aH98bP1agMUDH7mEXwEbRwUSIIi6ivq65Effr3ZJIuQF3Ofp3FqO36KiixwpkZQfjCawj6YGjbqAIvH0ZxMBT97KMaiuItaqME1dVfCD4JkH-M_ckIAut9v__BsQIViiwQRBYSYsATYUAScRRPgJ3_ZuzfoxbFKIKzjzgouugtQRUoBhhB35LMH6ifdmJxNzQY6s_Gd0P73SDtd7vnl8nw2Td8Xl0b-32dRxWWg1gAbMCIPA0ZhuBogqZCigAEB4OQJ7kwZCkYEhyHKQ7f3RAAEHXdHxqi1y4NZYCOaJcHjooOq10Rlto0X2rZlTIIXVfRAwWOPqpZjQLFIICicYeXmHuO24cVTINRfeiZV3iZVx_lggkRS4IXm0LHqLUVm2FKd7UiFgtn617dFzzsYq1Rzr26GJ8usLan_Fjvjp4S3kxnpUgyw87l89Vlo-3TlTJ_v2eq_c7Ir-y-7kb_DC-I2SRjv_GsRD8YZbvpu7AW2uU6NIqIu7KR4kXD7gga1iSSw3wv1kbp1-d-wzV3F6zmNrKeCsk37E0E-gPUQxhc-tS3SjkOLTeu9sXa4q5ZtexW_mEfS-5yL9-qOIOsHDUKhGDeHQebvMQrD5zkKyqsjFyVjO3UaJNzohNJqIwAyJJUURgakRfZv_hldqiGuRdJr3oEFSuU0s1FibD3hbBORZvZjfd4GOLVSVyGYyfuHF7zGN3oLdZkD-yqY5e677rg8MwZP7mE5dgHQx1LOcvMx_MT1OeKJ-nt3k6s8C4sYihlxHlT6KlkeU8arNC51iQcBtGzQW3U-QEOQZKnBJ4UaI77sY5wUAgcQxDvW_AXUXK5jiqpI7VTK4MFK5VT88axVnhe9o03zSvrHjne1cgZJsx2d09JSCvfHrRtShqvnbjAyobA1tuw3PbeBX9QWjmkti9vxfaBbeShbBEhxY6hXRDBWzGbhvZ1Ai88BaagPA9Ylnvys4CyOACKbKCcSh5FpoH9GFxK7KeQBXKRQcV6fWKkBFSW4xEJdxyaFSi3lOsYKUCf4ek6Xgrl7eswXkdvrZdadia0Ncx1ExtLuYwuuy-d0lNtDRh9NJC3dokTrYn6OnnsKlUEMii9NVlDxXiA13U8X64vA-Gn1HN8Hf58FQotx1jllnCd3bgzd7Jnnwcgs9XEGTrLHPMqvK2YwukwM_WBufSaKeFne8X4nDaqnL6-DtqoMfbkiNLqXbvopuvp2QaN9eaHkmw82eg8x7iHld4HGP8sw_e-Q6nfw8uP7xzaK0BZlIFt5WrWlK79HL3L_-HKY3tcZ9KJeRHwFjnG08xJ50ylZuCkT3PEJ1VsOStPnbO9LS55w13LfEpBjeuc0THb0FqWUNq4YfUsmfgyU8BpJngd1y6ljzl1XGE_0xaaMDAWEayXgp5dGa1UWd3WmKNp5dq6SPVxiVxz8_BKq3zHBlW8ecEirUy7aU277o-bdONO53BVRzfzYpOAO6tqKLcydlrZTbwGHJfZO54yiIwcHi-K4WpKTXvYnx4FV1pmyVOqK1VFE2nHUXtOl-ICzTd519W2RUXkvXkMSJLofhWkdXTv6tNecCVkPG8X59CsvdMmlKvhUt5O7fa0fOmdq8DTQRt3FP-6w_acZE7S8HwzJKRGMZleWKvLvHavr7ZLU_VxN24A5_4BBu7QydSZXy2TU0EmIfNMLdY1IuuiNHWqMawEmqcSn7a-cpwvg7CshgHFxT60IYVW0m0jP4bLGvDpeLmC-W3r1KqrFkldtKaYWanVgKbjHXNfKQdWMh8rKSmgy0XQJtf9PeoFUeK0ZfUMVXtvnqBc7SFhioW-dLqWOfm0aD3sQLzKD8xTTG1PbY-7ka-OzjLMeOtCL4W56C0FV3N3hHhEp3lLJDh_daBupsqI_ysEf2raOkZF9NNnv_Dr7J2w_P713rOMghYXvc_ah6q4fte_ARfnWSJnr_6ma_YqvaDn7chTxnm0FFsKot0O3-_Z_9KC_IvSj1PqZ47lOF7kBJxQf0-6HE1-LnQdBkj7vuk-vnyB0X1ePYKcwgU7irlUQM9qMXSLd_cxQX3BWN8bg_9MqkIg_3ebpy11BSY5H25lXekdYuTjoE-SJcVusbhBoB-mRu0Pht0iaYN70Aftm87n8AtLQzqmcP_BQ5Zi-VhgYooHAcELPBNCjvlb95URiF_ar03yC_z61vUzLf1MbfEPwOqHfXj-qbLDowgumurtcTQ57O4kWpZr2VxQ1iE-5yUdcv5RVq3xHvYqlU8bh_C_6dWGBgY97sYmZ8wogmLmJDEnSZPgP2jqg2EXNC14s2_fvv0TX22jag.ZwjUoA.pitPRgpTPJyCaDMIr0TPpBG_lIc Upgrade-Insecure-Requests: 1 Sec-Fetch-Dest: document Sec-Fetch-Mode: navigate -Sec-Fetch-Site: none +Sec-Fetch-Site: same-origin Sec-Fetch-User: ?1 Sec-Gpc: 1 Priority: u=0, i @@ -75,29 +33,36 @@ Traceback: Traceback (most recent call last): File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 865, in dispatch_request return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args) # type: ignore[no-any-return] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\controllers\store\product.py", line 113, in products - model = Model_View_Store_Product(form_filters) - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\models\model_view_store_product.py", line 101, in __init__ - self.category_list_filters, errors_filters = datastore_store.get_many_product( - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\datastores\datastore_store_base.py", line 109, in get_many_product - category_list.add_product(new_product) - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\business_objects\store\product_category.py", line 337, in add_product - self.categories[index_category].add_product(product) - File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\business_objects\store\product_category.py", line 100, in add_product - raise ValueError(f"{av.error_msg_str(product, 'product', _m, Product)}\nProduct already in category.") -ValueError: Invalid Category.add_product argument product. Type = . Value = Product - id_product: 1 - id_category: 1 - name: Braille Keyboard Translator - display_order: 1 - can_view: False - can_edit: False - can_admin: False - has_variations: True - permutations: [] - variation trees: [] - -Product already in category. + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\controllers\store\stock_item.py", line 40, in stock_items + model = Model_View_Store_Stock_Item(form_filters) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\models\model_view_store_stock_item.py", line 89, in __init__ + self.form_filters.import_values(filters_stock_item) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +AttributeError: 'Filters_Stock_Item' object has no attribute 'import_values' +Exception on /store/stock_items [GET] +Traceback (most recent call last): + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 1473, in wsgi_app + response = self.full_dispatch_request() + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 882, in full_dispatch_request + rv = self.handle_user_exception(e) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask_cors\extension.py", line 178, in wrapped_function + return cors_after_request(app.make_response(f(*args, **kwargs))) + ^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 880, in full_dispatch_request + rv = self.dispatch_request() + ^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\AppData\Local\Programs\Python\Python312\Lib\site-packages\flask\app.py", line 865, in dispatch_request + return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args) # type: ignore[no-any-return] + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\controllers\store\stock_item.py", line 40, in stock_items + model = Model_View_Store_Stock_Item(form_filters) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + File "C:\Users\edwar\OneDrive\Documents\Programming\Visual Studio 2022\PARTS_Web\app\models\model_view_store_stock_item.py", line 89, in __init__ + if product.id_category != self.form_filters.id_category.data and self.form_filters.id_category.data != '': + ^^^^^^^^^^^^^^^^^^^ +AttributeError: 'dict' object has no attribute 'id_category' +Server Error: 500 Internal Server Error: The server encountered an internal error and was unable to complete your request. Either the server is overloaded or there is an error in the application. diff --git a/business_objects/__pycache__/__init__.cpython-312.pyc b/business_objects/__pycache__/__init__.cpython-312.pyc index f3873cc2..69c5ed95 100644 Binary files a/business_objects/__pycache__/__init__.cpython-312.pyc and b/business_objects/__pycache__/__init__.cpython-312.pyc differ diff --git a/business_objects/__pycache__/base.cpython-312.pyc b/business_objects/__pycache__/base.cpython-312.pyc index 0dfde09f..5f33a95b 100644 Binary files a/business_objects/__pycache__/base.cpython-312.pyc and b/business_objects/__pycache__/base.cpython-312.pyc differ diff --git a/business_objects/__pycache__/currency.cpython-312.pyc b/business_objects/__pycache__/currency.cpython-312.pyc index d800db15..ba5f57da 100644 Binary files a/business_objects/__pycache__/currency.cpython-312.pyc and b/business_objects/__pycache__/currency.cpython-312.pyc differ diff --git a/business_objects/__pycache__/db_base.cpython-312.pyc b/business_objects/__pycache__/db_base.cpython-312.pyc index 2530a31a..52964c18 100644 Binary files a/business_objects/__pycache__/db_base.cpython-312.pyc and b/business_objects/__pycache__/db_base.cpython-312.pyc differ diff --git a/business_objects/__pycache__/sql_error.cpython-312.pyc b/business_objects/__pycache__/sql_error.cpython-312.pyc index 18727de8..734fe7ea 100644 Binary files a/business_objects/__pycache__/sql_error.cpython-312.pyc and b/business_objects/__pycache__/sql_error.cpython-312.pyc differ diff --git a/business_objects/__pycache__/unit_measurement.cpython-312.pyc b/business_objects/__pycache__/unit_measurement.cpython-312.pyc index 2747280a..1ac57a37 100644 Binary files a/business_objects/__pycache__/unit_measurement.cpython-312.pyc and b/business_objects/__pycache__/unit_measurement.cpython-312.pyc differ diff --git a/business_objects/__pycache__/user.cpython-312.pyc b/business_objects/__pycache__/user.cpython-312.pyc index 06e7cefe..1e34e0f0 100644 Binary files a/business_objects/__pycache__/user.cpython-312.pyc and b/business_objects/__pycache__/user.cpython-312.pyc differ diff --git a/business_objects/address.py b/business_objects/address.py new file mode 100644 index 00000000..78199060 --- /dev/null +++ b/business_objects/address.py @@ -0,0 +1,97 @@ +""" +Project: PARTS Website +Author: Edward Middleton-Smith + Precision And Research Technology Systems Limited + +Technology: Business Objects +Feature: Address Business Object + +Description: +Business object for address +""" + +# internal +import lib.argument_validation as av +from business_objects.base import Base +from business_objects.region import Region +from extensions import db +# external +from typing import ClassVar + + +class Address(db.Model, Base): + FLAG_ADDRESS_LINE_1: ClassVar[str] = 'address_line_1' + FLAG_ADDRESS_LINE_2: ClassVar[str] = 'address_line_2' + FLAG_CITY: ClassVar[str] = 'city' + FLAG_COUNTY: ClassVar[str] = 'county' + NAME_ATTR_OPTION_VALUE: ClassVar[str] = Base.ATTR_ID_ADDRESS + NAME_ATTR_OPTION_TEXT: ClassVar[str] = Base.FLAG_POSTCODE + __tablename__ = 'Shop_Address' + id_address = db.Column(db.Integer, primary_key=True) + id_region = db.Column(db.Integer) + postcode = db.Column(db.String(20)) + address_line_1 = db.Column(db.String(256)) + address_line_2 = db.Column(db.String(256)) + city = db.Column(db.String(256)) + county = db.Column(db.String(256)) + active = db.Column(db.Boolean) + + # region = None + + def __init__(self): + super().__init__() + Base.__init__(self) + self.region = None + @classmethod + def from_DB_storage_location(cls, query_row): + address = cls() + address.id_address = query_row[2] + address.id_region = query_row[3] + return address + @classmethod + def from_DB_plant(cls, query_row): + address = cls() + address.id_address = query_row[1] + address.id_region = query_row[2] + @classmethod + def from_DB_stock_item(cls, query_row): + address = cls() + address.id_address = query_row[6] + address.id_region = query_row[7] + return address + def __repr__(self): + return f''' + {self.ATTR_ID_ADDRESS}: {self.id_address} + {self.FLAG_REGION}: {self.region} + {self.FLAG_POSTCODE}: {self.postcode} + {self.FLAG_ADDRESS_LINE_1}: {self.address_line_1} + {self.FLAG_ADDRESS_LINE_2}: {self.address_line_2} + {self.FLAG_CITY}: {self.city} + {self.FLAG_COUNTY}: {self.county} + {self.FLAG_ACTIVE}: {self.active} + ''' + def to_json(self): + return { + **self.get_shared_json_attributes(self), + self.ATTR_ID_ADDRESS: self.id_address, + self.FLAG_REGION: self.region.to_json(), + self.FLAG_POSTCODE: self.postcode, + self.FLAG_ADDRESS_LINE_1: self.address_line_1, + self.FLAG_ADDRESS_LINE_2: self.address_line_2, + self.FLAG_CITY: self.city, + self.FLAG_COUNTY: self.county, + self.FLAG_ACTIVE: 1 if av.input_bool(self.active, self.FLAG_ACTIVE, f'{self.__class__.__name__}.to_json') else 0 + } + @classmethod + def from_json(cls, json): + print(f'{cls.__name__}.from_json: {json}') + address = cls() + address.id_address = json[cls.ATTR_ID_ADDRESS], + address.region = Region.from_json(json[cls.FLAG_REGION]), + address.postcode = json[cls.FLAG_POSTCODE], + address.address_line_1 = json[cls.FLAG_ADDRESS_LINE_1], + address.address_line_2 = json.get(cls.FLAG_ADDRESS_LINE_2, ''), + address.city = json[cls.FLAG_CITY], + address.county = json[cls.FLAG_COUNTY], + address.active = json[cls.FLAG_ACTIVE] + return address diff --git a/business_objects/base.py b/business_objects/base.py index c5b1a1b2..6d6c9a9a 100644 --- a/business_objects/base.py +++ b/business_objects/base.py @@ -19,15 +19,20 @@ from typing import ClassVar class Base(): ATTR_ID_ACCESS_LEVEL: ClassVar[str] = 'id_access_level' + ATTR_ID_ADDRESS: ClassVar[str] = 'id_address' ATTR_ID_CURRENCY: ClassVar[str] = 'id_currency' - ATTR_ID_DELIVERY_REGION: ClassVar[str] = 'id_delivery_region' + ATTR_ID_REGION: ClassVar[str] = 'id_region' ATTR_ID_USER: ClassVar[str] = 'id_user' + ATTR_ID_USER_MANAGER: ClassVar[str] = 'id_user_manager' FLAG_ACCESS_LEVEL_REQUIRED: ClassVar[str] = 'access_level_required' FLAG_ACTIVE: ClassVar[str] = 'active' + FLAG_ADDRESS: ClassVar[str] = 'address' FLAG_CAN_ADMIN: ClassVar[str] = 'can_admin' FLAG_CAN_EDIT: ClassVar[str] = 'can_edit' FLAG_CAN_VIEW: ClassVar[str] = 'can_view' FLAG_CODE: ClassVar[str] = 'code' + FLAG_CURRENCY: ClassVar[str] = 'currency' + FLAG_CURRENCY_COST: ClassVar[str] = 'currency_cost' FLAG_DESCRIPTION: ClassVar[str] = 'description' FLAG_DISPLAY_ORDER: ClassVar[str] = 'display_order' FLAG_GUID: ClassVar[str] = 'guid' @@ -38,10 +43,14 @@ class Base(): FLAG_NAME_ATTR_OPTION_VALUE: ClassVar[str] = 'NAME_ATTR_OPTION_VALUE' FLAG_NAME_SINGULAR: ClassVar[str] = 'name_singular' FLAG_NAME_PLURAL: ClassVar[str] = 'name_plural' + FLAG_POSTCODE: ClassVar[str] = 'postcode' FLAG_PRIORITY: ClassVar[str] = 'priority' + FLAG_REGION: ClassVar[str] = 'region' FLAG_ROWS: ClassVar[str] = 'rows' FLAG_SYMBOL: ClassVar[str] = 'symbol' FLAG_URL: ClassVar[str] = 'url' + FLAG_VALUE_LOCAL_VAT_EXCL: ClassVar[str] = 'value_local_vat_excl' + FLAG_VALUE_LOCAL_VAT_INCL: ClassVar[str] = 'value_local_vat_incl' NAME_ATTR_OPTION_TEXT: ClassVar[str] = 'name-attribute-option-text' NAME_ATTR_OPTION_VALUE: ClassVar[str] = 'name-attribute-option-value' diff --git a/business_objects/store/currency.py b/business_objects/currency.py similarity index 93% rename from business_objects/store/currency.py rename to business_objects/currency.py index eb67f2b9..5cfd09c6 100644 --- a/business_objects/store/currency.py +++ b/business_objects/currency.py @@ -81,6 +81,15 @@ class Currency(db.Model, Store_Base): v_arg_type = 'class attribute' currency = cls() return currency + @classmethod + def from_DB_stock_item(cls, query_row): + _m = 'Currency.from_DB_get_many_stock_item' + v_arg_type = 'class attribute' + currency = cls() + currency.id_currency = query_row[12] + currency.code = query_row[13] + currency.symbol = query_row[14] + return currency def __repr__(self): return f''' id: {self.id_currency} diff --git a/business_objects/db_base.py b/business_objects/db_base.py index d565b4a9..b711a9fd 100644 --- a/business_objects/db_base.py +++ b/business_objects/db_base.py @@ -30,11 +30,8 @@ class Get_Many_Parameters_Base(BaseModel, metaclass=ABCMeta): @abstractmethod def get_default(cls): # , id_user pass - """ - @abstractmethod def to_json(self): - pass - """ + return self.dict() """ @classmethod @abstractmethod diff --git a/business_objects/region.py b/business_objects/region.py new file mode 100644 index 00000000..de0cff18 --- /dev/null +++ b/business_objects/region.py @@ -0,0 +1,82 @@ +""" +Project: PARTS Website +Author: Edward Middleton-Smith + Precision And Research Technology Systems Limited + +Technology: Business Objects +Feature: Address Region Business Object + +Description: +Business object for address region +""" + +# internal +import lib.argument_validation as av +from business_objects.base import Base +from extensions import db +# external +from typing import ClassVar + + +class Region(db.Model, Base): + NAME_ATTR_OPTION_VALUE: ClassVar[str] = Base.ATTR_ID_REGION + NAME_ATTR_OPTION_TEXT: ClassVar[str] = Base.FLAG_NAME + __tablename__ = 'Shop_Region' + id_region = db.Column(db.Integer, primary_key=True) + code = db.Column(db.String(50)) + name = db.Column(db.String(200)) + active = db.Column(db.Boolean) + + # region = None + + def __init__(self): + super().__init__() + Base.__init__(self) + self.region = None + + @classmethod + def from_DB_stock_item(cls, query_row): + plant = cls() + plant.id_region = query_row[7] + return plant + def __repr__(self): + return f''' + {self.ATTR_ID_REGION}: {self.id_region} + {self.FLAG_CODE}: {self.code} + {self.FLAG_NAME}: {self.name} + {self.FLAG_ACTIVE}: {self.active} + ''' + def to_json(self): + return { + **self.get_shared_json_attributes(self), + self.ATTR_ID_REGION: self.id_region, + self.FLAG_CODE: self.code, + self.FLAG_NAME: self.name, + self.FLAG_ACTIVE: 1 if av.input_bool(self.active, self.FLAG_ACTIVE, f'{self.__class__.__name__}.to_json') else 0 + } + @classmethod + def from_json(cls, json): + print(f'{cls.__name__}.from_json: {json}') + plant = cls() + plant.id_region = json[cls.ATTR_ID_REGION] + plant.code = json[cls.FLAG_CODE] + plant.name = json[cls.FLAG_NAME] + plant.active = json[cls.FLAG_ACTIVE] + return plant + @classmethod + def from_DB_get_many_product_catalogue(cls, query_row): + region = cls() + region.id_region = query_row[0] + region.name = query_row[1] + region.code = query_row[2] + # self.display_order = query_row[3] + return region + @classmethod + def from_DB_region(cls, query_row): + region = cls() + region.id_region = query_row[0] + region.code = query_row[1] + region.name = query_row[2] + region.active = av.input_bool(query_row[3], cls.FLAG_ACTIVE, f'{cls.__name__}.from_DB_region') + region.display_order = query_row[4] + return region diff --git a/business_objects/store/__pycache__/__init__.cpython-312.pyc b/business_objects/store/__pycache__/__init__.cpython-312.pyc index 88186d32..1a9c3397 100644 Binary files a/business_objects/store/__pycache__/__init__.cpython-312.pyc and b/business_objects/store/__pycache__/__init__.cpython-312.pyc differ diff --git a/business_objects/store/__pycache__/access_level.cpython-312.pyc b/business_objects/store/__pycache__/access_level.cpython-312.pyc index 0253f0ed..3ab5f776 100644 Binary files a/business_objects/store/__pycache__/access_level.cpython-312.pyc and b/business_objects/store/__pycache__/access_level.cpython-312.pyc differ diff --git a/business_objects/store/__pycache__/basket.cpython-312.pyc b/business_objects/store/__pycache__/basket.cpython-312.pyc index e432aded..af53b5b5 100644 Binary files a/business_objects/store/__pycache__/basket.cpython-312.pyc and b/business_objects/store/__pycache__/basket.cpython-312.pyc differ diff --git a/business_objects/store/__pycache__/currency.cpython-312.pyc b/business_objects/store/__pycache__/currency.cpython-312.pyc index 81cebae2..5066849f 100644 Binary files a/business_objects/store/__pycache__/currency.cpython-312.pyc and b/business_objects/store/__pycache__/currency.cpython-312.pyc differ diff --git a/business_objects/store/__pycache__/delivery_option.cpython-312.pyc b/business_objects/store/__pycache__/delivery_option.cpython-312.pyc index c5117e83..178a1e92 100644 Binary files a/business_objects/store/__pycache__/delivery_option.cpython-312.pyc and b/business_objects/store/__pycache__/delivery_option.cpython-312.pyc differ diff --git a/business_objects/store/__pycache__/delivery_region.cpython-312.pyc b/business_objects/store/__pycache__/delivery_region.cpython-312.pyc index 07582857..0cc1259e 100644 Binary files a/business_objects/store/__pycache__/delivery_region.cpython-312.pyc and b/business_objects/store/__pycache__/delivery_region.cpython-312.pyc differ diff --git a/business_objects/store/__pycache__/discount.cpython-312.pyc b/business_objects/store/__pycache__/discount.cpython-312.pyc index aeb74573..77e3cbe7 100644 Binary files a/business_objects/store/__pycache__/discount.cpython-312.pyc and b/business_objects/store/__pycache__/discount.cpython-312.pyc differ diff --git a/business_objects/store/__pycache__/image.cpython-312.pyc b/business_objects/store/__pycache__/image.cpython-312.pyc index e7fabaf6..1ecc355a 100644 Binary files a/business_objects/store/__pycache__/image.cpython-312.pyc and b/business_objects/store/__pycache__/image.cpython-312.pyc differ diff --git a/business_objects/store/__pycache__/order.cpython-312.pyc b/business_objects/store/__pycache__/order.cpython-312.pyc index c700bb9b..2f778f4a 100644 Binary files a/business_objects/store/__pycache__/order.cpython-312.pyc and b/business_objects/store/__pycache__/order.cpython-312.pyc differ diff --git a/business_objects/store/__pycache__/product.cpython-312.pyc b/business_objects/store/__pycache__/product.cpython-312.pyc index 979001ec..3f2fa807 100644 Binary files a/business_objects/store/__pycache__/product.cpython-312.pyc and b/business_objects/store/__pycache__/product.cpython-312.pyc differ diff --git a/business_objects/store/__pycache__/product_category.cpython-312.pyc b/business_objects/store/__pycache__/product_category.cpython-312.pyc index 2b5014df..88c29724 100644 Binary files a/business_objects/store/__pycache__/product_category.cpython-312.pyc and b/business_objects/store/__pycache__/product_category.cpython-312.pyc differ diff --git a/business_objects/store/__pycache__/product_permutation.cpython-312.pyc b/business_objects/store/__pycache__/product_permutation.cpython-312.pyc index 3a940a64..32ad0912 100644 Binary files a/business_objects/store/__pycache__/product_permutation.cpython-312.pyc and b/business_objects/store/__pycache__/product_permutation.cpython-312.pyc differ diff --git a/business_objects/store/__pycache__/product_price.cpython-312.pyc b/business_objects/store/__pycache__/product_price.cpython-312.pyc index 3e0e4093..e976231d 100644 Binary files a/business_objects/store/__pycache__/product_price.cpython-312.pyc and b/business_objects/store/__pycache__/product_price.cpython-312.pyc differ diff --git a/business_objects/store/__pycache__/product_variation.cpython-312.pyc b/business_objects/store/__pycache__/product_variation.cpython-312.pyc index 62365a3e..84edbaa3 100644 Binary files a/business_objects/store/__pycache__/product_variation.cpython-312.pyc and b/business_objects/store/__pycache__/product_variation.cpython-312.pyc differ diff --git a/business_objects/store/__pycache__/product_variation_tree.cpython-312.pyc b/business_objects/store/__pycache__/product_variation_tree.cpython-312.pyc index 6664205a..ccd19133 100644 Binary files a/business_objects/store/__pycache__/product_variation_tree.cpython-312.pyc and b/business_objects/store/__pycache__/product_variation_tree.cpython-312.pyc differ diff --git a/business_objects/store/__pycache__/product_variation_type.cpython-312.pyc b/business_objects/store/__pycache__/product_variation_type.cpython-312.pyc index 45656987..e2236a27 100644 Binary files a/business_objects/store/__pycache__/product_variation_type.cpython-312.pyc and b/business_objects/store/__pycache__/product_variation_type.cpython-312.pyc differ diff --git a/business_objects/store/__pycache__/stock_item.cpython-312.pyc b/business_objects/store/__pycache__/stock_item.cpython-312.pyc index 76337416..737bdff6 100644 Binary files a/business_objects/store/__pycache__/stock_item.cpython-312.pyc and b/business_objects/store/__pycache__/stock_item.cpython-312.pyc differ diff --git a/business_objects/store/__pycache__/store_base.cpython-312.pyc b/business_objects/store/__pycache__/store_base.cpython-312.pyc index bdb86d5e..531592b9 100644 Binary files a/business_objects/store/__pycache__/store_base.cpython-312.pyc and b/business_objects/store/__pycache__/store_base.cpython-312.pyc differ diff --git a/business_objects/store/delivery_option.py b/business_objects/store/delivery_option.py index 36e4c0b6..2dd7ab6c 100644 --- a/business_objects/store/delivery_option.py +++ b/business_objects/store/delivery_option.py @@ -22,7 +22,7 @@ class Delivery_Option(): delay_max: int quantity_min: float quantity_max: float - regions: list # [Enum_Delivery_Region] + regions: list # [Enum_Region] cost: float def __new__(cls, name, delay_min, delay_max, quantity_min, quantity_max, regions, cost): @@ -33,7 +33,7 @@ class Delivery_Option(): av.val_int(delay_max, 'delay_max', _m, 0, v_arg_type = v_arg_type) av.val_float(quantity_min, 'quantity_min', _m, 0, v_arg_type = v_arg_type) av.val_float(quantity_max, 'quantity_max', _m, 0, v_arg_type = v_arg_type) - av.val_list_instances(regions, 'regions', _m, Enum_Delivery_Region, v_arg_type = v_arg_type) + av.val_list_instances(regions, 'regions', _m, Enum_Region, v_arg_type = v_arg_type) av.val_float(cost, 'cost', _m, 0, v_arg_type = v_arg_type) return super(Delivery_Option, cls).__new__(cls) diff --git a/business_objects/store/delivery_region.py b/business_objects/store/delivery_region.py deleted file mode 100644 index 94516b64..00000000 --- a/business_objects/store/delivery_region.py +++ /dev/null @@ -1,103 +0,0 @@ -""" -Project: PARTS Website -Author: Edward Middleton-Smith - Precision And Research Technology Systems Limited - -Technology: Business Objects -Feature: Delivery Region Business Object - -Description: -Business object for delivery region -""" - -# internal -from business_objects.store.store_base import Store_Base -from extensions import db -from lib import argument_validation as av -# external -from enum import Enum -from typing import ClassVar - - -class Enum_Delivery_Region(Enum): - UK = 0 - -class Delivery_Region(db.Model, Store_Base): - NAME_ATTR_OPTION_VALUE: ClassVar[str] = Store_Base.ATTR_ID_DELIVERY_REGION - NAME_ATTR_OPTION_TEXT: ClassVar[str] = Store_Base.FLAG_NAME - - id_region = db.Column(db.Integer, primary_key=True) - """ - id_category = db.Column(db.Integer) - id_product = db.Column(db.Integer) - id_discount = db.Column(db.Integer) - """ - code = db.Column(db.String(50)) - name = db.Column(db.String(200)) - active = db.Column(db.Boolean) - display_order = db.Column(db.Integer) - """ - def __new__(cls, id, id_category, id_product, id_discount, code, name, display_order): - _m = 'Delivery_Region.__new__' - v_arg_type = 'class attribute' - av.val_int(id, 'id', _m, 0, v_arg_type = v_arg_type) - av.val_int(id_category, 'id_category', _m, 0, v_arg_type=v_arg_type) - av.val_int(id_product, 'id_product', _m, 0, v_arg_type = v_arg_type) - av.val_int(id_discount, 'id_discount', _m, v_arg_type = v_arg_type) - av.val_str(code, 'code', _m, max_len = 50, v_arg_type = v_arg_type) - av.val_str(name, 'name', _m, max_len = 100, v_arg_type = v_arg_type) - av.val_int(display_order, 'display_order', _m, v_arg_type = v_arg_type) - return super(Delivery_Region, cls).__new__(cls) - - def __init__(self, id, id_category, id_product, id_discount, code, name, display_order): - self.id_region = id - self.id_category = id_category - self.id_product = id_product - self.id_discount = id_discount - self.name = name - self.code = code - self.display_order = display_order - """ - @classmethod - def from_DB_get_many_product_catalogue(cls, query_row): - region = cls() - region.id_region = query_row[0] - region.name = query_row[1] - region.code = query_row[2] - # self.display_order = query_row[3] - return region - @classmethod - def from_DB_region(cls, query_row): - region = cls() - region.id_region = query_row[0] - region.code = query_row[1] - region.name = query_row[2] - region.active = av.input_bool(query_row[3], cls.FLAG_ACTIVE, f'{cls.__name__}.from_DB_region') - region.display_order = query_row[4] - return region - def __repr__(self): - return f''' - id: {self.id_region} - name: {self.name} - code: {self.code} - active: {self.active} - display_order: {self.display_order} - ''' - def to_json(self): - return { - **self.get_shared_json_attributes(self), - self.ATTR_ID_REGION: self.id_region, - self.FLAG_CODE: self.code, - self.FLAG_NAME: self.name, - self.FLAG_ACTIVE: self.active, - self.FLAG_DISPLAY_ORDER: self.display_order - } - @staticmethod - def from_json(json_region): - region = Delivery_Region() - region.id_region = json_region[Delivery_Region.ATTR_ID_REGION] - region.code = json_region[Delivery_Region.FLAG_CODE] - region.name = json_region[Delivery_Region.FLAG_NAME] - region.active = json_region[Delivery_Region.FLAG_ACTIVE] - region.display_order = json_region[Delivery_Region.FLAG_DISPLAY_ORDER] - return region diff --git a/business_objects/store/plant.py b/business_objects/store/plant.py new file mode 100644 index 00000000..ec4d6c8a --- /dev/null +++ b/business_objects/store/plant.py @@ -0,0 +1,92 @@ +""" +Project: PARTS Website +Author: Edward Middleton-Smith + Precision And Research Technology Systems Limited + +Technology: Business Objects +Feature: Plant Business Object + +Description: +Business object for plant +""" + +# internal +import lib.argument_validation as av +from business_objects.address import Address +from business_objects.store.store_base import Store_Base +from extensions import db +# external +from typing import ClassVar + + +class Plant(db.Model, Store_Base): + NAME_ATTR_OPTION_VALUE: ClassVar[str] = Store_Base.ATTR_ID_PLANT + NAME_ATTR_OPTION_TEXT: ClassVar[str] = Store_Base.FLAG_NAME + __tablename__ = 'Shop_Plant' + id_plant = db.Column(db.Integer, primary_key=True) + code = db.Column(db.String(50)) + name = db.Column(db.String(255)) + id_address = db.Column(db.Integer) + id_user_manager = db.Column(db.Integer) + active = db.Column(db.Boolean) + + # address = None + + def __init__(self): + super().__init__() + Store_Base.__init__(self) + self.address = None + @classmethod + def from_DB_storage_location(cls, query_row): + plant = cls() + plant.id_plant = query_row[1] + plant.id_address = query_row[2] + plant.address = Address.from_DB_storage_location(query_row) + return plant + @classmethod + def from_DB_plant(cls, query_row): + plant = cls() + plant.id_plant = query_row[0] + plant.id_address = query_row[1] + plant.address = Address.from_DB_plant(query_row) + plant.code = query_row[4] + plant.name = query_row[5] + plant.active = query_row[6] + return plant + @classmethod + def from_DB_stock_item(cls, query_row): + plant = cls() + plant.id_plant = query_row[5] + plant.code = query_row[10] + plant.name = query_row[11] + return plant + def __repr__(self): + return f''' + {self.ATTR_ID_PLANT}: {self.id_plant} + {self.FLAG_CODE}: {self.code} + {self.FLAG_NAME}: {self.name} + {self.FLAG_ADDRESS}: {self.address} + {self.ATTR_ID_USER_MANAGER}: {self.id_user_manager} + {self.FLAG_ACTIVE}: {self.active} + ''' + def to_json(self): + return { + **self.get_shared_json_attributes(self), + self.ATTR_ID_PLANT: self.id_plant, + self.FLAG_CODE: self.code, + self.FLAG_NAME: self.name, + self.FLAG_ADDRESS: self.address.to_json(), + self.ATTR_ID_USER_MANAGER: self.id_user_manager, + self.FLAG_ACTIVE: 1 if av.input_bool(self.active, self.FLAG_ACTIVE, f'{self.__class__.__name__}.to_json') else 0 + } + @classmethod + def from_json(cls, json): + print(f'{cls.__name__}.from_json: {json}') + plant = cls() + plant.id_plant = json[cls.ATTR_ID_PLANT], + plant.code = json[cls.FLAG_CODE], + plant.name = json[cls.FLAG_NAME], + plant.address = Address.from_json(json[cls.FLAG_ADDRESS]), + plant.id_user_manager = json[cls.ATTR_ID_USER_MANAGER], + plant.active = json[cls.FLAG_ACTIVE] + return plant diff --git a/business_objects/store/product.py b/business_objects/store/product.py index 7f1e460d..b04362ad 100644 --- a/business_objects/store/product.py +++ b/business_objects/store/product.py @@ -175,7 +175,7 @@ class Product(SQLAlchemy_ABC, Store_Base): if self.variation_trees[index_tree].is_equal(variation_tree): found_variation_tree_match = True break - if not found_variation_tree_match: + if not found_variation_tree_match and variation_tree is not None: self.variation_trees.append(variation_tree) def from_DB_Stripe_product(query_row): permutation = Product_Permutation.from_DB_Stripe_product(query_row) @@ -374,6 +374,13 @@ class Product(SQLAlchemy_ABC, Store_Base): text_input += tree.get_text_input_types() return text_input """ + def get_csv_ids_permutation(self): + csv = '' + for permutation in self.permutations: + if csv != '': + csv += ',' + csv += str(permutation.id_permutation) + return csv class Parameters_Product(Get_Many_Parameters_Base): @@ -482,7 +489,7 @@ class Parameters_Product(Get_Many_Parameters_Base): @staticmethod def from_form_filters_product_permutation(form): # if not (form is Filters_Product_Permutation): raise ValueError(f'Invalid form type: {type(form)}') - av.val_instance(form, 'form', 'Parameters_Product.from_form', Filters_Product_Permutation) + # av.val_instance(form, 'form', 'Parameters_Product.from_form', Filters_Product_Permutation) has_category_filter = not (form.id_category.data == '0' or form.id_category.data == '') has_product_filter = not (form.id_product.data == '0' or form.id_product.data == '') get_permutations_stock_below_min = av.input_bool(form.is_out_of_stock.data, "is_out_of_stock", "Parameters_Product.from_form") @@ -491,11 +498,11 @@ class Parameters_Product(Get_Many_Parameters_Base): get_all_product_category = not has_category_filter, get_inactive_product_category = False, # get_first_product_category_only = False, - ids_product_category = form.id_category.data, + ids_product_category = form.id_category.data if form.id_category.data is not None else '', get_all_product = not has_product_filter, get_inactive_product = False, # get_first_product_only = False, - ids_product = form.id_product.data, + ids_product = form.id_product.data if form.id_product.data is not None else '', get_all_permutation = not get_permutations_stock_below_min, get_inactive_permutation = False, # get_first_permutation_only = False, @@ -601,6 +608,9 @@ class Parameters_Product(Get_Many_Parameters_Base): ids_image = '', get_products_quantity_stock_below_min = False ) + @classmethod + def from_filters_stock_item(cls, filters_stock_item): + return cls.from_form_filters_product_permutation(filters_stock_item) """ class Parameters_Product(Get_Many_Parameters_Base): diff --git a/business_objects/store/product_category.py b/business_objects/store/product_category.py index cf000111..a025347a 100644 --- a/business_objects/store/product_category.py +++ b/business_objects/store/product_category.py @@ -242,6 +242,11 @@ class Product_Category(SQLAlchemy_ABC, Store_Base): 'value': self.id_category, 'text': self.name } + def get_csv_ids_permutation(self): + list_ids = [] + for product in self.products: + list_ids += product.get_csv_ids_permutation() + return list_ids """ class Filters_Product_Category(BaseModel, Store_Base): ids_product_category: str @@ -433,6 +438,11 @@ class Product_Category_Container(Store_Base): if column.name not in ['created_on', 'created_by'] } return self.to_object_with_missing_attributes(excluded_attributes) + def get_csv_ids_permutation(self): + list_ids = [] + for category in self.categories: + list_ids += category.get_csv_ids_permutation() + return ','.join(list_ids) """ diff --git a/business_objects/store/product_permutation.py b/business_objects/store/product_permutation.py index ee9285f2..faee9018 100644 --- a/business_objects/store/product_permutation.py +++ b/business_objects/store/product_permutation.py @@ -14,7 +14,7 @@ Business object for product permutation import lib.argument_validation as av from lib import data_types from forms.forms import Form_Basket_Add, Form_Basket_Edit -from business_objects.store.currency import Currency +from business_objects.currency import Currency from business_objects.store.delivery_option import Delivery_Option from business_objects.store.discount import Discount from business_objects.store.image import Image @@ -309,6 +309,7 @@ class Product_Permutation(db.Model, Store_Base): 'value': self.id_permutation, 'text': self.get_name_variations() } + def get_name(self): return def get_name_variations(self): @@ -317,19 +318,14 @@ class Product_Permutation(db.Model, Store_Base): return len(self.prices) > 0 def get_price(self): return self.prices[0] - def get_price_local_VAT_incl(self): - price = self.get_price() - return price.value_local_VAT_incl - def get_price_local_VAT_excl(self): - price = self.get_price() - return price.value_local_VAT_excl - def output_lead_time(self): - return '1 day' if self.latency_manufacture_days == 1 else f'{self.latency_manufacture_days} days' - def output_delivery_date(self): return (datetime.now() + timedelta(days=self.latency_manufacture_days)).strftime('%A, %d %B %Y') + """ + def output_lead_time(self): + return '1 day' if self.latency_manufacture_days == 1 else f'{self.latency_manufacture_days} days' + def output_price(self, is_included_VAT): if self.is_unavailable_in_currency_or_region: return 'Not available in currency and region' @@ -341,33 +337,14 @@ class Product_Permutation(db.Model, Store_Base): return f'{price.symbol_currency} {locale.format_string("%d", price.value_local_VAT_incl, grouping=True)}' else: return f'{price.symbol_currency} {locale.format_string("%d", price.value_local_VAT_excl, grouping=True)}' - def output_currency(self): - if not self.is_available: - return '' - """ - price = self.get_price() - return price.code_currency - """ - return self.code_currency_cost if self.symbol_currency_cost == '' else self.symbol_currency_cost + """ def output_variations(self): if not self.has_variations: return '' return '\n'.join([f'{variation.name_variation_type}: {variation.name_variation}' for variation in self.variations]) def output_variations_jsonify(self): if not self.has_variations: return '' return ','.join([f'{variation.id_type}: {variation.id_variation}' for variation in self.variations]) - """ - def output_price_VAT_incl(self): - locale.setlocale(locale.LC_ALL, '') - return locale.format_string("%d", self.price_GBP_VAT_incl, grouping=True) - def output_price_VAT_excl(self): - locale.setlocale(locale.LC_ALL, '') - return locale.format_string("%d", self.price_GBP_VAT_excl, grouping=True) - def add_form_basket_add(self): - self.form_basket_add = None - - def add_form_basket_edit(self): - self.form_basket_edit = None - """ + def __repr__(self): return f'''Product_Permutation id_permutation: {self.id_permutation} diff --git a/business_objects/store/product_price.py b/business_objects/store/product_price.py index 10b58739..4822836c 100644 --- a/business_objects/store/product_price.py +++ b/business_objects/store/product_price.py @@ -11,8 +11,8 @@ Business object for product price """ # internal -from business_objects.store.currency import Currency -from business_objects.store.delivery_region import Delivery_Region +from business_objects.currency import Currency +from business_objects.region import Region from business_objects.store.store_base import Store_Base from extensions import db # external @@ -22,8 +22,6 @@ from typing import ClassVar class Product_Price(db.Model, Store_Base): NAME_ATTR_OPTION_VALUE: ClassVar[str] = Store_Base.ATTR_ID_PRODUCT_PRICE NAME_ATTR_OPTION_TEXT = Store_Base.FLAG_TEXT - FLAG_VALUE_LOCAL_VAT_INCL: ClassVar[str] = 'value-local-vat-incl' - FLAG_VALUE_LOCAL_VAT_EXCL: ClassVar[str] = 'value-local-vat-excl' id_price = db.Column(db.Integer, primary_key=True) id_permutation = db.Column(db.Integer) @@ -87,7 +85,7 @@ class Product_Price(db.Model, Store_Base): self.ATTR_ID_PRODUCT: self.id_product, self.ATTR_ID_PRODUCT_CATEGORY: self.id_category, self.FLAG_CURRENCY: self.currency.to_json(), - # Delivery_Region.ATTR_ID_DELIVERY_REGION: self.id_region, + # Region.ATTR_ID_REGION_DELIVERY: self.id_region, self.FLAG_VALUE_LOCAL_VAT_INCL: self.value_local_VAT_incl, self.FLAG_VALUE_LOCAL_VAT_EXCL: self.value_local_VAT_excl, self.FLAG_DISPLAY_ORDER: self.display_order @@ -101,7 +99,7 @@ class Product_Price(db.Model, Store_Base): price.id_product = json[cls.ATTR_ID_PRODUCT] price.id_category = json[cls.ATTR_ID_PRODUCT_CATEGORY] price.currency = Currency.from_json(json) - # price.id_region = json[Delivery_Region.ATTR_ID_DELIVERY_REGION] + # price.id_region = json[Region.ATTR_ID_REGION_DELIVERY] price.value_local_VAT_incl = json[cls.FLAG_VALUE_LOCAL_VAT_INCL] price.value_local_VAT_excl = json[cls.FLAG_VALUE_LOCAL_VAT_EXCL] price.display_order = json[cls.FLAG_DISPLAY_ORDER] diff --git a/business_objects/store/product_variation_tree.py b/business_objects/store/product_variation_tree.py index 392c8798..c434b746 100644 --- a/business_objects/store/product_variation_tree.py +++ b/business_objects/store/product_variation_tree.py @@ -82,6 +82,7 @@ class Product_Variation_Tree(): @classmethod def from_json_str(cls, json_str): variations = [] + if json_str is None or json_str == '': return None for json_variation in json_str.split(','): parts = json_variation.split(':') if len(parts) != 2: continue diff --git a/business_objects/store/stock_item.py b/business_objects/store/stock_item.py index df44f8d9..6ecfc783 100644 --- a/business_objects/store/stock_item.py +++ b/business_objects/store/stock_item.py @@ -13,13 +13,15 @@ import lib.argument_validation as av from lib import data_types from forms.store.stock_item import Filters_Stock_Item from business_objects.db_base import Get_Many_Parameters_Base -from business_objects.store.product_price import Product_Price +from business_objects.currency import Currency # from business_objects.discount import Discount +from business_objects.store.product_variation_tree import Product_Variation_Tree +from business_objects.store.storage_location import Storage_Location from business_objects.store.store_base import Store_Base from extensions import db # external from dataclasses import dataclass -from typing import ClassVar +from typing import ClassVar, Optional from datetime import datetime @@ -34,21 +36,19 @@ class Stock_Item(db.Model, Store_Base): FLAG_DATE_UNSEALED: ClassVar[str] = 'date_unsealed' FLAG_IS_CONSUMED: ClassVar[str] = 'is_consumed' FLAG_IS_SEALED: ClassVar[str] = 'is_sealed' - FLAG_VALUE_LOCAL_VAT_EXCL_COST: ClassVar[str] = f'{Product_Price.FLAG_VALUE_LOCAL_VAT_EXCL}_cost' - FLAG_VALUE_LOCAL_VAT_INCL_COST: ClassVar[str] = f'{Product_Price.FLAG_VALUE_LOCAL_VAT_INCL}_cost' id_stock = db.Column(db.Integer, primary_key=True) id_permutation = db.Column(db.Integer) id_product = db.Column(db.Integer) id_category = db.Column(db.Integer) - # name_category = db.Column(db.String(255)) - # name_product = db.Column(db.String(255)) + id_location_storage = db.Column(db.Integer) + id_plant = db.Column(db.Integer) + id_region = db.Column(db.Integer) + id_currency_cost = db.Column(db.Integer) + cost_local_VAT_excl = db.Column(db.Float) + cost_local_VAT_incl = db.Column(db.Float) date_purchased = db.Column(db.DateTime) date_received = db.Column(db.DateTime) - id_location_storage = db.Column(db.Integer) - id_currency_cost = db.Column(db.Integer) - cost_local_VAT_incl = db.Column(db.Float) - cost_local_VAT_excl = db.Column(db.Float) is_sealed = db.Column(db.Boolean) date_unsealed = db.Column(db.DateTime) date_expiration = db.Column(db.DateTime) @@ -60,10 +60,15 @@ class Stock_Item(db.Model, Store_Base): can_edit = db.Column(db.Boolean) can_admin = db.Column(db.Boolean) """ + # variation_tree: Product_Variation_Tree = None def __init__(self): super().__init__() Store_Base.__init__(self) + self.currency_cost = None + self.storage_location = None + self.variation_tree = None + self.has_variations = False def from_DB_stock_item(query_row): _m = 'Product.from_DB_stock_item' @@ -73,21 +78,20 @@ class Stock_Item(db.Model, Store_Base): stock_item.id_permutation = query_row[1] stock_item.id_product = query_row[2] stock_item.id_category = query_row[3] - # stock_item.name_category = query_row[4] - # stock_item.name_product = query_row[5] - stock_item.date_purchased = query_row[4] - stock_item.date_received = query_row[5] - stock_item.id_location_storage = query_row[6] - # stock_item.name_location_storage = query_row[9] - stock_item.id_currency_cost = query_row[7] - stock_item.cost_local_VAT_incl = query_row[8] - stock_item.cost_local_VAT_excl = query_row[9] - stock_item.is_sealed = av.input_bool(query_row[10], "is_sealed", _m, v_arg_type=v_arg_type) - stock_item.date_unsealed = query_row[11] - stock_item.date_expiration = query_row[12] - stock_item.is_consumed = av.input_bool(query_row[13], "is_consumed", _m, v_arg_type=v_arg_type) - stock_item.date_consumed = query_row[14] - stock_item.active = av.input_bool(query_row[15], "active", _m, v_arg_type=v_arg_type) + stock_item.id_location_storage = query_row[4] + stock_item.storage_location = Storage_Location.from_DB_stock_item(query_row) + stock_item.id_currency_cost = query_row[12] + stock_item.currency_cost = Currency.from_DB_stock_item(query_row) + stock_item.cost_local_VAT_excl = query_row[15] + stock_item.cost_local_VAT_incl = query_row[16] + stock_item.date_purchased = query_row[17] + stock_item.date_received = query_row[18] + stock_item.is_sealed = av.input_bool(query_row[19], "is_sealed", _m, v_arg_type=v_arg_type) + stock_item.date_unsealed = query_row[20] + stock_item.date_expiration = query_row[21] + stock_item.is_consumed = av.input_bool(query_row[22], "is_consumed", _m, v_arg_type=v_arg_type) + stock_item.date_consumed = query_row[23] + stock_item.active = av.input_bool(query_row[24], "active", _m, v_arg_type=v_arg_type) """ stock_item.can_view = av.input_bool(query_row[24], "can_view", _m, v_arg_type=v_arg_type) stock_item.can_edit = av.input_bool(query_row[25], "can_edit", _m, v_arg_type=v_arg_type) @@ -99,96 +103,55 @@ class Stock_Item(db.Model, Store_Base): def from_json(cls, json): stock_item = cls() stock_item.id_stock = json[cls.ATTR_ID_STOCK_ITEM] - stock_item.id_permutation = json[cls.ATTR_ID_PRODUCT_PERMUTATION] + stock_item.id_permutation = json.get(cls.ATTR_ID_PRODUCT_PERMUTATION, 0) stock_item.id_product = json[cls.ATTR_ID_PRODUCT] stock_item.id_category = json[cls.ATTR_ID_PRODUCT_CATEGORY] + print(f'json: {json}\nhalf stock item: {stock_item}') + stock_item.variation_tree = Product_Variation_Tree.from_json_str(json[cls.FLAG_PRODUCT_VARIATIONS]) stock_item.date_purchased = json[cls.FLAG_DATE_PURCHASED] stock_item.date_received = json[cls.FLAG_DATE_RECEIVED] - stock_item.id_location_storage = json[cls.ATTR_ID_LOCATION_STORAGE] + stock_item.id_location_storage = json[cls.ATTR_ID_STORAGE_LOCATION] stock_item.id_currency_cost = json[cls.ATTR_ID_CURRENCY_COST] - stock_item.cost_local_VAT_incl = json[cls.FLAG_VALUE_LOCAL_VAT_INCL_COST] - stock_item.cost_local_VAT_excl = json[cls.FLAG_VALUE_LOCAL_VAT_EXCL_COST] + stock_item.cost_local_VAT_excl = json[cls.FLAG_COST_LOCAL_VAT_EXCL] + stock_item.cost_local_VAT_incl = json[cls.FLAG_COST_LOCAL_VAT_INCL] stock_item.is_sealed = json[cls.FLAG_IS_SEALED] stock_item.date_unsealed = json[cls.FLAG_DATE_UNSEALED] stock_item.date_expiration = json[cls.FLAG_DATE_EXPIRATION] stock_item.is_consumed = json[cls.FLAG_IS_CONSUMED] stock_item.date_consumed = json[cls.FLAG_DATE_CONSUMED] stock_item.active = json[cls.FLAG_ACTIVE] - """ - stock_item.can_view = json[cls.FLAG_CAN_VIEW] - stock_item.can_edit = json[cls.FLAG_CAN_EDIT] - stock_item.can_admin = json[cls.FLAG_CAN_ADMIN] - """ return stock_item - """ - def from_json(json_basket_item, key_id_product, key_id_permutation): - permutation = Product_Permutation.from_json(json_basket_item, key_id_product, key_id_permutation) - product = Product.from_permutation(permutation) - return product - - def output_lead_time(self): - return self.get_permutation_selected().output_lead_time() - def output_delivery_date(self): - return self.get_permutation_selected().output_delivery_date() - def output_price(self, is_included_VAT): - return self.get_permutation_selected().output_price(is_included_VAT) - def output_price_VAT_incl(self): - return self.get_permutation_selected().output_price(True) - def output_price_VAT_excl(self): - return self.get_permutation_selected().output_price(False) - def get_price_local(self, is_included_VAT): - if is_included_VAT: - return self.get_price_local_VAT_incl() - else: - return self.get_price_local_VAT_excl() - def get_price_local_VAT_incl(self): - return self.get_permutation_selected().get_price_local_VAT_incl() - def get_price_local_VAT_excl(self): - return self.get_permutation_selected().get_price_local_VAT_excl() - def get_quantity_min(self): - return self.get_permutation_selected().quantity_min - def get_id_permutation(self): - return self.get_permutation_selected().id_permutation - def get_image_from_index(self, index_image): - return self.get_permutation_selected().images[index_image] - def get_name(self): - return self.get_permutation_selected().name - def get_description(self): - return self.get_permutation_selected().description - def output_currency(self): - return self.get_permutation_selected().get_price().symbol_currency - def add_form_basket_add(self): - self.form_basket_add = None - - def add_form_basket_edit(self): - self.form_basket_edit = None - """ def __repr__(self): - return f'''Product + return f'''Stock Item + id_stock: {self.id_stock} + id_permutation: {self.id_permutation} id_product: {self.id_product} id_category: {self.id_category} - name: {self.name} - display_order: {self.display_order} - can_view: {self.can_view} - can_edit: {self.can_edit} - can_admin: {self.can_admin} - has_variations: {self.has_variations} - permutations: {self.permutations} - variation trees: {self.variation_trees} + variations: {self.variation_tree.to_preview_str() if self.variation_tree is not None else 'None'} + storage_location: {self.storage_location} + currency: {self.currency_cost} + cost_local_VAT_excl: {self.cost_local_VAT_excl} + cost_local_VAT_incl: {self.cost_local_VAT_incl} + date_purchased: {self.date_purchased} + date_received: {self.date_received} + is_sealed: {self.is_sealed} + date_unsealed: {self.date_unsealed} + date_expiration: {self.date_expiration} + is_consumed: {self.is_consumed} + date_consumed: {self.date_consumed} + active: {self.active} ''' def to_json(self): return { **self.get_shared_json_attributes(self), - self.ATTR_ID_PRODUCT: {self.id_product}, - self.ATTR_ID_PRODUCT_CATEGORY: {self.id_category}, - self.FLAG_NAME: {self.name}, - self.FLAG_DISPLAY_ORDER: {self.display_order}, - self.FLAG_CAN_VIEW: {self.can_view}, - self.FLAG_CAN_EDIT: {self.can_edit}, - self.FLAG_CAN_ADMIN: {self.can_admin}, - self.FLAG_HAS_VARIATIONS: {self.has_variations}, - self.FLAG_PRODUCT_PERMUTATION: {self.permutations}, - self.FLAG_PRODUCT_VARIATION_TREES: {self.variation_trees}, + self.ATTR_ID_STOCK_ITEM: self.id_stock, + self.ATTR_ID_PRODUCT_PERMUTATION: self.id_permutation, + self.ATTR_ID_PRODUCT: self.id_product, + self.ATTR_ID_PRODUCT_CATEGORY: self.id_category, + self.FLAG_STORAGE_LOCATION: self.storage_location.to_json(), + self.FLAG_CURRENCY_COST: self.currency_cost.to_json(), + self.FLAG_COST_LOCAL_VAT_EXCL: self.cost_local_VAT_excl, + self.FLAG_COST_LOCAL_VAT_INCL: self.cost_local_VAT_incl, } def has_permutations(self): return len(self.permutations) > 0 @@ -224,12 +187,11 @@ class Parameters_Stock_Item(Get_Many_Parameters_Base): a_ids_region_storage: str a_get_all_plant_storage: bool a_get_inactive_plant_storage: bool - a_get_first_plant_storage_only: bool a_ids_plant_storage: str a_get_all_location_storage: bool a_get_inactive_location_storage: bool a_ids_location_storage: str - a_date_received_to: datetime + a_date_received_to: Optional[datetime] = None a_get_sealed_stock_item_only: bool a_get_unsealed_stock_item_only: bool a_get_expired_stock_item_only: bool @@ -244,7 +206,7 @@ class Parameters_Stock_Item(Get_Many_Parameters_Base): def get_default(cls): return cls( # a_id_user = id_user, - a_get_all_product_permutation = True, + a_get_all_product_permutation = False, a_get_inactive_product_permutation = False, a_ids_product_permutation = '', a_get_all_stock_item = True, @@ -270,4 +232,71 @@ class Parameters_Stock_Item(Get_Many_Parameters_Base): @classmethod def from_form_stock_item(cls, form): - return cls.get_default() \ No newline at end of file + return cls.get_default() + + +class Stock_Item_Temp(db.Model, Store_Base): + __tablename__: ClassVar[str] = 'Shop_Stock_Item_Temp' + __table_args__ = { 'extend_existing': True } + id_stock: int = db.Column(db.Integer, primary_key=True) + # id_category: int = db.Column(db.Integer) + id_product: int = db.Column(db.Integer) + # has_variations: bool = db.Column(db.Boolean) + id_permutation: int = db.Column(db.Integer) + id_pairs_variations: str = db.Column(db.String(4000)) + date_purchased: datetime = db.Column(db.DateTime) + date_received: datetime = db.Column(db.DateTime, nullable=True) + id_location_storage: int = db.Column(db.Integer) + id_currency_cost: int = db.Column(db.Integer) + cost_local_VAT_excl: float = db.Column(db.Float) + cost_local_VAT_incl: float = db.Column(db.Float) + is_sealed: bool = db.Column(db.Boolean) + date_unsealed: datetime = db.Column(db.DateTime, nullable=True) + date_expiration: datetime = db.Column(db.DateTime, nullable=True) + is_consumed: bool = db.Column(db.Boolean) + date_consumed: datetime = db.Column(db.DateTime, nullable=True) + active: bool = db.Column(db.Boolean) + guid: str = db.Column(db.String(36)) + + @classmethod + def from_stock_item(cls, stock_item): + row = cls() + row.id_stock = stock_item.id_stock + # row.id_category = stock_item.id_category + row.id_product = stock_item.id_product + row.id_permutation = stock_item.id_permutation + # row.has_variations = stock_item.has_variations + row.id_pairs_variations = stock_item.variation_tree.to_json_str() if stock_item.variation_tree is not None else '' + row.date_purchased = stock_item.date_purchased + row.date_received = stock_item.date_received if stock_item.date_received else None + row.id_location_storage = stock_item.id_location_storage + row.id_currency_cost = stock_item.id_currency_cost + row.cost_local_VAT_excl = stock_item.cost_local_VAT_excl + row.cost_local_VAT_incl = stock_item.cost_local_VAT_incl + row.is_sealed = 1 if stock_item.is_sealed else 0 + row.date_unsealed = stock_item.date_unsealed if stock_item.date_unsealed else None + row.date_expiration = stock_item.date_expiration if stock_item.date_expiration else None + row.is_consumed = 1 if stock_item.is_consumed else 0 + row.date_consumed = stock_item.date_consumed if stock_item.date_consumed else None + row.active = 1 if stock_item.active else 0 + return row + def __repr__(self): + return f''' +id_stock: {self.id_stock} +id_product: {self.id_product} +id_permutation: {self.id_permutation} +id_pairs_variations: {self.id_pairs_variations} +date_purchased: {self.date_purchased} +date_received: {self.date_received} +id_location_storage: {self.id_location_storage} +id_currency_cost: {self.id_currency_cost} +cost_local_VAT_excl: {self.cost_local_VAT_excl} +cost_local_VAT_incl: {self.cost_local_VAT_incl} +is_sealed: {self.is_sealed} +date_unsealed: {self.date_unsealed} +date_expiration: {self.date_expiration} +is_consumed: {self.is_consumed} +date_consumed: {self.date_consumed} +active: {self.active} +guid: {self.guid} + ''' \ No newline at end of file diff --git a/business_objects/store/storage_location.py b/business_objects/store/storage_location.py index 72c8ff48..170291b0 100644 --- a/business_objects/store/storage_location.py +++ b/business_objects/store/storage_location.py @@ -12,6 +12,7 @@ Business object for product # internal import lib.argument_validation as av +from business_objects.store.plant import Plant from business_objects.store.store_base import Store_Base from extensions import db # external @@ -27,19 +28,33 @@ class Storage_Location(db.Model, Store_Base): code = db.Column(db.String(50)) name = db.Column(db.String(255)) active = db.Column(db.Boolean) + + # plant = None def __init__(self): super().__init__() Store_Base.__init__(self) + self.plant = None + @classmethod def from_DB_storage_location(cls, query_row): location = cls() location.id_location = query_row[0] location.id_plant = query_row[1] + location.plant = Plant.from_DB_storage_location(query_row) location.code = query_row[2] location.name = query_row[3] location.active = query_row[4] return location + @classmethod + def from_DB_stock_item(cls, query_row): + location = cls() + location.id_location = query_row[4] + location.id_plant = query_row[5] + location.code = query_row[8] + location.name = query_row[9] + location.plant = Plant.from_DB_stock_item(query_row) + return location def __repr__(self): return f''' {self.ATTR_ID_STORAGE_LOCATION}: {self.id_location} @@ -67,3 +82,6 @@ class Storage_Location(db.Model, Store_Base): location.name = json[cls.FLAG_NAME], location.active = json[cls.FLAG_ACTIVE] return location + + def get_full_name(self): + return f'{self.plant.name} - {self.name}' \ No newline at end of file diff --git a/business_objects/store/store_base.py b/business_objects/store/store_base.py index fc921720..48b52505 100644 --- a/business_objects/store/store_base.py +++ b/business_objects/store/store_base.py @@ -58,9 +58,9 @@ class I_Store_Base(): class Store_Base(Base): # ATTR_ID_CURRENCY_COST: ClassVar[str] = 'id_currency_cost' + ATTR_ID_DELIVERY_OPTION: ClassVar[str] = 'id_delivery_option' ATTR_ID_DISCOUNT: ClassVar[str] = 'id_discount' ATTR_ID_IMAGE: ClassVar[str] = 'id_image' - ATTR_ID_LOCATION_STORAGE: ClassVar[str] = 'id_location_storage' ATTR_ID_PLANT: ClassVar[str] = 'id_plant' ATTR_ID_PRODUCT: ClassVar[str] = 'id_product' ATTR_ID_PRODUCT_CATEGORY: ClassVar[str] = 'id_category' @@ -70,10 +70,15 @@ class Store_Base(Base): ATTR_ID_PRODUCT_VARIATION: ClassVar[str] = 'id_variation' ATTR_ID_PRODUCT_VARIATION_TYPE: ClassVar[str] = 'id_type' ATTR_ID_STOCK_ITEM: ClassVar[str] = 'id_stock_item' - FLAG_CURRENCY: ClassVar[str] = 'currency' + ATTR_ID_STORAGE_LOCATION: ClassVar[str] = 'id_location' + FLAG_COST_LOCAL: ClassVar[str] = 'cost_local' + FLAG_COST_LOCAL_VAT_EXCL: ClassVar[str] = FLAG_COST_LOCAL + '_vat_excl' + FLAG_COST_LOCAL_VAT_INCL: ClassVar[str] = FLAG_COST_LOCAL + '_vat_incl' FLAG_DELIVERY_OPTION: ClassVar[str] = 'delivery_option' FLAG_HAS_VARIATIONS: ClassVar[str] = 'has_variations' FLAG_IS_OUT_OF_STOCK: ClassVar[str] = 'is_out_of_stock' + FLAG_DISCOUNT: ClassVar[str] = 'discount' + FLAG_PLANT: ClassVar[str] = 'plant' FLAG_PRODUCT: ClassVar[str] = 'product' FLAG_PRODUCT_CATEGORY: ClassVar[str] = 'product_category' FLAG_PRODUCT_IMAGE: ClassVar[str] = 'product_image' @@ -85,6 +90,7 @@ class Store_Base(Base): FLAG_QUANTITY_MIN: ClassVar[str] = 'quantity_min' FLAG_QUANTITY_MAX: ClassVar[str] = 'quantity_max' FLAG_STOCK_ITEM: ClassVar[str] = 'stock_item' + FLAG_STORAGE_LOCATION: ClassVar[str] = 'storage_location' FLAG_TEXT: ClassVar[str] = 'text' FLAG_VALUE_TEXT: ClassVar[str] = 'value_text' \ No newline at end of file diff --git a/business_objects/user.py b/business_objects/user.py index d6b3f457..8dcbcd71 100644 --- a/business_objects/user.py +++ b/business_objects/user.py @@ -38,7 +38,9 @@ class User(db.Model, Base): # is_logged_in: bool def __init__(self): + self.id_user = 0 self.is_logged_in = False + super().__init__() def from_DB_user(query_row): _m = 'User.from_DB_user' @@ -62,7 +64,7 @@ class User(db.Model, Base): _m = 'User.from_json' user = User() if json is None: return user - print(f'json: {json}') + print(f'{_m}\njson: {json}') user.id_user = json['id_user'] user.id_user_auth0 = json['id_user_auth0'] user.firstname = json['firstname'] @@ -85,7 +87,7 @@ class User(db.Model, Base): _m = 'User.from_json_auth0' user = User() if json is None: return user - print(f'json: {json}') + print(f'{_m}\njson: {json}') user_info = json['userinfo'] user.id_user = None user.id_user_auth0 = user_info['sub'] @@ -136,11 +138,6 @@ class User(db.Model, Base): can_admin_user: {self.can_admin_user} ''' - @staticmethod - def get_default(): - user = User() - user.id_user = None - return user @dataclass diff --git a/controllers/__pycache__/__init__.cpython-312.pyc b/controllers/__pycache__/__init__.cpython-312.pyc index 387d9b83..ce29ae52 100644 Binary files a/controllers/__pycache__/__init__.cpython-312.pyc and b/controllers/__pycache__/__init__.cpython-312.pyc differ diff --git a/controllers/__pycache__/core.cpython-312.pyc b/controllers/__pycache__/core.cpython-312.pyc index 5c685fa2..0840b30c 100644 Binary files a/controllers/__pycache__/core.cpython-312.pyc and b/controllers/__pycache__/core.cpython-312.pyc differ diff --git a/controllers/__pycache__/legal.cpython-312.pyc b/controllers/__pycache__/legal.cpython-312.pyc index d5267cf6..6b38c463 100644 Binary files a/controllers/__pycache__/legal.cpython-312.pyc and b/controllers/__pycache__/legal.cpython-312.pyc differ diff --git a/controllers/__pycache__/user.cpython-312.pyc b/controllers/__pycache__/user.cpython-312.pyc index 59df1307..2d74953b 100644 Binary files a/controllers/__pycache__/user.cpython-312.pyc and b/controllers/__pycache__/user.cpython-312.pyc differ diff --git a/controllers/core.py b/controllers/core.py index a881a683..28a3ef54 100644 --- a/controllers/core.py +++ b/controllers/core.py @@ -88,6 +88,11 @@ def services(): def admin_home(): try: model = Model_View_Admin_Home() + if not model.is_user_logged_in: + # return redirect(url_for('routes_user.login', callback = Model_View_Admin_Home.HASH_PAGE_ADMIN_HOME)) + return redirect(url_for('routes_core.home')) + if not (model.user.can_admin_store or model.user.can_admin_user): + return redirect(url_for('routes_core.home')) html_body = render_template('pages/core/_admin_home.html', model = model) except Exception as e: return jsonify(error=str(e)), 403 diff --git a/controllers/store/__pycache__/__init__.cpython-312.pyc b/controllers/store/__pycache__/__init__.cpython-312.pyc index 13f4a71c..aa8a0685 100644 Binary files a/controllers/store/__pycache__/__init__.cpython-312.pyc and b/controllers/store/__pycache__/__init__.cpython-312.pyc differ diff --git a/controllers/store/__pycache__/product.cpython-312.pyc b/controllers/store/__pycache__/product.cpython-312.pyc index 26e3517c..cd9eeaf2 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 487be009..4474aca8 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 fbaea038..bbc800b5 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/__pycache__/stock_item.cpython-312.pyc b/controllers/store/__pycache__/stock_item.cpython-312.pyc index 9a77a291..b46f8a1e 100644 Binary files a/controllers/store/__pycache__/stock_item.cpython-312.pyc and b/controllers/store/__pycache__/stock_item.cpython-312.pyc differ diff --git a/controllers/store/__pycache__/store.cpython-312.pyc b/controllers/store/__pycache__/store.cpython-312.pyc index edf2d772..7735cdd9 100644 Binary files a/controllers/store/__pycache__/store.cpython-312.pyc and b/controllers/store/__pycache__/store.cpython-312.pyc differ diff --git a/controllers/store/__pycache__/supplier.cpython-312.pyc b/controllers/store/__pycache__/supplier.cpython-312.pyc index 5697d5d5..bb02e2ea 100644 Binary files a/controllers/store/__pycache__/supplier.cpython-312.pyc and b/controllers/store/__pycache__/supplier.cpython-312.pyc differ diff --git a/controllers/store/product.py b/controllers/store/product.py index 045b0bd5..94d06d8a 100644 --- a/controllers/store/product.py +++ b/controllers/store/product.py @@ -111,6 +111,9 @@ def products(): form_filters = Filters_Product() print(f'form_filters={form_filters}') model = Model_View_Store_Product(form_filters) + if not model.is_user_logged_in: + # return redirect(url_for('routes_user.login', data = jsonify({ Model_View_Store_Product.KEY_CALLBACK: Model_View_Store_Product.HASH_PAGE_STORE_PRODUCTS }))) + return redirect(url_for('routes_core.home')) return render_template('pages/store/_products.html', model = model) @routes_store_product.route(Model_View_Store_Product.HASH_GET_STORE_PRODUCT, methods=['POST']) @@ -124,6 +127,8 @@ def filter_product(): Model_View_Store_Product.FLAG_MESSAGE: f'Form invalid.\n{form_filters.errors}' }) model = Model_View_Store_Product(form_filters = form_filters) + if not model.is_user_logged_in: + raise Exception('User not logged in') return jsonify({ Model_View_Store_Product.FLAG_STATUS: Model_View_Store_Product.FLAG_SUCCESS, Model_View_Store_Product.KEY_DATA: model.category_list.to_json() @@ -161,6 +166,8 @@ def save_product(): save_errors = Model_View_Store_Product.save_products(data.get('comment', 'No comment'), objsProduct) model_return = Model_View_Store_Product(form_filters=form_filters) + if not model_return.is_user_logged_in: + raise Exception('User not logged in') print('nips') return jsonify({ Model_View_Store_Product.FLAG_STATUS: Model_View_Store_Product.FLAG_SUCCESS, diff --git a/controllers/store/product_category.py b/controllers/store/product_category.py index 4eb4bf6b..d2b8fae4 100644 --- a/controllers/store/product_category.py +++ b/controllers/store/product_category.py @@ -54,6 +54,9 @@ def categories(): return redirect(url_for('routes_store_product_category.categories', **filters.to_json())) """ model = Model_View_Store_Product_Category(form_filters) + if not model.is_user_logged_in: + # return redirect(url_for('routes_user.login', data = jsonify({ Model_View_Store_Product_Category.KEY_CALLBACK: Model_View_Store_Product_Category.HASH_PAGE_STORE_PRODUCT_CATEGORIES }))) + return redirect(url_for('routes_core.home')) return render_template('pages/store/_product_categories.html', model = model) @routes_store_product_category.route(Model_View_Store_Product_Category.HASH_GET_STORE_PRODUCT_CATEGORY, methods=['POST']) @@ -70,6 +73,8 @@ 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) + if not model.is_user_logged_in: + raise Exception('User not logged in') return jsonify({ Model_View_Store_Product_Category.FLAG_STATUS: Model_View_Store_Product_Category.FLAG_SUCCESS, Model_View_Store_Product_Category.KEY_DATA: model.category_list.to_json() @@ -106,7 +111,8 @@ def save_category(): Model_View_Store_Product_Category.save_categories(data.get('comment', 'No comment'), objsCategory) model_return = Model_View_Store_Product_Category(form_filters=form_filters) - print('nips') + if not model_return.is_user_logged_in: + raise Exception('User not logged in') return jsonify({ Model_View_Store_Product_Category.FLAG_STATUS: Model_View_Store_Product_Category.FLAG_SUCCESS, Model_View_Store_Product_Category.KEY_DATA: model_return.category_list.to_json() diff --git a/controllers/store/product_permutation.py b/controllers/store/product_permutation.py index dfd42dce..9584d2b1 100644 --- a/controllers/store/product_permutation.py +++ b/controllers/store/product_permutation.py @@ -96,6 +96,9 @@ def permutations(): form_filters = Filters_Product_Permutation() print(f'form_filters={form_filters}') model = Model_View_Store_Product_Permutation(form_filters) + if not model.is_user_logged_in: + # return redirect(url_for('routes_user.login', data = jsonify({ Model_View_Store_Product_Permutation.KEY_CALLBACK: Model_View_Store_Product_Permutation.HASH_PAGE_STORE_PRODUCT_PERMUTATIONS }))) + return redirect(url_for('routes_core.home')) return render_template('pages/store/_product_permutations.html', model = model) @routes_store_product_permutation.route(Model_View_Store_Product_Permutation.HASH_GET_STORE_PRODUCT_PERMUTATION, methods=['POST']) @@ -109,6 +112,8 @@ def filter_permutation(): Model_View_Store_Product_Permutation.FLAG_MESSAGE: f'Form invalid.\n{form_filters.errors}' }) model = Model_View_Store_Product_Permutation(form_filters = form_filters) + if not model.is_user_logged_in: + raise Exception('User not logged in') return jsonify({ Model_View_Store_Product_Permutation.FLAG_STATUS: Model_View_Store_Product_Permutation.FLAG_SUCCESS, Model_View_Store_Product_Permutation.KEY_DATA: model.category_list.to_json() @@ -146,6 +151,8 @@ def save_permutation(): Model_View_Store_Product_Permutation.save_permutations(data.get('comment', 'No comment'), objsPermutation) model_return = Model_View_Store_Product_Permutation(form_filters=form_filters) + if not model_return.is_user_logged_in: + raise Exception('User not logged in') print('nips') return jsonify({ Model_View_Store_Product_Permutation.FLAG_STATUS: Model_View_Store_Product_Permutation.FLAG_SUCCESS, diff --git a/controllers/store/stock_item.py b/controllers/store/stock_item.py index edbe07f7..82285608 100644 --- a/controllers/store/stock_item.py +++ b/controllers/store/stock_item.py @@ -11,91 +11,26 @@ Initializes the Flask application, sets the configuration based on the environme """ # internal -from business_objects.store.product import Product, Parameters_Product, Product_Permutation from business_objects.store.stock_item import Stock_Item from forms.store.stock_item import Filters_Stock_Item -from models.model_view_base import Model_View_Base -from models.model_view_store import Model_View_Store -from models.model_view_store_supplier import Model_View_Store_Supplier -from models.model_view_store_product_category import Model_View_Store_Product_Category -from models.model_view_store_product_permutation import Model_View_Store_Product_Permutation from models.model_view_store_stock_item import Model_View_Store_Stock_Item from helpers.helper_app import Helper_App import lib.argument_validation as av # external +from datetime import datetime 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 - +import requests routes_store_stock_item = Blueprint('routes_store_stock_item', __name__) -""" -@routes_store_stock_item.route('/store/stock_items', methods=['GET']) -def stock(): - filters = Filters_Stock_Item.get_default() - model = Model_View_Store_Stock_Item(filters_stock_item=filters) - return render_template('pages/store/_stock_items.html', model = model) - -@routes_store_stock_item.route('/store/stock_item_filter', methods=['POST']) -def stock_filter(): - data = Helper_App.get_request_data(request) - form_filters = None - try: - form_filters = get_Filters_Stock_Items(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 = Filters_Stock_Item.from_form(form_filters) - model = Model_View_Store_Stock_Item(filters_stock_item=filters_form) - return jsonify({Model_View_Base.FLAG_STATUS: Model_View_Base.FLAG_SUCCESS, 'Success': True, Model_View_Base.KEY_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_Filters_Stock_Items(data_request): - data_form = data_request[Model_View_Store_Stock_Item.KEY_FORM] - form_filters = Filters_Stock_Item(**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_stock_item.route('/store/stock_item_save', methods=['POST']) -def stock_save(): - data = Helper_App.get_request_data(request) -"" - form_filters = None - try: - form_filters = get_Filters_Stock_Items(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}'}) - - stock_items = data[Model_View_Store_Stock.KEY_PERMUTATIONS] - print(f'stock_items: {stock_items}') - if len(stock_items) == 0: - return jsonify({Model_View_Base.FLAG_STATUS: Model_View_Base.FLAG_FAILURE, Model_View_Base.FLAG_MESSAGE: f'No stock items.'}) - objsStockItem = [] - for stock_item in stock_items: - objsStockItem.append(Product_Permutation.from_json(stock_item)) - print(f'objsStockItem: {objsStockItem}') - - # ToDo: manually validate category, product - filters_form = Stock_Filters.from_form(form_filters) - model_save = Model_View_Store_Stock(filters_product=filters_form) - model_save.save_stock_items(data.comment, objsPermutation) - - model_return = Model_View_Store_Stock(filters_product=filters_form) - return jsonify({Model_View_Base.FLAG_STATUS: Model_View_Base.FLAG_SUCCESS, 'Success': True, Model_View_Base.KEY_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_stock_item.route(Model_View_Store_Stock_Item.HASH_PAGE_STORE_STOCK_ITEMS, methods=['GET']) -def permutations(): - print('permutations') +def stock_items(): + print('stock_items') try: form_filters = Filters_Stock_Item.from_json(request.args) except Exception as e: @@ -103,19 +38,39 @@ def permutations(): form_filters = Filters_Stock_Item() print(f'form_filters={form_filters}') model = Model_View_Store_Stock_Item(form_filters) - return render_template('pages/store/_stock_items.html', model = model) + if not model.is_user_logged_in: + # return redirect(url_for('routes_user.login', data = jsonify({ Model_View_Store_Stock_Item.KEY_CALLBACK: Model_View_Store_Stock_Item.HASH_PAGE_STORE_STOCK_ITEMS }))) + # return requests.post(f"{current_app.config['URL_HOST']}{url_for('routes_user.login')}", json={ Model_View_Store_Stock_Item.KEY_CALLBACK: Model_View_Store_Stock_Item.HASH_PAGE_STORE_STOCK_ITEMS }) + return redirect(url_for('routes_core.home')) + return render_template('pages/store/_stock_items.html', model = model, datetime = datetime) @routes_store_stock_item.route(Model_View_Store_Stock_Item.HASH_GET_STORE_STOCK_ITEM, methods=['POST']) -def filter_permutation(): +def filter_stock_item(): data = Helper_App.get_request_data(request) try: form_filters = Filters_Stock_Item.from_json(data) if not form_filters.validate_on_submit(): - return jsonify({ - Model_View_Store_Stock_Item.FLAG_STATUS: Model_View_Store_Stock_Item.FLAG_FAILURE, - Model_View_Store_Stock_Item.FLAG_MESSAGE: f'Form invalid.\n{form_filters.errors}' - }) - model = Model_View_Store_Stock_Item(form_filters = form_filters) + error_keys = list(form_filters.errors.keys()) + try: + error_keys.remove(Stock_Item.ATTR_ID_PRODUCT_CATEGORY) + """ + if not av.val_int(form_filters.id_product_category.data): + form_filters.errors[Stock_Item.ATTR_ID_PRODUCT_CATEGORY] = ['Invalid category.'] + """ + except: + pass + try: + error_keys.remove(Stock_Item.ATTR_ID_PRODUCT) + except: + pass + if error_keys: + return jsonify({ + Model_View_Store_Stock_Item.FLAG_STATUS: Model_View_Store_Stock_Item.FLAG_FAILURE, + Model_View_Store_Stock_Item.FLAG_MESSAGE: f'Form invalid.\n{form_filters.errors}' + }) + model = Model_View_Store_Stock_Item(filters_stock_item = form_filters) + if not model.is_user_logged_in: + raise Exception('User not logged in.') return jsonify({ Model_View_Store_Stock_Item.FLAG_STATUS: Model_View_Store_Stock_Item.FLAG_SUCCESS, Model_View_Store_Stock_Item.KEY_DATA: model.category_list.to_json() @@ -127,33 +82,55 @@ def filter_permutation(): }) @routes_store_stock_item.route(Model_View_Store_Stock_Item.HASH_SAVE_STORE_STOCK_ITEM, methods=['POST']) -def save_permutation(): +def save_stock_item(): data = Helper_App.get_request_data(request) try: form_filters = Filters_Stock_Item.from_json(data[Model_View_Store_Stock_Item.FLAG_FORM_FILTERS]) + """ if not form_filters.validate_on_submit(): - return jsonify({ - Model_View_Store_Stock_Item.FLAG_STATUS: Model_View_Store_Stock_Item.FLAG_FAILURE, - Model_View_Store_Stock_Item.FLAG_MESSAGE: f'Filters form invalid.\n{form_filters.errors}' - }) + error_keys = list(form_filters.errors.keys()) + try: + error_keys.remove(Stock_Item.ATTR_ID_PRODUCT_CATEGORY) + "" + if not av.val_int(form_filters.id_product_category.data): + form_filters.errors[Stock_Item.ATTR_ID_PRODUCT_CATEGORY] = ['Invalid category.'] + "" + except: + pass + try: + error_keys.remove(Stock_Item.ATTR_ID_PRODUCT) + except: + pass + if error_keys: + return jsonify({ + Model_View_Store_Stock_Item.FLAG_STATUS: Model_View_Store_Stock_Item.FLAG_FAILURE, + Model_View_Store_Stock_Item.FLAG_MESSAGE: f'Form invalid.\n{form_filters.errors}' + }) + """ # filters_form = Filters_Stock_Item.from_form(form_filters) print(f'form_filters: {form_filters}') - permutations = data[Model_View_Store_Stock_Item.FLAG_STOCK_ITEM] - if len(permutations) == 0: + stock_items = data[Model_View_Store_Stock_Item.FLAG_STOCK_ITEM] + if len(stock_items) == 0: return jsonify({ Model_View_Store_Stock_Item.FLAG_STATUS: Model_View_Store_Stock_Item.FLAG_FAILURE, - Model_View_Store_Stock_Item.FLAG_MESSAGE: f'No permutations.' + Model_View_Store_Stock_Item.FLAG_MESSAGE: f'No stock items.' }) - objsPermutation = [] - for permutation in permutations: - objsPermutation.append(Stock_Item.from_json(permutation)) + print(f'stock_items={stock_items}') + objs_stock_item = [] + for stock_item in stock_items: + objs_stock_item.append(Stock_Item.from_json(stock_item)) # model_save = Model_View_Store_Stock_Item() # filters_product=filters_form) - print(f'objsPermutation={objsPermutation}') - Model_View_Store_Stock_Item.save_permutations(data.get('comment', 'No comment'), objsPermutation) - - model_return = Model_View_Store_Stock_Item(form_filters=form_filters) - print('nips') + print(f'objs_stock_item={objs_stock_item}') + save_errors = Model_View_Store_Stock_Item.save_stock_items(data.get('comment', 'No comment'), objs_stock_item) + if len(save_errors) > 0: + return jsonify({ + Model_View_Store_Stock_Item.FLAG_STATUS: Model_View_Store_Stock_Item.FLAG_FAILURE, + Model_View_Store_Stock_Item.FLAG_MESSAGE: f'Save errors: {save_errors}' + }) + model_return = Model_View_Store_Stock_Item(filters_stock_item=form_filters) + if not model_return.is_user_logged_in: + raise Exception('User not logged in.') return jsonify({ Model_View_Store_Stock_Item.FLAG_STATUS: Model_View_Store_Stock_Item.FLAG_SUCCESS, Model_View_Store_Stock_Item.KEY_DATA: model_return.category_list.to_json() diff --git a/controllers/store/supplier.py b/controllers/store/supplier.py index bf7d98a0..07837bb6 100644 --- a/controllers/store/supplier.py +++ b/controllers/store/supplier.py @@ -53,6 +53,9 @@ def supplier(): # if not logged in: try: model = Model_View_Store_Supplier(form) + if not model.is_user_logged_in: + # return redirect(url_for('routes_user.login', data = jsonify({ Model_View_Store_Supplier.KEY_CALLBACK: Model_View_Store_Supplier.HASH_PAGE_STORE_SUPPLIERS }))) + return redirect(url_for('routes_core.home')) # print('importing basket') # model.import_JSON_basket(data) model.get_basket(data) diff --git a/controllers/user.py b/controllers/user.py index 5d28c569..08ca818c 100644 --- a/controllers/user.py +++ b/controllers/user.py @@ -170,6 +170,9 @@ def logout_callback(): def user(): try: model = Model_View_User(current_app, db) + if not model.is_user_logged_in: + # return redirect(url_for('routes_user.login', data = jsonify({ Model_View_User.KEY_CALLBACK: Model_View_User.HASH_PAGE_USER_ACCOUNT }))) + return redirect(url_for('routes_core.home')) html_body = render_template('pages/user/_user.html', model = model) except Exception as e: return str(e) diff --git a/datastores/__pycache__/__init__.cpython-312.pyc b/datastores/__pycache__/__init__.cpython-312.pyc index 8c2301e6..0ae6ea85 100644 Binary files a/datastores/__pycache__/__init__.cpython-312.pyc and b/datastores/__pycache__/__init__.cpython-312.pyc differ diff --git a/datastores/__pycache__/datastore_base.cpython-312.pyc b/datastores/__pycache__/datastore_base.cpython-312.pyc index 4bb370e9..4037a563 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 c1104160..8e01e1fb 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 420302be..6dd49865 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 28cef3c1..3869955d 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/__pycache__/datastore_store_product_permutation.cpython-312.pyc b/datastores/__pycache__/datastore_store_product_permutation.cpython-312.pyc index 1016f588..468fa292 100644 Binary files a/datastores/__pycache__/datastore_store_product_permutation.cpython-312.pyc and b/datastores/__pycache__/datastore_store_product_permutation.cpython-312.pyc differ diff --git a/datastores/__pycache__/datastore_store_stock_item.cpython-312.pyc b/datastores/__pycache__/datastore_store_stock_item.cpython-312.pyc index 030ca917..fdc41dd8 100644 Binary files a/datastores/__pycache__/datastore_store_stock_item.cpython-312.pyc and b/datastores/__pycache__/datastore_store_stock_item.cpython-312.pyc differ diff --git a/datastores/__pycache__/datastore_user.cpython-312.pyc b/datastores/__pycache__/datastore_user.cpython-312.pyc index df4968de..841398e0 100644 Binary files a/datastores/__pycache__/datastore_user.cpython-312.pyc and b/datastores/__pycache__/datastore_user.cpython-312.pyc differ diff --git a/datastores/datastore_base.py b/datastores/datastore_base.py index 20010460..8e6e85a7 100644 --- a/datastores/datastore_base.py +++ b/datastores/datastore_base.py @@ -20,7 +20,7 @@ from business_objects.store.product_category import Product_Category_Container, from business_objects.store.currency import Currency from business_objects.store.image import Image from business_objects.store.delivery_option import Delivery_Option -from business_objects.store.delivery_region import Delivery_Region +from business_objects.store.delivery_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 # Permutation_Variation_Link @@ -145,7 +145,7 @@ class DataStore_Base(BaseModel): result_set_1 = cursor.fetchall() regions = [] for row in result_set_1: - region = Delivery_Region.make_from_DB_region(row) + region = Region.make_from_DB_region(row) regions.append(region) print(f'regions: {regions}') DataStore_Base.db_cursor_clear(cursor) diff --git a/datastores/datastore_store_base.py b/datastores/datastore_store_base.py index 947b68dd..764e77d7 100644 --- a/datastores/datastore_store_base.py +++ b/datastores/datastore_store_base.py @@ -14,10 +14,10 @@ Datastore for Store # from routes import bp_home from business_objects.store.basket import Basket, Basket_Item from business_objects.store.product_category import Product_Category_Container, Product_Category -from business_objects.store.currency import Currency +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.store.delivery_region import Delivery_Region +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, Parameters_Product @@ -235,7 +235,7 @@ class DataStore_Store_Base(DataStore_Base): result_set_1 = cursor.fetchall() regions = [] for row in result_set_1: - region = Delivery_Region.from_DB_region(row) + region = Region.from_DB_region(row) regions.append(region) print(f'regions: {regions}') DataStore_Store_Base.db_cursor_clear(cursor) diff --git a/datastores/datastore_store_basket.py b/datastores/datastore_store_basket.py index c68db87e..184636bf 100644 --- a/datastores/datastore_store_basket.py +++ b/datastores/datastore_store_basket.py @@ -15,10 +15,10 @@ Datastore for Store Baskets 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.store.currency import Currency +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.store.delivery_region import Delivery_Region +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 diff --git a/datastores/datastore_store_product_category.py b/datastores/datastore_store_product_category.py index 553615f7..ba0794c6 100644 --- a/datastores/datastore_store_product_category.py +++ b/datastores/datastore_store_product_category.py @@ -14,10 +14,10 @@ Datastore for Store Product Categories 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.store.currency import Currency +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.store.delivery_region import Delivery_Region +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 diff --git a/datastores/datastore_store_product_variation.py b/datastores/datastore_store_product_variation.py index e44263a0..2e3171e6 100644 --- a/datastores/datastore_store_product_variation.py +++ b/datastores/datastore_store_product_variation.py @@ -15,10 +15,10 @@ Datastore for Store Product Variations 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.store.currency import Currency +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.store.delivery_region import Delivery_Region +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 diff --git a/datastores/datastore_store_stock_item.py b/datastores/datastore_store_stock_item.py index 806dab05..683f64bd 100644 --- a/datastores/datastore_store_stock_item.py +++ b/datastores/datastore_store_stock_item.py @@ -13,21 +13,10 @@ Datastore for Store Stock Items # 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.store.currency import Currency -from business_objects.store.image import Image -from business_objects.store.delivery_option import Delivery_Option -from business_objects.store.delivery_region import Delivery_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.stock_item import Stock_Item, Parameters_Stock_Item, Stock_Item_Temp from datastores.datastore_store_base import DataStore_Store_Base -# from helpers.helper_db_mysql import Helper_DB_MySQL +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 # external @@ -52,11 +41,11 @@ class DataStore_Store_Stock_Item(DataStore_Store_Base): super().__init__() # Stock Items - def get_many_stock_item(self, Parameters_Stock_Item, category_list): + def get_many_stock_item(self, parameters_stock_item, category_list): # redundant argument validation? _m = 'DataStore_Store_Stock_Item.get_many_stock_item' - av.val_instance(Parameters_Stock_Item, 'Parameters_Stock_Item', _m, Parameters_Stock_Item) - argument_dict = Parameters_Stock_Item.to_json() + av.val_instance(parameters_stock_item, 'parameters_stock_item', _m, Parameters_Stock_Item) + argument_dict = parameters_stock_item.to_json() user = self.get_user_session() """ argument_dict['a_id_user'] = user.id_user # 'auth0|6582b95c895d09a70ba10fef' # id_user @@ -67,6 +56,9 @@ class DataStore_Store_Stock_Item(DataStore_Store_Base): , **argument_dict , 'a_debug': 0 } + ids_permutation = category_list.get_csv_ids_permutation() + print(f'ids_permutation: {ids_permutation}') + argument_dict['a_ids_product_permutation'] = ids_permutation print(f'argument_dict: {argument_dict}') print('executing p_shop_get_many_stock_item') result = self.db_procedure_execute('p_shop_get_many_stock_item', argument_dict) @@ -85,7 +77,7 @@ class DataStore_Store_Stock_Item(DataStore_Store_Base): print(f'raw categories: {result_set_1}') for row in result_set_1: new_stock_item = Stock_Item.from_DB_stock_item(row) - category_list.add_stock_item(new_stock_item, row) + category_list.add_stock_item(new_stock_item) # , row) # Errors cursor.nextset() @@ -112,5 +104,47 @@ class DataStore_Store_Stock_Item(DataStore_Store_Base): if 'region' in error.msg or 'currency' in error.msg: permutation.is_unavailable_in_currency_or_region = True """ + DataStore_Store_Stock_Item.db_cursor_clear(cursor) return category_list, errors # categories, category_index - \ No newline at end of file + + @classmethod + def save_stock_items(cls, comment, stock_items): + _m = 'DataStore_Store_Stock_Item.save_stock_items' + av.val_str(comment, 'comment', _m) + + guid = Helper_DB_MySQL.create_guid_str() + now = datetime.now() + user = cls.get_user_session() + rows = [] + for stock_item in stock_items: + # row = permutation.to_temporary_record() + row = Stock_Item_Temp.from_stock_item(stock_item) + row.guid = guid + rows.append(row) + + print(f'rows: {rows}') + + DataStore_Store_Base.upload_bulk(Stock_Item_Temp.__tablename__, rows, 1000) + print('bulk uploaded') + + argument_dict_list = { + 'a_comment': comment, + 'a_guid': guid, + 'a_id_user': user.id_user, + 'a_debug': 0 + } + result = cls.db_procedure_execute('p_shop_save_stock_item', argument_dict_list) + print('saved product permutations') + + # Errors + cursor = result.cursor + cursor.nextset() + result_set_e = cursor.fetchall() + print(f'raw errors: {result_set_e}') + errors = [] + if len(result_set_e) > 0: + errors = [SQL_Error.from_DB_record(row) for row in result_set_e] # (row[0], row[1]) + for error in errors: + print(f"Error [{error.code}]: {error.msg}") + DataStore_Store_Stock_Item.db_cursor_clear(cursor) + return errors diff --git a/datastores/datastore_store_stripe.py b/datastores/datastore_store_stripe.py index 0c11fe8f..4cae7b7f 100644 --- a/datastores/datastore_store_stripe.py +++ b/datastores/datastore_store_stripe.py @@ -15,10 +15,10 @@ Datastore for Store Stripe service 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.store.currency import Currency +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.store.delivery_region import Delivery_Region +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 diff --git a/datastores/datastore_user.py b/datastores/datastore_user.py index 1936cf13..b8c65261 100644 --- a/datastores/datastore_user.py +++ b/datastores/datastore_user.py @@ -139,6 +139,76 @@ class DataStore_User(DataStore_Base): 'a_id_user': user.id_user , 'a_id_user_auth0': user.id_user_auth0 , **user_filters.to_json() + , 'a_debug': 0 + + } + # argument_dict_list['a_guid'] = guid + result = self.db_procedure_execute('p_get_many_user', argument_dict_list) + """ + query = text(f"SELECT * FROM Shop_Calc_User_Temp UE_T WHERE UE_T.guid = '{guid}'") + result = self.db.session.execute(query) + """ + cursor = result.cursor + result_set = cursor.fetchall() + print(f'raw users: {result_set}') + print(f'type result set: {str(type(result_set))}') + print(f'len result set: {len(result_set)}') + """ + user_permission_evals = [] + for row in result_set: + user_permission_eval = User_Permission_Evaluation.from_DB_user_eval(row) + user_permission_evals.append(user_permission_eval) + print(f'user_permission_evals: {user_permission_evals}') + """ + users = [] + if len(result_set) > 0: + for row in result_set: + print(f'row: {row}') + user = User.from_DB_user(row) + users.append(user) + print(f'user {str(type(user))}: {user}') + print(f'type users: {str(type(users))}\n type user 0: {str(type(None if len(users) == 0 else users[0]))}') + # error_list, cursor = self.get_error_list_from_cursor(cursor) + errors = [] + cursor.nextset() + result_set_e = cursor.fetchall() + print(f'raw errors: {result_set_e}') + if len(result_set_e) > 0: + errors = [SQL_Error.from_DB_record(row) for row in result_set_e] # [SQL_Error(row[0], row[1]) for row in result_set_e] + for error in errors: + print(f"Error [{error.code}]: {error.msg}") + + DataStore_User.db_cursor_clear(cursor) + + return users, errors + + def get_many_user(self, user_filters, user=None): + _m = 'DataStore_User.get_many_user' + print(_m) + # av.val_str(user_filters, 'user_filters', _m) + # av.val_list(permutations, 'list_permutations', _m, Product_Permutation, 1) + av.val_instance(user_filters, 'user_filters', _m, User_Filters) + + guid = Helper_DB_MySQL.create_guid() + # now = datetime.now() + # user = self.get_user_session() + + """ + argument_dict_list = { + 'a_id_user': id_user, + 'a_comment': comment, + 'a_guid': guid + } + """ + if user is None: + user = self.get_user_session() + argument_dict_list = { + # 'a_guid': guid + 'a_id_user': user.id_user + , 'a_id_user_auth0': user.id_user_auth0 + , **user_filters.to_json() + , 'a_debug': 0 + } # argument_dict_list['a_guid'] = guid result = self.db_procedure_execute('p_get_many_user', argument_dict_list) diff --git a/forms/__pycache__/__init__.cpython-312.pyc b/forms/__pycache__/__init__.cpython-312.pyc index 02f75864..4cfa2a5a 100644 Binary files a/forms/__pycache__/__init__.cpython-312.pyc and b/forms/__pycache__/__init__.cpython-312.pyc differ diff --git a/forms/__pycache__/access_level.cpython-312.pyc b/forms/__pycache__/access_level.cpython-312.pyc index 40a47abc..9174ed14 100644 Binary files a/forms/__pycache__/access_level.cpython-312.pyc and b/forms/__pycache__/access_level.cpython-312.pyc differ diff --git a/forms/__pycache__/base.cpython-312.pyc b/forms/__pycache__/base.cpython-312.pyc index 5ba31834..4fd011ac 100644 Binary files a/forms/__pycache__/base.cpython-312.pyc and b/forms/__pycache__/base.cpython-312.pyc differ diff --git a/forms/__pycache__/forms.cpython-312.pyc b/forms/__pycache__/forms.cpython-312.pyc index 92dd7e30..dfb3fa02 100644 Binary files a/forms/__pycache__/forms.cpython-312.pyc and b/forms/__pycache__/forms.cpython-312.pyc differ diff --git a/forms/__pycache__/unit_measurement.cpython-312.pyc b/forms/__pycache__/unit_measurement.cpython-312.pyc index a68ac77a..7827d856 100644 Binary files a/forms/__pycache__/unit_measurement.cpython-312.pyc and b/forms/__pycache__/unit_measurement.cpython-312.pyc differ diff --git a/forms/access_level.py b/forms/access_level.py index c9136e88..5fd6f2fc 100644 --- a/forms/access_level.py +++ b/forms/access_level.py @@ -23,7 +23,7 @@ from abc import ABCMeta, abstractmethod class Filters_Access_Level(Form_Base): - active = BooleanField("Active only?") + active = BooleanField("Active only?", default = True) def __repr__(self): return f'{self.__class__.__name__}(active={self.active.data})' @classmethod diff --git a/forms/forms.py b/forms/forms.py index 1a5bad3d..93419717 100644 --- a/forms/forms.py +++ b/forms/forms.py @@ -122,7 +122,7 @@ class Form_Supplier(FlaskForm): fax = StringField('Fax number') website = StringField('Website') id_currency = SelectField('Currency ID') - is_active = BooleanField('Active') + is_active = BooleanField('Active', default = True) # class Form_Supplier_Purchase_Order(FlaskForm): @@ -130,5 +130,5 @@ class Form_Supplier(FlaskForm): # User class Form_Filters_User(FlaskForm): - active = BooleanField('Active only?') + active = BooleanField('Active only?', default = True) id_user = SelectField('User ID', validators=[Optional()], choices=[]) \ No newline at end of file diff --git a/forms/store/__pycache__/__init__.cpython-312.pyc b/forms/store/__pycache__/__init__.cpython-312.pyc index b0530ac6..f2679b87 100644 Binary files a/forms/store/__pycache__/__init__.cpython-312.pyc and b/forms/store/__pycache__/__init__.cpython-312.pyc differ diff --git a/forms/store/__pycache__/product.cpython-312.pyc b/forms/store/__pycache__/product.cpython-312.pyc index 7d88d192..2e89a74c 100644 Binary files a/forms/store/__pycache__/product.cpython-312.pyc and b/forms/store/__pycache__/product.cpython-312.pyc differ diff --git a/forms/store/__pycache__/product_category.cpython-312.pyc b/forms/store/__pycache__/product_category.cpython-312.pyc index 1acd6363..4b9588f9 100644 Binary files a/forms/store/__pycache__/product_category.cpython-312.pyc and b/forms/store/__pycache__/product_category.cpython-312.pyc differ diff --git a/forms/store/__pycache__/product_permutation.cpython-312.pyc b/forms/store/__pycache__/product_permutation.cpython-312.pyc index 3bfc0602..78ec6a34 100644 Binary files a/forms/store/__pycache__/product_permutation.cpython-312.pyc and b/forms/store/__pycache__/product_permutation.cpython-312.pyc differ diff --git a/forms/store/product.py b/forms/store/product.py index 7eb3df1d..b1c7c6da 100644 --- a/forms/store/product.py +++ b/forms/store/product.py @@ -24,7 +24,7 @@ from flask_wtf.recaptcha import RecaptchaField class Filters_Product(FlaskForm): id_category = SelectField('Category', validators=[Optional()], choices=[('', 'All')]) is_not_empty = BooleanField('Not empty only?') - active = BooleanField("Active only?") + active = BooleanField("Active only?", default = True) @classmethod def from_filters_product(cls, filters_product): form = Filters_Product() diff --git a/forms/store/product_category.py b/forms/store/product_category.py index f2229d47..463540ab 100644 --- a/forms/store/product_category.py +++ b/forms/store/product_category.py @@ -27,7 +27,7 @@ from abc import ABCMeta, abstractmethod class Filters_Product_Category(Form_Base): is_not_empty = BooleanField('Not empty only?') - active = BooleanField("Active only?") + active = BooleanField("Active only?", default = True) """ @classmethod def from_filters(cls, filters): diff --git a/forms/store/stock_item.py b/forms/store/stock_item.py index a1eab1d8..0388031f 100644 --- a/forms/store/stock_item.py +++ b/forms/store/stock_item.py @@ -25,8 +25,8 @@ from flask_wtf.recaptcha import RecaptchaField from abc import ABCMeta, abstractmethod class Filters_Stock_Item(Form_Base): - id_category = SelectField('Category', validators=[Optional()], choices=[]) - id_product = SelectField('Product', validators=[Optional()], choices=[]) + id_category = SelectField('Category', choices=[Form_Base.get_choice_all()], default='') + id_product = SelectField('Product', choices=[Form_Base.get_choice_all()], default='') is_out_of_stock = BooleanField('Out of stock only?') quantity_min = FloatField('Min stock') quantity_max = FloatField('Max stock') @@ -45,9 +45,9 @@ class Filters_Stock_Item(Form_Base): @classmethod def from_json(cls, json): form = cls() - form.id_category.choices = [(json[Store_Base.ATTR_ID_PRODUCT_CATEGORY], json[Store_Base.ATTR_ID_PRODUCT_CATEGORY])] + # form.id_category.choices = [(json[Store_Base.ATTR_ID_PRODUCT_CATEGORY], json[Store_Base.ATTR_ID_PRODUCT_CATEGORY])] form.id_category.data = json[Store_Base.ATTR_ID_PRODUCT_CATEGORY] - form.id_product.choices = [(json[Store_Base.ATTR_ID_PRODUCT], json[Store_Base.ATTR_ID_PRODUCT])] + # form.id_product.choices = [(json[Store_Base.ATTR_ID_PRODUCT], json[Store_Base.ATTR_ID_PRODUCT])] form.id_product.data = json[Store_Base.ATTR_ID_PRODUCT] form.is_out_of_stock.data = av.input_bool(json[Store_Base.FLAG_IS_OUT_OF_STOCK], Store_Base.FLAG_IS_OUT_OF_STOCK, f'{cls.__name__}.from_json') form.quantity_min.data = json[Store_Base.FLAG_QUANTITY_MIN] @@ -65,4 +65,12 @@ class Filters_Stock_Item(Form_Base): def get_default(cls): filters = cls() filters.id_category.choices = cls.get_choices_blank() - filters.id_product.choices = cls.get_choices_blank() \ No newline at end of file + filters.id_product.choices = cls.get_choices_blank() + """ + def import_values(self, form_filters): + self.id_category.data = form_filters.id_category.data + self.id_product.data = form_filters.id_product.data + self.is_out_of_stock.data = form_filters.is_out_of_stock.data + self.quantity_min.data = form_filters.quantity_min.data + self.quantity_max.data = form_filters.quantity_max.data + """ \ No newline at end of file diff --git a/forms/unit_measurement.py b/forms/unit_measurement.py index 9f69daa4..2c2d46e2 100644 --- a/forms/unit_measurement.py +++ b/forms/unit_measurement.py @@ -23,7 +23,7 @@ from abc import ABCMeta, abstractmethod class Filters_Unit_Measurement(Form_Base): - active = BooleanField("Active only?") + active = BooleanField("Active only?", default = True) @classmethod def from_filters(cls, filters): form = Filters_Unit_Measurement() diff --git a/helpers/__pycache__/__init__.cpython-312.pyc b/helpers/__pycache__/__init__.cpython-312.pyc index d53abf27..2149f674 100644 Binary files a/helpers/__pycache__/__init__.cpython-312.pyc and b/helpers/__pycache__/__init__.cpython-312.pyc differ diff --git a/helpers/__pycache__/helper_app.cpython-312.pyc b/helpers/__pycache__/helper_app.cpython-312.pyc index 5ae92951..13087f28 100644 Binary files a/helpers/__pycache__/helper_app.cpython-312.pyc and b/helpers/__pycache__/helper_app.cpython-312.pyc differ diff --git a/helpers/__pycache__/helper_db_mysql.cpython-312.pyc b/helpers/__pycache__/helper_db_mysql.cpython-312.pyc index bc9fbf83..b0ddfb16 100644 Binary files a/helpers/__pycache__/helper_db_mysql.cpython-312.pyc and b/helpers/__pycache__/helper_db_mysql.cpython-312.pyc differ diff --git a/lib/__pycache__/__init__.cpython-312.pyc b/lib/__pycache__/__init__.cpython-312.pyc index 252f070f..a40d61ac 100644 Binary files a/lib/__pycache__/__init__.cpython-312.pyc and b/lib/__pycache__/__init__.cpython-312.pyc differ diff --git a/lib/__pycache__/argument_validation.cpython-312.pyc b/lib/__pycache__/argument_validation.cpython-312.pyc index 48ef064e..826d786d 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/__pycache__/data_types.cpython-312.pyc b/lib/__pycache__/data_types.cpython-312.pyc index 65125b4d..e9f14a17 100644 Binary files a/lib/__pycache__/data_types.cpython-312.pyc and b/lib/__pycache__/data_types.cpython-312.pyc differ diff --git a/models/__pycache__/__init__.cpython-312.pyc b/models/__pycache__/__init__.cpython-312.pyc index 224e41c5..9cf8329f 100644 Binary files a/models/__pycache__/__init__.cpython-312.pyc and b/models/__pycache__/__init__.cpython-312.pyc differ diff --git a/models/__pycache__/model_view_accessibility_report.cpython-312.pyc b/models/__pycache__/model_view_accessibility_report.cpython-312.pyc index f478875b..23a454e0 100644 Binary files a/models/__pycache__/model_view_accessibility_report.cpython-312.pyc and b/models/__pycache__/model_view_accessibility_report.cpython-312.pyc differ diff --git a/models/__pycache__/model_view_accessibility_statement.cpython-312.pyc b/models/__pycache__/model_view_accessibility_statement.cpython-312.pyc index cb617569..03289019 100644 Binary files a/models/__pycache__/model_view_accessibility_statement.cpython-312.pyc and b/models/__pycache__/model_view_accessibility_statement.cpython-312.pyc differ diff --git a/models/__pycache__/model_view_admin.cpython-312.pyc b/models/__pycache__/model_view_admin.cpython-312.pyc index e2b594c3..b3c78373 100644 Binary files a/models/__pycache__/model_view_admin.cpython-312.pyc and b/models/__pycache__/model_view_admin.cpython-312.pyc differ diff --git a/models/__pycache__/model_view_admin_home.cpython-312.pyc b/models/__pycache__/model_view_admin_home.cpython-312.pyc index e7d0c4a1..52923e1d 100644 Binary files a/models/__pycache__/model_view_admin_home.cpython-312.pyc and b/models/__pycache__/model_view_admin_home.cpython-312.pyc differ diff --git a/models/__pycache__/model_view_base.cpython-312.pyc b/models/__pycache__/model_view_base.cpython-312.pyc index 856adc48..914d4d6b 100644 Binary files a/models/__pycache__/model_view_base.cpython-312.pyc and b/models/__pycache__/model_view_base.cpython-312.pyc differ diff --git a/models/__pycache__/model_view_contact.cpython-312.pyc b/models/__pycache__/model_view_contact.cpython-312.pyc index 1df0e1a0..013bcbdd 100644 Binary files a/models/__pycache__/model_view_contact.cpython-312.pyc and b/models/__pycache__/model_view_contact.cpython-312.pyc differ diff --git a/models/__pycache__/model_view_home.cpython-312.pyc b/models/__pycache__/model_view_home.cpython-312.pyc index a930b8ac..a3077269 100644 Binary files a/models/__pycache__/model_view_home.cpython-312.pyc and b/models/__pycache__/model_view_home.cpython-312.pyc differ diff --git a/models/__pycache__/model_view_license.cpython-312.pyc b/models/__pycache__/model_view_license.cpython-312.pyc index a642a516..9b6a6d0d 100644 Binary files a/models/__pycache__/model_view_license.cpython-312.pyc and b/models/__pycache__/model_view_license.cpython-312.pyc differ diff --git a/models/__pycache__/model_view_privacy_policy.cpython-312.pyc b/models/__pycache__/model_view_privacy_policy.cpython-312.pyc index 72352694..336261ec 100644 Binary files a/models/__pycache__/model_view_privacy_policy.cpython-312.pyc and b/models/__pycache__/model_view_privacy_policy.cpython-312.pyc differ diff --git a/models/__pycache__/model_view_retention_schedule.cpython-312.pyc b/models/__pycache__/model_view_retention_schedule.cpython-312.pyc index 67015cb5..f470d4c7 100644 Binary files a/models/__pycache__/model_view_retention_schedule.cpython-312.pyc and b/models/__pycache__/model_view_retention_schedule.cpython-312.pyc differ diff --git a/models/__pycache__/model_view_services.cpython-312.pyc b/models/__pycache__/model_view_services.cpython-312.pyc index e9b67bc5..17d8c19f 100644 Binary files a/models/__pycache__/model_view_services.cpython-312.pyc and b/models/__pycache__/model_view_services.cpython-312.pyc differ diff --git a/models/__pycache__/model_view_store.cpython-312.pyc b/models/__pycache__/model_view_store.cpython-312.pyc index 9b2631b7..550a7117 100644 Binary files a/models/__pycache__/model_view_store.cpython-312.pyc and b/models/__pycache__/model_view_store.cpython-312.pyc differ diff --git a/models/__pycache__/model_view_store_product.cpython-312.pyc b/models/__pycache__/model_view_store_product.cpython-312.pyc index d9585874..adf0be07 100644 Binary files a/models/__pycache__/model_view_store_product.cpython-312.pyc and b/models/__pycache__/model_view_store_product.cpython-312.pyc differ diff --git a/models/__pycache__/model_view_store_product_category.cpython-312.pyc b/models/__pycache__/model_view_store_product_category.cpython-312.pyc index a567b97f..3fd6ccd4 100644 Binary files a/models/__pycache__/model_view_store_product_category.cpython-312.pyc and b/models/__pycache__/model_view_store_product_category.cpython-312.pyc differ diff --git a/models/__pycache__/model_view_store_product_permutation.cpython-312.pyc b/models/__pycache__/model_view_store_product_permutation.cpython-312.pyc index a9b11f75..dea5d6ed 100644 Binary files a/models/__pycache__/model_view_store_product_permutation.cpython-312.pyc and b/models/__pycache__/model_view_store_product_permutation.cpython-312.pyc differ diff --git a/models/__pycache__/model_view_store_stock_item.cpython-312.pyc b/models/__pycache__/model_view_store_stock_item.cpython-312.pyc index b82b4079..e6a9c4a1 100644 Binary files a/models/__pycache__/model_view_store_stock_item.cpython-312.pyc and b/models/__pycache__/model_view_store_stock_item.cpython-312.pyc differ diff --git a/models/__pycache__/model_view_store_supplier.cpython-312.pyc b/models/__pycache__/model_view_store_supplier.cpython-312.pyc index 9bca2131..dc768bbc 100644 Binary files a/models/__pycache__/model_view_store_supplier.cpython-312.pyc and b/models/__pycache__/model_view_store_supplier.cpython-312.pyc differ diff --git a/models/__pycache__/model_view_user.cpython-312.pyc b/models/__pycache__/model_view_user.cpython-312.pyc index 3341b189..4f2a389e 100644 Binary files a/models/__pycache__/model_view_user.cpython-312.pyc and b/models/__pycache__/model_view_user.cpython-312.pyc differ diff --git a/models/model_view_base.py b/models/model_view_base.py index fb025248..bd3187e8 100644 --- a/models/model_view_base.py +++ b/models/model_view_base.py @@ -21,7 +21,7 @@ import lib.argument_validation as av from forms.forms import Form_Is_Included_VAT, Form_Delivery_Region, Form_Currency from datastores.datastore_base import DataStore_Base from datastores.datastore_user import DataStore_User -from business_objects.store.store_base import Store_Base +from business_objects.base import Base from business_objects.store.product_category import Product_Category from forms.access_level import Filters_Access_Level from forms.unit_measurement import Filters_Unit_Measurement @@ -37,20 +37,25 @@ from typing import ClassVar class Model_View_Base(BaseModel, ABC): # Global constants # ATTR_FOR: ClassVar[str] = 'for' - ATTR_ID_ACCESS_LEVEL: ClassVar[str] = Store_Base.ATTR_ID_ACCESS_LEVEL + ATTR_ID_ACCESS_LEVEL: ClassVar[str] = Base.ATTR_ID_ACCESS_LEVEL + ATTR_ID_ADDRESS: ClassVar[str] = Base.ATTR_ID_ADDRESS + ATTR_ID_CURRENCY: ClassVar[str] = Base.ATTR_ID_CURRENCY + ATTR_ID_REGION: ClassVar[str] = Base.ATTR_ID_REGION ATTR_TEXT_COLLAPSED: ClassVar[str] = 'textCollapsed' ATTR_TEXT_EXPANDED: ClassVar[str] = 'textExpanded' ATTR_VALUE_CURRENT: ClassVar[str] = 'current-value' ATTR_VALUE_PREVIOUS: ClassVar[str] = 'previous-value' FLAG_ACCESS_LEVEL: ClassVar[str] = 'access_level' FLAG_ACCESS_LEVEL_REQUIRED: ClassVar[str] = Product_Category.FLAG_ACCESS_LEVEL_REQUIRED - FLAG_ACTIVE: ClassVar[str] = Store_Base.FLAG_ACTIVE + FLAG_ACTIVE: ClassVar[str] = Base.FLAG_ACTIVE FLAG_ADD: ClassVar[str] = 'add' + FLAG_BOOL_FALSE: ClassVar[str] = 'false' + FLAG_BOOL_TRUE: ClassVar[str] = 'true' FLAG_CANCEL: ClassVar[str] = 'button-cancel' # FLAG_CONTACT_US: ClassVar[str] = 'button-contact' FLAG_CLOSE_TEMPORARY_ELEMENT: ClassVar[str] = 'button-temporary-element-close' FLAG_CARD: ClassVar[str] = 'card' - FLAG_CODE: ClassVar[str] = Store_Base.FLAG_CODE + FLAG_CODE: ClassVar[str] = Base.FLAG_CODE FLAG_COLLAPSED: ClassVar[str] = 'collapsed' FLAG_COLLAPSIBLE: ClassVar[str] = 'collapsible' FLAG_COLUMN: ClassVar[str] = 'column' @@ -59,11 +64,11 @@ class Model_View_Base(BaseModel, ABC): FLAG_CONTAINER_INPUT: ClassVar[str] = FLAG_CONTAINER + '-input' FLAG_CURRENCY: ClassVar[str] = 'currency' FLAG_DELETE: ClassVar[str] = 'delete' - FLAG_DESCRIPTION: ClassVar[str] = Store_Base.FLAG_DESCRIPTION + FLAG_DESCRIPTION: ClassVar[str] = Base.FLAG_DESCRIPTION FLAG_DETAIL: ClassVar[str] = 'detail' FLAG_DIALOG: ClassVar[str] = 'dialog' # try element FLAG_DIRTY: ClassVar[str] = 'dirty' - FLAG_DISPLAY_ORDER: ClassVar[str] = Store_Base.FLAG_DISPLAY_ORDER + FLAG_DISPLAY_ORDER: ClassVar[str] = Base.FLAG_DISPLAY_ORDER FLAG_ERROR: ClassVar[str] = 'error' FLAG_EXPANDED: ClassVar[str] = 'expanded' FLAG_FAILURE: ClassVar[str] = 'failure' @@ -75,9 +80,9 @@ class Model_View_Base(BaseModel, ABC): # FLAG_KEY_PRIMARY: ClassVar[str] = Store_Base.FLAG_KEY_PRIMARY FLAG_MESSAGE: ClassVar[str] = 'Message' FLAG_MODAL: ClassVar[str] = 'modal' - FLAG_NAME: ClassVar[str] = Store_Base.FLAG_NAME - FLAG_NAME_ATTR_OPTION_TEXT: ClassVar[str] = Store_Base.FLAG_NAME_ATTR_OPTION_TEXT - FLAG_NAME_ATTR_OPTION_VALUE: ClassVar[str] = Store_Base.FLAG_NAME_ATTR_OPTION_VALUE + FLAG_NAME: ClassVar[str] = Base.FLAG_NAME + FLAG_NAME_ATTR_OPTION_TEXT: ClassVar[str] = Base.FLAG_NAME_ATTR_OPTION_TEXT + FLAG_NAME_ATTR_OPTION_VALUE: ClassVar[str] = Base.FLAG_NAME_ATTR_OPTION_VALUE FLAG_NAV_ADMIN_HOME: ClassVar[str] = 'navAdminHome' FLAG_NAV_ADMIN_STORE_STRIPE_PRICES: ClassVar[str] = 'navAdminStoreStripePrices' FLAG_NAV_ADMIN_STORE_STRIPE_PRODUCTS: ClassVar[str] = 'navAdminStoreStripeProducts' @@ -96,11 +101,10 @@ class Model_View_Base(BaseModel, ABC): FLAG_NAV_USER_LOGIN: ClassVar[str] = 'navUserLogin' FLAG_NAV_USER_LOGOUT: ClassVar[str] = 'navUserLogout' FLAG_OVERLAY: ClassVar[str] = 'overlay' - FLAG_TEMPORARY_ELEMENT: ClassVar[str] = 'temporary-element' FLAG_PAGE_BODY: ClassVar[str] = 'page-body' FLAG_ROW: ClassVar[str] = 'row' FLAG_ROW_NEW: ClassVar[str] = 'row-new' - FLAG_ROWS: ClassVar[str] = Store_Base.FLAG_ROWS + FLAG_ROWS: ClassVar[str] = Base.FLAG_ROWS FLAG_SAVE: ClassVar[str] = 'save' FLAG_SCROLLABLE: ClassVar[str] = 'scrollable' FLAG_SLIDER: ClassVar[str] = 'slider' @@ -108,6 +112,7 @@ class Model_View_Base(BaseModel, ABC): FLAG_SUBMIT: ClassVar[str] = 'submit' FLAG_SUBMITTED: ClassVar[str] = 'submitted' FLAG_SUCCESS: ClassVar[str] = 'success' + FLAG_TEMPORARY_ELEMENT: ClassVar[str] = 'temporary-element' # flagIsDatePicker: ClassVar[str] = 'is-date-picker' HASH_APPLY_FILTERS_STORE_PRODUCT_PERMUTATION: ClassVar[str] = '/store/permutation_filter' HASH_CALLBACK_LOGIN: ClassVar[str] = '/callback-login' @@ -130,7 +135,7 @@ class Model_View_Base(BaseModel, ABC): HASH_PAGE_STORE_PRODUCT_PRICES: ClassVar[str] = '/store/prices' HASH_PAGE_STORE_PRODUCT_VARIATIONS: ClassVar[str] = '/store/variations' HASH_PAGE_STORE_STOCK_ITEMS: ClassVar[str] = '/store/stock_items' - HASH_PAGE_STORE_SUPPLIER: ClassVar[str] = '/store/supplier' + HASH_PAGE_STORE_SUPPLIERS: ClassVar[str] = '/store/suppliers' HASH_PAGE_USER_ACCOUNT: ClassVar[str] = '/user' HASH_PAGE_USER_ADMIN: ClassVar[str] = '/user/admin' HASH_PAGE_USER_LOGIN: ClassVar[str] = '/login' @@ -148,9 +153,9 @@ class Model_View_Base(BaseModel, ABC): ID_FORM_FILTERS: ClassVar[str] = 'formFilters' ID_FORM_IS_INCLUDED_VAT: ClassVar[str] = 'formIsIncludedVAT' ID_LABEL_ERROR: ClassVar[str] = 'labelError' + """ ID_MODAL_SERVICES: ClassVar[str] = 'modalServices' ID_MODAL_TECHNOLOGIES: ClassVar[str] = 'modalTechnologies' - """ ID_BUTTON_NAV_ADMIN_HOME: ClassVar[str] = 'navAdminHome' ID_BUTTON_NAV_ADMIN_STORE_STRIPE_PRICE: ClassVar[str] = 'navAdminStoreStripePrice' ID_BUTTON_NAV_ADMIN_STORE_STRIPE_PRODUCT: ClassVar[str] = 'navAdminStoreStripeProduct' @@ -179,8 +184,6 @@ class Model_View_Base(BaseModel, ABC): # KEY_CSRF_TOKEN: ClassVar[str] = 'X-CSRFToken' KEY_DATA: ClassVar[str] = 'data' KEY_FORM: ClassVar[str] = 'form' - KEY_FORM_FILTERS: ClassVar[str] = KEY_FORM + 'Filters' - KEY_USER: ClassVar[str] = User.KEY_USER NAME_COMPANY: ClassVar[str] = 'Precision And Research Technology Systems Limited' NAME_CSRF_TOKEN: ClassVar[str] = 'csrf-token' # URL_HOST: ClassVar[str] = os.env() 'http://127.0.0.1:5000' # 'https://www.partsltd.co.uk' @@ -311,7 +314,7 @@ class Model_View_Base(BaseModel, ABC): return [obj.to_json() for obj in list_objects] @staticmethod def convert_list_objects_to_list_options(list_objects): - return Store_Base.convert_list_objects_to_list_options(list_objects) + return Base.convert_list_objects_to_list_options(list_objects) @staticmethod def convert_list_objects_to_dict_by_attribute_key(list_objects, key): return {getattr(obj, key): obj for obj in list_objects} @@ -340,4 +343,14 @@ class Model_View_Base(BaseModel, ABC): if str_multiline != '': str_multiline += '\n' str_multiline += str - return str_multiline \ No newline at end of file + return str_multiline + @staticmethod + def format_date(date): + if date is None: + return '' + return date.strftime('%Y-%m-%d') + @staticmethod + def format_datetime(date_time): + if date_time is None: + return '' + return date_time.strftime('%Y-%m-%dT%H:%M') \ No newline at end of file diff --git a/models/model_view_store.py b/models/model_view_store.py index a0a102e3..1509f051 100644 --- a/models/model_view_store.py +++ b/models/model_view_store.py @@ -24,6 +24,7 @@ from business_objects.store.image import Resolution_Level_Enum from business_objects.store.basket import Basket_Item, Basket from business_objects.store.product_category import Product_Category from business_objects.store.product_variation import Product_Variation_Filters, Product_Variation +from business_objects.store.stock_item import Stock_Item from datastores.datastore_store_base import DataStore_Store_Base from datastores.datastore_user import DataStore_User from datastores.datastore_store_basket import DataStore_Store_Basket @@ -41,52 +42,63 @@ from abc import abstractmethod class Model_View_Store(Model_View_Base): # Global constants ATTR_FORM_TYPE: ClassVar[str] = 'form-type' + ATTR_ID_DELIVERY_OPTION: ClassVar[str] = Store_Base.ATTR_ID_DELIVERY_OPTION + ATTR_ID_DISCOUNT: ClassVar[str] = Store_Base.ATTR_ID_DISCOUNT + ATTR_ID_PLANT: ClassVar[str] = 'id-plant' ATTR_ID_PRODUCT : ClassVar[str] = Product.ATTR_ID_PRODUCT # 'id-product' ATTR_ID_PRODUCT_CATEGORY: ClassVar[str] = Product.ATTR_ID_PRODUCT_CATEGORY ATTR_ID_PRODUCT_PERMUTATION : ClassVar[str] = Product.ATTR_ID_PRODUCT_PERMUTATION # 'id-permutation' + ATTR_ID_PRODUCT_PRICE: ClassVar[str] = Product.ATTR_ID_PRODUCT_PRICE ATTR_ID_PRODUCT_VARIATION : ClassVar[str] = Product_Variation.ATTR_ID_PRODUCT_VARIATION # 'id-variation' ATTR_ID_PRODUCT_VARIATION_TYPE : ClassVar[str] = Product_Variation.ATTR_ID_PRODUCT_VARIATION_TYPE # 'id-variation-type' + ATTR_ID_STOCK_ITEM: ClassVar[str] = Store_Base.ATTR_ID_STOCK_ITEM + ATTR_ID_STORAGE_LOCATION: ClassVar[str] = Store_Base.ATTR_ID_STORAGE_LOCATION FLAG_BUTTON_BASKET_ADD : ClassVar[str] = Model_View_Base.FLAG_SUBMIT + '.buttonAddToBasket' FLAG_BUTTON_BUY_NOW : ClassVar[str] = 'buttonBuyNow' - FLAG_COST_LOCAL: ClassVar[str] = Product_Permutation.FLAG_COST_LOCAL - # FLAG_COST_LOCAL_VAT_INCL: ClassVar[str] = 'cost-local-VAT-incl' + FLAG_COST_LOCAL: ClassVar[str] = Store_Base.FLAG_COST_LOCAL + FLAG_COST_LOCAL_VAT_EXCL: ClassVar[str] = Store_Base.FLAG_COST_LOCAL_VAT_EXCL + FLAG_COST_LOCAL_VAT_INCL: ClassVar[str] = Store_Base.FLAG_COST_LOCAL_VAT_INCL FLAG_COUNT_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED: ClassVar[str] = Product_Permutation.FLAG_COUNT_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED FLAG_COUNT_UNIT_MEASUREMENT_INTERVAL_RECURRENCE: ClassVar[str] = Product_Permutation.FLAG_COUNT_UNIT_MEASUREMENT_INTERVAL_RECURRENCE FLAG_COUNT_UNIT_MEASUREMENT_PER_QUANTITY_STEP: ClassVar[str] = Product_Permutation.FLAG_COUNT_UNIT_MEASUREMENT_PER_QUANTITY_STEP FLAG_CURRENCY_COST: ClassVar[str] = Product_Permutation.FLAG_CURRENCY_COST - FLAG_DATE_CONSUMED: ClassVar[str] = 'date-consumed' - FLAG_DATE_EXPIRATION: ClassVar[str] = 'date-expiration' - FLAG_DATE_PURCHASED: ClassVar[str] = 'date-purchased' - FLAG_DATE_RECEIVED: ClassVar[str] = 'date-received' - FLAG_DATE_UNSEALED: ClassVar[str] = 'date-unsealed' + FLAG_DATE_CONSUMED: ClassVar[str] = Stock_Item.FLAG_DATE_CONSUMED + FLAG_DATE_EXPIRATION: ClassVar[str] = Stock_Item.FLAG_DATE_EXPIRATION + FLAG_DATE_PURCHASED: ClassVar[str] = Stock_Item.FLAG_DATE_PURCHASED + FLAG_DATE_RECEIVED: ClassVar[str] = Stock_Item.FLAG_DATE_RECEIVED + FLAG_DATE_UNSEALED: ClassVar[str] = Stock_Item.FLAG_DATE_UNSEALED + FLAG_DISCOUNT: ClassVar[str] = Store_Base.FLAG_DISCOUNT FLAG_DOES_EXPIRE_FASTER_ONCE_UNSEALED: ClassVar[str] = Product_Permutation.FLAG_DOES_EXPIRE_FASTER_ONCE_UNSEALED FLAG_HAS_VARIATIONS: ClassVar[str] = Product_Permutation.FLAG_HAS_VARIATIONS FLAG_ID_STRIPE_PRODUCT: ClassVar[str] = Product_Permutation.FLAG_ID_STRIPE_PRODUCT + FLAG_IS_CONSUMED: ClassVar[str] = Stock_Item.FLAG_IS_CONSUMED FLAG_IS_NOT_EMPTY: ClassVar[str] = Store_Base.FLAG_IS_NOT_EMPTY - FLAG_IS_OUT_OF_STOCK: ClassVar[str] = 'is-out-of-stock' + FLAG_IS_OUT_OF_STOCK: ClassVar[str] = Store_Base.FLAG_IS_OUT_OF_STOCK + FLAG_IS_SEALED: ClassVar[str] = Stock_Item.FLAG_IS_SEALED FLAG_IS_SUBSCRIPTION: ClassVar[str] = Product_Permutation.FLAG_IS_SUBSCRIPTION FLAG_LATENCY_MANUFACTURE_DAYS: ClassVar[str] = Product_Permutation.FLAG_LATENCY_MANUFACTURE_DAYS - FLAG_LOCATION_STORAGE: ClassVar[str] = 'storage-location' FLAG_NAME_PLURAL_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED: ClassVar[str] = Product_Permutation.FLAG_NAME_PLURAL_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED FLAG_NAME_PLURAL_UNIT_MEASUREMENT_INTERVAL_RECURRENCE: ClassVar[str] = Product_Permutation.FLAG_NAME_PLURAL_UNIT_MEASUREMENT_INTERVAL_RECURRENCE FLAG_NAME_PLURAL_UNIT_MEASUREMENT_QUANTITY: ClassVar[str] = Product_Permutation.FLAG_NAME_PLURAL_UNIT_MEASUREMENT_QUANTITY FLAG_NAME_SINGULAR_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED: ClassVar[str] = Product_Permutation.FLAG_NAME_SINGULAR_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED FLAG_NAME_SINGULAR_UNIT_MEASUREMENT_INTERVAL_RECURRENCE: ClassVar[str] = Product_Permutation.FLAG_NAME_SINGULAR_UNIT_MEASUREMENT_INTERVAL_RECURRENCE FLAG_NAME_SINGULAR_UNIT_MEASUREMENT_QUANTITY: ClassVar[str] = Product_Permutation.FLAG_NAME_SINGULAR_UNIT_MEASUREMENT_QUANTITY + FLAG_PLANT: ClassVar[str] = Store_Base.FLAG_PLANT FLAG_PRODUCT: ClassVar[str] = Store_Base.FLAG_PRODUCT FLAG_PRODUCT_CATEGORY: ClassVar[str] = Store_Base.FLAG_PRODUCT_CATEGORY FLAG_PRODUCT_PERMUTATION: ClassVar[str] = Store_Base.FLAG_PRODUCT_PERMUTATION + FLAG_PRODUCT_PRICE: ClassVar[str] = Store_Base.FLAG_PRODUCT_PRICE FLAG_PRODUCT_VARIATION: ClassVar[str] = Store_Base.FLAG_PRODUCT_VARIATION FLAG_PRODUCT_VARIATIONS: ClassVar[str] = Store_Base.FLAG_PRODUCT_VARIATIONS FLAG_PRODUCT_VARIATION_TYPE: ClassVar[str] = Store_Base.FLAG_PRODUCT_VARIATION_TYPE + FLAG_PROFIT_LOCAL_MIN: ClassVar[str] = Product_Permutation.FLAG_PROFIT_LOCAL_MIN FLAG_QUANTITY: ClassVar[str] = 'quantity' FLAG_QUANTITY_MAX: ClassVar[str] = Product_Permutation.FLAG_QUANTITY_MAX # 'quantity-max' FLAG_QUANTITY_MIN: ClassVar[str] = Product_Permutation.FLAG_QUANTITY_MIN # 'quantity-min' FLAG_QUANTITY_STOCK: ClassVar[str] = Product_Permutation.FLAG_QUANTITY_STOCK # 'quantity-stock' - FLAG_PLANT_STORAGE: ClassVar[str] = 'plant-storage' - FLAG_PRODUCT_CATEGORY: ClassVar[str] = 'category' - FLAG_PROFIT_LOCAL_MIN: ClassVar[str] = Product_Permutation.FLAG_PROFIT_LOCAL_MIN - FLAG_REGION_STORAGE: ClassVar[str] = 'region-storage' + FLAG_REGION: ClassVar[str] = Store_Base.FLAG_REGION + FLAG_STOCK_ITEM: ClassVar[str] = Store_Base.FLAG_STOCK_ITEM + FLAG_STORAGE_LOCATION: ClassVar[str] = Store_Base.FLAG_STORAGE_LOCATION FLAG_SYMBOL_CURRENCY_COST: ClassVar[str] = Product_Permutation.FLAG_SYMBOL_CURRENCY_COST FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED: ClassVar[str] = Product_Permutation.FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_MEASUREMENT_INTERVAL_RECURRENCE: ClassVar[str] = Product_Permutation.FLAG_SYMBOL_IS_SUFFIX_NOT_PREFIX_UNIT_MEASUREMENT_INTERVAL_RECURRENCE @@ -97,33 +109,32 @@ class Model_View_Store(Model_View_Base): FLAG_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED: ClassVar[str] = Product_Permutation.FLAG_UNIT_MEASUREMENT_INTERVAL_EXPIRATION_UNSEALED FLAG_UNIT_MEASUREMENT_INTERVAL_RECURRENCE: ClassVar[str] = Product_Permutation.FLAG_UNIT_MEASUREMENT_INTERVAL_RECURRENCE FLAG_UNIT_MEASUREMENT_QUANTITY: ClassVar[str] = Product_Permutation.FLAG_UNIT_MEASUREMENT_QUANTITY - HASH_PAGE_STORE_BASKET : ClassVar[str] = '/store/basket' - HASH_STORE_BASKET_ADD : ClassVar[str] = '/store/basket_add' - HASH_STORE_BASKET_DELETE : ClassVar[str] = '/store/basket_delete' - HASH_STORE_BASKET_EDIT : ClassVar[str] = '/store/basket_edit' - HASH_STORE_BASKET_LOAD : ClassVar[str] = '/store/basket_load' HASH_GET_STORE_PRODUCT: ClassVar[str] = '/store/product_get' HASH_GET_STORE_PRODUCT_CATEGORY: ClassVar[str] = '/store/category_get' HASH_GET_STORE_PRODUCT_PERMUTATION: ClassVar[str] = '/store/permutation_get' HASH_GET_STORE_STOCK_ITEM: ClassVar[str] = '/store/stock_item_get' + HASH_PAGE_STORE_BASKET : ClassVar[str] = '/store/basket' HASH_SAVE_STORE_PRODUCT: ClassVar[str] = '/store/save_product' HASH_SAVE_STORE_PRODUCT_CATEGORY: ClassVar[str] = '/store/save_category' HASH_SAVE_STORE_PRODUCT_PERMUTATION: ClassVar[str] = '/store/save_permutation' HASH_SAVE_STORE_STOCK_ITEM: ClassVar[str] = '/store/save_stock_item' + HASH_STORE_BASKET_ADD : ClassVar[str] = '/store/basket_add' + HASH_STORE_BASKET_DELETE : ClassVar[str] = '/store/basket_delete' + HASH_STORE_BASKET_EDIT : ClassVar[str] = '/store/basket_edit' + HASH_STORE_BASKET_LOAD : ClassVar[str] = '/store/basket_load' HASH_STORE_SET_CURRENCY : ClassVar[str] = '/store/set_currency' HASH_STORE_SET_DELIVERY_REGION : ClassVar[str] = '/store/set_delivery_region' HASH_STORE_SET_IS_INCLUDED_VAT : ClassVar[str] = '/store/set_is_included_VAT' ID_BASKET : ClassVar[str] = 'basket' ID_BASKET_CONTAINER : ClassVar[str] = 'basketContainer' ID_BASKET_TOTAL : ClassVar[str] = 'basketTotal' - ID_BUTTON_CHECKOUT : ClassVar[str] = 'buttonCheckout' ID_BUTTON_BASKET_ADD : ClassVar[str] = 'buttonBasketAdd' ID_BUTTON_BUY_NOW : ClassVar[str] = 'buttonBuyNow' - ID_PRODUCT_CATEGORY_DEFAULT: ClassVar[str] = 1 + ID_BUTTON_CHECKOUT : ClassVar[str] = 'buttonCheckout' ID_CURRENCY : ClassVar[str] = Form_Currency.id_id_currency # 'id_currency' ID_CURRENCY_DEFAULT : ClassVar[str] = 1 ID_LABEL_BASKET_EMPTY : ClassVar[str] = 'basketEmpty' - ID_REGION_DELIVERY : ClassVar[str] = Form_Delivery_Region.id_id_region_delivery # 'id_region_delivery' + ID_PRODUCT_CATEGORY_DEFAULT: ClassVar[str] = 1 ID_REGION_DELIVERY_DEFAULT : ClassVar[str] = 1 IS_INCLUDED_VAT_DEFAULT : ClassVar[str] = True """ diff --git a/models/model_view_store_product.py b/models/model_view_store_product.py index 3528adcb..e5c42ed2 100644 --- a/models/model_view_store_product.py +++ b/models/model_view_store_product.py @@ -75,7 +75,7 @@ class Model_View_Store_Product(Model_View_Store): filters_product: Parameters_Product = None form_filters: Filters_Product list_options_product: list = None - product_blank: Product = None + # product_blank: Product = None units_measurement: list = None units_measurement_time: list = None # variation_container: Product_Variation_Container = None diff --git a/models/model_view_store_product_permutation.py b/models/model_view_store_product_permutation.py index 7bac6751..62cae7b9 100644 --- a/models/model_view_store_product_permutation.py +++ b/models/model_view_store_product_permutation.py @@ -42,7 +42,6 @@ class Model_View_Store_Product_Permutation(Model_View_Store): filters_product: Parameters_Product = None form_filters: Filters_Product_Permutation list_options_product: list = None - permutation_blank: Product_Permutation = None units_measurement: list = None units_measurement_time: list = None # variation_container: Product_Variation_Container = None @@ -79,12 +78,11 @@ class Model_View_Store_Product_Permutation(Model_View_Store): ) ) print(f'category filters: {self.category_list_filters.categories}') - self.form_filters.id_category.choices = [('0', 'All')] + [(str(category.id_category), category.name) for category in self.category_list_filters.categories] + self.form_filters.id_category.choices += [(str(category.id_category), category.name) for category in self.category_list_filters.categories] print(f'category options: {self.form_filters.id_category.choices}') self.list_options_product = self.category_list_filters.to_product_option_list() print(f'product options: {self.list_options_product}') - self.form_filters.id_product.choices = [('0', 'All')] + [(str(product['value']), product['text']) for product in self.list_options_product] - self.permutation_blank = Product_Permutation() + self.form_filters.id_product.choices += [(str(product['value']), product['text']) for product in self.list_options_product] self.variation_types, self.variations, errors = self.get_many_product_variation() self.units_measurement = self.get_many_unit_measurement() self.units_measurement_time = [unit_measurement for unit_measurement in self.units_measurement if unit_measurement.is_unit_of_time] diff --git a/models/model_view_store_stock_item.py b/models/model_view_store_stock_item.py index 705a1349..95e193e7 100644 --- a/models/model_view_store_stock_item.py +++ b/models/model_view_store_stock_item.py @@ -16,7 +16,7 @@ from datastores.datastore_store_stock_item import DataStore_Store_Stock_Item from business_objects.store.product_category import Product_Category_Container # from routes import bp_home from business_objects.store.product import Product, Parameters_Product, Product_Permutation -from business_objects.store.stock_item import Stock_Item +from business_objects.store.stock_item import Stock_Item, Parameters_Stock_Item from forms.store.stock_item import Filters_Stock_Item import lib.argument_validation as av @@ -35,10 +35,17 @@ class Model_View_Store_Stock_Item(Model_View_Store): """ KEY_PERMUTATIONS: ClassVar[str] = 'permutations' - category_list: Product_Category_Container = None # (str) + category_list: Product_Category_Container = None + category_list_filters: Product_Category_Container = None + currencies: list = None + currency_options: list = None filters_stock_item: Filters_Stock_Item form_filters: Filters_Stock_Item = None - permutation_blank: Product_Permutation = None + list_options_product: list = None + units_measurement: list = None + units_measurement_time: list = None + variations: list = None + variation_types: list = None @property def title(self): @@ -49,13 +56,11 @@ class Model_View_Store_Stock_Item(Model_View_Store): print(f'{_m}\nstarting...') super().__init__(hash_page_current=hash_page_current, filters_stock_item=filters_stock_item) # BaseModel.__init__(self, app=app, filters_stock_item=filters_stock_item, **kwargs) - self.form_filters = Filters_Stock_Item() + self.form_filters = Filters_Stock_Item.from_json(filters_stock_item.to_json()) # .from_form_stock_item(filters_stock_item) datastore_store = DataStore_Store_Stock_Item() tmp_category_list_stock_item, errors = datastore_store.get_many_product(Parameters_Product.from_filters_stock_item(filters_stock_item)) - self.category_list, errors = datastore_store.get_many_stock_item(filters_stock_item, tmp_category_list_stock_item) - category_list_filters, errors_filters = datastore_store.get_many_stock_item( - Filters_Stock_Item() - ) + self.category_list, errors = datastore_store.get_many_stock_item(Parameters_Stock_Item.from_form_stock_item(filters_stock_item), tmp_category_list_stock_item) + self.category_list_filters, errors_filters = datastore_store.get_many_product(Parameters_Product.get_default()) """ Parameters_Stock_Item( # self.info_user['sub'], @@ -73,15 +78,26 @@ class Model_View_Store_Stock_Item(Model_View_Store): ) """ - print(f'category_list_filters: {category_list_filters.categories}') - self.form_filters.id_category.choices = [('0', 'All')] + [(str(category.id_category), category.name) for category in category_list_filters.categories] - print(f'category options: {self.form_filters.id_category.choices}') - product_list = category_list_filters.to_product_option_list() - print(f'product_list: {product_list}') - self.form_filters.id_product.choices = [('0', 'All')] + [(str(product['value']), product['text']) for product in product_list] - self.permutation_blank = Product_Permutation() + print(f'category_list_filters: {self.category_list_filters.categories}') + self.form_filters.id_category.choices += [(str(category.id_category), category.name) for category in self.category_list_filters.categories] # [Filters_Stock_Item.get_choice_all()] + print(f'category options: {self.form_filters.id_category.choices}') + product_list = self.category_list_filters.to_product_option_list() + filtered_product_list = [] + if product_list is not None: + for product in product_list: + # print(f'product: {product}\n{product[Stock_Item.ATTR_ID_PRODUCT_CATEGORY]}\n{self.form_filters.id_category.data}\n{str(type(product[Stock_Item.ATTR_ID_PRODUCT_CATEGORY]))}\n{str(type(self.form_filters.id_category.data))}') + if (self.form_filters.id_category.data == '' or str(product[Stock_Item.ATTR_ID_PRODUCT_CATEGORY]) == self.form_filters.id_category.data): + filtered_product_list.append(product) + print(f'product_list: {product_list}\nfiltered_product_list: {filtered_product_list}') + self.form_filters.id_product.choices += [(str(product['value']), product['text']) for product in filtered_product_list] # [Filters_Stock_Item.get_choice_all()] + + # self.form_filters.import_values(filters_stock_item) + self.variation_types, self.variations, errors = self.get_many_product_variation() + self.units_measurement = self.get_many_unit_measurement() + self.units_measurement_time = [unit_measurement for unit_measurement in self.units_measurement if unit_measurement.is_unit_of_time] + self.currencies = self.get_many_currency() + self.currency_options = [currency.to_json_option() for currency in self.currencies] - def save_stock_item(self, comment, list_stock_items): - _m = 'Model_View_Store_Stock_Item.save_stock_item' - DataStore_Store_Stock_Item().save_stock_item(comment, list_stock_items) \ No newline at end of file + @classmethod + def save_stock_items(cls, comment, list_stock_items): + _m = f'{cls.__name__}.save_stock_items' + return DataStore_Store_Stock_Item().save_stock_items(comment, list_stock_items) \ No newline at end of file diff --git a/models/model_view_store_supplier.py b/models/model_view_store_supplier.py index afdb4d27..c210fb1c 100644 --- a/models/model_view_store_supplier.py +++ b/models/model_view_store_supplier.py @@ -34,5 +34,5 @@ class Model_View_Store_Supplier(Model_View_Store): av.val_instance(form, 'form', _m, FlaskForm) return super(Model_View_Supplier, cls).__new__(cls, db, info_user, app) """ - def __init__(self,form, hash_page_current=Model_View_Base.HASH_PAGE_STORE_SUPPLIER): + def __init__(self,form, hash_page_current=Model_View_Base.HASH_PAGE_STORE_SUPPLIERS): super().__init__(hash_page_current=hash_page_current, form=form) diff --git a/requirements.txt b/requirements.txt index fe8064e2..cad5cd2f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,4 +12,4 @@ python_dotenv authlib pydantic # psycopg2 - +requests diff --git a/static/MySQL/0000_combine.sql b/static/MySQL/0000_combine.sql index b25480b3..8e50d762 100644 --- a/static/MySQL/0000_combine.sql +++ b/static/MySQL/0000_combine.sql @@ -41,6 +41,8 @@ DROP TABLE IF EXISTS tmp_Shop_Customer_Sale_Order; # Delete old tables DROP TABLE IF EXISTS Split_Temp; +DROP TABLE IF EXISTS Split_Key_Value_Pair_Csv_Temp; +DROP TABLE IF EXISTS Split_Key_Value_Pair_Temp; DROP TABLE IF EXISTS Shop_User_Eval_Temp; DROP TABLE IF EXISTS Shop_Calc_User_Temp; @@ -87,8 +89,8 @@ DROP TABLE IF EXISTS Shop_User_Order_Status; DROP TABLE IF EXISTS Shop_User_Basket_Audit; DROP TABLE IF EXISTS Shop_User_Basket; -DROP TABLE IF EXISTS Shop_Address_Audit; -DROP TABLE IF EXISTS Shop_Address; +DROP TABLE IF EXISTS Shop_User_Address_Audit; +DROP TABLE IF EXISTS Shop_User_Address; DROP TABLE IF EXISTS Shop_User_Role_Link_Audit; DROP TABLE IF EXISTS Shop_User_Role_Link; @@ -190,6 +192,9 @@ DROP TABLE IF EXISTS Shop_Plant_Temp; DROP TABLE IF EXISTS Shop_Plant_Audit; DROP TABLE IF EXISTS Shop_Plant; +DROP TABLE IF EXISTS Shop_Address_Audit; +DROP TABLE IF EXISTS Shop_Address; + DROP TABLE IF EXISTS Shop_Delivery_Region_Branch_Audit; DROP TABLE IF EXISTS Shop_Delivery_Region_Branch; DROP TABLE IF EXISTS Shop_Region_Branch_Temp; @@ -232,6 +237,9 @@ DROP TABLE IF EXISTS Shop_Product_Change_Set; -- Procedures DROP PROCEDURE IF EXISTS p_split; DROP PROCEDURE IF EXISTS p_clear_split_temp; +DROP PROCEDURE IF EXISTS p_split_key_value_pair_csv; +DROP PROCEDURE IF EXISTS p_clear_split_key_value_csv_temp; +DROP PROCEDURE IF EXISTS p_clear_split_key_value_pair_csv_temp; DROP PROCEDURE IF EXISTS p_debug_timing_reporting; DROP PROCEDURE IF EXISTS p_validate_guid; @@ -248,12 +256,15 @@ DROP PROCEDURE IF EXISTS p_shop_get_many_access_level; DROP PROCEDURE IF EXISTS p_shop_get_many_unit_measurement; DROP PROCEDURE IF EXISTS p_shop_get_many_region; +DROP PROCEDURE IF EXISTS p_shop_get_many_plant; +DROP PROCEDURE IF EXISTS p_shop_get_many_storage_location; DROP PROCEDURE IF EXISTS p_shop_get_many_currency; DROP PROCEDURE IF EXISTS p_shop_save_category; DROP PROCEDURE IF EXISTS p_shop_save_product_category; DROP PROCEDURE IF EXISTS p_shop_save_product_category_test; DROP PROCEDURE IF EXISTS p_shop_save_product; +DROP PROCEDURE IF EXISTS p_shop_save_product_test; DROP PROCEDURE IF EXISTS p_shop_calc_product_permutation; DROP PROCEDURE IF EXISTS p_shop_clear_calc_product_permutation; DROP PROCEDURE IF EXISTS p_shop_get_many_product; @@ -261,6 +272,9 @@ DROP PROCEDURE IF EXISTS p_shop_get_many_stripe_product_new; DROP PROCEDURE IF EXISTS p_shop_save_permutation; DROP PROCEDURE IF EXISTS p_shop_save_product_permutation; DROP PROCEDURE IF EXISTS p_shop_get_many_product_variation; +DROP FUNCTION IF EXISTS fn_shop_get_id_product_permutation_from_variation_csv_list; +DROP PROCEDURE IF EXISTS p_shop_save_stock_item; +DROP PROCEDURE IF EXISTS p_shop_save_stock_item_test; DROP PROCEDURE IF EXISTS p_shop_get_many_stock_item; DROP PROCEDURE IF EXISTS p_shop_get_many_product_price_and_discount_and_delivery_option; DROP PROCEDURE IF EXISTS p_shop_get_many_product_price_and_discount_and_delivery_option; @@ -318,6 +332,19 @@ CREATE TABLE IF NOT EXISTS Shop_User_Change_Set ( updated_last_on TIMESTAMP, updated_last_by VARCHAR(100) ); +# Split Key Value Pair CSV Staging +-- USE partsltd_prod; +-- DROP TABLE IF EXISTS Split_Temp; + +SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Split_Key_Value_Pair_Csv_Temp'; + +CREATE TABLE Split_Key_Value_Pair_Csv_Temp ( + guid BINARY(36) NOT NULL + , id INT NOT NULL + , key_column VARCHAR(4000) NULL + , value_column VARCHAR(4000) NULL +); + # Sales And Purchasing Change Sets @@ -512,8 +539,6 @@ CREATE TABLE IF NOT EXISTS Shop_Image_Type_Audit ( ); # Regions - - SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Region'; CREATE TABLE IF NOT EXISTS Shop_Region ( @@ -632,10 +657,29 @@ CREATE TABLE IF NOT EXISTS Shop_Region_Branch_Temp ( active BIT NOT NULL DEFAULT 1, display_order INT NOT NULL ); +# Addresses + + +SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Address'; + +CREATE TABLE Shop_Address ( + id_address INT NOT NULL AUTO_INCREMENT PRIMARY KEY, + id_region INT NOT NULL, + postcode VARCHAR(20) NOT NULL, + address_line_1 VARCHAR(256) NOT NULL, + address_line_2 VARCHAR(256) NOT NULL, + city VARCHAR(256) NOT NULL, + county VARCHAR(256) NOT NULL, + active BIT NOT NULL DEFAULT 1, + created_on TIMESTAMP, + created_by INT, + id_change_set INT, + CONSTRAINT FK_Shop_Address_id_change_set + FOREIGN KEY (id_change_set) + REFERENCES Shop_User_Change_Set(id_change_set) +); # Plant - - SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Plant'; CREATE TABLE IF NOT EXISTS Shop_Plant ( @@ -643,6 +687,9 @@ CREATE TABLE IF NOT EXISTS Shop_Plant ( code VARCHAR(50) NOT NULL, name VARCHAR(500) NOT NULL, id_address INT NOT NULL, + CONSTRAINT FK_Shop_Plant_id_address + FOREIGN KEY (id_address) + REFERENCES Shop_Address(id_address), id_user_manager INT NOT NULL, active BIT NOT NULL DEFAULT 1, created_on TIMESTAMP, @@ -653,6 +700,28 @@ CREATE TABLE IF NOT EXISTS Shop_Plant ( REFERENCES Shop_Product_Change_Set(id_change_set) ); +# Address Audits + + + +SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Address_Audit'; + +CREATE TABLE IF NOT EXISTS Shop_Address_Audit ( + id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, + id_address INT NOT NULL, + CONSTRAINT FK_Shop_Address_Audit_id_address + FOREIGN KEY (id_address) + REFERENCES Shop_Address(id_address) + ON UPDATE RESTRICT, + name_field VARCHAR(50), + value_prev VARCHAR(500), + value_new VARCHAR(500), + id_change_set INT NOT NULL, + CONSTRAINT FK_Shop_Address_Audit_id_change_set + FOREIGN KEY (id_change_set) + REFERENCES Shop_User_Change_Set(id_change_set) + ON UPDATE RESTRICT +); # Plant Audits @@ -682,12 +751,13 @@ CREATE TABLE IF NOT EXISTS Shop_Plant_Audit ( SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Plant_Temp'; CREATE TABLE IF NOT EXISTS Shop_Plant_Temp ( - id_plant INT NOT NULL PRIMARY KEY, - code VARCHAR(50) NOT NULL, - name VARCHAR(500) NOT NULL, - id_address INT NOT NULL, - id_user_manager INT NOT NULL, - active BIT NOT NULL DEFAULT 1 + id_plant INT NOT NULL PRIMARY KEY + , code VARCHAR(50) NOT NULL + , name VARCHAR(500) NOT NULL + , id_address INT NOT NULL + , id_user_manager INT NOT NULL + , active BIT NOT NULL DEFAULT 1 + , guid BINARY(36) NOT NULL ); # Storage Location @@ -1457,7 +1527,7 @@ CREATE TABLE IF NOT EXISTS Shop_Product_Permutation_Variation_Link_Audit ( ); # Stock Stock Item - +-- DROP TABLE IF EXISTS Shop_Stock_Item; SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Stock_Item'; @@ -1467,8 +1537,8 @@ CREATE TABLE IF NOT EXISTS Shop_Stock_Item ( CONSTRAINT FK_Shop_Stock_Item_id_permutation FOREIGN KEY (id_permutation) REFERENCES Shop_Product_Permutation(id_permutation), - date_purchased TIMESTAMP NOT NULL, - date_received TIMESTAMP NULL, + date_purchased DATETIME NOT NULL, + date_received DATETIME NULL, id_location_storage INT NOT NULL, CONSTRAINT FK_Shop_Stock_Item_id_location_storage FOREIGN KEY (id_location_storage) @@ -1477,15 +1547,15 @@ CREATE TABLE IF NOT EXISTS Shop_Stock_Item ( CONSTRAINT FK_Shop_Stock_Item_id_currency FOREIGN KEY (id_currency_cost) REFERENCES Shop_Currency(id_currency), - cost_local_VAT_incl FLOAT NOT NULL, - cost_local_VAT_excl FLOAT NOT NULL, + cost_local_VAT_incl FLOAT NULL, + cost_local_VAT_excl FLOAT NULL, is_sealed BIT NOT NULL DEFAULT 1, - date_unsealed TIMESTAMP NULL, - date_expiration TIMESTAMP NOT NULL, + date_unsealed DATETIME NULL, + date_expiration DATETIME NOT NULL, is_consumed BIT NOT NULL DEFAULT 0, - date_consumed TIMESTAMP NULL, + date_consumed DATETIME NULL, active BIT NOT NULL DEFAULT 1, - created_on TIMESTAMP, + created_on DATETIME, created_by INT, id_change_set INT, CONSTRAINT FK_Shop_Stock_Item_id_change_set @@ -1518,24 +1588,29 @@ CREATE TABLE IF NOT EXISTS Shop_Stock_Item_Audit ( # Stock Stock Item Temp - +DROP TABLE IF EXISTS Shop_Stock_Item_Temp; SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Stock_Item_Temp'; CREATE TABLE IF NOT EXISTS Shop_Stock_Item_Temp ( - id_stock INT NOT NULL PRIMARY KEY, - id_permutation INT NOT NULL, - date_purchased TIMESTAMP NOT NULL, - id_location_storage INT NOT NULL, - id_currency INT NOT NULL, - cost_local_VAT_incl FLOAT NOT NULL, - cost_local_VAT_excl FLOAT NOT NULL, - is_sealed BIT NOT NULL DEFAULT 1, - date_unsealed TIMESTAMP NULL, - date_expiration TIMESTAMP NULL, - is_consumed BIT NOT NULL DEFAULT 0, - date_consumed TIMESTAMP NULL, - active BIT NOT NULL DEFAULT 1 + id_stock INT NULL + -- , id_category INT NULL + , id_product INT NOT NULL + , id_permutation INT NULL + , id_pairs_variations VARCHAR(4000) NULL + , date_purchased DATETIME NOT NULL + , date_received DATETIME NULL + , id_location_storage INT NOT NULL + , id_currency_cost INT NOT NULL + , cost_local_VAT_incl FLOAT NOT NULL + , cost_local_VAT_excl FLOAT NOT NULL + , is_sealed BIT NOT NULL + , date_unsealed DATETIME NULL + , date_expiration DATETIME NULL + , is_consumed BIT NOT NULL + , date_consumed DATETIME NULL + , active BIT NOT NULL + , guid BINARY(36) NOT NULL ); # Product Price @@ -1868,45 +1943,6 @@ CREATE TABLE IF NOT EXISTS Shop_Discount_Region_Currency_Link ( FOREIGN KEY (id_change_set) REFERENCES Shop_Product_Change_Set(id_change_set) ); -# Product Currency Region link - - - -SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Product_Currency_Region_Link'; - -CREATE TABLE IF NOT EXISTS Shop_Product_Currency_Region_Link ( - id_link INT NOT NULL AUTO_INCREMENT PRIMARY KEY, - id_product INT NOT NULL, - CONSTRAINT FK_Shop_Product_Currency_Region_Link_id_product - FOREIGN KEY (id_product) - REFERENCES Shop_Product(id_product) - ON UPDATE RESTRICT, - id_permutation INT NULL, - CONSTRAINT FK_Shop_Product_Currency_Region_Link_id_permutation - FOREIGN KEY (id_permutation) - REFERENCES Shop_Product_Permutation(id_permutation) - ON UPDATE RESTRICT, - id_currency INT NOT NULL, - CONSTRAINT FK_Shop_Product_Currency_Region_Link_id_currency - FOREIGN KEY (id_currency) - REFERENCES Shop_Currency(id_currency) - ON UPDATE RESTRICT, - id_region_purchase INT NOT NULL, - CONSTRAINT FK_Shop_Product_Currency_Region_Link_id_region_purchase - FOREIGN KEY (id_region_purchase) - REFERENCES Shop_Region(id_region) - ON UPDATE RESTRICT, - price_local_VAT_incl FLOAT NULL, - price_local_VAT_excl FLOAT NULL, - id_stripe_price VARCHAR(200), - active BIT NOT NULL DEFAULT 1, - created_on TIMESTAMP, - created_by INT, - id_change_set INT, - CONSTRAINT FK_Shop_Product_Currency_Region_Link_id_change_set - FOREIGN KEY (id_change_set) - REFERENCES Shop_Product_Change_Set(id_change_set) -); # Discount Region Currency Link Audits @@ -1929,28 +1965,6 @@ CREATE TABLE IF NOT EXISTS Shop_Discount_Region_Currency_Link_Audit ( REFERENCES Shop_Product_Change_Set(id_change_set) ON UPDATE RESTRICT ); -# Product Currency Region Link Audits - - - -SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Product_Currency_Region_Link_Audit'; - -CREATE TABLE IF NOT EXISTS Shop_Product_Currency_Region_Link_Audit ( - id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, - id_link INT NOT NULL, - CONSTRAINT FK_Shop_Product_Currency_Region_Link_Audit_id_link - FOREIGN KEY (id_link) - REFERENCES Shop_Product_Currency_Region_Link(id_link) - ON UPDATE RESTRICT, - name_field VARCHAR(50), - value_prev VARCHAR(500), - value_new VARCHAR(500), - id_change_set INT NOT NULL, - CONSTRAINT FK_Shop_Product_Currency_Region_Link_Audit_id_change_set - FOREIGN KEY (id_change_set) - REFERENCES Shop_Product_Change_Set(id_change_set) -); - # Permission Groups @@ -2230,14 +2244,12 @@ CREATE TABLE IF NOT EXISTS Shop_User_Role_Link_Audit ( REFERENCES Shop_User_Change_Set(id_change_set) ); -# Addresses +# User Addresses +SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_User_Address'; - -SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Address'; - -CREATE TABLE Shop_Address ( - id_address INT NOT NULL AUTO_INCREMENT PRIMARY KEY, +CREATE TABLE Shop_User_Address ( + id_user_address INT NOT NULL AUTO_INCREMENT PRIMARY KEY, id_user INT NOT NULL, CONSTRAINT FK_Shop_Address_id_user FOREIGN KEY (id_user) @@ -2248,36 +2260,34 @@ CREATE TABLE Shop_Address ( name_full VARCHAR(255) NOT NULL, phone_number VARCHAR(20) NOT NULL, postcode VARCHAR(20) NOT NULL, - address_line_1 VARCHAR(100) NOT NULL, - address_line_2 VARCHAR(100) NOT NULL, - city VARCHAR(50) NOT NULL, - county VARCHAR(100) NOT NULL, + address_line_1 VARCHAR(256) NOT NULL, + address_line_2 VARCHAR(256) NOT NULL, + city VARCHAR(256) NOT NULL, + county VARCHAR(256) NOT NULL, active BIT NOT NULL DEFAULT 1, created_on TIMESTAMP, created_by INT, id_change_set INT, - CONSTRAINT FK_Shop_Address_id_change_set + CONSTRAINT FK_Shop_User_Address_id_change_set FOREIGN KEY (id_change_set) REFERENCES Shop_User_Change_Set(id_change_set) ); # Address Audits +SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_User_Address_Audit'; - -SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Address_Audit'; - -CREATE TABLE IF NOT EXISTS Shop_Address_Audit ( +CREATE TABLE IF NOT EXISTS Shop_User_Address_Audit ( id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, - id_address INT NOT NULL, - CONSTRAINT FK_Shop_Address_Audit_id_address - FOREIGN KEY (id_address) - REFERENCES Shop_Address(id_address) + id_user_address INT NOT NULL, + CONSTRAINT FK_Shop_User_Address_Audit_id_address + FOREIGN KEY (id_user_address) + REFERENCES Shop_User_Address(id_user_address) ON UPDATE RESTRICT, name_field VARCHAR(50), value_prev VARCHAR(500), value_new VARCHAR(500), id_change_set INT NOT NULL, - CONSTRAINT FK_Shop_Address_Audit_id_change_set + CONSTRAINT FK_Shop_User_Address_Audit_id_change_set FOREIGN KEY (id_change_set) REFERENCES Shop_User_Change_Set(id_change_set) ON UPDATE RESTRICT @@ -3378,6 +3388,72 @@ BEGIN END // DELIMITER ;; +# Shop Address + + + +DROP TRIGGER IF EXISTS before_insert_Shop_Address; +DROP TRIGGER IF EXISTS before_update_Shop_Address; + + +DELIMITER // +CREATE TRIGGER before_insert_Shop_Address +BEFORE INSERT ON Shop_Address +FOR EACH ROW +BEGIN + SET NEW.created_on := IFNULL(NEW.created_on, NOW()); + SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); +END // +DELIMITER ;; + + +DELIMITER // +CREATE TRIGGER before_update_Shop_Address +BEFORE UPDATE ON Shop_Address +FOR EACH ROW +BEGIN + IF OLD.id_change_set <=> NEW.id_change_set THEN + SIGNAL SQLSTATE '45000' + SET MESSAGE_TEXT = 'New change Set ID must be provided.'; + END IF; + + INSERT INTO Shop_Address_Audit ( + id_address, + name_field, + value_prev, + value_new, + id_change_set + ) + # Changed region + SELECT NEW.id_address, 'id_region', OLD.id_region, NEW.id_region, NEW.id_change_set + WHERE NOT OLD.id_region <=> NEW.id_region + UNION + # Changed postcode + SELECT NEW.id_address, 'postcode', OLD.postcode, NEW.postcode, NEW.id_change_set + WHERE NOT OLD.postcode <=> NEW.postcode + UNION + # Changed address_line_1 + SELECT NEW.id_address, 'address_line_1', OLD.address_line_1, NEW.address_line_1, NEW.id_change_set + WHERE NOT OLD.address_line_1 <=> NEW.address_line_1 + UNION + # Changed address_line_2 + SELECT NEW.id_address, 'address_line_2', OLD.address_line_2, NEW.address_line_2, NEW.id_change_set + WHERE NOT OLD.address_line_2 <=> NEW.address_line_2 + UNION + # Changed city + SELECT NEW.id_address, 'city', OLD.city, NEW.city, NEW.id_change_set + WHERE NOT OLD.city <=> NEW.city + UNION + # Changed county + SELECT NEW.id_address, 'county', OLD.county, NEW.county, NEW.id_change_set + WHERE NOT OLD.county <=> NEW.county + UNION + # Changed active + SELECT NEW.id_address, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set + WHERE NOT (OLD.active <=> NEW.active) + ; +END // +DELIMITER ;; # Shop Storage Location @@ -5018,13 +5094,13 @@ DELIMITER ;; -DROP TRIGGER IF EXISTS before_insert_Shop_Address; -DROP TRIGGER IF EXISTS before_update_Shop_Address; +DROP TRIGGER IF EXISTS before_insert_Shop_User_Address; +DROP TRIGGER IF EXISTS before_update_Shop_User_Address; DELIMITER // -CREATE TRIGGER before_insert_Shop_Address -BEFORE INSERT ON Shop_Address +CREATE TRIGGER before_insert_Shop_User_Address +BEFORE INSERT ON Shop_User_Address FOR EACH ROW BEGIN SET NEW.created_on := IFNULL(NEW.created_on, NOW()); @@ -5034,8 +5110,8 @@ DELIMITER ;; DELIMITER // -CREATE TRIGGER before_update_Shop_Address -BEFORE UPDATE ON Shop_Address +CREATE TRIGGER before_update_Shop_User_Address +BEFORE UPDATE ON Shop_User_Address FOR EACH ROW BEGIN IF OLD.id_change_set <=> NEW.id_change_set THEN @@ -5043,47 +5119,47 @@ BEGIN SET MESSAGE_TEXT = 'New change Set ID must be provided.'; END IF; - INSERT INTO Shop_Address_Audit ( - id_address, + INSERT INTO Shop_User_Address_Audit ( + id_user_address, name_field, value_prev, value_new, id_change_set ) # Changed region - SELECT NEW.id_address, 'id_region', OLD.id_region, NEW.id_region, NEW.id_change_set + SELECT NEW.id_user_address, 'id_region', OLD.id_region, NEW.id_region, NEW.id_change_set WHERE NOT OLD.id_region <=> NEW.id_region UNION # Changed name_full - SELECT NEW.id_address, 'name_full', OLD.name_full, NEW.name_full, NEW.id_change_set + SELECT NEW.id_user_address, 'name_full', OLD.name_full, NEW.name_full, NEW.id_change_set WHERE NOT OLD.name_full <=> NEW.name_full UNION # Changed phone_number - SELECT NEW.id_address, 'phone_number', OLD.phone_number, NEW.phone_number, NEW.id_change_set + SELECT NEW.id_user_address, 'phone_number', OLD.phone_number, NEW.phone_number, NEW.id_change_set WHERE NOT OLD.phone_number <=> NEW.phone_number UNION # Changed postcode - SELECT NEW.id_address, 'postcode', OLD.postcode, NEW.postcode, NEW.id_change_set + SELECT NEW.id_user_address, 'postcode', OLD.postcode, NEW.postcode, NEW.id_change_set WHERE NOT OLD.postcode <=> NEW.postcode UNION # Changed address_line_1 - SELECT NEW.id_address, 'address_line_1', OLD.address_line_1, NEW.address_line_1, NEW.id_change_set + SELECT NEW.id_user_address, 'address_line_1', OLD.address_line_1, NEW.address_line_1, NEW.id_change_set WHERE NOT OLD.address_line_1 <=> NEW.address_line_1 UNION # Changed address_line_2 - SELECT NEW.id_address, 'address_line_2', OLD.address_line_2, NEW.address_line_2, NEW.id_change_set + SELECT NEW.id_user_address, 'address_line_2', OLD.address_line_2, NEW.address_line_2, NEW.id_change_set WHERE NOT OLD.address_line_2 <=> NEW.address_line_2 UNION # Changed city - SELECT NEW.id_address, 'city', OLD.city, NEW.city, NEW.id_change_set + SELECT NEW.id_user_address, 'city', OLD.city, NEW.city, NEW.id_change_set WHERE NOT OLD.city <=> NEW.city UNION # Changed county - SELECT NEW.id_address, 'county', OLD.county, NEW.county, NEW.id_change_set + SELECT NEW.id_user_address, 'county', OLD.county, NEW.county, NEW.id_change_set WHERE NOT OLD.county <=> NEW.county UNION # Changed active - SELECT NEW.id_address, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set + SELECT NEW.id_user_address, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set WHERE NOT (OLD.active <=> NEW.active) ; END // @@ -6028,6 +6104,8 @@ BEGIN COMMIT; END IF; + DROP TABLE IF EXISTS tmp_Split_Split; + IF a_debug = 1 THEN CALL p_debug_timing_reporting ( v_time_start ); END IF; @@ -6138,6 +6216,143 @@ END // DELIMITER ;; CALL p_validate_guid_test(); + +DROP PROCEDURE IF EXISTS p_split_key_value_pair_csv; + +DELIMITER // +CREATE PROCEDURE p_split_key_value_pair_csv ( + IN a_guid BINARY(36) + , IN a_string LONGTEXT + , IN a_debug BIT +) +BEGIN + DECLARE v_has_string BIT; + DECLARE v_current_item VARCHAR(4000); + DECLARE v_time_start TIMESTAMP(6); + + SET v_time_start := CURRENT_TIMESTAMP(6); + SET a_string := IFNULL(a_string, ''); + SET a_debug := IFNULL(a_debug, 0); + + SET v_has_string = CASE WHEN a_string = '' THEN 0 ELSE 1 END; + + IF a_debug = 1 THEN + SELECT + a_guid + , a_string + , a_debug + ; + END IF; + + CALL p_validate_guid ( a_guid ); + + DROP TEMPORARY TABLE IF EXISTS tmp_Split_Input; + DROP TEMPORARY TABLE IF EXISTS tmp_Split_Split; + + CREATE TEMPORARY TABLE tmp_Split_Input ( + input_string TEXT + ); + + CREATE TEMPORARY TABLE tmp_Split_Split ( + id INT AUTO_INCREMENT PRIMARY KEY + , key_column VARCHAR(4000) + , value_column VARCHAR(4000) + ); + + INSERT INTO tmp_Split_Input ( + input_string + ) + VALUES ( + a_string + ); + + INSERT INTO tmp_Split_Split (key_column, value_column) + SELECT + SUBSTRING_INDEX(SUBSTRING_INDEX(t.pair, ':', 1), ',', -1) AS key_column, + SUBSTRING_INDEX(t.pair, ':', -1) AS value_column + FROM ( + SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(input_string, ',', n), ',', -1) pair + FROM temp_input + CROSS JOIN ( + SELECT a.N + b.N * 10 + 1 n + FROM (SELECT 0 AS N UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) a + CROSS JOIN (SELECT 0 AS N UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) b + ORDER BY n + ) numbers + WHERE n <= 1 + (LENGTH(input_string) - LENGTH(REPLACE(input_string, ',', ''))) + ) t; + + IF EXISTS (SELECT * FROM tmp_Split_Split LIMIT 1) THEN + START TRANSACTION; + INSERT INTO Split_Key_Value_Pair_Csv_Temp ( + guid + , id + , key_column + , value_column + ) + SELECT + a_guid + , id + , key_column + , value_column + FROM tmp_Split_Split + ; + COMMIT; + END IF; + + DROP TEMPORARY TABLE IF EXISTS tmp_Split_Input; + DROP TEMPORARY TABLE IF EXISTS tmp_Split_Split; + + IF a_debug = 1 THEN + CALL p_debug_timing_reporting ( v_time_start ); + END IF; +END // +DELIMITER ;; + + +/* +CALL p_split_key_value_pair_csv ( + 'nipsnipsnipsnipsnipsnipsnipsnipsnips' + , '1:100,2:200,3:300,4:400' # a_string + , 1 +); + +SELECT * +FROM Split_key_value_pair_csv_Temp +WHERE GUID = 'nipsnipsnipsnipsnipsnipsnipsnipsnips'; + +CALL p_clear_split_key_value_pair_csv_temp( 'nipsnipsnipsnipsnipsnipsnipsnipsnips' ); +*/ + +-- Clear previous proc +DROP PROCEDURE IF EXISTS p_clear_split_key_value_pair_csv_temp; + + +DELIMITER // +CREATE PROCEDURE p_clear_split_key_value_pair_csv_temp ( + IN a_guid BINARY(36) +) +BEGIN + CALL p_validate_guid( a_guid ); + + START TRANSACTION; + + -- DROP TABLE IF EXISTS + DELETE FROM Split_Key_Value_Pair_Csv_Temp + WHERE GUID = a_guid + ; + + COMMIT; +END // +DELIMITER ;; + +/* + +CALL p_clear_split_key_value_pair_csv_temp ( 'nipsnipsnipsnipsnipsnipsnipsnipsnips' ); + + +*/ + DROP FUNCTION IF EXISTS fn_shop_get_product_permutation_name; DELIMITER // @@ -6863,6 +7078,79 @@ CALL p_shop_get_many_region ( */ +-- Clear previous proc +DROP PROCEDURE IF EXISTS p_shop_get_many_plant; + + +DELIMITER // +CREATE PROCEDURE p_shop_get_many_plant ( + IN a_get_inactive_plant BIT +) +BEGIN + SET a_get_inactive_plant = IFNULL(a_get_inactive_plant, 0); + + SELECT + P.id_plant + , P.id_address + , A.id_region + , P.id_user_manager + , P.code + , P.name + , P.active + FROM Shop_Plant P + INNER JOIN Shop_Address A ON P.id_address = A.id_address + WHERE + a_get_inactive_plant = 1 + OR P.active = 1 + ; +END // +DELIMITER ;; + + +/* +CALL p_shop_get_many_plant ( + 0 # a_get_inactive_plant +); +*/ + + +-- Clear previous proc +DROP PROCEDURE IF EXISTS p_shop_get_many_storage_location; + + +DELIMITER // +CREATE PROCEDURE p_shop_get_many_storage_location ( + IN a_get_inactive_storage_location BIT +) +BEGIN + SET a_get_inactive_storage_location = IFNULL(a_get_inactive_storage_location, 0); + + SELECT + SL.id_storage_location + , P.id_plant + , P.id_address + , A.id_region + , SL.code + , SL.name + , P.active + FROM Shop_Storage_Location SL + INNER JOIN Shop_Plant P ON SL.id_plant = P.id_plant + INNER JOIN Shop_Address A ON P.id_address = A.id_address + WHERE + a_get_inactive_storage_location = 1 + OR SL.active = 1 + ; +END // +DELIMITER ;; + + +/* +CALL p_shop_get_many_storage_location ( + 0 # a_get_inactive_storage_location +); +*/ + + /* @@ -6959,9 +7247,9 @@ DROP PROCEDURE IF EXISTS p_shop_save_product_category; DELIMITER // CREATE PROCEDURE p_shop_save_product_category ( - IN a_id_user INT, + IN a_comment VARCHAR(500), IN a_guid BINARY(36), - IN a_comment VARCHAR(500) + IN a_id_user INT ) BEGIN DECLARE v_code_type_error_bad_data VARCHAR(100); @@ -7157,59 +7445,59 @@ BEGIN IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN START TRANSACTION; - - IF NOT ISNULL(v_ids_product_permission) THEN - INSERT INTO Shop_Product_Change_Set ( comment ) - VALUES ( a_comment ) - ; - SET v_id_change_set := LAST_INSERT_ID(); + IF NOT ISNULL(v_ids_product_permission) THEN + INSERT INTO Shop_Product_Change_Set ( comment ) + VALUES ( a_comment ) + ; + + SET v_id_change_set := LAST_INSERT_ID(); + + UPDATE Shop_Product_Category PC + INNER JOIN tmp_Category t_C ON PC.id_category = t_C.id_category + SET + PC.id_category = t_C.id_category + , PC.code = t_C.code + , PC.name = t_C.name + , PC.description = t_C.description + , PC.id_access_level_required = t_C.id_access_level_required + , PC.active = t_C.active + , PC.display_order = t_C.display_order + , PC.id_change_set = v_id_change_set + ; + END IF; - UPDATE Shop_Product_Category PC - INNER JOIN tmp_Category t_C ON PC.id_category = t_C.id_category - SET - PC.id_category = t_C.id_category - , PC.code = t_C.code - , PC.name = t_C.name - , PC.description = t_C.description - , PC.id_access_level_required = t_C.id_access_level_required - , PC.active = t_C.active - , PC.display_order = t_C.display_order - , PC.id_change_set = v_id_change_set + INSERT INTO Shop_Product_Category ( + code + , name + , description + , id_access_level_required + , active + , display_order + , created_by + , created_on + ) + SELECT + -- t_C.id_category AS id_category + t_C.code AS code + , t_C.name AS name + , t_C.description AS description + , t_C.id_access_level_required AS id_access_level_required + , t_C.active AS active + , t_C.display_order AS display_order + , a_id_user AS created_by + , v_now AS created_on + FROM tmp_Category t_C + WHERE is_new = 1 + AND active = 1 ; - END IF; - - INSERT INTO Shop_Product_Category ( - code - , name - , description - , id_access_level_required - , active - , display_order - , created_by - , created_on - ) - SELECT - -- t_C.id_category AS id_category - t_C.code AS code - , t_C.name AS name - , t_C.description AS description - , t_C.id_access_level_required AS id_access_level_required - , t_C.active AS active - , t_C.display_order AS display_order - , a_id_user AS created_by - , v_now AS created_on - FROM tmp_Category t_C - WHERE is_new = 1 - AND active = 1 - ; + DELETE FROM Shop_Product_Category_Temp + WHERE GUID = a_guid; + COMMIT; END IF; - DELETE FROM Shop_Product_Category_Temp - WHERE GUID = a_guid; - SELECT * FROM tmp_Msg_Error; DROP TEMPORARY TABLE IF EXISTS tmp_Catgory; @@ -7554,16 +7842,19 @@ DROP PROCEDURE IF EXISTS p_shop_save_product; DELIMITER // CREATE PROCEDURE p_shop_save_product ( + IN a_comment VARCHAR(500), IN a_guid BINARY(36), - IN a_id_user INT, - IN a_comment VARCHAR(500) + IN a_id_user INT, + IN a_debug BIT ) BEGIN DECLARE v_code_type_error_bad_data VARCHAR(100); + DECLARE v_id_access_level_edit INT; DECLARE v_id_type_error_bad_data INT; DECLARE v_id_permission_product INT; DECLARE v_ids_product_permission LONGTEXT; DECLARE v_id_change_set INT; + DECLARE v_time_start TIMESTAMP(6); DECLARE exit handler for SQLEXCEPTION BEGIN @@ -7580,24 +7871,44 @@ BEGIN -- Select the error information -- SELECT 'Error' AS status, @errno AS error_code, @sqlstate AS sql_state, @text AS message; INSERT INTO tmp_Msg_Error ( - guid - , id_type + -- guid + id_type , code , msg ) SELECT - a_guid - , NULL + -- a_guid + (SELECT id_type FROM Shop_Msg_Error_Type WHERE code = 'MYSQL_ERROR' LIMIT 1) , @errno - , @text + , IFNULL(@text, 'NULL') ; + + SELECT * + FROM tmp_Msg_Error t_ME + INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type + ; + + DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error; + DROP TEMPORARY TABLE IF EXISTS tmp_Product; END; - SET v_code_type_error_bad_data := 'BAD_DATA'; + SET v_time_start := CURRENT_TIMESTAMP(6); + SET v_code_type_error_bad_data := (SELECT code FROM Shop_Msg_Error_Type WHERE code = 'BAD_DATA' LIMIT 1); SET v_id_type_error_bad_data := (SELECT id_type FROM Shop_Msg_Error_Type WHERE code = v_code_type_error_bad_data LIMIT 1); + SET v_id_access_level_edit := (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'EDIT' LIMIT 1); SET a_guid := IFNULL(a_guid, UUID()); + SET a_debug := IFNULL(a_debug, 0); + IF a_debug = 1 THEN + SELECT + v_code_type_error_bad_data + , v_id_type_error_bad_data + ; + END IF; + + DROP TEMPORARY TABLE IF EXISTS tmp_Product; + DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error; CREATE TEMPORARY TABLE tmp_Product ( id_category INT NOT NULL @@ -7616,7 +7927,7 @@ BEGIN CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error ( display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT - , guid BINARY(36) NOT NULL + -- , guid BINARY(36) NOT NULL , id_type INT NOT NULL /* CONSTRAINT FK_tmp_Msg_Error_id_type @@ -7643,79 +7954,115 @@ BEGIN SELECT IFNULL(P_T.id_category, P.id_category) AS id_category , IFNULL(P_T.id_product, 0) AS id_product - , IFNULL(PT.name, P.name) AS name - , IFNULL(PT.has_variations, P.has_variations) AS has_variations - , IFNULL(PT.id_access_level_required, P.id_access_level_required) AS id_access_level_required + , IFNULL(P_T.name, P.name) AS name + , IFNULL(P_T.has_variations, P.has_variations) AS has_variations + , IFNULL(P_T.id_access_level_required, P.id_access_level_required) AS id_access_level_required , IFNULL(P_T.active, P.active) AS active , IFNULL(P_T.display_order, P.display_order) AS display_order - , IFNULL(PT.name, IFNULL(P.name, IFNULL(P_T.id_product, '(No Product)'))) AS name_error + , IFNULL(P_T.name, IFNULL(P.name, IFNULL(P_T.id_product, '(No Product)'))) AS name_error , CASE WHEN IFNULL(P_T.id_product, 0) < 1 THEN 1 ELSE 0 END AS is_new - FROM Shop_Product_Tenp P_T - LEFT JOIN Shop_Product P ON P_T.id_product = P.id_product + FROM partsltd_prod.Shop_Product_Temp P_T + LEFT JOIN partsltd_prod.Shop_Product P ON P_T.id_product = P.id_product ; -- Validation - -- Missing mandatory fields - INSERT INTO tmp_Msg_Error ( - guid - , id_type - , code - , msg - ) + -- Missing mandatory fields -- id_category - SELECT - a_guid AS GUID - , v_id_type_error_bad_data - , v_code_error_bad_data - , CONCAT('The following product(s) do not have a category: ', GROUP_CONCAT(t_P.name_error SEPARATOR ', ')) - FROM tmp_Product t_P - WHERE ISNULL(t_P.id_category) - UNION + IF EXISTS (SELECT * FROM tmp_Product t_P WHERE ISNULL(t_P.id_category) LIMIT 1) THEN + INSERT INTO tmp_Msg_Error ( + id_type + , code + , msg + ) + SELECT + v_id_type_error_bad_data + , v_code_type_error_bad_data + , IFNULL(CONCAT('The following product(s) do not have a category: ', GROUP_CONCAT(IFNULL(t_P.name_error, 'NULL') SEPARATOR ', ')), 'NULL') + FROM tmp_Product t_P + WHERE ISNULL(t_P.id_category) + ; + END IF; + -- name - SELECT - a_guid AS GUID - , v_id_type_error_bad_data - , v_code_error_bad_data - , CONCAT('The following product(s) do not have a name: ', GROUP_CONCAT(t_P.name_error SEPARATOR ', ')) - FROM tmp_Product t_P - WHERE ISNULL(t_P.name) - UNION + IF EXISTS (SELECT * FROM tmp_Product t_P WHERE ISNULL(t_P.name) LIMIT 1) THEN + INSERT INTO tmp_Msg_Error ( + id_type + , code + , msg + ) + SELECT + v_id_type_error_bad_data + , v_code_type_error_bad_data + , IFNULL(CONCAT('The following product(s) do not have a name: ', GROUP_CONCAT(IFNULL(t_P.name_error, 'NULL') SEPARATOR ', ')), 'NULL') + FROM tmp_Product t_P + WHERE ISNULL(t_P.name) + ; + END IF; + -- has_variations - SELECT - a_guid AS GUID - , v_id_type_error_bad_data - , v_code_error_bad_data - , CONCAT('The following product(s) do not have a has-variations setting: ', GROUP_CONCAT(t_P.name_error SEPARATOR ', ')) - FROM tmp_Product t_P - WHERE ISNULL(t_P.has_variations) - UNION + IF EXISTS (SELECT * FROM tmp_Product t_P WHERE ISNULL(t_P.has_variations) LIMIT 1) THEN + INSERT INTO tmp_Msg_Error ( + id_type + , code + , msg + ) + SELECT + v_id_type_error_bad_data + , v_code_type_error_bad_data + , IFNULL(CONCAT('The following product(s) do not have a has-variations setting: ', GROUP_CONCAT(IFNULL(t_P.name_error, 'NULL') SEPARATOR ', ')), 'NULL') + FROM tmp_Product t_P + WHERE ISNULL(t_P.has_variations) + ; + END IF; + -- id_access_level_required - SELECT - a_guid AS GUID - , v_id_type_error_bad_data - , v_code_error_bad_data - , CONCAT('The following product(s) do not have a required access level ID: ', GROUP_CONCAT(t_P.name_error SEPARATOR ', ')) - FROM tmp_Product t_P - WHERE ISNULL(t_P.id_access_level_required) - UNION + IF EXISTS (SELECT * FROM tmp_Product t_P WHERE ISNULL(t_P.id_access_level_required) LIMIT 1) THEN + INSERT INTO tmp_Msg_Error ( + id_type + , code + , msg + ) + SELECT + v_id_type_error_bad_data + , v_code_type_error_bad_data + , IFNULL(CONCAT('The following product(s) do not have a required access level ID: ', GROUP_CONCAT(IFNULL(t_P.name_error, 'NULL') SEPARATOR ', ')), 'NULL') + FROM tmp_Product t_P + WHERE ISNULL(t_P.id_access_level_required) + ; + END IF; + -- display_order - SELECT - a_guid AS GUID - , v_id_type_error_bad_data - , v_code_error_bad_data - , CONCAT('The following product(s) do not have a display order: ', GROUP_CONCAT(t_P.name_error SEPARATOR ', ')) - FROM tmp_Product t_P - WHERE ISNULL(t_P.display_order) - ; + IF EXISTS (SELECT * FROM tmp_Product t_P WHERE ISNULL(t_P.display_order) LIMIT 1) THEN + INSERT INTO tmp_Msg_Error ( + id_type + , code + , msg + ) + SELECT + v_id_type_error_bad_data + , v_code_type_error_bad_data + , IFNULL(CONCAT('The following product(s) do not have a display order: ', GROUP_CONCAT(IFNULL(t_P.name_error, 'NULL') SEPARATOR ', ')), 'NULL') + FROM tmp_Product t_P + WHERE ISNULL(t_P.display_order) + ; + END IF; -- Permissions IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN -- (SELECT * FROM tmp_Product WHERE is_new = 0 LIMIT 1) THEN - SET v_ids_product_permission := (SELECT GROUP_CONCAT(item SEPARATOR ',') FROM tmp_Shop_Product WHERE is_new = 0); + SET v_ids_product_permission := (SELECT GROUP_CONCAT(id_product SEPARATOR ',') FROM tmp_Product WHERE is_new = 0); IF NOT ISNULL(v_ids_product_permission) THEN SET v_id_permission_product = (SELECT id_permission FROM Shop_Permission WHERE code = 'STORE_PRODUCT' LIMIT 1); - CALL p_shop_calc_user(a_guid, a_id_user, v_id_permission_product, v_ids_product_permission); + CALL partsltd_prod.p_shop_calc_user( + a_guid + , a_id_user + , FALSE -- get_inactive_users + , v_id_permission_product + , v_id_access_level_edit + , v_ids_product_permission + , 0 -- debug + ); UPDATE tmp_Product t_P INNER JOIN Shop_Calc_User_Temp UE_T @@ -7727,68 +8074,153 @@ BEGIN , t_P.can_admin = UE_T.can_admin ; - CALL p_shop_clear_calc_user(a_guid); + CALL partsltd_prod.p_shop_clear_calc_user( + a_guid + , 0 -- debug + ); END IF; END IF; IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN - -- Start the transaction START TRANSACTION; + IF NOT ISNULL(v_ids_product_permission) THEN + INSERT INTO partsltd_prod.Shop_Product_Change_Set ( comment ) + VALUES ( a_comment ) + ; + + SET v_id_change_set := LAST_INSERT_ID(); + + UPDATE partsltd_prod.Shop_Product P + INNER JOIN tmp_Product t_P ON P.id_product = t_P.id_product + SET + P.id_category = t_P.id_category + , P.name = t_P.name + , P.has_variations = t_P.has_variations + , P.id_access_level_required = t_P.id_access_level_required + , P.display_order = t_P.display_order + , P.id_change_set = v_id_change_set + ; + END IF; + + INSERT INTO partsltd_prod.Shop_Product ( + id_category + , name + , has_variations + , id_access_level_required + , display_order + , created_by + , created_on + ) + SELECT + t_P.id_category AS id_category + , t_P.name AS name + , t_P.has_variations AS has_variations + , t_P.id_access_level_required AS id_access_level_required + , t_P.display_order AS display_order + , a_id_user AS created_by + , v_time_start AS created_on + FROM tmp_Product t_P + WHERE is_new = 1 + ; + + DELETE FROM partsltd_prod.Shop_Product_Category_Temp + WHERE GUID = a_guid; + COMMIT; + END IF; + + SELECT * + FROM tmp_Msg_Error t_ME + INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type + ; + + DROP TEMPORARY TABLE IF EXISTS tmp_Product; + DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error; + + IF a_debug = 1 THEN + CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); + END IF; +END // +DELIMITER ;; + + + +-- Clear previous proc +DROP PROCEDURE IF EXISTS partsltd_prod.p_shop_save_product_test; + + +DELIMITER // +CREATE PROCEDURE p_shop_save_product_test () +BEGIN + + DECLARE v_guid BINARY(36); + DECLARE v_time_start TIMESTAMP(6); + + SET v_time_start := CURRENT_TIMESTAMP(6); + SET v_guid := 'nips'; + + SELECT * + FROM partsltd_prod.Shop_Product + ; + SELECT * + FROM partsltd_prod.Shop_Product_Temp + ; + + START TRANSACTION; - -- Your transaction logic goes here - IF NOT ISNULL(v_ids_product_permission) THEN - INSERT INTO Shop_Product_Change_Set ( comment ) - VALUES ( a_comment ) - ; - - SET v_id_change_set := LAST_INSERT_ID(); - - UPDATE Shop_Product P - INNER JOIN tmp_Product t_P ON P.id_product = t_P.id_product - SET - P.id_category = t_P.id_category - , P.name = t_P.name - , P.has_variations = t_P.has_variations - , P.id_access_level_required = t_P.id_access_level_required - , P.display_order = t_P.display_order - , P.id_change_set = v_id_change_set - ; - END IF; - - INSERT INTO Shop_Product ( - id_category + INSERT INTO partsltd_prod.Shop_Product_Temp ( + id_product + , id_category , name , has_variations , id_access_level_required , display_order - , created_by - , created_on + , active + , guid ) - SELECT - t_P.id_category AS id_category - , t_P.name AS name - , t_P.has_variations AS has_variations - , t_P.id_access_level_required AS id_access_level_required - , t_P.display_order AS display_order - , a_id_user AS created_by - , v_now AS created_on - FROM tmp_Product t_P - WHERE is_new = 1 - ; + VALUES ( + 4 -- id_product + , 1 -- id_category + , 'Laptops' -- name + , 0 -- has_variations + , 2 -- id_access_level_required + , 2 -- display_order + , 1 -- active + , v_guid + ); - -- If we reach here without error, commit the transaction - COMMIT; - END IF; + COMMIT; - SELECT * FROM tmp_Msg_Error; + SELECT * + FROM partsltd_prod.Shop_Product_Temp + WHERE GUID = v_guid + ; - DROP TEMPORARY TABLE IF EXISTS tmp_Product; - DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error; + CALL partsltd_prod.p_shop_save_product ( + 'Test save product' -- comment + , v_guid -- guid + , 1 -- id_user + , 1 -- debug + ); + + SELECT * + FROM partsltd_prod.Shop_Product + ; + SELECT * + FROM partsltd_prod.Shop_Product_Temp + ; + + CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); END // DELIMITER ;; --- USE partsltd_prod; +/* +CALL partsltd_prod.p_shop_save_product_test (); + +DELETE FROM partsltd_prod.Shop_Product_Temp; + +DROP TABLE IF EXISTS tmp_Msg_Error; +*/-- USE partsltd_prod; -- Clear previous proc DROP PROCEDURE IF EXISTS p_shop_calc_product_permutation; @@ -8945,6 +9377,7 @@ END // DELIMITER ;; +/* CALL partsltd_prod.p_shop_get_many_product ( 1 #'auth0|6582b95c895d09a70ba10fef', # a_id_user @@ -8964,7 +9397,6 @@ CALL partsltd_prod.p_shop_get_many_product ( , 0 # a_debug ); -/* select * FROM partsltd_prod.Shop_Calc_User_Temp; select * FROM partsltd_prod.Shop_Product_Category; @@ -9304,620 +9736,15 @@ CALL p_shop_calc_user ( */ - - --- Clear previous proc -DROP PROCEDURE IF EXISTS p_shop_save_permutation; - -DROP TABLE IF EXISTS tmp_Shop_Manufacturing_Purchase_Order_Product_Link; -DROP TABLE IF EXISTS tmp_Msg_Error; - -DELIMITER // -CREATE PROCEDURE p_shop_save_permutation ( - IN a_guid VARCHAR(500), - IN a_id_user INT, - IN a_id_order INT, - -- IN a_id_supplier_ordered INT, - IN a_id_currency_cost INT, - IN a_active BIT, - IN a_comment VARCHAR(500) -) -BEGIN - DECLARE v_id_error_type_bad_data INT; - DECLARE v_code_error_type_bad_data VARCHAR(50); - DECLARE v_id_error_type_no_permission INT; - DECLARE v_code_error_type_no_permission VARCHAR(50); - DECLARE v_guid_permission BINARY(36); - -- DECLARE v_id_user VARCHAR(100); - DECLARE v_id_permission_manufacturing_purchase_order INT; - DECLARE v_id_access_level_EDIT INT; - DECLARE v_ids_product VARCHAR(4000); - DECLARE v_ids_product_no_permission VARCHAR(4000); - -- DECLARE v_id_order_new INT; - DECLARE v_id_change_set INT; - DECLARE v_is_new_manufacturing_purchase_order BIT; - - SET SESSION sql_mode = sys.list_drop(@@session.sql_mode, 'ONLY_FULL_GROUP_BY'); - - SET v_code_error_type_bad_data = 'BAD_DATA'; - SET v_id_error_type_bad_data := (SELECT id_type FROM Shop_Msg_Error_Type WHERE code = v_code_error_type_bad_data LIMIT 1); - SET v_code_error_type_no_permission = 'NO_PERMISSION'; - SET v_id_error_type_no_permission := (SELECT id_type FROM Shop_Msg_Error_Type WHERE code = v_code_error_type_no_permission LIMIT 1); - SET v_guid_permission = UUID(); - -- SET v_id_user = CURRENT_USER(); - SET v_id_permission_manufacturing_purchase_order := (SELECT id_permission FROM Shop_Permission WHERE code = 'STORE_MANUFACTURING_PURCHASE_ORDER' LIMIT 1); - SET v_id_access_level_EDIT := (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'EDIT'); - - -- Argument default values - IF a_guid IS NULL THEN - SET a_guid = UUID(); - END IF; - IF a_active IS NULL THEN - SET a_active = 0; - END IF; - - -- Temporary tables - /* - CREATE TABLE tmp_Shop_Supplier_Purchase_Order ( - id_order INT NOT NULL PRIMARY KEY, - id_supplier_ordered INT NOT NULL, - CONSTRAINT FK_tmp_Shop_Supplier_Purchase_Order_id_supplier_ordered - FOREIGN KEY (id_supplier_ordered) - REFERENCES Shop_Supplier(id_supplier), - cost_total_local FLOAT NOT NULL, - id_currency_cost INT NOT NULL - ); - */ - - CREATE TABLE tmp_Shop_Manufacturing_Purchase_Order_Product_Link ( - id_link INT NOT NULL PRIMARY KEY, - id_order INT NOT NULL, - /* - CONSTRAINT FK_tmp_Supplier_Purchase_Order_Product_Link_id_order - FOREIGN KEY (id_order) - REFERENCES Shop_Manufacturing_Purchase_Order(id_order), - */ - id_permutation INT NOT NULL, - CONSTRAINT FK_tmp_Manuf_Purch_Order_Product_Link_id_permutation - FOREIGN KEY (id_permutation) - REFERENCES Shop_Product_Permutation(id_permutation), - cost_total_local FLOAT NOT NULL, - id_currency_cost INT NOT NULL, - value_produced_total_local FLOAT NOT NULL, - quantity_used FLOAT NOT NULL, - id_unit_quantity INT NOT NULL, - CONSTRAINT FK_tmp_Manuf_Purch_Order_Product_Link_id_unit_quantity - FOREIGN KEY (id_unit_quantity) - REFERENCES Shop_Unit_Measurement(id_unit_measurement), - quantity_produced FLOAT NULL, - latency_manufacture_days INT NOT NULL, - display_order INT NOT NULL, - active BIT NOT NULL, - name_error VARCHAR(200) NOT NULL - ); - - CREATE TABLE IF NOT EXISTS tmp_Msg_Error ( - display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, - guid BINARY(36) NOT NULL, - id_type INT NOT NULL, - CONSTRAINT FK_tmp_Msg_Error_id_type - FOREIGN KEY (id_type) - REFERENCES Shop_Msg_Error_Type (id_type), - code VARCHAR(50) NOT NULL, - msg VARCHAR(4000) NOT NULL - ); - - - -- Argument validation - # User ID - IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN - IF ISNULL(a_id_user) OR NOT EXISTS (SELECT * FROM Shop_User WHERE id_user = a_id_user) THEN - INSERT INTO tmp_Msg_Error ( - guid, id_type, code, msg - ) - VALUES - (a_guid, v_id_error_type_bad_data, v_code_error_type_bad_data, CONCAT('Invalid User ID: ', IFNULL(a_id_user, 'NULL'))) - ; - END IF; - END IF; - - # Order ID - IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN - IF ISNULL(a_id_order) OR ((a_id_order > 0) AND NOT EXISTS (SELECT * FROM Shop_Manufacturing_Purchase_Order WHERE id_order = a_id_order)) THEN - INSERT INTO tmp_Msg_Error ( - guid, id_type, code, msg - ) - VALUES - (a_guid, v_id_error_type_bad_data, v_code_error_type_bad_data, CONCAT('Invalid Manufacturing Purchase Order ID: ', IFNULL(a_id_order, 'NULL'))) - ; - END IF; - END IF; - - /* - # Supplier ID - IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN - IF ISNULL(a_id_supplier_ordered) OR NOT EXISTS (SELECT * FROM Shop_Supplier WHERE id_supplier = a_id_supplier_ordered) THEN - INSERT INTO tmp_Msg_Error ( - guid, id_type, code, msg - ) - VALUES - (a_guid, v_id_error_type_bad_data, v_code_error_type_bad_data, CONCAT('Invalid supplier ID: ', IFNULL(a_id_supplier_ordered, 'NULL'))) - ; - END IF; - END IF; - */ - - # Currency ID - IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN - IF ISNULL(a_id_currency_cost) OR NOT EXISTS (SELECT * FROM Shop_Currency WHERE id_currency = a_id_currency_cost) THEN - INSERT INTO tmp_Msg_Error ( - guid, id_type, code, msg - ) - VALUES - (a_guid, v_id_error_type_bad_data, v_code_error_type_bad_data, CONCAT('Invalid currency ID: ', IFNULL(a_id_currency, 'NULL'))) - ; - END IF; - END IF; - - # Comment - IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN - IF ISNULL(a_comment) OR TRIM(a_comment) = '' THEN - INSERT INTO tmp_Msg_Error ( - guid, id_type, code, msg - ) - VALUES - (a_guid, v_id_error_type_bad_data, v_code_error_type_bad_data, 'A comment must be provided.') - ; - END IF; - END IF; - - - -- Get data from Temp table - IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN - SET v_is_new_manufacturing_purchase_order := CASE WHEN a_id_order <= 0 THEN 1 ELSE 0 END; - - INSERT INTO tmp_Shop_Manufacturing_Purchase_Order_Product_Link ( - id_link, - id_order, - id_permutation, - cost_total_local, - id_currency_cost, - quantity_used, - id_unit_quantity, - quantity_produced, - value_produced_total_local, - latency_manufacture_days, - display_order, - active, - name_error - ) - /* - VALUES - (a_id_supplier, a_name_company, a_name_contact, a_department_contact, a_id_address, a_phone_number, a_fax, a_email, a_website, a_id_currency, a_active) - */ - SELECT - MPOPL_T.id_link, - MPOPL_T.id_order, - MPOPL_T.id_permutation, - PP.cost_local * MPOPL_T.quantity_used AS cost_total_local, - MPOPL_T.id_currency_cost, - MPOPL_T.quantity_used, - MPOPL_T.id_unit_quantity, - MPOPL_T.quantity_produced, - (PP.cost_local + PP.profit_local_min) * MPOPL_T.quantity_produced AS value_produced_total_local, - MPOPL_T.latency_manufacture_days, - MPOPL_T.display_order, - MPOPL_T.active, - CONCAT(PP.id_permutation, ' - ', IFNULL(P.name ,'')) AS name_error - FROM Shop_Manufacturing_Purchase_Order_Product_Link_Temp MPOPL_T - INNER JOIN Shop_Product_Permutation PP ON MPOPL_T.id_permutation = PP.id_permutation - INNER JOIN Shop_Product P ON PP.id_product = P.id_product - WHERE MPOPL_T.GUID = a_guid - -- GROUP BY MPOPL_T.id_order, name_error, MPOPL_T.id_link - /* - group by - MPOPL_T.id_link, - MPOPL_T.id_order, - MPOPL_T.id_permutation, - cost_total_local, - MPOPL_T.id_currency_cost, - MPOPL_T.quantity_used, - MPOPL_T.id_unit_quantity, - MPOPL_T.quantity_produced, - value_produced_total_local, - MPOPL_T.latency_manufacture_days, - MPOPL_T.display_order, - MPOPL_T.active, - name_error - */ - -- GROUP BY id_link, P.id_product, PP.id_permutation - -- GROUP BY name_error, ID_LINK, cost_total_local, value_produced_total_local - ; - DELETE MPOPL_T - FROM Shop_Manufacturing_Purchase_Order_Product_Link_Temp MPOPL_T - WHERE MPOPL_T.GUID = a_guid - ; - END IF; - - -- Invalid quantity used - IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN - IF EXISTS ( - SELECT * - FROM tmp_Shop_Manufacturing_Purchase_Order_Product_Link - WHERE - NOT ISNULL(quantity_used) - AND quantity_used < 0 - ) THEN - INSERT INTO tmp_Msg_Error ( - guid, id_type, code, msg - ) - SELECT - a_guid, - v_id_error_type_bad_data, - v_code_error_type_bad_data, - CONCAT('Invalid quantity used property for the following permutations: ', GROUP_CONCAT(t_MPOPL.name_error SEPARATOR ', ')) - FROM tmp_Shop_Manufacturing_Purchase_Order_Product_Link t_MPOPL - WHERE t_MPOPL.quantity_used < 0 - ; - END IF; - END IF; - - -- Invalid quantity produced - IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN - IF EXISTS ( - SELECT * - FROM tmp_Shop_Manufacturing_Purchase_Order_Product_Link - WHERE - NOT ISNULL(quantity_produced) - AND quantity_produced < 0 - ) THEN - INSERT INTO tmp_Msg_Error ( - guid, id_type, code, msg - ) - SELECT - a_guid, - v_id_error_type_bad_data, - v_code_error_type_bad_data, - CONCAT('Invalid quantity produced property for the following permutations: ', GROUP_CONCAT(t_MPOPL.name_error SEPARATOR ', ')) - FROM tmp_Shop_Manufacturing_Purchase_Order_Product_Link t_MPOPL - WHERE t_MPOPL.quantity_produced < 0 - ; - END IF; - END IF; - - -- Duplicates - IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN - IF EXISTS (SELECT id_permutation, name_error, COUNT(*) FROM tmp_Shop_Manufacturing_Purchase_Order_Product_Link t_MPOPL GROUP BY id_permutation HAVING COUNT(*) > 1) THEN - INSERT INTO tmp_Msg_Error ( - guid, id_type, code, msg - ) - SELECT - a_guid, - v_id_error_type_bad_data, - v_code_error_type_bad_data, - CONCAT('Duplicate records: ', GROUP_CONCAT(t_MPOPLC.name_error SEPARATOR ', ')) - FROM (SELECT id_permutation, name_error, COUNT(*) FROM tmp_Shop_Manufacturing_Purchase_Order_Product_Link t_MPOPL GROUP BY id_permutation HAVING COUNT(*) > 1) t_MPOPLC - ; - END IF; - END IF; - - - -- Permissions - IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN - SET v_ids_product := ( - SELECT GROUP_CONCAT(G.id_product SEPARATOR ',') - FROM ( - SELECT DISTINCT PP.id_product - FROM tmp_Shop_Manufacturing_Purchase_Order_Product_Link t_MPO - INNER JOIN Shop_Product_Permutation PP ON t_MPO.id_permutation = PP.id_permutation - ) G - ); - - CALL p_shop_calc_user(v_guid_permission, a_id_user, 0, v_id_permission_manufacturing_purchase_order, v_id_access_level_edit, v_ids_product); - - /* - UPDATE tmp_Shop_Supplier t_S - INNER JOIN Shop_Calc_User_Temp TP - ON TP.GUID = v_guid_permission - SET tP.can_view = TP.can_view, - tP.can_edit = TP.can_edit, - tP.can_admin = TP.can_admin; - */ - /* - SET v_has_permission := ( - SELECT can_edit - FROM Shop_Calc_User_Temp - WHERE - GUID = v_guid_permission - AND can_edit = 0 - ); - - IF v_has_permission = 0 THEN - SET v_id_error_type_no_permission := (SELECT id_type FROM Shop_Msg_Error_Type WHERE code = 'NO_PERMISSION'); - INSERT INTO tmp_Msg_Error ( - guid, id_type, msg - ) - SELECT - a_guid, - v_id_error_type_no_permission, - CONCAT('You do not have ', name, ' permissions.') - FROM Shop_Permission - WHERE id_permission = v_id_permission_manufacturing_purchase_order - ; - END IF; - */ - SET v_ids_product_no_permission := ( - SELECT GROUP_CONCAT(PT.id_product SEPARATOR ',') - FROM Shop_Calc_User_Temp PT - WHERE - PT.can_edit = 0 - AND NOT ISNULL(PT.id_product) - ); - IF NOT ISNULL(v_ids_product_no_permission) THEN - INSERT INTO tmp_Msg_Error ( - guid, id_type, code, msg - ) - VALUES ( - a_guid, - v_id_error_type_no_permission, - v_code_error_type_no_permission, - CONCAT('You do not have permission to edit the following product IDs: ', v_ids_product_no_permission) - ) - ; - END IF; - END IF; - - -- Transaction - IF NOT EXISTS (SELECT * FROM tmp_Msg_Error) THEN - START TRANSACTION; - INSERT INTO Shop_Sales_And_Purchasing_Change_Set ( - comment, - updated_last_by, - updated_last_on - ) - VALUES ( - CONCAT( - 'Save ', - CASE WHEN v_is_new_manufacturing_purchase_order = 1 THEN 'new ' ELSE '' END, - 'Manufacturing Purchase Order - ', - a_comment - ), - a_id_user, - CURRENT_TIME() - ); - - SET v_id_change_set := (SELECT id_change_set FROM Shop_Sales_And_Purchasing_Change_Set ORDER BY id_change_set DESC LIMIT 1); - - IF (v_is_new_manufacturing_purchase_order = 1) THEN - INSERT INTO Shop_Manufacturing_Purchase_Order ( - -- id_supplier_ordered, - cost_total_local, - id_currency_cost, - value_produced_total_local, - created_by, - id_change_set, - active - ) - SELECT - -- a_id_supplier_ordered, - SUM(t_MPOPL.cost_total_local), - a_id_currency_cost, - SUM(t_MPOPL.value_produced_total_local), - a_id_user, - v_id_change_set, - a_active - FROM tmp_Shop_Manufacturing_Purchase_Order_Product_Link t_MPOPL - ; - -- SET v_id_order_new - SET a_id_order := (SELECT id_order FROM Shop_Manufacturing_Purchase_Order ORDER BY id_order DESC LIMIT 1); - - INSERT INTO Shop_Manufacturing_Purchase_Order_Product_Link ( - id_order, - id_permutation, - cost_total_local, - value_produced_total_local, - id_currency_cost, - quantity_used, - id_unit_quantity, - quantity_produced, - latency_manufacture_days, - display_order, - active, - created_by, - id_change_set - ) - SELECT - a_id_order, -- v_id_order_new, - id_permutation, - cost_total_local, - value_produced_total_local, - id_currency_cost, - quantity_used, - id_unit_quantity, - quantity_produced, - latency_manufacture_days, - display_order, - active, - a_id_user, - v_id_change_set - FROM tmp_Shop_Manufacturing_Purchase_Order_Product_Link t_MPOPL - ; - ELSE - UPDATE Shop_Manufacturing_Purchase_Order MPO - INNER JOIN tmp_Shop_Manufacturing_Purchase_Order_Product_Link t_MPOPL ON MPO.id_order = t_MPOPL.id_order - SET - -- MPO.id_supplier_ordered = a_id_supplier_ordered, - MPO.cost_total_local = SUM(t_MPOPL.cost_total_local), - MPO.value_produced_total_local = SUM(t_MPOPL.value_produced_total_local), - MPO.id_currency = a_id_currency_cost, - MPO.id_change_set = v_id_change_set, - MPO.active = a_active - WHERE MPO.id_order = a_id_order - ; - IF EXISTS (SELECT * FROM tmp_Shop_Manufacturing_Purchase_Order_Product_Link t_MPOPL INNER JOIN Shop_Manufacturing_Purchase_Order_Product_Link MPOPL ON t_MPOPL.id_link = MPOPL.id_link) THEN - UPDATE Shop_Manufacturing_Purchase_Order_Product_Link MPOPL - INNER JOIN tmp_Shop_Manufacturing_Purchase_Order_Product_Link t_MPOPL - ON MPOPL.id_link = t_MPOPL.id_link - SET - MPOPL.id_order = t_MPOPL.id_order, - MPOPL.id_permutation = t_MPOPL.id_permutation, - MPOPL.cost_total_local = t_MPOPL.cost_total_local, - MPOPL.value_produced_total_local = t_MPOPL.value_produced_total_local, - MPOPL.id_currency_cost = t_MPOPL.id_currency_cost, - MPOPL.quantity_used = t_MPOPL.quantity_used, - MPOPL.id_unit_quantity = t_MPOPL.id_unit_quantity, - MPOPL.quantity_produced = t_MPOPL.quantity_produced, - MPOPL.latency_manufacture_days = t_MPOPL.latency_manufacture_days, - MPOPL.display_order = t_MPOPL.display_order, - MPOPL.active = t_MPOPL.active, - MPOPL.id_change_set = v_id_change_set - ; - ELSE - INSERT INTO Shop_Manufacturing_Purchase_Order_Product_Link ( - id_order, - id_permutation, - cost_total_local, - value_produced_total_local, - id_currency_cost, - quantity_used, - id_unit_quantity, - quantity_produced, - latency_manufacture_days, - display_order, - active, - created_by, - id_change_set - ) - SELECT - id_order, - id_permutation, - cost_total_local, - value_produced_total_local, - id_currency_cost, - quantity_used, - id_unit_quantity, - quantity_produced, - latency_manufacture_days, - display_order, - active, - a_id_user, - v_id_change_set - FROM tmp_Shop_Manufacturing_Purchase_Order_Product_Link t_MPOPL - WHERE t_MPOPL.id_link < 0 - ; - END IF; - END IF; - - IF EXISTS (SELECT * FROM tmp_Msg_Error) THEN - ROLLBACK; - ELSE - COMMIT; - END IF; - END IF; - - -- Returns - # SET v_now = NOW(); - - # Manufacturing Purchase Orders - SELECT * - FROM Shop_Manufacturing_Purchase_Order - WHERE - id_order = a_id_order - -- GUID = a_guid - ; - - # Manufacturing Purchase Order Product Links - SELECT * - FROM Shop_Manufacturing_Purchase_Order_Product_Link - WHERE - id_order = a_id_order - -- GUID = a_guid - ; - - # Errors - SELECT * - FROM tmp_Msg_Error - ; - - # DROP TABLE tmp_Shop_Manufacturing_Purchase_Order; - DROP TABLE tmp_Shop_Manufacturing_Purchase_Order_Product_Link; - DROP TABLE tmp_Msg_Error; -END // -DELIMITER ;; - - -/* - -DELETE FROM Shop_Manufacturing_Purchase_Order_Product_Link_Audit; -DELETE FROM Shop_Manufacturing_Purchase_Order_Product_Link; -DELETE FROM Shop_Manufacturing_Purchase_Order_Product_Link_Temp; -DELETE FROM Shop_Manufacturing_Purchase_Order_Audit; -DELETE FROM Shop_Manufacturing_Purchase_Order; - -INSERT INTO Shop_Manufacturing_Purchase_Order_Product_Link_Temp ( - guid, - id_link, - id_order, - id_permutation, - cost_total_local, - id_currency_cost, - quantity_used, - id_unit_quantity, - quantity_produced, - latency_manufacture_days, - display_order, - active -) -VALUES - ( - 'NIPS', # guid - -1, # id_link, - -1, # id_order, - 1, # id_permutation, - 100, # cost_total_local, - 1, # id_currency_cost, - 1, # quantity_used, - 1, # id_unit_quantity, - 1, # quantity_produced, - 14, # latency_manufacture_days , - 1, # display_order - 1 # active - ) -; - -SELECT * FROM Shop_Manufacturing_Purchase_Order_Product_Link_Temp; - -CALL p_shop_save_manufacturing_purchase_order ( - 'NIPS', # a_guid - 'auth0|6582b95c895d09a70ba10fef', # a_id_user - -1, # a_id_order - 1, # a_id_currency_cost - 1, # a_active - 'Initial data' # a_comment -); - -SELECT * FROM Shop_Manufacturing_Purchase_Order_Product_Link_Temp; - -DELETE FROM Shop_Manufacturing_Purchase_Order_Product_Link_Audit; -DELETE FROM Shop_Manufacturing_Purchase_Order_Product_Link; -DELETE FROM Shop_Manufacturing_Purchase_Order_Product_Link_Temp; -DELETE FROM Shop_Manufacturing_Purchase_Order_Audit; -DELETE FROM Shop_Manufacturing_Purchase_Order; - - -*/ - - - -- Clear previous proc DROP PROCEDURE IF EXISTS p_shop_save_permutation; DROP PROCEDURE IF EXISTS p_shop_save_product_permutation; DELIMITER // CREATE PROCEDURE p_shop_save_product_permutation ( - IN a_id_user INT, IN a_comment VARCHAR(500), - IN a_guid BINARY(36) + IN a_guid BINARY(36), + IN a_id_user INT ) BEGIN @@ -10469,6 +10296,227 @@ WHERE id_permutation = 1; */ +DROP FUNCTION IF EXISTS fn_shop_get_id_product_permutation_from_variation_csv_list; + +DELIMITER // + +CREATE FUNCTION fn_shop_get_id_product_permutation_from_variation_csv_list ( + a_id_product INT + , a_variation_csv TEXT +) +RETURNS INT +DETERMINISTIC +READS SQL DATA +BEGIN + DECLARE v_id_permutation INT; + DECLARE done INT DEFAULT FALSE; + DECLARE v_id_variation_type INT; + DECLARE v_id_variation INT; + DECLARE v_id_permutation_tmp INT; + DECLARE cur CURSOR FOR + SELECT + CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(t.pair, ':', 1), ',', -1) AS UNSIGNED) AS id_variation_type, + CAST(SUBSTRING_INDEX(t.pair, ':', -1) AS UNSIGNED) AS id_variation + FROM ( + SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(a_variation_csv, ',', n), ',', -1) pair + FROM ( + SELECT a.N + b.N * 10 + 1 n + FROM (SELECT 0 AS N UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) a + CROSS JOIN (SELECT 0 AS N UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) b + ORDER BY n + ) numbers + WHERE n <= 1 + (LENGTH(a_variation_csv) - LENGTH(REPLACE(a_variation_csv, ',', ''))) + ) t; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; + + SET v_id_permutation = NULL; + + OPEN cur; + + read_loop: LOOP + FETCH cur INTO v_id_variation_type, v_id_variation; + IF done THEN + LEAVE read_loop; + END IF; + + IF v_id_permutation IS NULL THEN + -- First iteration: find initial v_id_permutations + SELECT PPVL.id_permutation INTO v_id_permutation + FROM partsltd_prod.Shop_Product_Permutation_Variation_Link PPVL + INNER JOIN partsltd_prod.Shop_Product_Permutation PP ON PPVL.id_permutation = PP.id_permutation + INNER JOIN partsltd_prod.Shop_Variation PV ON PPVL.id_variation = PV.id_variation + WHERE 1=1 + AND PP.id_product = a_id_product + AND PPVL.id_variation = v_id_variation + AND PV.id_type = v_id_variation_type + ; + ELSE + -- Subsequent iterations: narrow down the v_id_permutation + SELECT PPVL.id_permutation INTO v_id_permutation_tmp + FROM partsltd_prod.Shop_Product_Permutation_Variation_Link PPVL + INNER JOIN partsltd_prod.Shop_Product_Permutation PP ON PPVL.id_permutation = PP.id_permutation + INNER JOIN partsltd_prod.Shop_Variation PV ON PPVL.id_variation = PV.id_variation + WHERE 1=1 + AND PP.id_product = a_id_product + AND PPVL.v_id_permutation = v_id_permutation + AND PPVL.id_variation = v_id_variation + AND PV.id_type = v_id_variation_type + ; + + IF v_id_permutation_tmp IS NULL THEN + -- If no match found, exit the loop + SET v_id_permutation := NULL; + LEAVE read_loop; + ELSE + SET v_id_permutation := v_id_permutation_tmp; + END IF; + END IF; + END LOOP; + + CLOSE cur; + + RETURN v_id_permutation; +END // + +DELIMITER ; + +/* +SELECT fn_shop_get_id_product_permutation_from_variation_csv_list ( 1, '1:1' ) AS id_permutation; +SELECT fn_shop_get_id_product_permutation_from_variation_csv_list ( 3, '' ) AS id_permutation; +*/ + + +/* +-- Update the table using the function +UPDATE product_permutation_input +SET v_id_permutation = find_v_id_permutation(variation_csv) +WHERE v_id_permutation IS NULL; +*/ + +/* +select * from partsltd_prod.Shop_Variation + +DROP PROCEDURE IF EXISTS p_shop_get_id_product_permutation_from_variation_csv_list; + +DELIMITER // +CREATE PROCEDURE p_shop_get_id_product_permutation_from_variation_csv_list ( + IN a_guid BINARY(36) + , IN a_debug BIT +) +BEGIN + DECLARE done INT DEFAULT FALSE; + DECLARE v_id INT; + DECLARE v_row_id INT; + DECLARE v_variation_csv TEXT; + DECLARE v_id_permutation INT; + DECLARE v_time_start TIMESTAMP(6); + + -- Cursor to iterate through unprocessed rows + DECLARE cur CURSOR FOR + SELECT id, session_guid, row_id, variation_csv + FROM product_permutation_input + WHERE v_id_permutation IS NULL; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; + + SET v_time_start := CURRENT_TIMESTAMP(6); + SET a_debug := IFNULL(a_debug, 0); + + IF a_debug = 1 THEN + SELECT + a_guid + , a_debug + ; + END IF; + + CALL p_validate_guid ( a_guid ); + + OPEN cur; + + read_loop: LOOP + FETCH cur INTO v_id, v_session_guid, v_row_id, v_variation_csv; + IF done THEN + LEAVE read_loop; + END IF; + + -- Find matching v_id_permutation + SET v_id_permutation = NULL; + + SELECT ppvl.v_id_permutation INTO v_id_permutation + FROM ( + SELECT + SUBSTRING_INDEX(SUBSTRING_INDEX(t.pair, ':', 1), ',', -1) AS id_variation_type, + SUBSTRING_INDEX(t.pair, ':', -1) AS id_variation + FROM ( + SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(v_variation_csv, ',', numbers.n), ',', -1) pair + FROM ( + SELECT 1 n UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 -- add more if needed + ) numbers + WHERE CHAR_LENGTH(v_variation_csv) - CHAR_LENGTH(REPLACE(v_variation_csv, ',', '')) >= numbers.n - 1 + ) t + ) parsed + INNER JOIN product_permutation_variation_link ppvl + ON parsed.id_variation_type = ppvl.id_variation_type + AND parsed.id_variation = ppvl.id_variation + GROUP BY ppvl.v_id_permutation + HAVING COUNT(*) = (LENGTH(v_variation_csv) - LENGTH(REPLACE(v_variation_csv, ',', '')) + 1) + LIMIT 1; + + -- Update the v_id_permutation in the input table + UPDATE product_permutation_input + SET v_id_permutation = v_id_permutation + WHERE id = v_id; + + END LOOP; + + CLOSE cur; + + + IF EXISTS ( SELECT * FROM Shop_Get_Id_Product_Permutation_From_Variation_Csv_List_Temp WHERE GUID = a_guid LIMIT 1 ) THEN + IF EXISTS (SELECT * FROM tmp_Split_Split LIMIT 1) THEN + START TRANSACTION; + INSERT INTO Split_Key_Value_Pair_Csv_Temp ( + guid + , id + , key_column + , value_column + ) + SELECT + a_guid + , id + , key_column + , value_column + FROM tmp_Split_Split + ; + COMMIT; + END IF; + END IF; + + DROP TEMPORARY TABLE IF EXISTS tmp_Split_Input; + DROP TEMPORARY TABLE IF EXISTS tmp_Split_Split; + + IF a_debug = 1 THEN + CALL p_debug_timing_reporting ( v_time_start ); + END IF; +END // +DELIMITER ;; +*/ + +/* +CALL p_shop_get_id_product_permutation_from_variation_csv_list ( + 'nipsnipsnipsnipsnipsnipsnipsnipsnips' + , '1:100,2:200,3:300,4:400' # a_string + , 1 +); + +SELECT * +FROM Split_key_value_pair_csv_Temp +WHERE GUID = 'nipsnipsnipsnipsnipsnipsnipsnipsnips'; + +CALL p_clear_split_key_value_pair_csv_temp( 'nipsnipsnipsnipsnipsnipsnipsnipsnips' ); +*/ + DROP PROCEDURE IF EXISTS p_shop_get_many_product_variation; DELIMITER // @@ -10496,14 +10544,14 @@ BEGIN DECLARE v_id_access_level_view INT; DECLARE v_time_start TIMESTAMP(6); DECLARE v_id_minimum INT; - DECLARE v_code_error_data VARCHAR(50); - DECLARE v_id_type_error_data INT; + DECLARE v_code_error_bad_data VARCHAR(50); + DECLARE v_id_type_error_bad_data INT; SET v_time_start := CURRENT_TIMESTAMP(6); SET v_guid := UUID(); SET v_id_access_level_view := (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'VIEW' LIMIT 1); - SET v_code_error_data := (SELECT code FROM Shop_Msg_Error_Type WHERE code = 'BAD_DATA' LIMIT 1); - SET v_id_type_error_data := (SELECT id_type FROM Shop_Msg_Error_Type WHERE code = v_code_error_data LIMIT 1); + SET v_code_error_bad_data := (SELECT code FROM Shop_Msg_Error_Type WHERE code = 'BAD_DATA' LIMIT 1); + SET v_id_type_error_bad_data := (SELECT id_type FROM Shop_Msg_Error_Type WHERE code = v_code_error_bad_data LIMIT 1); -- Argument validation + default values SET a_id_user = IFNULL(a_id_user, 0); @@ -10752,8 +10800,8 @@ BEGIN ) VALUES ( -- v_guid, - v_id_type_error_data, - v_code_error_data, + v_id_type_error_bad_data, + v_code_error_bad_data, CONCAT('You do not have view permissions for ', (SELECT name FROM Shop_Permission WHERE id_permission = v_id_permission_variation LIMIT 1)) ) ; @@ -11508,6 +11556,7 @@ BEGIN select * from tmp_Stock_Item; select * from tmp_Permutation; select * from tmp_Location_Storage; + select * from Shop_Storage_Location; select * from tmp_Plant_Storage; select * from tmp_Region_Storage; */ @@ -11522,14 +11571,19 @@ BEGIN P.id_category, t_SI.id_location_storage, t_PS.id_plant, - t_RS.id_region, + PLANT.id_address AS id_address_plant, + t_RS.id_region AS id_region_plant, + SL.code AS code_storage_location, + SL.name AS name_storage_location, + PLANT.code AS code_plant, + PLANT.name AS name_plant, SI.id_currency_cost, CURRENCY.symbol AS symbol_currency_cost, CURRENCY.code AS code_currency_cost, + SI.cost_local_VAT_excl, + SI.cost_local_VAT_incl, SI.date_purchased, SI.date_received, - SI.cost_local_VAT_incl, - SI.cost_local_VAT_excl, SI.is_sealed, SI.date_unsealed, SI.date_expiration, @@ -11608,6 +11662,7 @@ END // DELIMITER ;; +/* CALL p_shop_get_many_stock_item ( 1, # a_id_user 1, # a_get_all_product_permutation @@ -11636,7 +11691,6 @@ CALL p_shop_get_many_stock_item ( , 0 # a_debug ); -/* DROP TABLE IF EXISTS tmp_Msg_Error; @@ -11653,7 +11707,768 @@ insert into shop_product_change_set (comment) id_change_set = (select id_change_set FROM partsltd_prod.Shop_product_change_set order by id_change_set desc limit 1) where id_product = 1 */ --- USE partsltd_prod; + + +-- Clear previous proc +DROP PROCEDURE IF EXISTS p_shop_save_stock_item; + +DELIMITER // +CREATE PROCEDURE p_shop_save_stock_item ( + IN a_comment VARCHAR(500) + , IN a_guid BINARY(36) + , IN a_id_user INT + , IN a_debug BIT +) +BEGIN + + DECLARE v_code_type_error_bad_data VARCHAR(100); + DECLARE v_id_type_error_bad_data INT; + DECLARE v_id_permission_product INT; + DECLARE v_ids_product_permission LONGTEXT; + DECLARE v_id_change_set INT; + DECLARE v_id_access_level_edit INT; + DECLARE v_time_start TIMESTAMP(6); + DECLARE v_time_expire TIMESTAMP; + + DECLARE exit handler for SQLEXCEPTION + BEGIN + -- Get diagnostic information + GET DIAGNOSTICS CONDITION 1 + @sqlstate = RETURNED_SQLSTATE + , @errno = MYSQL_ERRNO + , @text = MESSAGE_TEXT + ; + + -- Rollback the transaction + ROLLBACK; + + -- Select the error information + -- SELECT 'Error' AS status, @errno AS error_code, @sqlstate AS sql_state, @text AS message; + + CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error ( + display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT + , guid BINARY(36) NOT NULL + , id_type INT NULL + , code VARCHAR(50) NOT NULL + , msg VARCHAR(4000) NOT NULL + ); + INSERT INTO tmp_Msg_Error ( + guid + , id_type + , code + , msg + ) + SELECT + a_guid + , NULL + , @errno + , @text + ; + SELECT * + FROM tmp_Msg_Error; + DROP TABLE IF EXISTS tmp_Msg_Error; + END; + + SET v_time_start := CURRENT_TIMESTAMP(6); + SET v_time_expire := DATE_ADD(v_time_start, INTERVAL 1000 YEAR); + SET v_code_type_error_bad_data := 'BAD_DATA'; + SET v_id_type_error_bad_data := (SELECT id_type FROM Shop_Msg_Error_Type WHERE code = v_code_type_error_bad_data LIMIT 1); + SET v_id_access_level_edit := (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'EDIT' LIMIT 1); + + SET a_guid := IFNULL(a_guid, UUID()); + + DROP TABLE IF EXISTS tmp_Stock_Item; + + CREATE TEMPORARY TABLE tmp_Stock_Item ( + id_stock INT NOT NULL + , id_category INT NULL + , id_product INT NOT NULL + , id_permutation INT NULL + , id_pairs_variations VARCHAR(4000) NULL + , has_variations BIT NULL + , date_purchased DATETIME NOT NULL + , date_received DATETIME NULL + , id_location_storage INT NOT NULL + , id_currency_cost INT NOT NULL + , cost_local_VAT_incl FLOAT NOT NULL + , cost_local_VAT_excl FLOAT NOT NULL + , is_sealed BIT NOT NULL + , date_unsealed DATETIME NULL + , date_expiration DATETIME NOT NULL + , is_consumed BIT NOT NULL + , date_consumed DATETIME NULL + , active BIT NOT NULL + , can_view BIT NULL + , can_edit BIT NULL + , can_admin BIT NULL + , name_error VARCHAR(255) NOT NULL + , is_new BIT NOT NULL + ); + + CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error ( + display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT + , id_type INT NULL + , code VARCHAR(50) NOT NULL + , msg VARCHAR(4000) NOT NULL + ); + + + -- Get data from Temp table + INSERT INTO tmp_Stock_Item ( + id_stock + -- , id_category + , id_product + , id_permutation + , id_pairs_variations + , has_variations + , date_purchased + , date_received + , id_location_storage + , id_currency_cost + , cost_local_VAT_incl + , cost_local_VAT_excl + , is_sealed + , date_unsealed + , date_expiration + , is_consumed + , date_consumed + , active + # , name_error + , is_new + ) + SELECT + SI_T.id_stock + -- , IFNULL(SI_T.id_category, P.id_category) AS id_category + , IFNULL(IFNULL(SI_T.id_product, PP.id_product), 0) AS id_product + , IFNULL(IFNULL(SI_T.id_permutation, PP.id_permutation), 0) AS id_permutation + , TRIM(IFNULL(SI_T.id_pairs_variations, '')) + , CASE WHEN TRIM(IFNULL(SI_T.id_pairs_variations, '')) = '' THEN 0 ELSE 1 END AS has_variations + , IFNULL(IFNULL(SI_T.date_purchased, PP.date_purchased), v_time_start) AS date_purchased + , IFNULL(SI_T.date_received, PP.date_received) AS date_received + , IFNULL(IFNULL(SI_T.id_location_storage, PP.id_location_storage), 0) AS id_location_storage + , IFNULL(IFNULL(SI_T.id_currency_cost, PP.id_currency_cost), 0) AS id_currency_cost + , IFNULL(SI_T.cost_local_VAT_incl, PP.cost_local_VAT_incl) AS cost_local_VAT_incl + , IFNULL(SI_T.cost_local_VAT_excl, PP.cost_local_VAT_excl) AS cost_local_VAT_excl + , IFNULL(IFNULL(SI_T.is_sealed, PP.is_sealed), 1) AS is_sealed + , IFNULL(SI_T.date_unsealed, PP.date_unsealed) AS date_unsealed + , IFNULL(IFNULL(SI_T.date_expiration, PP.date_expiration), v_time_expire) AS date_expiration + , IFNULL(IFNULL(SI_T.is_consumed, PP.is_consumed), 0) AS is_consumed + , IFNULL(SI_T.date_consumed, PP.date_consumed) AS date_consumed + , IFNULL(IFNULL(SI_T.active, PP.active), 1) AS active + # , fn_shop_get_product_permutation_name(SI_T.id_permutation) + , CASE WHEN IFNULL(SI_T.id_stock, 0) < 1 THEN 1 ELSE 0 END AS is_new + FROM Shop_Stock_Item_Temp SI_T + LEFT JOIN Shop_Product_Permutation PP ON SI_T.id_permutation = PP.id_permutation + -- LEFT JOIN Shop_Product P ON PP.id_product = P.id_product + WHERE SI_T.guid = a_guid + ; + + -- Missing Permutation IDs for setting new permutation for stock item + -- With variations + UPDATE tmp_Stock_Item t_SI + INNER JOIN partsltd_prod.Shop_Product P ON t_SI.id_product = P.id_product + SET t_SI.id_permutation = IFNULL(fn_shop_get_id_product_permutation_from_variation_csv_list ( t_SI.id_product, t_SI.id_pairs_variations ), 0) + WHERE 1=1 + AND t_SI.id_permutation = 0 + AND t_SI.has_variations = 1 + ; + -- Without variations + UPDATE tmp_Stock_Item t_SI + -- INNER JOIN Shop_Product P ON t_SI.id_product = P.id_product + INNER JOIN partsltd_prod.Shop_Product_Permutation PP ON t_SI.id_product = PP.id_product + SET t_SI.id_permutation = IFNULL(PP.id_permutation, 0) + WHERE 1=1 + AND t_SI.id_permutation = 0 + AND t_SI.has_variations = 0 + ; + + -- Add stock item error names + UPDATE tmp_Stock_Item t_SI + INNER JOIN partsltd_prod.Shop_Product P ON t_SI.id_product = P.id_product + INNER JOIN partsltd_prod.Shop_Category PC ON P.id_category = PC.id_category + -- INNER JOIN Shop_Product_Permutation PP ON t_SI.id_product = PP.id_product + SET t_SI.name_error = CONCAT( + C.name, + ' - ', + P.name, + ' - ', + CASE WHEN IFNULL(t_SI.id_permutation, 0) = 0 THEN '(No permutation)' ELSE fn_shop_get_product_permutation_name ( t_SI.id_permutation ) END + ) + ; + + + -- Validation + -- Missing mandatory fields + -- id_product + IF EXISTS (SELECT * FROM tmp_Stock_Item t_SI WHERE t_SI.id_product = 0 LIMIT 1) THEN + INSERT INTO tmp_Msg_Error ( + guid + , id_type + , code + , msg + ) + SELECT + a_guid AS GUID + , v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('The following stock item(s) do not have a product: ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + WHERE t_SI.id_product = 0 + ; + END IF; + -- id_permutation + IF EXISTS ( + SELECT * + FROM tmp_Stock_Item t_SI + LEFT JOIN partsltd_prod.Shop_Product_Permutation PP ON t_SI.id_permutation = PP.id_permutation + WHERE 1=1 + AND ( + t_SI.id_permutation = 0 + OR PP.active = 0 + ) + LIMIT 1 + ) THEN + INSERT INTO tmp_Msg_Error ( + guid + , id_type + , code + , msg + ) + SELECT + a_guid AS GUID + , v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('A valid permutation could not be found for the variations selected for the following stock item(s): ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + LEFT JOIN partsltd_prod.Shop_Product_Permutation PP ON t_SI.id_permutation = PP.id_permutation + WHERE 1=1 + AND ( + t_SI.id_permutation = 0 + OR PP.active = 0 + ) + ; + END IF; + -- date_purchased + IF EXISTS (SELECT * FROM tmp_Stock_Item t_SI WHERE ISNULL(t_SI.date_purchased) LIMIT 1) THEN + INSERT INTO tmp_Msg_Error ( + guid + , id_type + , code + , msg + ) + SELECT + a_guid AS GUID + , v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('The following stock item(s) do not have an purchase date: ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + WHERE ISNULL(t_SI.date_purchased) + ; + END IF; + -- id_location_storage + IF EXISTS ( + SELECT * + FROM tmp_Stock_Item t_SI + INNER JOIN partsltd_prod.Shop_Storage_Location SL + ON t_SI.id_location_storage = SL.id_location + AND SL.active = 1 + WHERE ISNULL(SL.id_location) + LIMIT 1 + ) THEN + INSERT INTO tmp_Msg_Error ( + guid + , id_type + , code + , msg + ) + SELECT + a_guid AS GUID + , v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('The following stock item(s) do not have a valid storage location: ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + INNER JOIN partsltd_prod.Shop_Storage_Location SL + ON t_SI.id_location_storage = SL.id_location + AND SL.active = 1 + WHERE ISNULL(SL.id_location) + ; + END IF; + -- id_currency_cost + IF EXISTS ( + SELECT * + FROM tmp_Stock_Item t_SI + INNER JOIN partsltd_prod.Shop_Currency C + ON t_SI.id_curency_cost = C.id_currency + AND C.active = 1 + WHERE ISNULL(C.id_currency) + LIMIT 1 + ) THEN + INSERT INTO tmp_Msg_Error ( + guid + , id_type + , code + , msg + ) + SELECT + a_guid AS GUID + , v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('The following stock item(s) do not have a valid cost currency: ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + INNER JOIN partsltd_prod.Shop_Currency C + ON t_SI.id_curency_cost = C.id_currency + AND C.active = 1 + WHERE ISNULL(C.id_currency) + ; + END IF; + -- cost_local_VAT_excl + IF EXISTS ( + SELECT * + FROM tmp_Stock_Item t_SI + WHERE 1=1 + AND ( + ISNULL(t_SI.cost_local_VAT_excl) + OR t_SI.cost_local_VAT_excl < 0 + ) + LIMIT 1 + ) THEN + INSERT INTO tmp_Msg_Error ( + guid + , id_type + , code + , msg + ) + SELECT + a_guid AS GUID + , v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('The following stock item(s) do not have a valid cost excluding VAT: ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + WHERE 1=1 + AND ( + ISNULL(t_SI.cost_local_VAT_excl) + OR t_SI.cost_local_VAT_excl < 0 + ) + ; + END IF; + -- cost_local_VAT_incl + IF EXISTS ( + SELECT * + FROM tmp_Stock_Item t_SI + WHERE 1=1 + AND ( + ISNULL(t_SI.cost_local_VAT_incl) + OR t_SI.cost_local_VAT_incl < 0 + ) + LIMIT 1 + ) THEN + INSERT INTO tmp_Msg_Error ( + guid + , id_type + , code + , msg + ) + SELECT + a_guid AS GUID + , v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('The following stock item(s) do not have a valid cost including VAT: ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + WHERE 1=1 + AND ( + ISNULL(t_SI.cost_local_VAT_incl) + OR t_SI.cost_local_VAT_incl < t_SI.cost_local_VAT_excl + ) + ; + END IF; + -- date_received + IF EXISTS (SELECT * FROM tmp_Stock_Item t_SI WHERE ISNULL(t_SI.date_received) OR t_SI.date_received < t_SI.date_purchased LIMIT 1) THEN + INSERT INTO tmp_Msg_Error ( + guid + , id_type + , code + , msg + ) + SELECT + a_guid AS GUID + , v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('The following stock item(s) do not have a valid received date: ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + WHERE 1=1 + AND ( + ISNULL(t_SI.date_received) + OR t_SI.date_received < t_SI.date_purchased + ) + ; + END IF; + -- date_unsealed + IF EXISTS (SELECT * FROM tmp_Stock_Item t_SI WHERE ISNULL(t_SI.date_unsealed) OR t_SI.date_unsealed < t_SI.date_purchased LIMIT 1) THEN + INSERT INTO tmp_Msg_Error ( + guid + , id_type + , code + , msg + ) + SELECT + a_guid AS GUID + , v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('The following stock item(s) do not have a valid unsealed date: ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + WHERE 1=1 + AND ( + ISNULL(t_SI.date_unsealed) + OR t_SI.date_unsealed < t_SI.date_purchased + ) + ; + END IF; + -- date_expiration + IF EXISTS (SELECT * FROM tmp_Stock_Item t_SI WHERE ISNULL(t_SI.date_expiration) OR t_SI.date_expiration < t_SI.date_purchased LIMIT 1) THEN + INSERT INTO tmp_Msg_Error ( + guid + , id_type + , code + , msg + ) + SELECT + a_guid AS GUID + , v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('The following stock item(s) do not have a valid expiration date: ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + WHERE 1=1 + AND ( + ISNULL(t_SI.date_expiration) + OR t_SI.date_expiration < t_SI.date_purchased + ) + ; + END IF; + -- date_consumed + IF EXISTS (SELECT * FROM tmp_Stock_Item t_SI WHERE ISNULL(t_SI.date_consumed) OR t_SI.date_consumed < t_SI.date_purchased LIMIT 1) THEN + INSERT INTO tmp_Msg_Error ( + guid + , id_type + , code + , msg + ) + SELECT + a_guid AS GUID + , v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('The following stock item(s) do not have a valid consumed date: ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + WHERE 1=1 + AND ( + ISNULL(t_SI.date_consumed) + OR t_SI.date_consumed < t_SI.date_purchased + ) + ; + END IF; + + -- Permissions + SET v_ids_product_permission := ( SELECT GROUP_CONCAT(t_SI.id_product SEPARATOR ',') FROM tmp_Stock_Item t_SI ); + + IF NOT ISNULL(v_ids_product_permission) THEN + SET v_id_permission_product = (SELECT id_permission FROM Shop_Permission WHERE code = 'STORE_PRODUCT' LIMIT 1); + + CALL p_shop_calc_user(a_guid, a_id_user, FALSE, v_id_permission_product, v_id_access_level_edit, v_ids_product_permission); + + UPDATE tmp_Stock_Item t_SI + INNER JOIN Shop_Product P ON t_SI.id_product = P.id_product + INNER JOIN Shop_Calc_User_Temp UE_T + ON P.id_product = UE_T.id_product + AND UE_T.GUID = a_guid + SET + t_SI.can_view = UE_T.can_view + , t_SI.can_edit = UE_T.can_edit + , t_SI.can_admin = UE_T.can_admin + ; + + CALL p_shop_clear_calc_user(a_guid); + + IF EXISTS (SELECT * FROM tmp_Stock_Item t_SI WHERE IFNULL(t_SI.can_edit, 0) = 0 LIMIT 1) THEN + INSERT INTO tmp_Msg_Error ( + guid + , id_type + , code + , msg + ) + SELECT + a_guid AS GUID + , v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('The following stock item(s) do not have product edit permission: ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + WHERE IFNULL(t_SI.can_edit, 0) = 0 + ; + END IF; + END IF; + + IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN + START TRANSACTION; + + IF NOT ISNULL(v_ids_product_permission) THEN + INSERT INTO Shop_Product_Change_Set ( comment ) + VALUES ( a_comment ) + ; + + SET v_id_change_set := LAST_INSERT_ID(); + -- select * from partsltd_prod.Shop_Stock_Item + UPDATE partsltd_prod.Shop_Stock_Item + INNER JOIN tmp_Stock_Item t_SI ON SI.id_stock = t_SI.id_stock + SET + SI.id_permutation = t_SI.id_permutation + , SI.date_purchased = t_SI.date_purchased + , SI.date_received = t_SI.date_received + , SI.id_location_storage = t_SI.id_location_storage + , SI.id_currency_cost = t_SI.id_currency_cost + , SI.cost_local_VAT_excl = t_SI.cost_local_VAT_excl + , SI.cost_local_VAT_incl = t_SI.cost_local_VAT_incl + , SI.is_sealed = t_SI.is_sealed + , SI.date_unsealed = t_SI.date_unsealed + , SI.date_expiration = t_SI.date_expiration + , SI.is_consumed = t_SI.is_consumed + , SI.date_consumed = t_SI.date_consumed + , SI.active = t_SI.active + , SI.id_change_set = v_id_change_set + ; + END IF; + + INSERT INTO partsltd_prod.Shop_Stock_Item ( + id_permutation + , date_purchased + , date_received + , id_location_storage + , id_currency_cost + , cost_local_VAT_excl + , cost_local_VAT_incl + , is_sealed + , date_unsealed + , date_expiration + , is_consumed + , date_consumed + , active + , created_by + , created_on + ) + SELECT + t_SI.id_permutation + , t_SI.date_purchased + , t_SI.date_received + , t_SI.id_location_storage + , t_SI.id_currency_cost + , t_SI.cost_local_VAT_excl + , t_SI.cost_local_VAT_incl + , t_SI.is_sealed + , t_SI.date_unsealed + , t_SI.date_expiration + , t_SI.is_consumed + , t_SI.date_consumed + , t_SI.active + , a_id_user AS created_by + , v_time_start AS created_on + FROM tmp_Stock_Item t_SI + WHERE + is_new = 1 + AND active = 1 + ; + + DELETE FROM partsltd_prod.Shop_Stock_Item_Temp + WHERE GUID = a_guid; + + COMMIT; + END IF; + + SELECT * FROM tmp_Msg_Error; + + DROP TEMPORARY TABLE IF EXISTS tmp_Stock_Item; + DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error; +END // +DELIMITER ;; + + +/* + +DELETE FROM Shop_Product_Permutation_Temp +WHERE id_permutation = 1 +; + +INSERT INTO Shop_Product_Permutation_Temp ( + id_permutation, + id_product, + description, + cost_local, + id_currency_cost, + profit_local_min, + latency_manufacture_days, + id_unit_measurement_quantity, + count_unit_measurement_per_quantity_step, + quantity_min, + quantity_max, + quantity_stock, + is_subscription, + id_unit_measurement_interval_recurrence, + count_interval_recurrence, + id_stripe_product, + does_expire_faster_once_unsealed, + id_unit_measurement_interval_expiration_unsealed, + count_interval_expiration_unsealed, + active, + guid +) +VALUES + ( + 1 -- id_permutation, + , 1 -- id_product, + , 'Good Reddy Teddy' -- description, + , 5.0 -- cost_local, + , 1 -- id_currency_cost, + , 3.0 -- profit_local_min, + , 14 -- latency_manufacture_days, + , 1 -- id_unit_measurement_quantity, + , 1.0 -- count_unit_measurement_quantity, + , 3.0 -- quantity_min, + , 99.0 -- quantity_max, + , 1.0 -- quantity_stock, + , False -- is_subscription, + , null -- id_unit_measurement_interval_recurrence, + , null -- count_interval_recurrence, + , null -- id_stripe_product, + , False -- does_expire_faster_once_unsealed, + , null -- id_unit_measurement_interval_expiration_unsealed, + , null -- count_interval_expiration_unsealed, + , True -- active, + , 'NIPS' -- guid + ) +; + +select 'Shop_Product_Permutation_Temp before call'; +SELECT * FROM Shop_Product_Permutation_Temp; + +SELECT 'Shop_Product_Permutation before call' AS result_name; +select * FROM Shop_Product_Permutation; + +CALL p_shop_save_product_permutation ( + 1, -- 'auth0|6582b95c895d09a70ba10fef', # a_id_user + 'Initial data', # a_comment + 'NIPS' # a_guid +); + +SELECT 'Shop_Product_Permutation_Temp after call' AS result_name; +select * FROM Shop_Product_Permutation_Temp; + +SELECT 'Shop_Product_Permutation after call' AS result_name; +select * FROM Shop_Product_Permutation; + + +DELETE FROM Shop_Product_Permutation_Temp +WHERE id_permutation = 1; + + +*/ + + + +-- Clear previous proc +DROP PROCEDURE IF EXISTS partsltd_prod.p_shop_save_stock_item_test; + + +DELIMITER // +CREATE PROCEDURE p_shop_save_stock_item_test () +BEGIN + + DECLARE v_guid BINARY(36); + DECLARE v_time_start TIMESTAMP(6); + + SET v_time_start := CURRENT_TIMESTAMP(6); + SET v_guid := 'nips'; + + SELECT * + FROM partsltd_prod.Shop_Stock_Item + ; + SELECT * + FROM partsltd_prod.Shop_Stock_Item_Temp + ; + + START TRANSACTION; + + INSERT INTO partsltd_prod.Shop_Stock_Item_Temp ( + id_stock + -- id_category + , id_product + , id_permutation + , id_pairs_variations + -- , has_variations + , date_purchased + , date_received + , id_location_storage + , id_currency_cost + , cost_local_VAT_incl + , cost_local_VAT_excl + , is_sealed + , date_unsealed + , date_expiration + , is_consumed + , date_consumed + , active + , guid + ) + VALUES ( + -1 -- id_stock + -- 1 -- id_category + , 4 -- id_product + , NULL -- id_permutation + , NULL -- id_pairs_variations + -- , FALSE -- 0 -- has_variations + , '05-09-2025' -- date_purchased + , NULL -- date_received + , 1 -- id_location_storage + , 1 -- id_currency_cost + , 10 -- cost_local_VAT_incl + , 12 -- cost_local_VAT_excl + , 1 -- is_sealed + , NULL -- date_unsealed + , NULL -- date_expiration + , FALSE -- 0 -- is_consumed + , NULL -- date_consumed + , 1 -- active + , v_guid + ); + + COMMIT; + + SELECT * + FROM partsltd_prod.Shop_Stock_Item_Temp + WHERE GUID = v_guid + ; + + CALL partsltd_prod.p_shop_save_Stock_Item ( + 'Test save Stock_Item' -- comment + , v_guid -- guid + , 1 -- id_user + , 1 -- debug + ); + + SELECT * + FROM partsltd_prod.Shop_Stock_Item + ; + SELECT * + FROM partsltd_prod.Shop_Stock_Item_Temp + ; + + CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); +END // +DELIMITER ;; + +/* +CALL partsltd_prod.p_shop_save_stock_item_test (); + +DELETE FROM partsltd_prod.Shop_Stock_Item_Temp; + +update shop_product p set p.has_variations = 0 where id_product = 4 +DROP TABLE IF EXISTS tmp_Msg_Error; +*/-- USE partsltd_prod; -- Clear previous proc DROP PROCEDURE IF EXISTS p_shop_get_many_product_price_and_discount_and_delivery_option; @@ -13084,8 +13899,6 @@ CALL p_shop_edit_user ( */ - - -- Clear previous proc DROP PROCEDURE IF EXISTS p_get_many_user; @@ -13099,48 +13912,81 @@ CREATE PROCEDURE p_get_many_user ( , IN a_get_first_user_only BIT , IN a_ids_user LONGTEXT , IN a_ids_user_auth0 LONGTEXT + , IN a_debug BIT ) BEGIN + DECLARE v_id_access_level_admin INT; DECLARE v_id_access_level_view INT; DECLARE v_id_permission_store_admin INT; DECLARE v_id_permission_user INT; DECLARE v_id_permission_user_admin INT; + DECLARE v_ids_permission_required VARCHAR(4000); DECLARE v_now TIMESTAMP; DECLARE v_id_minimum INT; - DECLARE v_code_error_data VARCHAR(50); - DECLARE v_id_type_error_data INT; + DECLARE v_code_error_bad_data VARCHAR(50); + DECLARE v_id_type_error_bad_data INT; DECLARE v_has_filter_user BIT; + DECLARE v_has_filter_user_auth0 BIT; DECLARE v_guid BINARY(36); + DECLARE v_rank_max INT; + DECLARE v_time_start TIMESTAMP(6); + SET v_time_start := CURRENT_TIMESTAMP(6); SET v_guid := UUID(); - SET v_id_access_level_view := (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'VIEW' LIMIT 1); - SET v_id_permission_store_admin := (SELECT id_permission FROM Shop_Permission WHERE code = 'STORE_ADMIN' LIMIT 1); - SET v_id_permission_user := (SELECT id_permission FROM Shop_Permission WHERE code = 'STORE_USER' LIMIT 1); - SET v_id_permission_user_admin := (SELECT id_permission FROM Shop_Permission WHERE code = 'STORE_USER_ADMIN' LIMIT 1); - SET v_code_error_data := (SELECT code FROM Shop_Msg_Error_Type WHERE code = 'BAD_DATA' LIMIT 1); - SET v_id_type_error_data := (SELECT id_type FROM Shop_Msg_Error_Type WHERE code = v_code_error_data LIMIT 1); + SET v_id_access_level_admin := (SELECT id_access_level FROM partsltd_prod.Shop_Access_Level WHERE code = 'ADMIN' LIMIT 1); + SET v_id_access_level_view := (SELECT id_access_level FROM partsltd_prod.Shop_Access_Level WHERE code = 'VIEW' LIMIT 1); + SET v_id_permission_store_admin := (SELECT id_permission FROM partsltd_prod.Shop_Permission WHERE code = 'STORE_ADMIN' LIMIT 1); + SET v_id_permission_user := (SELECT id_permission FROM partsltd_prod.Shop_Permission WHERE code = 'STORE_USER' LIMIT 1); + SET v_id_permission_user_admin := (SELECT id_permission FROM partsltd_prod.Shop_Permission WHERE code = 'STORE_USER_ADMIN' LIMIT 1); + SET v_code_error_bad_data := (SELECT code FROM partsltd_prod.Shop_Msg_Error_Type WHERE code = 'BAD_DATA' LIMIT 1); + SET v_id_type_error_bad_data := (SELECT id_type FROM partsltd_prod.Shop_Msg_Error_Type WHERE code = v_code_error_bad_data LIMIT 1); + SET v_ids_permission_required := CONCAT(v_id_permission_user, ',', v_id_permission_user_admin, ',', v_id_permission_store_admin); + SET a_get_all_user := IFNULL(a_get_all_user, 1); + SET a_get_inactive_user := IFNULL(a_get_inactive_user, 0); + SET a_get_first_user_only := IFNULL(a_get_first_user_only, 0); SET a_ids_user := TRIM(IFNULL(a_ids_user, '')); SET a_ids_user_auth0 := TRIM(IFNULL(a_ids_user_auth0, '')); + SET a_debug := IFNULL(a_debug, 0); + + IF a_debug = 1 THEN + SELECT + a_id_user + , a_id_user_auth0 + , a_get_all_user + , a_get_inactive_user + , a_get_first_user_only + , a_ids_user + , a_ids_user_auth0 + , a_debug + ; + END IF; DROP TEMPORARY TABLE IF EXISTS tmp_User; DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error; CREATE TEMPORARY TABLE tmp_User ( - id_user INT NOT NULL, - rank_user INT NULL + id_user INT NULL + , rank_user INT NULL + , can_admin_store BIT NULL + , can_admin_user BIT NULL ); CREATE TEMPORARY TABLE tmp_Msg_Error ( display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, - guid BINARY(36) NOT NULL, + -- guid BINARY(36) NOT NULL, id_type INT NOT NULL, code VARCHAR(50) NOT NULL, msg VARCHAR(4000) NOT NULL ); + CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Split ( + substring VARCHAR(4000) NOT NULL + , as_int INT NULL + ); + IF ISNULL(a_id_user) AND NOT ISNULL(a_id_user_auth0) THEN - SET a_id_user := (SELECT U.id_user FROM Shop_User U WHERE U.id_user_auth0 LIKE CONCAT('%', a_id_user_auth0, '%') LIMIT 1); + SET a_id_user := (SELECT U.id_user FROM partsltd_prod.Shop_User U WHERE U.id_user_auth0 = a_id_user_auth0 LIMIT 1); -- LIKE CONCAT('%', a_id_user_auth0, '%') LIMIT 1); END IF; IF ISNULL(a_id_user) THEN @@ -13152,150 +13998,352 @@ BEGIN ) VALUES ( v_guid, - v_id_type_error_data, - v_code_error_data, + v_id_type_error_bad_data, + v_code_error_bad_data, CONCAT('User ID required for authorisation.') ) ; END IF; - SET v_has_filter_user := CASE WHEN a_ids_user = '' AND a_ids_user_auth0= '' THEN 0 ELSE 1 END; + SET v_has_filter_user := CASE WHEN a_ids_user = '' THEN 0 ELSE 1 END; + SET v_has_filter_user_auth0 := CASE WHEN a_ids_user_auth0 = '' THEN 0 ELSE 1 END; - IF v_has_filter_user THEN - INSERT INTO tmp_User ( - id_user - -- , active - , rank_user - ) - SELECT - DISTINCT U.id_user - -- S.active - , RANK() OVER (ORDER BY id_user ASC) AS rank_user - FROM Shop_User U - WHERE 1=1 - AND ( - FIND_IN_SET(U.id_user, a_ids_user) > 0 - OR FIND_IN_SET(U.id_user_auth0, a_ids_user_auth0) > 0 - ) - AND ( - a_get_inactive_user - OR U.active - ) - /*Shop_Calc_User_Temp UE_T - WHERE 1=1 - AND UE_T.guid = v_guid - AND UE_T.active = 1 - */ + IF a_debug = 1 THEN + SELECT + v_has_filter_user + , v_has_filter_user_auth0 ; - - IF a_get_first_user_only THEN - DELETE t_U - FROM tmp_User t_U - WHERE t_U.rank_user > 1 - ; - END IF; END IF; - -- Permissions - IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN - -- SELECT v_guid, a_id_user, false, v_id_permission_product, v_id_access_level_view, v_ids_permutation_permission; - -- select * from Shop_Calc_User_Temp; + -- User IDs + IF (NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) AND v_has_filter_user = 1) THEN + CALL partsltd_prod.p_split(v_guid, a_ids_user, ',', FALSE); - CALL p_shop_calc_user( - v_guid, -- guid - a_id_user, -- ids_user - FALSE, -- get_inactive_user - CONCAT(v_id_permission_user, ',', v_id_permission_user_admin, ',', v_id_permission_store_admin), -- ids_permission - v_id_access_level_view, -- ids_access_level - '' -- ids_product + DELETE FROM tmp_Split; + + INSERT INTO tmp_Split ( + substring + , as_int + ) + SELECT + substring + , CONVERT(substring, DECIMAL(10,0)) AS as_int + FROM partsltd_prod.Split_Temp + WHERE 1=1 + AND GUID = v_guid + AND NOT ISNULL(substring) + AND substring != '' + ; + + CALL partsltd_prod.p_clear_split_temp( v_guid ); + END IF; + + IF (NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) AND v_has_filter_user = 1) THEN + IF EXISTS ( + SELECT * + FROM tmp_Split t_S + LEFT JOIN partsltd_prod.Shop_User U ON t_S.as_int = U.id_user + WHERE + ISNULL(t_S.as_int) + OR ISNULL(U.id_user) + ) THEN + INSERT INTO tmp_Msg_Error ( + -- guid, + id_type, + code, + msg + ) + SELECT + -- v_guid, + v_id_type_error_bad_data, + v_code_error_bad_data, + CONCAT('Invalid or inactive User IDs: ', IFNULL(GROUP_CONCAT(t_S.substring SEPARATOR ', '), 'NULL')) + FROM tmp_Split t_S + LEFT JOIN partsltd_prod.Shop_User U ON t_S.as_int = U.id_user + WHERE + ISNULL(t_S.as_int) + OR ISNULL(U.id_user) + ; + ELSE + INSERT INTO tmp_User ( + id_user + , rank_user + ) + SELECT + U.id_user + , RANK() OVER (ORDER BY U.id_user DESC) AS rank_user + FROM tmp_Split t_S + RIGHT JOIN partsltd_prod.Shop_User U ON t_S.as_int = U.id_user + WHERE + ( + a_get_all_user = 1 + OR ( + v_has_filter_user = 1 + AND NOT ISNULL(t_S.as_int) + ) + ) + AND ( + a_get_inactive_user = 1 + OR U.active = 1 + ) + ; + END IF; + END IF; + + -- Auth0 User IDs + IF (NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) AND v_has_filter_user_auth0 = 1) THEN + CALL partsltd_prod.p_split(v_guid, a_ids_user_auth0, ',', FALSE); + + DELETE FROM tmp_Split; + + INSERT INTO tmp_Split ( + substring + ) + SELECT + substring + FROM partsltd_prod.Split_Temp + WHERE 1=1 + AND GUID = v_guid + AND NOT ISNULL(substring) + AND substring != '' + ; + + CALL partsltd_prod.p_clear_split_temp( v_guid ); + END IF; + + IF (NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) AND v_has_filter_user_auth0 = 1) THEN + IF EXISTS ( + SELECT * + FROM tmp_Split t_S + LEFT JOIN partsltd_prod.Shop_User U ON t_S.substring = U.id_user_auth0 + WHERE + ISNULL(t_S.substring) + OR ISNULL(U.id_user_auth0) + ) THEN + INSERT INTO tmp_Msg_Error ( + -- guid, + id_type, + code, + msg + ) + SELECT + -- v_guid, + v_id_type_error_bad_data, + v_code_error_bad_data, + CONCAT('Invalid or inactive Auth0 User IDs: ', IFNULL(GROUP_CONCAT(t_S.substring SEPARATOR ', '), 'NULL')) + FROM tmp_Split t_S + LEFT JOIN partsltd_prod.Shop_User U ON t_S.substring = U.id_user_auth0 + WHERE + ISNULL(t_S.substring) + OR ISNULL(U.id_user_auth0) + ; + ELSE + SET v_rank_max := IFNULL((SELECT rank_user FROM tmp_User ORDER BY rank_user DESC LIMIT 1), 0); + + INSERT INTO tmp_User ( + id_user + , rank_user + ) + SELECT + U.id_user + , v_rank_max + (RANK() OVER (ORDER BY U.id_user DESC)) AS rank_user + FROM tmp_Split t_S + RIGHT JOIN partsltd_prod.Shop_User U ON t_S.substring = U.id_user_auth0 + WHERE + ( + a_get_all_user = 1 + OR ( + v_has_filter_user_auth0 = 1 + AND NOT ISNULL(t_S.substring) + ) + ) + AND ( + a_get_inactive_user = 1 + OR U.active = 1 + ) + ; + END IF; + END IF; + + IF a_debug = 1 THEN + SELECT * FROM tmp_User; + END IF; + + IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN + IF a_get_first_user_only THEN + DELETE t_U + FROM tmp_User t_U + WHERE t_U.rank_user > 1 + ; + END IF; + END IF; + + IF a_debug = 1 THEN + SELECT * FROM tmp_User; + END IF; + + -- Can admin store + IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN + IF a_debug = 1 THEN + SELECT + v_guid -- guid + , a_id_user -- ids_user + , FALSE -- get_inactive_user + , v_id_permission_store_admin -- ids_permission + , v_id_access_level_admin -- ids_access_level + , '' -- ids_product + , 0 -- a_debug + ; + SELECT * FROM partsltd_prod.Shop_Calc_User_Temp; + END IF; + + CALL partsltd_prod.p_shop_calc_user( + v_guid -- guid + , a_id_user -- ids_user + , FALSE -- get_inactive_user + , v_id_permission_store_admin -- ids_permission + , v_id_access_level_admin -- ids_access_level + , '' -- ids_product + , 0 -- a_debug ); - -- select * from Shop_Calc_User_Temp; + IF a_debug = 1 THEN + SELECT * FROM partsltd_prod.Shop_Calc_User_Temp WHERE GUID = v_guid; + END IF; + + UPDATE tmp_User t_U + INNER JOIN partsltd_prod.Shop_Calc_User_Temp CUT + ON CUT.GUID = v_guid + AND t_U.id_user = CUT.id_user + SET t_U.can_admin_store = CUT.can_admin + ; + + CALL partsltd_prod.p_shop_clear_calc_user( v_guid, FALSE ); + END IF; + + -- Can admin user + IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN + IF a_debug = 1 THEN + SELECT + v_guid -- guid + , a_id_user -- ids_user + , FALSE -- get_inactive_user + , v_id_permission_user_admin -- ids_permission + , v_id_access_level_admin -- ids_access_level + , '' -- ids_product + , 0 -- a_debug + ; + SELECT * FROM partsltd_prod.Shop_Calc_User_Temp; + END IF; + + CALL partsltd_prod.p_shop_calc_user( + v_guid -- guid + , a_id_user -- ids_user + , FALSE -- get_inactive_user + , v_id_permission_user_admin -- ids_permission + , v_id_access_level_admin -- ids_access_level + , '' -- ids_product + , 0 -- a_debug + ); + + IF a_debug = 1 THEN + SELECT * FROM partsltd_prod.Shop_Calc_User_Temp WHERE GUID = v_guid; + END IF; + + UPDATE tmp_User t_U + INNER JOIN partsltd_prod.Shop_Calc_User_Temp CUT + ON CUT.GUID = v_guid + AND t_U.id_user = CUT.id_user + SET t_U.can_admin_user = CUT.can_admin + ; + + CALL partsltd_prod.p_shop_clear_calc_user( v_guid, FALSE ); + END IF; + + -- Permissions + IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN + IF a_debug = 1 THEN + SELECT + v_guid -- guid + , a_id_user -- ids_user + , FALSE -- get_inactive_user + , v_ids_permission_required -- ids_permission + , v_id_access_level_view -- ids_access_level + , '' -- ids_product + , 0 -- a_debug + ; + SELECT * FROM partsltd_prod.Shop_Calc_User_Temp; + END IF; + + CALL partsltd_prod.p_shop_calc_user( + v_guid -- guid + , a_id_user -- ids_user + , FALSE -- get_inactive_user + , v_ids_permission_required -- ids_permission + , v_id_access_level_view -- ids_access_level + , '' -- ids_product + , 0 -- a_debug + ); + + IF a_debug = 1 THEN + SELECT * FROM partsltd_prod.Shop_Calc_User_Temp WHERE GUID = v_guid; + END IF; IF NOT EXISTS ( SELECT can_view - FROM Shop_Calc_User_Temp UE_T + FROM partsltd_prod.Shop_Calc_User_Temp CUT WHERE 1=1 - AND UE_T.GUID = v_guid - AND UE_T.id_permission_required = v_id_permission_user + AND CUT.GUID = v_guid + AND can_view = 1 + -- AND FIND_IN_SET(v_ids_permission_required, CUT.id_permission_required) > 0 ) THEN INSERT INTO tmp_Msg_Error ( - guid, id_type, code, msg ) VALUES ( - v_guid, - v_id_type_error_data, - v_code_error_data, - CONCAT('You do not have view permissions for ', (SELECT name FROM Shop_Permission WHERE id_permission = v_id_permission_user LIMIT 1)) + v_id_type_error_bad_data, + v_code_error_bad_data, + -- CONCAT('You do not have view permissions for ', (SELECT name FROM partsltd_prod.Shop_Permission WHERE id_permission = v_id_permission_user LIMIT 1)) + -- CONCAT('You do not have view permissions for ', (SELECT GROUP_CONCAT(name SEPARATOR ', ') FROM partsltd_prod.Shop_Permission WHERE FIND_IN_SET(v_id_permission_user, id_permission) > 0)) + CONCAT('You do not have view permissions for ', (SELECT name FROM partsltd_prod.Shop_Permission P INNER JOIN partsltd_prod.Shop_Calc_User_Temp CUT ON P.id_permission = CUT.id_permission_required WHERE GUID = v_guid AND IFNULL(can_view, 0) = 0 LIMIT 1)) -- WHERE IFNULL(CUT.can_view, 0) = 0 ) ; + ELSE + -- INSERT INTO + SET a_debug := a_debug; END IF; + + CALL partsltd_prod.p_shop_clear_calc_user( v_guid, FALSE ); END IF; -- Returns - /* NULL record required for flask sql_alchemy to detect result set - IF EXISTS (SELECT * FROM tmp_Msg_Error WHERE GUID = v_guid) THEN + /* NULL record required for flask sql_alchemy to detect result set */ + IF EXISTS (SELECT * FROM tmp_Msg_Error) THEN DELETE FROM tmp_User; + INSERT INTO tmp_User ( id_user ) + VALUES ( NULL ); END IF; - */ - IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE GUID = v_guid) THEN - SELECT - U.id_user - , U.id_user_auth0 - , U.firstname - , U.surname - , U.email - , U.is_email_verified - , U.id_currency_default - , U.id_region_default - , U.is_included_VAT_default - , U.is_super_user - , UE_T_STORE.can_admin_store AS can_admin_store - , UE_T_USER.can_admin_user AS can_admin_user - FROM tmp_User t_U - INNER JOIN Shop_User U ON t_U.id_user = U.id_user - INNER JOIN ( - SELECT - id_user - , id_permission_required - , can_admin AS can_admin_store - FROM Shop_Calc_User_Temp UE_T_STORE - WHERE 1=1 - AND UE_T_STORE.guid = v_guid - AND UE_T_STORE.id_permission_required = v_id_permission_store_admin - ) UE_T_STORE ON t_U.id_user = UE_T_STORE.id_user - INNER JOIN ( - SELECT - id_user - , id_permission_required - , can_admin AS can_admin_user - FROM Shop_Calc_User_Temp UE_T_USER - WHERE 1=1 - AND UE_T_USER.guid = v_guid - AND UE_T_USER.id_permission_required = v_id_permission_user_admin - ) UE_T_USER ON t_U.id_user = UE_T_USER.id_user - ; - ELSE - SELECT - NULL AS id_user - , NULL AS id_user_auth0 - , NULL AS firstname - , NULL AS surname - , NULL AS email - , NULL AS is_email_verified - , NULL AS id_currency_default - , NULL AS id_region_default - , NULL AS is_included_VAT_default - , NULL AS is_super_user - , NULL AS can_admin_store - , NULL AS can_admin_user - ; - END IF; + + SELECT + U.id_user + , U.id_user_auth0 + , U.firstname + , U.surname + , U.email + , U.is_email_verified + , U.id_currency_default + , U.id_region_default + , U.is_included_VAT_default + , U.is_super_user + , t_U.can_admin_store + , t_U.can_admin_user + FROM tmp_User t_U + INNER JOIN partsltd_prod.Shop_User U ON t_U.id_user = U.id_user + ; # Errors SELECT @@ -13305,27 +14353,33 @@ BEGIN MET.name, MET.description FROM tmp_Msg_Error t_ME - INNER JOIN Shop_Msg_Error_Type MET + INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type - WHERE guid = v_guid ; + IF a_debug = 1 THEN + SELECT * FROM tmp_User; + END IF; + -- Clean up DROP TEMPORARY TABLE IF EXISTS tmp_User; DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error; /* - DELETE FROM Shop_Calc_User_Temp + DELETE FROM partsltd_prod.Shop_Calc_User_Temp WHERE GUID = v_guid; */ - CALL p_shop_clear_calc_user(v_guid); + + IF a_debug = 1 THEN + CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); + END IF; END // DELIMITER ;; - /* + CALL p_get_many_user ( NULL # a_id_user , 'auth0|6582b95c895d09a70ba10fef' # a_id_user_auth0 @@ -13333,13 +14387,15 @@ CALL p_get_many_user ( , 0 # a_get_inactive_user , 0 # a_get_first_user_only , NULL # a_ids_user - , 'auth0|6582b95c895d09a70ba10fef' # a_ids_user_auth0 # ' -- + , 'auth0|6582b95c895d09a70ba10fef' # a_ids_user_auth0 + , 1 -- a_debug ); -select * from Shop_Calc_User_Temp; -delete from Shop_Calc_User_Temp; + +select * FROM partsltd_prod.Shop_Calc_User_Temp; +delete FROM partsltd_prod.Shop_Calc_User_Temp; SELECT * -FROM SHOP_USER; +FROM partsltd_prod.Shop_USER; CALL p_get_many_user( NULL -- :a_id_user, @@ -19253,9 +20309,10 @@ INSERT INTO Shop_Msg_Error_Type ( code, name, description ) VALUES - ('BAD_DATA', 'Invalid data', 'Rubbish data'), - ('NO_PERMISSION', 'No permission', 'Not authorised'), - ('PRODUCT_AVAILABILITY', 'Product not available', 'Product not available') + ('BAD_DATA', 'Invalid data', 'Rubbish data') + , ('NO_PERMISSION', 'No permission', 'Not authorised') + , ('PRODUCT_AVAILABILITY', 'Product not available', 'Product not available') + , ('MYSQL_ERROR', 'MySQL error', 'MySQL execution error.') ; # File Types @@ -19305,6 +20362,14 @@ VALUES ; */ +# Addresses +INSERT INTO Shop_Address ( + id_region, postcode, address_line_1, address_line_2, city, county +) +VALUES ( + 1, 'CV22 6DN', '53 Alfred Green Close', '', 'Rugby', 'Warwickshire' +); + # Plants INSERT INTO Shop_Plant ( code, name, id_address, id_user_manager @@ -19771,7 +20836,10 @@ VALUES (4, 'SALES_AND_PURCHASING', 'Sales and Purchasing'), (5, 'MANUFACTURING', 'Manufacturing') ; - +/* +select * from Shop_Permission +select * from Shop_Role_Permission_Link +*/ # Permissions INSERT INTO Shop_Permission ( display_order, code, name, id_permission_group, id_access_level_required @@ -19846,8 +20914,8 @@ VALUES (1, 1) ; -# Addresses -INSERT INTO Shop_Address ( +# User Addresses +INSERT INTO Shop_User_Address ( id_user, id_region, name_full, phone_number, postcode, address_line_1, address_line_2, city, county ) SELECT U.id_user, 1, CONCAT(U.firstname, ' ', U.surname), '07375 571430', 'CV22 6DN', '53 Alfred Green Close', '', 'Rugby', 'Warwickshire' @@ -19916,7 +20984,7 @@ INSERT INTO Shop_Supplier ( , id_currency ) VALUES - ('Malt Kiln Farm Shop', NULL, NULL, 2, '01788 832640', NULL, 'farmshop@maltkilnfarmshop.co.uk', 'https://www.maltkilnfarmshop.co.uk/', 1) + ('Malt Kiln Farm Shop', NULL, NULL, 1, '01788 832640', NULL, 'farmshop@maltkilnfarmshop.co.uk', 'https://www.maltkilnfarmshop.co.uk/', 1) ; /* @@ -20200,7 +21268,7 @@ SELECT * FROM Shop_Customer_Sales_Order_Product_Link_Audit; - +/* SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES @@ -20224,4 +21292,7 @@ FROM WHERE TABLE_SCHEMA = 'PARTS' -- AND TABLE_NAME = 'your_table_name' -; \ No newline at end of file +; + +*/ + diff --git a/static/MySQL/0001_destroy.sql b/static/MySQL/0001_destroy.sql index be06d199..561523ff 100644 --- a/static/MySQL/0001_destroy.sql +++ b/static/MySQL/0001_destroy.sql @@ -41,6 +41,8 @@ DROP TABLE IF EXISTS tmp_Shop_Customer_Sale_Order; # Delete old tables DROP TABLE IF EXISTS Split_Temp; +DROP TABLE IF EXISTS Split_Key_Value_Pair_Csv_Temp; +DROP TABLE IF EXISTS Split_Key_Value_Pair_Temp; DROP TABLE IF EXISTS Shop_User_Eval_Temp; DROP TABLE IF EXISTS Shop_Calc_User_Temp; @@ -87,8 +89,8 @@ DROP TABLE IF EXISTS Shop_User_Order_Status; DROP TABLE IF EXISTS Shop_User_Basket_Audit; DROP TABLE IF EXISTS Shop_User_Basket; -DROP TABLE IF EXISTS Shop_Address_Audit; -DROP TABLE IF EXISTS Shop_Address; +DROP TABLE IF EXISTS Shop_User_Address_Audit; +DROP TABLE IF EXISTS Shop_User_Address; DROP TABLE IF EXISTS Shop_User_Role_Link_Audit; DROP TABLE IF EXISTS Shop_User_Role_Link; @@ -190,6 +192,9 @@ DROP TABLE IF EXISTS Shop_Plant_Temp; DROP TABLE IF EXISTS Shop_Plant_Audit; DROP TABLE IF EXISTS Shop_Plant; +DROP TABLE IF EXISTS Shop_Address_Audit; +DROP TABLE IF EXISTS Shop_Address; + DROP TABLE IF EXISTS Shop_Delivery_Region_Branch_Audit; DROP TABLE IF EXISTS Shop_Delivery_Region_Branch; DROP TABLE IF EXISTS Shop_Region_Branch_Temp; @@ -232,6 +237,9 @@ DROP TABLE IF EXISTS Shop_Product_Change_Set; -- Procedures DROP PROCEDURE IF EXISTS p_split; DROP PROCEDURE IF EXISTS p_clear_split_temp; +DROP PROCEDURE IF EXISTS p_split_key_value_pair_csv; +DROP PROCEDURE IF EXISTS p_clear_split_key_value_csv_temp; +DROP PROCEDURE IF EXISTS p_clear_split_key_value_pair_csv_temp; DROP PROCEDURE IF EXISTS p_debug_timing_reporting; DROP PROCEDURE IF EXISTS p_validate_guid; @@ -248,12 +256,15 @@ DROP PROCEDURE IF EXISTS p_shop_get_many_access_level; DROP PROCEDURE IF EXISTS p_shop_get_many_unit_measurement; DROP PROCEDURE IF EXISTS p_shop_get_many_region; +DROP PROCEDURE IF EXISTS p_shop_get_many_plant; +DROP PROCEDURE IF EXISTS p_shop_get_many_storage_location; DROP PROCEDURE IF EXISTS p_shop_get_many_currency; DROP PROCEDURE IF EXISTS p_shop_save_category; DROP PROCEDURE IF EXISTS p_shop_save_product_category; DROP PROCEDURE IF EXISTS p_shop_save_product_category_test; DROP PROCEDURE IF EXISTS p_shop_save_product; +DROP PROCEDURE IF EXISTS p_shop_save_product_test; DROP PROCEDURE IF EXISTS p_shop_calc_product_permutation; DROP PROCEDURE IF EXISTS p_shop_clear_calc_product_permutation; DROP PROCEDURE IF EXISTS p_shop_get_many_product; @@ -261,6 +272,9 @@ DROP PROCEDURE IF EXISTS p_shop_get_many_stripe_product_new; DROP PROCEDURE IF EXISTS p_shop_save_permutation; DROP PROCEDURE IF EXISTS p_shop_save_product_permutation; DROP PROCEDURE IF EXISTS p_shop_get_many_product_variation; +DROP FUNCTION IF EXISTS fn_shop_get_id_product_permutation_from_variation_csv_list; +DROP PROCEDURE IF EXISTS p_shop_save_stock_item; +DROP PROCEDURE IF EXISTS p_shop_save_stock_item_test; DROP PROCEDURE IF EXISTS p_shop_get_many_stock_item; DROP PROCEDURE IF EXISTS p_shop_get_many_product_price_and_discount_and_delivery_option; DROP PROCEDURE IF EXISTS p_shop_get_many_product_price_and_discount_and_delivery_option; diff --git a/static/MySQL/1001_tbl_Split_Key_Value_Pair_Csv_Temp.sql b/static/MySQL/1001_tbl_Split_Key_Value_Pair_Csv_Temp.sql new file mode 100644 index 00000000..75275214 --- /dev/null +++ b/static/MySQL/1001_tbl_Split_Key_Value_Pair_Csv_Temp.sql @@ -0,0 +1,13 @@ + +# Split Key Value Pair CSV Staging +-- USE partsltd_prod; +-- DROP TABLE IF EXISTS Split_Temp; + +SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Split_Key_Value_Pair_Csv_Temp'; + +CREATE TABLE Split_Key_Value_Pair_Csv_Temp ( + guid BINARY(36) NOT NULL + , id INT NOT NULL + , key_column VARCHAR(4000) NULL + , value_column VARCHAR(4000) NULL +); diff --git a/static/MySQL/1100_tbl_Shop_Region.sql b/static/MySQL/1100_tbl_Shop_Region.sql index bab1a4e1..6ce12b78 100644 --- a/static/MySQL/1100_tbl_Shop_Region.sql +++ b/static/MySQL/1100_tbl_Shop_Region.sql @@ -1,8 +1,6 @@ # Regions - - SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Region'; CREATE TABLE IF NOT EXISTS Shop_Region ( diff --git a/static/MySQL/1106_tbl_Shop_Address.sql b/static/MySQL/1106_tbl_Shop_Address.sql new file mode 100644 index 00000000..0c66b3d8 --- /dev/null +++ b/static/MySQL/1106_tbl_Shop_Address.sql @@ -0,0 +1,22 @@ + +# Addresses + + +SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Address'; + +CREATE TABLE Shop_Address ( + id_address INT NOT NULL AUTO_INCREMENT PRIMARY KEY, + id_region INT NOT NULL, + postcode VARCHAR(20) NOT NULL, + address_line_1 VARCHAR(256) NOT NULL, + address_line_2 VARCHAR(256) NOT NULL, + city VARCHAR(256) NOT NULL, + county VARCHAR(256) NOT NULL, + active BIT NOT NULL DEFAULT 1, + created_on TIMESTAMP, + created_by INT, + id_change_set INT, + CONSTRAINT FK_Shop_Address_id_change_set + FOREIGN KEY (id_change_set) + REFERENCES Shop_User_Change_Set(id_change_set) +); \ No newline at end of file diff --git a/static/MySQL/1106_tbl_Shop_Plant.sql b/static/MySQL/1106_tbl_Shop_Plant.sql index a040ea03..7ebc467d 100644 --- a/static/MySQL/1106_tbl_Shop_Plant.sql +++ b/static/MySQL/1106_tbl_Shop_Plant.sql @@ -1,8 +1,6 @@ # Plant - - SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Plant'; CREATE TABLE IF NOT EXISTS Shop_Plant ( @@ -10,6 +8,9 @@ CREATE TABLE IF NOT EXISTS Shop_Plant ( code VARCHAR(50) NOT NULL, name VARCHAR(500) NOT NULL, id_address INT NOT NULL, + CONSTRAINT FK_Shop_Plant_id_address + FOREIGN KEY (id_address) + REFERENCES Shop_Address(id_address), id_user_manager INT NOT NULL, active BIT NOT NULL DEFAULT 1, created_on TIMESTAMP, diff --git a/static/MySQL/1319_tbl_Shop_Address_Audit.sql b/static/MySQL/1107_tbl_Shop_Address_Audit.sql similarity index 100% rename from static/MySQL/1319_tbl_Shop_Address_Audit.sql rename to static/MySQL/1107_tbl_Shop_Address_Audit.sql diff --git a/static/MySQL/1108_tbl_Shop_Plant_Temp.sql b/static/MySQL/1108_tbl_Shop_Plant_Temp.sql index f0f9560d..79c9ad90 100644 --- a/static/MySQL/1108_tbl_Shop_Plant_Temp.sql +++ b/static/MySQL/1108_tbl_Shop_Plant_Temp.sql @@ -6,10 +6,11 @@ SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Plant_Temp'; CREATE TABLE IF NOT EXISTS Shop_Plant_Temp ( - id_plant INT NOT NULL PRIMARY KEY, - code VARCHAR(50) NOT NULL, - name VARCHAR(500) NOT NULL, - id_address INT NOT NULL, - id_user_manager INT NOT NULL, - active BIT NOT NULL DEFAULT 1 + id_plant INT NOT NULL PRIMARY KEY + , code VARCHAR(50) NOT NULL + , name VARCHAR(500) NOT NULL + , id_address INT NOT NULL + , id_user_manager INT NOT NULL + , active BIT NOT NULL DEFAULT 1 + , guid BINARY(36) NOT NULL ); diff --git a/static/MySQL/1218_tbl_Shop_Stock_Item.sql b/static/MySQL/1218_tbl_Shop_Stock_Item.sql index f8591647..810c8b0f 100644 --- a/static/MySQL/1218_tbl_Shop_Stock_Item.sql +++ b/static/MySQL/1218_tbl_Shop_Stock_Item.sql @@ -1,7 +1,7 @@ # Stock Stock Item - +-- DROP TABLE IF EXISTS Shop_Stock_Item; SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Stock_Item'; @@ -11,8 +11,8 @@ CREATE TABLE IF NOT EXISTS Shop_Stock_Item ( CONSTRAINT FK_Shop_Stock_Item_id_permutation FOREIGN KEY (id_permutation) REFERENCES Shop_Product_Permutation(id_permutation), - date_purchased TIMESTAMP NOT NULL, - date_received TIMESTAMP NULL, + date_purchased DATETIME NOT NULL, + date_received DATETIME NULL, id_location_storage INT NOT NULL, CONSTRAINT FK_Shop_Stock_Item_id_location_storage FOREIGN KEY (id_location_storage) @@ -21,15 +21,15 @@ CREATE TABLE IF NOT EXISTS Shop_Stock_Item ( CONSTRAINT FK_Shop_Stock_Item_id_currency FOREIGN KEY (id_currency_cost) REFERENCES Shop_Currency(id_currency), - cost_local_VAT_incl FLOAT NOT NULL, - cost_local_VAT_excl FLOAT NOT NULL, + cost_local_VAT_incl FLOAT NULL, + cost_local_VAT_excl FLOAT NULL, is_sealed BIT NOT NULL DEFAULT 1, - date_unsealed TIMESTAMP NULL, - date_expiration TIMESTAMP NOT NULL, + date_unsealed DATETIME NULL, + date_expiration DATETIME NOT NULL, is_consumed BIT NOT NULL DEFAULT 0, - date_consumed TIMESTAMP NULL, + date_consumed DATETIME NULL, active BIT NOT NULL DEFAULT 1, - created_on TIMESTAMP, + created_on DATETIME, created_by INT, id_change_set INT, CONSTRAINT FK_Shop_Stock_Item_id_change_set diff --git a/static/MySQL/1220_tbl_Shop_Stock_Item_Temp.sql b/static/MySQL/1220_tbl_Shop_Stock_Item_Temp.sql index 4f6b4bc6..8393de95 100644 --- a/static/MySQL/1220_tbl_Shop_Stock_Item_Temp.sql +++ b/static/MySQL/1220_tbl_Shop_Stock_Item_Temp.sql @@ -1,22 +1,27 @@ # Stock Stock Item Temp - +DROP TABLE IF EXISTS Shop_Stock_Item_Temp; SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Stock_Item_Temp'; CREATE TABLE IF NOT EXISTS Shop_Stock_Item_Temp ( - id_stock INT NOT NULL PRIMARY KEY, - id_permutation INT NOT NULL, - date_purchased TIMESTAMP NOT NULL, - id_location_storage INT NOT NULL, - id_currency INT NOT NULL, - cost_local_VAT_incl FLOAT NOT NULL, - cost_local_VAT_excl FLOAT NOT NULL, - is_sealed BIT NOT NULL DEFAULT 1, - date_unsealed TIMESTAMP NULL, - date_expiration TIMESTAMP NULL, - is_consumed BIT NOT NULL DEFAULT 0, - date_consumed TIMESTAMP NULL, - active BIT NOT NULL DEFAULT 1 + id_stock INT NULL + -- , id_category INT NULL + , id_product INT NOT NULL + , id_permutation INT NULL + , id_pairs_variations VARCHAR(4000) NULL + , date_purchased DATETIME NOT NULL + , date_received DATETIME NULL + , id_location_storage INT NOT NULL + , id_currency_cost INT NOT NULL + , cost_local_VAT_incl FLOAT NOT NULL + , cost_local_VAT_excl FLOAT NOT NULL + , is_sealed BIT NOT NULL + , date_unsealed DATETIME NULL + , date_expiration DATETIME NULL + , is_consumed BIT NOT NULL + , date_consumed DATETIME NULL + , active BIT NOT NULL + , guid BINARY(36) NOT NULL ); diff --git a/static/MySQL/1318_tbl_Shop_Address.sql b/static/MySQL/1318_tbl_Shop_User_Address.sql similarity index 66% rename from static/MySQL/1318_tbl_Shop_Address.sql rename to static/MySQL/1318_tbl_Shop_User_Address.sql index ed309ee4..a18c999e 100644 --- a/static/MySQL/1318_tbl_Shop_Address.sql +++ b/static/MySQL/1318_tbl_Shop_User_Address.sql @@ -1,12 +1,10 @@ -# Addresses +# User Addresses +SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_User_Address'; - -SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_Address'; - -CREATE TABLE Shop_Address ( - id_address INT NOT NULL AUTO_INCREMENT PRIMARY KEY, +CREATE TABLE Shop_User_Address ( + id_user_address INT NOT NULL AUTO_INCREMENT PRIMARY KEY, id_user INT NOT NULL, CONSTRAINT FK_Shop_Address_id_user FOREIGN KEY (id_user) @@ -17,15 +15,15 @@ CREATE TABLE Shop_Address ( name_full VARCHAR(255) NOT NULL, phone_number VARCHAR(20) NOT NULL, postcode VARCHAR(20) NOT NULL, - address_line_1 VARCHAR(100) NOT NULL, - address_line_2 VARCHAR(100) NOT NULL, - city VARCHAR(50) NOT NULL, - county VARCHAR(100) NOT NULL, + address_line_1 VARCHAR(256) NOT NULL, + address_line_2 VARCHAR(256) NOT NULL, + city VARCHAR(256) NOT NULL, + county VARCHAR(256) NOT NULL, active BIT NOT NULL DEFAULT 1, created_on TIMESTAMP, created_by INT, id_change_set INT, - CONSTRAINT FK_Shop_Address_id_change_set + CONSTRAINT FK_Shop_User_Address_id_change_set FOREIGN KEY (id_change_set) REFERENCES Shop_User_Change_Set(id_change_set) ); \ No newline at end of file diff --git a/static/MySQL/1319_tbl_Shop_User_Address_Audit.sql b/static/MySQL/1319_tbl_Shop_User_Address_Audit.sql new file mode 100644 index 00000000..48ae53fa --- /dev/null +++ b/static/MySQL/1319_tbl_Shop_User_Address_Audit.sql @@ -0,0 +1,21 @@ + +# Address Audits + +SELECT CONCAT('WARNING: Table ', TABLE_NAME, ' already exists.') AS msg_warning FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Shop_User_Address_Audit'; + +CREATE TABLE IF NOT EXISTS Shop_User_Address_Audit ( + id_audit INT NOT NULL AUTO_INCREMENT PRIMARY KEY, + id_user_address INT NOT NULL, + CONSTRAINT FK_Shop_User_Address_Audit_id_address + FOREIGN KEY (id_user_address) + REFERENCES Shop_User_Address(id_user_address) + ON UPDATE RESTRICT, + name_field VARCHAR(50), + value_prev VARCHAR(500), + value_new VARCHAR(500), + id_change_set INT NOT NULL, + CONSTRAINT FK_Shop_User_Address_Audit_id_change_set + FOREIGN KEY (id_change_set) + REFERENCES Shop_User_Change_Set(id_change_set) + ON UPDATE RESTRICT +); \ No newline at end of file diff --git a/static/MySQL/3318_tri_Shop_Address.sql b/static/MySQL/3106_tri_Shop_Address.sql similarity index 85% rename from static/MySQL/3318_tri_Shop_Address.sql rename to static/MySQL/3106_tri_Shop_Address.sql index 6fa1df86..30d2d987 100644 --- a/static/MySQL/3318_tri_Shop_Address.sql +++ b/static/MySQL/3106_tri_Shop_Address.sql @@ -39,14 +39,6 @@ BEGIN SELECT NEW.id_address, 'id_region', OLD.id_region, NEW.id_region, NEW.id_change_set WHERE NOT OLD.id_region <=> NEW.id_region UNION - # Changed name_full - SELECT NEW.id_address, 'name_full', OLD.name_full, NEW.name_full, NEW.id_change_set - WHERE NOT OLD.name_full <=> NEW.name_full - UNION - # Changed phone_number - SELECT NEW.id_address, 'phone_number', OLD.phone_number, NEW.phone_number, NEW.id_change_set - WHERE NOT OLD.phone_number <=> NEW.phone_number - UNION # Changed postcode SELECT NEW.id_address, 'postcode', OLD.postcode, NEW.postcode, NEW.id_change_set WHERE NOT OLD.postcode <=> NEW.postcode diff --git a/static/MySQL/3318_tri_Shop_User_Address.sql b/static/MySQL/3318_tri_Shop_User_Address.sql new file mode 100644 index 00000000..99420d98 --- /dev/null +++ b/static/MySQL/3318_tri_Shop_User_Address.sql @@ -0,0 +1,75 @@ + +# Shop Address + + + +DROP TRIGGER IF EXISTS before_insert_Shop_User_Address; +DROP TRIGGER IF EXISTS before_update_Shop_User_Address; + + +DELIMITER // +CREATE TRIGGER before_insert_Shop_User_Address +BEFORE INSERT ON Shop_User_Address +FOR EACH ROW +BEGIN + SET NEW.created_on := IFNULL(NEW.created_on, NOW()); + SET NEW.created_by := IFNULL(NEW.created_by, IFNULL((SELECT id_user FROM Shop_User WHERE firstname = CURRENT_USER()), -1)); +END // +DELIMITER ;; + + +DELIMITER // +CREATE TRIGGER before_update_Shop_User_Address +BEFORE UPDATE ON Shop_User_Address +FOR EACH ROW +BEGIN + IF OLD.id_change_set <=> NEW.id_change_set THEN + SIGNAL SQLSTATE '45000' + SET MESSAGE_TEXT = 'New change Set ID must be provided.'; + END IF; + + INSERT INTO Shop_User_Address_Audit ( + id_user_address, + name_field, + value_prev, + value_new, + id_change_set + ) + # Changed region + SELECT NEW.id_user_address, 'id_region', OLD.id_region, NEW.id_region, NEW.id_change_set + WHERE NOT OLD.id_region <=> NEW.id_region + UNION + # Changed name_full + SELECT NEW.id_user_address, 'name_full', OLD.name_full, NEW.name_full, NEW.id_change_set + WHERE NOT OLD.name_full <=> NEW.name_full + UNION + # Changed phone_number + SELECT NEW.id_user_address, 'phone_number', OLD.phone_number, NEW.phone_number, NEW.id_change_set + WHERE NOT OLD.phone_number <=> NEW.phone_number + UNION + # Changed postcode + SELECT NEW.id_user_address, 'postcode', OLD.postcode, NEW.postcode, NEW.id_change_set + WHERE NOT OLD.postcode <=> NEW.postcode + UNION + # Changed address_line_1 + SELECT NEW.id_user_address, 'address_line_1', OLD.address_line_1, NEW.address_line_1, NEW.id_change_set + WHERE NOT OLD.address_line_1 <=> NEW.address_line_1 + UNION + # Changed address_line_2 + SELECT NEW.id_user_address, 'address_line_2', OLD.address_line_2, NEW.address_line_2, NEW.id_change_set + WHERE NOT OLD.address_line_2 <=> NEW.address_line_2 + UNION + # Changed city + SELECT NEW.id_user_address, 'city', OLD.city, NEW.city, NEW.id_change_set + WHERE NOT OLD.city <=> NEW.city + UNION + # Changed county + SELECT NEW.id_user_address, 'county', OLD.county, NEW.county, NEW.id_change_set + WHERE NOT OLD.county <=> NEW.county + UNION + # Changed active + SELECT NEW.id_user_address, 'active', CONVERT(CONVERT(OLD.active, SIGNED), CHAR), CONVERT(CONVERT(NEW.active, SIGNED), CHAR), NEW.id_change_set + WHERE NOT (OLD.active <=> NEW.active) + ; +END // +DELIMITER ;; \ No newline at end of file diff --git a/static/MySQL/6000_p_split.sql b/static/MySQL/6000_p_split.sql index cf10e634..33fbcfe7 100644 --- a/static/MySQL/6000_p_split.sql +++ b/static/MySQL/6000_p_split.sql @@ -78,6 +78,8 @@ BEGIN COMMIT; END IF; + DROP TABLE IF EXISTS tmp_Split_Split; + IF a_debug = 1 THEN CALL p_debug_timing_reporting ( v_time_start ); END IF; diff --git a/static/MySQL/6003_p_split_key_value_pair_csv.sql b/static/MySQL/6003_p_split_key_value_pair_csv.sql new file mode 100644 index 00000000..bacbb427 --- /dev/null +++ b/static/MySQL/6003_p_split_key_value_pair_csv.sql @@ -0,0 +1,108 @@ + + +DROP PROCEDURE IF EXISTS p_split_key_value_pair_csv; + +DELIMITER // +CREATE PROCEDURE p_split_key_value_pair_csv ( + IN a_guid BINARY(36) + , IN a_string LONGTEXT + , IN a_debug BIT +) +BEGIN + DECLARE v_has_string BIT; + DECLARE v_current_item VARCHAR(4000); + DECLARE v_time_start TIMESTAMP(6); + + SET v_time_start := CURRENT_TIMESTAMP(6); + SET a_string := IFNULL(a_string, ''); + SET a_debug := IFNULL(a_debug, 0); + + SET v_has_string = CASE WHEN a_string = '' THEN 0 ELSE 1 END; + + IF a_debug = 1 THEN + SELECT + a_guid + , a_string + , a_debug + ; + END IF; + + CALL p_validate_guid ( a_guid ); + + DROP TEMPORARY TABLE IF EXISTS tmp_Split_Input; + DROP TEMPORARY TABLE IF EXISTS tmp_Split_Split; + + CREATE TEMPORARY TABLE tmp_Split_Input ( + input_string TEXT + ); + + CREATE TEMPORARY TABLE tmp_Split_Split ( + id INT AUTO_INCREMENT PRIMARY KEY + , key_column VARCHAR(4000) + , value_column VARCHAR(4000) + ); + + INSERT INTO tmp_Split_Input ( + input_string + ) + VALUES ( + a_string + ); + + INSERT INTO tmp_Split_Split (key_column, value_column) + SELECT + SUBSTRING_INDEX(SUBSTRING_INDEX(t.pair, ':', 1), ',', -1) AS key_column, + SUBSTRING_INDEX(t.pair, ':', -1) AS value_column + FROM ( + SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(input_string, ',', n), ',', -1) pair + FROM temp_input + CROSS JOIN ( + SELECT a.N + b.N * 10 + 1 n + FROM (SELECT 0 AS N UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) a + CROSS JOIN (SELECT 0 AS N UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) b + ORDER BY n + ) numbers + WHERE n <= 1 + (LENGTH(input_string) - LENGTH(REPLACE(input_string, ',', ''))) + ) t; + + IF EXISTS (SELECT * FROM tmp_Split_Split LIMIT 1) THEN + START TRANSACTION; + INSERT INTO Split_Key_Value_Pair_Csv_Temp ( + guid + , id + , key_column + , value_column + ) + SELECT + a_guid + , id + , key_column + , value_column + FROM tmp_Split_Split + ; + COMMIT; + END IF; + + DROP TEMPORARY TABLE IF EXISTS tmp_Split_Input; + DROP TEMPORARY TABLE IF EXISTS tmp_Split_Split; + + IF a_debug = 1 THEN + CALL p_debug_timing_reporting ( v_time_start ); + END IF; +END // +DELIMITER ;; + + +/* +CALL p_split_key_value_pair_csv ( + 'nipsnipsnipsnipsnipsnipsnipsnipsnips' + , '1:100,2:200,3:300,4:400' # a_string + , 1 +); + +SELECT * +FROM Split_key_value_pair_csv_Temp +WHERE GUID = 'nipsnipsnipsnipsnipsnipsnipsnipsnips'; + +CALL p_clear_split_key_value_pair_csv_temp( 'nipsnipsnipsnipsnipsnipsnipsnipsnips' ); +*/ diff --git a/static/MySQL/6004_p_clear_split_key_value_pair_csv_temp.sql b/static/MySQL/6004_p_clear_split_key_value_pair_csv_temp.sql new file mode 100644 index 00000000..3ab910cf --- /dev/null +++ b/static/MySQL/6004_p_clear_split_key_value_pair_csv_temp.sql @@ -0,0 +1,29 @@ + +-- Clear previous proc +DROP PROCEDURE IF EXISTS p_clear_split_key_value_pair_csv_temp; + + +DELIMITER // +CREATE PROCEDURE p_clear_split_key_value_pair_csv_temp ( + IN a_guid BINARY(36) +) +BEGIN + CALL p_validate_guid( a_guid ); + + START TRANSACTION; + + -- DROP TABLE IF EXISTS + DELETE FROM Split_Key_Value_Pair_Csv_Temp + WHERE GUID = a_guid + ; + + COMMIT; +END // +DELIMITER ;; + +/* + +CALL p_clear_split_key_value_pair_csv_temp ( 'nipsnipsnipsnipsnipsnipsnipsnipsnips' ); + + +*/ diff --git a/static/MySQL/7106_p_shop_get_many_plant.sql b/static/MySQL/7106_p_shop_get_many_plant.sql new file mode 100644 index 00000000..7f6775c9 --- /dev/null +++ b/static/MySQL/7106_p_shop_get_many_plant.sql @@ -0,0 +1,36 @@ + + +-- Clear previous proc +DROP PROCEDURE IF EXISTS p_shop_get_many_plant; + + +DELIMITER // +CREATE PROCEDURE p_shop_get_many_plant ( + IN a_get_inactive_plant BIT +) +BEGIN + SET a_get_inactive_plant = IFNULL(a_get_inactive_plant, 0); + + SELECT + P.id_plant + , P.id_address + , A.id_region + , P.id_user_manager + , P.code + , P.name + , P.active + FROM Shop_Plant P + INNER JOIN Shop_Address A ON P.id_address = A.id_address + WHERE + a_get_inactive_plant = 1 + OR P.active = 1 + ; +END // +DELIMITER ;; + + +/* +CALL p_shop_get_many_plant ( + 0 # a_get_inactive_plant +); +*/ diff --git a/static/MySQL/7109_p_shop_get_many_storage_location.sql b/static/MySQL/7109_p_shop_get_many_storage_location.sql new file mode 100644 index 00000000..d4de385e --- /dev/null +++ b/static/MySQL/7109_p_shop_get_many_storage_location.sql @@ -0,0 +1,37 @@ + + +-- Clear previous proc +DROP PROCEDURE IF EXISTS p_shop_get_many_storage_location; + + +DELIMITER // +CREATE PROCEDURE p_shop_get_many_storage_location ( + IN a_get_inactive_storage_location BIT +) +BEGIN + SET a_get_inactive_storage_location = IFNULL(a_get_inactive_storage_location, 0); + + SELECT + SL.id_storage_location + , P.id_plant + , P.id_address + , A.id_region + , SL.code + , SL.name + , P.active + FROM Shop_Storage_Location SL + INNER JOIN Shop_Plant P ON SL.id_plant = P.id_plant + INNER JOIN Shop_Address A ON P.id_address = A.id_address + WHERE + a_get_inactive_storage_location = 1 + OR SL.active = 1 + ; +END // +DELIMITER ;; + + +/* +CALL p_shop_get_many_storage_location ( + 0 # a_get_inactive_storage_location +); +*/ diff --git a/static/MySQL/7203_p_shop_save_product_test.sql b/static/MySQL/7203_p_shop_save_product_test.sql index 18666a78..34651f91 100644 --- a/static/MySQL/7203_p_shop_save_product_test.sql +++ b/static/MySQL/7203_p_shop_save_product_test.sql @@ -37,7 +37,7 @@ BEGIN 4 -- id_product , 1 -- id_category , 'Laptops' -- name - , 1 -- has_variations + , 0 -- has_variations , 2 -- id_access_level_required , 2 -- display_order , 1 -- active @@ -69,10 +69,10 @@ BEGIN END // DELIMITER ;; +/* CALL partsltd_prod.p_shop_save_product_test (); DELETE FROM partsltd_prod.Shop_Product_Temp; -/* DROP TABLE IF EXISTS tmp_Msg_Error; */ \ No newline at end of file diff --git a/static/MySQL/7204_p_shop_get_many_product.sql b/static/MySQL/7204_p_shop_get_many_product.sql index 0b26f7c4..783d2273 100644 --- a/static/MySQL/7204_p_shop_get_many_product.sql +++ b/static/MySQL/7204_p_shop_get_many_product.sql @@ -464,6 +464,7 @@ END // DELIMITER ;; +/* CALL partsltd_prod.p_shop_get_many_product ( 1 #'auth0|6582b95c895d09a70ba10fef', # a_id_user @@ -483,7 +484,6 @@ CALL partsltd_prod.p_shop_get_many_product ( , 0 # a_debug ); -/* select * FROM partsltd_prod.Shop_Calc_User_Temp; select * FROM partsltd_prod.Shop_Product_Category; diff --git a/static/MySQL/7210_fn_shop_get_id_product_permutation_from_variation_csv_list.sql b/static/MySQL/7210_fn_shop_get_id_product_permutation_from_variation_csv_list.sql new file mode 100644 index 00000000..a31b0b8d --- /dev/null +++ b/static/MySQL/7210_fn_shop_get_id_product_permutation_from_variation_csv_list.sql @@ -0,0 +1,221 @@ + +DROP FUNCTION IF EXISTS fn_shop_get_id_product_permutation_from_variation_csv_list; + +DELIMITER // + +CREATE FUNCTION fn_shop_get_id_product_permutation_from_variation_csv_list ( + a_id_product INT + , a_variation_csv TEXT +) +RETURNS INT +DETERMINISTIC +READS SQL DATA +BEGIN + DECLARE v_id_permutation INT; + DECLARE done INT DEFAULT FALSE; + DECLARE v_id_variation_type INT; + DECLARE v_id_variation INT; + DECLARE v_id_permutation_tmp INT; + DECLARE cur CURSOR FOR + SELECT + CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(t.pair, ':', 1), ',', -1) AS UNSIGNED) AS id_variation_type, + CAST(SUBSTRING_INDEX(t.pair, ':', -1) AS UNSIGNED) AS id_variation + FROM ( + SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(a_variation_csv, ',', n), ',', -1) pair + FROM ( + SELECT a.N + b.N * 10 + 1 n + FROM (SELECT 0 AS N UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) a + CROSS JOIN (SELECT 0 AS N UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) b + ORDER BY n + ) numbers + WHERE n <= 1 + (LENGTH(a_variation_csv) - LENGTH(REPLACE(a_variation_csv, ',', ''))) + ) t; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; + + SET v_id_permutation = NULL; + + OPEN cur; + + read_loop: LOOP + FETCH cur INTO v_id_variation_type, v_id_variation; + IF done THEN + LEAVE read_loop; + END IF; + + IF v_id_permutation IS NULL THEN + -- First iteration: find initial v_id_permutations + SELECT PPVL.id_permutation INTO v_id_permutation + FROM partsltd_prod.Shop_Product_Permutation_Variation_Link PPVL + INNER JOIN partsltd_prod.Shop_Product_Permutation PP ON PPVL.id_permutation = PP.id_permutation + INNER JOIN partsltd_prod.Shop_Variation PV ON PPVL.id_variation = PV.id_variation + WHERE 1=1 + AND PP.id_product = a_id_product + AND PPVL.id_variation = v_id_variation + AND PV.id_type = v_id_variation_type + ; + ELSE + -- Subsequent iterations: narrow down the v_id_permutation + SELECT PPVL.id_permutation INTO v_id_permutation_tmp + FROM partsltd_prod.Shop_Product_Permutation_Variation_Link PPVL + INNER JOIN partsltd_prod.Shop_Product_Permutation PP ON PPVL.id_permutation = PP.id_permutation + INNER JOIN partsltd_prod.Shop_Variation PV ON PPVL.id_variation = PV.id_variation + WHERE 1=1 + AND PP.id_product = a_id_product + AND PPVL.v_id_permutation = v_id_permutation + AND PPVL.id_variation = v_id_variation + AND PV.id_type = v_id_variation_type + ; + + IF v_id_permutation_tmp IS NULL THEN + -- If no match found, exit the loop + SET v_id_permutation := NULL; + LEAVE read_loop; + ELSE + SET v_id_permutation := v_id_permutation_tmp; + END IF; + END IF; + END LOOP; + + CLOSE cur; + + RETURN v_id_permutation; +END // + +DELIMITER ; + +/* +SELECT fn_shop_get_id_product_permutation_from_variation_csv_list ( 1, '1:1' ) AS id_permutation; +SELECT fn_shop_get_id_product_permutation_from_variation_csv_list ( 3, '' ) AS id_permutation; +*/ + + +/* +-- Update the table using the function +UPDATE product_permutation_input +SET v_id_permutation = find_v_id_permutation(variation_csv) +WHERE v_id_permutation IS NULL; +*/ + +/* +select * from partsltd_prod.Shop_Variation + +DROP PROCEDURE IF EXISTS p_shop_get_id_product_permutation_from_variation_csv_list; + +DELIMITER // +CREATE PROCEDURE p_shop_get_id_product_permutation_from_variation_csv_list ( + IN a_guid BINARY(36) + , IN a_debug BIT +) +BEGIN + DECLARE done INT DEFAULT FALSE; + DECLARE v_id INT; + DECLARE v_row_id INT; + DECLARE v_variation_csv TEXT; + DECLARE v_id_permutation INT; + DECLARE v_time_start TIMESTAMP(6); + + -- Cursor to iterate through unprocessed rows + DECLARE cur CURSOR FOR + SELECT id, session_guid, row_id, variation_csv + FROM product_permutation_input + WHERE v_id_permutation IS NULL; + + DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE; + + SET v_time_start := CURRENT_TIMESTAMP(6); + SET a_debug := IFNULL(a_debug, 0); + + IF a_debug = 1 THEN + SELECT + a_guid + , a_debug + ; + END IF; + + CALL p_validate_guid ( a_guid ); + + OPEN cur; + + read_loop: LOOP + FETCH cur INTO v_id, v_session_guid, v_row_id, v_variation_csv; + IF done THEN + LEAVE read_loop; + END IF; + + -- Find matching v_id_permutation + SET v_id_permutation = NULL; + + SELECT ppvl.v_id_permutation INTO v_id_permutation + FROM ( + SELECT + SUBSTRING_INDEX(SUBSTRING_INDEX(t.pair, ':', 1), ',', -1) AS id_variation_type, + SUBSTRING_INDEX(t.pair, ':', -1) AS id_variation + FROM ( + SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(v_variation_csv, ',', numbers.n), ',', -1) pair + FROM ( + SELECT 1 n UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 -- add more if needed + ) numbers + WHERE CHAR_LENGTH(v_variation_csv) - CHAR_LENGTH(REPLACE(v_variation_csv, ',', '')) >= numbers.n - 1 + ) t + ) parsed + INNER JOIN product_permutation_variation_link ppvl + ON parsed.id_variation_type = ppvl.id_variation_type + AND parsed.id_variation = ppvl.id_variation + GROUP BY ppvl.v_id_permutation + HAVING COUNT(*) = (LENGTH(v_variation_csv) - LENGTH(REPLACE(v_variation_csv, ',', '')) + 1) + LIMIT 1; + + -- Update the v_id_permutation in the input table + UPDATE product_permutation_input + SET v_id_permutation = v_id_permutation + WHERE id = v_id; + + END LOOP; + + CLOSE cur; + + + IF EXISTS ( SELECT * FROM Shop_Get_Id_Product_Permutation_From_Variation_Csv_List_Temp WHERE GUID = a_guid LIMIT 1 ) THEN + IF EXISTS (SELECT * FROM tmp_Split_Split LIMIT 1) THEN + START TRANSACTION; + INSERT INTO Split_Key_Value_Pair_Csv_Temp ( + guid + , id + , key_column + , value_column + ) + SELECT + a_guid + , id + , key_column + , value_column + FROM tmp_Split_Split + ; + COMMIT; + END IF; + END IF; + + DROP TEMPORARY TABLE IF EXISTS tmp_Split_Input; + DROP TEMPORARY TABLE IF EXISTS tmp_Split_Split; + + IF a_debug = 1 THEN + CALL p_debug_timing_reporting ( v_time_start ); + END IF; +END // +DELIMITER ;; +*/ + +/* +CALL p_shop_get_id_product_permutation_from_variation_csv_list ( + 'nipsnipsnipsnipsnipsnipsnipsnipsnips' + , '1:100,2:200,3:300,4:400' # a_string + , 1 +); + +SELECT * +FROM Split_key_value_pair_csv_Temp +WHERE GUID = 'nipsnipsnipsnipsnipsnipsnipsnipsnips'; + +CALL p_clear_split_key_value_pair_csv_temp( 'nipsnipsnipsnipsnipsnipsnipsnipsnips' ); +*/ diff --git a/static/MySQL/7219_p_shop_get_many_stock_item.sql b/static/MySQL/7219_p_shop_get_many_stock_item.sql index 21c21bf2..20443aff 100644 --- a/static/MySQL/7219_p_shop_get_many_stock_item.sql +++ b/static/MySQL/7219_p_shop_get_many_stock_item.sql @@ -622,6 +622,7 @@ BEGIN select * from tmp_Stock_Item; select * from tmp_Permutation; select * from tmp_Location_Storage; + select * from Shop_Storage_Location; select * from tmp_Plant_Storage; select * from tmp_Region_Storage; */ @@ -636,14 +637,19 @@ BEGIN P.id_category, t_SI.id_location_storage, t_PS.id_plant, - t_RS.id_region, + PLANT.id_address AS id_address_plant, + t_RS.id_region AS id_region_plant, + SL.code AS code_storage_location, + SL.name AS name_storage_location, + PLANT.code AS code_plant, + PLANT.name AS name_plant, SI.id_currency_cost, CURRENCY.symbol AS symbol_currency_cost, CURRENCY.code AS code_currency_cost, + SI.cost_local_VAT_excl, + SI.cost_local_VAT_incl, SI.date_purchased, SI.date_received, - SI.cost_local_VAT_incl, - SI.cost_local_VAT_excl, SI.is_sealed, SI.date_unsealed, SI.date_expiration, @@ -722,6 +728,7 @@ END // DELIMITER ;; +/* CALL p_shop_get_many_stock_item ( 1, # a_id_user 1, # a_get_all_product_permutation @@ -750,7 +757,6 @@ CALL p_shop_get_many_stock_item ( , 0 # a_debug ); -/* DROP TABLE IF EXISTS tmp_Msg_Error; diff --git a/static/MySQL/7220_p_shop_save_stock_item.sql b/static/MySQL/7220_p_shop_save_stock_item.sql new file mode 100644 index 00000000..97195ef2 --- /dev/null +++ b/static/MySQL/7220_p_shop_save_stock_item.sql @@ -0,0 +1,646 @@ + + +-- Clear previous proc +DROP PROCEDURE IF EXISTS p_shop_save_stock_item; + +DELIMITER // +CREATE PROCEDURE p_shop_save_stock_item ( + IN a_comment VARCHAR(500) + , IN a_guid BINARY(36) + , IN a_id_user INT + , IN a_debug BIT +) +BEGIN + + DECLARE v_code_type_error_bad_data VARCHAR(100); + DECLARE v_id_type_error_bad_data INT; + DECLARE v_id_permission_product INT; + DECLARE v_ids_product_permission LONGTEXT; + DECLARE v_id_change_set INT; + DECLARE v_id_access_level_edit INT; + DECLARE v_time_start TIMESTAMP(6); + DECLARE v_time_expire DATETIME; + + DECLARE exit handler for SQLEXCEPTION + BEGIN + -- Get diagnostic information + GET DIAGNOSTICS CONDITION 1 + @sqlstate = RETURNED_SQLSTATE + , @errno = MYSQL_ERRNO + , @text = MESSAGE_TEXT + ; + + -- Rollback the transaction + ROLLBACK; + + -- Select the error information + -- SELECT 'Error' AS status, @errno AS error_code, @sqlstate AS sql_state, @text AS message; + + CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error ( + display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT + , id_type INT NULL + , code VARCHAR(50) NOT NULL + , msg VARCHAR(4000) NOT NULL + ); + INSERT INTO tmp_Msg_Error ( + id_type + , code + , msg + ) + SELECT + NULL + , @errno + , @text + ; + SELECT * + FROM tmp_Msg_Error; + DROP TABLE IF EXISTS tmp_Msg_Error; + END; + + SET v_time_start := CURRENT_TIMESTAMP(6); + SET v_time_expire := DATE_ADD(v_time_start, INTERVAL 1000 YEAR); + SET v_code_type_error_bad_data := 'BAD_DATA'; + SET v_id_type_error_bad_data := (SELECT id_type FROM Shop_Msg_Error_Type WHERE code = v_code_type_error_bad_data LIMIT 1); + SET v_id_access_level_edit := (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'EDIT' LIMIT 1); + + SET a_guid := IFNULL(a_guid, UUID()); + + DROP TEMPORARY TABLE IF EXISTS tmp_Stock_Item; + DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error; + + CREATE TEMPORARY TABLE tmp_Stock_Item ( + id_stock INT NOT NULL + , id_category INT NULL + , id_product INT NOT NULL + , id_permutation INT NULL + , id_pairs_variations VARCHAR(4000) NULL + , has_variations BIT NULL + , date_purchased DATETIME NOT NULL + , date_received DATETIME NULL + , id_location_storage INT NOT NULL + , id_currency_cost INT NOT NULL + , cost_local_VAT_incl FLOAT NOT NULL + , cost_local_VAT_excl FLOAT NOT NULL + , is_sealed BIT NOT NULL + , date_unsealed DATETIME NULL + , date_expiration DATETIME NOT NULL + , is_consumed BIT NOT NULL + , date_consumed DATETIME NULL + , active BIT NOT NULL + , can_view BIT NULL + , can_edit BIT NULL + , can_admin BIT NULL + , name_error VARCHAR(1000) NULL + , is_new BIT NOT NULL + ); + + CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error ( + display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT + , id_type INT NULL + , code VARCHAR(50) NOT NULL + , msg VARCHAR(4000) NOT NULL + ); + + + -- Get data from Temp table + INSERT INTO tmp_Stock_Item ( + id_stock + -- , id_category + , id_product + , id_permutation + , id_pairs_variations + , has_variations + , date_purchased + , date_received + , id_location_storage + , id_currency_cost + , cost_local_VAT_incl + , cost_local_VAT_excl + , is_sealed + , date_unsealed + , date_expiration + , is_consumed + , date_consumed + , active + # , name_error + , is_new + ) + SELECT + SI_T.id_stock + -- , IFNULL(SI_T.id_category, P.id_category) AS id_category + , IFNULL(IFNULL(SI_T.id_product, PP.id_product), 0) AS id_product + , IFNULL(IFNULL(SI_T.id_permutation, SI.id_permutation), 0) AS id_permutation + , TRIM(IFNULL(SI_T.id_pairs_variations, '')) + , CASE WHEN TRIM(IFNULL(SI_T.id_pairs_variations, '')) = '' THEN 0 ELSE 1 END AS has_variations + , IFNULL(IFNULL(SI_T.date_purchased, SI.date_purchased), v_time_start) AS date_purchased + , IFNULL(SI_T.date_received, SI.date_received) AS date_received + , IFNULL(IFNULL(SI_T.id_location_storage, SI.id_location_storage), 0) AS id_location_storage + , IFNULL(IFNULL(SI_T.id_currency_cost, SI.id_currency_cost), 0) AS id_currency_cost + , IFNULL(SI_T.cost_local_VAT_incl, SI.cost_local_VAT_incl) AS cost_local_VAT_incl + , IFNULL(SI_T.cost_local_VAT_excl, SI.cost_local_VAT_excl) AS cost_local_VAT_excl + , IFNULL(IFNULL(SI_T.is_sealed, SI.is_sealed), 1) AS is_sealed + , IFNULL(SI_T.date_unsealed, SI.date_unsealed) AS date_unsealed + , IFNULL(IFNULL(SI_T.date_expiration, SI.date_expiration), v_time_expire) AS date_expiration + , IFNULL(IFNULL(SI_T.is_consumed, SI.is_consumed), 0) AS is_consumed + , IFNULL(SI_T.date_consumed, SI.date_consumed) AS date_consumed + , IFNULL(IFNULL(SI_T.active, SI.active), 1) AS active + # , fn_shop_get_product_permutation_name(SI_T.id_permutation) + , CASE WHEN IFNULL(SI_T.id_stock, 0) < 1 THEN 1 ELSE 0 END AS is_new + FROM partsltd_prod.Shop_Stock_Item_Temp SI_T + LEFT JOIN partsltd_prod.Shop_Stock_Item SI ON SI_T.id_stock = SI.id_stock + LEFT JOIN partsltd_prod.Shop_Product_Permutation PP ON SI_T.id_permutation = PP.id_permutation + -- LEFT JOIN Shop_Product P ON PP.id_product = P.id_product + WHERE SI_T.guid = a_guid + ; + + -- Missing Permutation IDs for setting new permutation for stock item + -- With variations + UPDATE tmp_Stock_Item t_SI + INNER JOIN partsltd_prod.Shop_Product P ON t_SI.id_product = P.id_product + SET t_SI.id_permutation = IFNULL(fn_shop_get_id_product_permutation_from_variation_csv_list ( t_SI.id_product, t_SI.id_pairs_variations ), 0) + WHERE 1=1 + AND t_SI.id_permutation = 0 + AND t_SI.has_variations = 1 + ; + -- Without variations + UPDATE tmp_Stock_Item t_SI + -- INNER JOIN Shop_Product P ON t_SI.id_product = P.id_product + INNER JOIN partsltd_prod.Shop_Product_Permutation PP ON t_SI.id_product = PP.id_product + SET t_SI.id_permutation = IFNULL(PP.id_permutation, 0) + WHERE 1=1 + AND t_SI.id_permutation = 0 + AND t_SI.has_variations = 0 + ; + + -- Add stock item error names + UPDATE tmp_Stock_Item t_SI + INNER JOIN partsltd_prod.Shop_Product P ON t_SI.id_product = P.id_product + INNER JOIN partsltd_prod.Shop_Product_Category PC ON P.id_category = PC.id_category + -- INNER JOIN Shop_Product_Permutation PP ON t_SI.id_product = PP.id_product + SET t_SI.name_error = CONCAT( + PC.name, + ' - ', + P.name, + ' - ', + CASE WHEN IFNULL(t_SI.id_permutation, 0) = 0 THEN '(No permutation)' ELSE fn_shop_get_product_permutation_name ( t_SI.id_permutation ) END + ) + ; + + IF a_debug = 1 THEN + sElect * from tmp_Stock_Item; + END IF; + + -- Validation + -- Missing mandatory fields + -- id_product + IF EXISTS (SELECT * FROM tmp_Stock_Item t_SI WHERE t_SI.id_product = 0 LIMIT 1) THEN + INSERT INTO tmp_Msg_Error ( + id_type + , code + , msg + ) + SELECT + v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('The following stock item(s) do not have a product: ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + WHERE t_SI.id_product = 0 + ; + END IF; + -- id_permutation + IF EXISTS ( + SELECT * + FROM tmp_Stock_Item t_SI + LEFT JOIN partsltd_prod.Shop_Product_Permutation PP ON t_SI.id_permutation = PP.id_permutation + WHERE 1=1 + AND ( + t_SI.id_permutation = 0 + OR PP.active = 0 + ) + LIMIT 1 + ) THEN + INSERT INTO tmp_Msg_Error ( + id_type + , code + , msg + ) + SELECT + v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('A valid permutation could not be found for the variations selected for the following stock item(s): ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + LEFT JOIN partsltd_prod.Shop_Product_Permutation PP ON t_SI.id_permutation = PP.id_permutation + WHERE 1=1 + AND ( + t_SI.id_permutation = 0 + OR PP.active = 0 + ) + ; + END IF; + -- date_purchased + IF EXISTS (SELECT * FROM tmp_Stock_Item t_SI WHERE ISNULL(t_SI.date_purchased) LIMIT 1) THEN + INSERT INTO tmp_Msg_Error ( + id_type + , code + , msg + ) + SELECT + v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('The following stock item(s) do not have an purchase date: ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + WHERE ISNULL(t_SI.date_purchased) + ; + END IF; + -- id_location_storage + IF EXISTS ( + SELECT * + FROM tmp_Stock_Item t_SI + INNER JOIN partsltd_prod.Shop_Storage_Location SL + ON t_SI.id_location_storage = SL.id_location + AND SL.active = 1 + WHERE ISNULL(SL.id_location) + LIMIT 1 + ) THEN + INSERT INTO tmp_Msg_Error ( + id_type + , code + , msg + ) + SELECT + v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('The following stock item(s) do not have a valid storage location: ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + INNER JOIN partsltd_prod.Shop_Storage_Location SL + ON t_SI.id_location_storage = SL.id_location + AND SL.active = 1 + WHERE ISNULL(SL.id_location) + ; + END IF; + -- id_currency_cost + IF EXISTS ( + SELECT * + FROM tmp_Stock_Item t_SI + INNER JOIN partsltd_prod.Shop_Currency C + ON t_SI.id_currency_cost = C.id_currency + AND C.active = 1 + WHERE ISNULL(C.id_currency) + LIMIT 1 + ) THEN + INSERT INTO tmp_Msg_Error ( + id_type + , code + , msg + ) + SELECT + v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('The following stock item(s) do not have a valid cost currency: ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + INNER JOIN partsltd_prod.Shop_Currency C + ON t_SI.id_currency_cost = C.id_currency + AND C.active = 1 + WHERE ISNULL(C.id_currency) + ; + END IF; + -- cost_local_VAT_excl + IF EXISTS ( + SELECT * + FROM tmp_Stock_Item t_SI + WHERE 1=1 + AND ( + ISNULL(t_SI.cost_local_VAT_excl) + OR t_SI.cost_local_VAT_excl < 0 + ) + LIMIT 1 + ) THEN + INSERT INTO tmp_Msg_Error ( + id_type + , code + , msg + ) + SELECT + v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('The following stock item(s) do not have a valid cost excluding VAT: ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + WHERE 1=1 + AND ( + ISNULL(t_SI.cost_local_VAT_excl) + OR t_SI.cost_local_VAT_excl < 0 + ) + ; + END IF; + -- cost_local_VAT_incl + IF EXISTS ( + SELECT * + FROM tmp_Stock_Item t_SI + WHERE 1=1 + AND ( + ISNULL(t_SI.cost_local_VAT_incl) + OR t_SI.cost_local_VAT_incl < 0 + ) + LIMIT 1 + ) THEN + INSERT INTO tmp_Msg_Error ( + id_type + , code + , msg + ) + SELECT + v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('The following stock item(s) do not have a valid cost including VAT: ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + WHERE 1=1 + AND ( + ISNULL(t_SI.cost_local_VAT_incl) + OR t_SI.cost_local_VAT_incl < t_SI.cost_local_VAT_excl + ) + ; + END IF; + -- date_received + IF EXISTS (SELECT * FROM tmp_Stock_Item t_SI WHERE NOT ISNULL(t_SI.date_received) AND t_SI.date_received < t_SI.date_purchased LIMIT 1) THEN + INSERT INTO tmp_Msg_Error ( + id_type + , code + , msg + ) + SELECT + v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('The following stock item(s) do not have a valid received date: ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + WHERE 1=1 + AND NOT ISNULL(t_SI.date_received) + AND t_SI.date_received < t_SI.date_purchased + ; + END IF; + -- date_unsealed + IF EXISTS (SELECT * FROM tmp_Stock_Item t_SI WHERE NOT ISNULL(t_SI.date_unsealed) AND t_SI.date_unsealed < t_SI.date_purchased LIMIT 1) THEN + INSERT INTO tmp_Msg_Error ( + id_type + , code + , msg + ) + SELECT + v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('The following stock item(s) do not have a valid unsealed date: ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + WHERE 1=1 + AND NOT ISNULL(t_SI.date_received) + AND t_SI.date_received < t_SI.date_purchased + ; + END IF; + -- date_expiration + IF EXISTS (SELECT * FROM tmp_Stock_Item t_SI WHERE NOT ISNULL(t_SI.date_expiration) AND t_SI.date_expiration < t_SI.date_purchased LIMIT 1) THEN + INSERT INTO tmp_Msg_Error ( + id_type + , code + , msg + ) + SELECT + v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('The following stock item(s) do not have a valid expiration date: ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + WHERE 1=1 + AND NOT ISNULL(t_SI.date_expiration) + AND t_SI.date_expiration < t_SI.date_purchased + ; + END IF; + -- date_consumed + IF EXISTS (SELECT * FROM tmp_Stock_Item t_SI WHERE NOT ISNULL(t_SI.date_consumed) AND t_SI.date_consumed < t_SI.date_purchased LIMIT 1) THEN + INSERT INTO tmp_Msg_Error ( + id_type + , code + , msg + ) + SELECT + v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('The following stock item(s) do not have a valid consumed date: ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + WHERE 1=1 + AND NOT ISNULL(t_SI.date_consumed) + AND t_SI.date_consumed < t_SI.date_purchased + ; + END IF; + + -- Permissions + SET v_ids_product_permission := ( SELECT GROUP_CONCAT(t_SI.id_product SEPARATOR ',') FROM tmp_Stock_Item t_SI ); + + IF NOT ISNULL(v_ids_product_permission) THEN + SET v_id_permission_product = (SELECT id_permission FROM Shop_Permission WHERE code = 'STORE_PRODUCT' LIMIT 1); + + CALL p_shop_calc_user( + a_guid + , a_id_user + , FALSE -- a_get_inactive_users + , v_id_permission_product + , v_id_access_level_edit + , v_ids_product_permission + , 0 -- a_debug + ); + + UPDATE tmp_Stock_Item t_SI + INNER JOIN Shop_Product P ON t_SI.id_product = P.id_product + INNER JOIN Shop_Calc_User_Temp UE_T + ON P.id_product = UE_T.id_product + AND UE_T.GUID = a_guid + SET + t_SI.can_view = UE_T.can_view + , t_SI.can_edit = UE_T.can_edit + , t_SI.can_admin = UE_T.can_admin + ; + + CALL p_shop_clear_calc_user( + a_guid + , 0 -- a_debug + ); + + IF EXISTS (SELECT * FROM tmp_Stock_Item t_SI WHERE IFNULL(t_SI.can_edit, 0) = 0 LIMIT 1) THEN + INSERT INTO tmp_Msg_Error ( + guid + , id_type + , code + , msg + ) + SELECT + a_guid AS GUID + , v_id_type_error_bad_data + , v_code_type_error_bad_data + , CONCAT('The following stock item(s) do not have product edit permission: ', GROUP_CONCAT(IFNULL(t_SI.name_error, 'NULL') SEPARATOR ', ')) AS msg + FROM tmp_Stock_Item t_SI + WHERE IFNULL(t_SI.can_edit, 0) = 0 + ; + END IF; + END IF; + + IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN + START TRANSACTION; + + IF NOT ISNULL(v_ids_product_permission) THEN + INSERT INTO Shop_Product_Change_Set ( comment ) + VALUES ( a_comment ) + ; + + SET v_id_change_set := LAST_INSERT_ID(); + + -- select * from partsltd_prod.Shop_Stock_Item + UPDATE partsltd_prod.Shop_Stock_Item SI + INNER JOIN tmp_Stock_Item t_SI + ON SI.id_stock = t_SI.id_stock + SET + SI.id_permutation = t_SI.id_permutation + , SI.date_purchased = t_SI.date_purchased + , SI.date_received = t_SI.date_received + , SI.id_location_storage = t_SI.id_location_storage + , SI.id_currency_cost = t_SI.id_currency_cost + , SI.cost_local_VAT_excl = t_SI.cost_local_VAT_excl + , SI.cost_local_VAT_incl = t_SI.cost_local_VAT_incl + , SI.is_sealed = t_SI.is_sealed + , SI.date_unsealed = t_SI.date_unsealed + , SI.date_expiration = t_SI.date_expiration + , SI.is_consumed = t_SI.is_consumed + , SI.date_consumed = t_SI.date_consumed + , SI.active = t_SI.active + , SI.id_change_set = v_id_change_set + ; + END IF; + + INSERT INTO partsltd_prod.Shop_Stock_Item ( + id_permutation + , date_purchased + , date_received + , id_location_storage + , id_currency_cost + , cost_local_VAT_excl + , cost_local_VAT_incl + , is_sealed + , date_unsealed + , date_expiration + , is_consumed + , date_consumed + , active + , created_by + , created_on + ) + SELECT + t_SI.id_permutation + , t_SI.date_purchased + , t_SI.date_received + , t_SI.id_location_storage + , t_SI.id_currency_cost + , t_SI.cost_local_VAT_excl + , t_SI.cost_local_VAT_incl + , t_SI.is_sealed + , t_SI.date_unsealed + , t_SI.date_expiration + , t_SI.is_consumed + , t_SI.date_consumed + , t_SI.active + , a_id_user AS created_by + , v_time_start AS created_on + FROM tmp_Stock_Item t_SI + WHERE + is_new = 1 + AND active = 1 + ; + + DELETE FROM partsltd_prod.Shop_Stock_Item_Temp + WHERE GUID = a_guid; + + COMMIT; + END IF; + + SELECT * FROM tmp_Msg_Error; + + DROP TEMPORARY TABLE IF EXISTS tmp_Stock_Item; + DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error; +END // +DELIMITER ;; + + +/* + +DELETE FROM Shop_Product_Permutation_Temp +WHERE id_permutation = 1 +; + +INSERT INTO Shop_Product_Permutation_Temp ( + id_permutation, + id_product, + description, + cost_local, + id_currency_cost, + profit_local_min, + latency_manufacture_days, + id_unit_measurement_quantity, + count_unit_measurement_per_quantity_step, + quantity_min, + quantity_max, + quantity_stock, + is_subscription, + id_unit_measurement_interval_recurrence, + count_interval_recurrence, + id_stripe_product, + does_expire_faster_once_unsealed, + id_unit_measurement_interval_expiration_unsealed, + count_interval_expiration_unsealed, + active, + guid +) +VALUES + ( + 1 -- id_permutation, + , 1 -- id_product, + , 'Good Reddy Teddy' -- description, + , 5.0 -- cost_local, + , 1 -- id_currency_cost, + , 3.0 -- profit_local_min, + , 14 -- latency_manufacture_days, + , 1 -- id_unit_measurement_quantity, + , 1.0 -- count_unit_measurement_quantity, + , 3.0 -- quantity_min, + , 99.0 -- quantity_max, + , 1.0 -- quantity_stock, + , False -- is_subscription, + , null -- id_unit_measurement_interval_recurrence, + , null -- count_interval_recurrence, + , null -- id_stripe_product, + , False -- does_expire_faster_once_unsealed, + , null -- id_unit_measurement_interval_expiration_unsealed, + , null -- count_interval_expiration_unsealed, + , True -- active, + , 'NIPS' -- guid + ) +; + +select 'Shop_Product_Permutation_Temp before call'; +SELECT * FROM Shop_Product_Permutation_Temp; + +SELECT 'Shop_Product_Permutation before call' AS result_name; +select * FROM Shop_Product_Permutation; + +CALL p_shop_save_product_permutation ( + 1, -- 'auth0|6582b95c895d09a70ba10fef', # a_id_user + 'Initial data', # a_comment + 'NIPS' # a_guid +); + +SELECT 'Shop_Product_Permutation_Temp after call' AS result_name; +select * FROM Shop_Product_Permutation_Temp; + +SELECT 'Shop_Product_Permutation after call' AS result_name; +select * FROM Shop_Product_Permutation; + + +DELETE FROM Shop_Product_Permutation_Temp +WHERE id_permutation = 1; + + +*/ + diff --git a/static/MySQL/7220_p_shop_save_stock_item_test.sql b/static/MySQL/7220_p_shop_save_stock_item_test.sql new file mode 100644 index 00000000..99d0834d --- /dev/null +++ b/static/MySQL/7220_p_shop_save_stock_item_test.sql @@ -0,0 +1,101 @@ + + +-- Clear previous proc +DROP PROCEDURE IF EXISTS partsltd_prod.p_shop_save_stock_item_test; + + +DELIMITER // +CREATE PROCEDURE p_shop_save_stock_item_test () +BEGIN + + DECLARE v_guid BINARY(36); + DECLARE v_time_start TIMESTAMP(6); + + SET v_time_start := CURRENT_TIMESTAMP(6); + SET v_guid := 'nips'; + + SELECT * + FROM partsltd_prod.Shop_Stock_Item + ; + SELECT * + FROM partsltd_prod.Shop_Stock_Item_Temp + ; + + START TRANSACTION; + + INSERT INTO partsltd_prod.Shop_Stock_Item_Temp ( + id_stock + -- id_category + , id_product + , id_permutation + , id_pairs_variations + -- , has_variations + , date_purchased + , date_received + , id_location_storage + , id_currency_cost + , cost_local_VAT_excl + , cost_local_VAT_incl + , is_sealed + , date_unsealed + , date_expiration + , is_consumed + , date_consumed + , active + , guid + ) + VALUES ( + -1 -- id_stock + -- 1 -- id_category + , 4 -- id_product + , NULL -- id_permutation + , NULL -- id_pairs_variations + -- , FALSE -- 0 -- has_variations + , '2025-09-05 00:00' -- date_purchased + , NULL -- date_received + , 1 -- id_location_storage + , 1 -- id_currency_cost + , 10 -- cost_local_VAT_excl + , 12 -- cost_local_VAT_incl + , 1 -- is_sealed + , NULL -- date_unsealed + , NULL -- date_expiration + , FALSE -- 0 -- is_consumed + , NULL -- date_consumed + , 1 -- active + , v_guid + ); + + COMMIT; + + SELECT * + FROM partsltd_prod.Shop_Stock_Item_Temp + WHERE GUID = v_guid + ; + + CALL partsltd_prod.p_shop_save_Stock_Item ( + 'Test save Stock_Item' -- comment + , v_guid -- guid + , 1 -- id_user + , 0 -- debug + ); + + SELECT * + FROM partsltd_prod.Shop_Stock_Item + ; + SELECT * + FROM partsltd_prod.Shop_Stock_Item_Temp + ; + + CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); +END // +DELIMITER ;; + +CALL partsltd_prod.p_shop_save_stock_item_test (); + +DELETE FROM partsltd_prod.Shop_Stock_Item_Temp; + +/* +update shop_product p set p.has_variations = 0 where id_product = 4 +DROP TABLE IF EXISTS tmp_Msg_Error; +*/ \ No newline at end of file diff --git a/static/MySQL/7313_p_get_many_user.sql b/static/MySQL/7313_p_get_many_user.sql index 8b797b4d..27b730eb 100644 --- a/static/MySQL/7313_p_get_many_user.sql +++ b/static/MySQL/7313_p_get_many_user.sql @@ -1,7 +1,5 @@ - - -- Clear previous proc DROP PROCEDURE IF EXISTS p_get_many_user; @@ -15,48 +13,81 @@ CREATE PROCEDURE p_get_many_user ( , IN a_get_first_user_only BIT , IN a_ids_user LONGTEXT , IN a_ids_user_auth0 LONGTEXT + , IN a_debug BIT ) BEGIN + DECLARE v_id_access_level_admin INT; DECLARE v_id_access_level_view INT; DECLARE v_id_permission_store_admin INT; DECLARE v_id_permission_user INT; DECLARE v_id_permission_user_admin INT; + DECLARE v_ids_permission_required VARCHAR(4000); DECLARE v_now TIMESTAMP; DECLARE v_id_minimum INT; - DECLARE v_code_error_data VARCHAR(50); - DECLARE v_id_type_error_data INT; + DECLARE v_code_error_bad_data VARCHAR(50); + DECLARE v_id_type_error_bad_data INT; DECLARE v_has_filter_user BIT; + DECLARE v_has_filter_user_auth0 BIT; DECLARE v_guid BINARY(36); + DECLARE v_rank_max INT; + DECLARE v_time_start TIMESTAMP(6); + SET v_time_start := CURRENT_TIMESTAMP(6); SET v_guid := UUID(); - SET v_id_access_level_view := (SELECT id_access_level FROM Shop_Access_Level WHERE code = 'VIEW' LIMIT 1); - SET v_id_permission_store_admin := (SELECT id_permission FROM Shop_Permission WHERE code = 'STORE_ADMIN' LIMIT 1); - SET v_id_permission_user := (SELECT id_permission FROM Shop_Permission WHERE code = 'STORE_USER' LIMIT 1); - SET v_id_permission_user_admin := (SELECT id_permission FROM Shop_Permission WHERE code = 'STORE_USER_ADMIN' LIMIT 1); - SET v_code_error_data := (SELECT code FROM Shop_Msg_Error_Type WHERE code = 'BAD_DATA' LIMIT 1); - SET v_id_type_error_data := (SELECT id_type FROM Shop_Msg_Error_Type WHERE code = v_code_error_data LIMIT 1); + SET v_id_access_level_admin := (SELECT id_access_level FROM partsltd_prod.Shop_Access_Level WHERE code = 'ADMIN' LIMIT 1); + SET v_id_access_level_view := (SELECT id_access_level FROM partsltd_prod.Shop_Access_Level WHERE code = 'VIEW' LIMIT 1); + SET v_id_permission_store_admin := (SELECT id_permission FROM partsltd_prod.Shop_Permission WHERE code = 'STORE_ADMIN' LIMIT 1); + SET v_id_permission_user := (SELECT id_permission FROM partsltd_prod.Shop_Permission WHERE code = 'STORE_USER' LIMIT 1); + SET v_id_permission_user_admin := (SELECT id_permission FROM partsltd_prod.Shop_Permission WHERE code = 'STORE_USER_ADMIN' LIMIT 1); + SET v_code_error_bad_data := (SELECT code FROM partsltd_prod.Shop_Msg_Error_Type WHERE code = 'BAD_DATA' LIMIT 1); + SET v_id_type_error_bad_data := (SELECT id_type FROM partsltd_prod.Shop_Msg_Error_Type WHERE code = v_code_error_bad_data LIMIT 1); + SET v_ids_permission_required := CONCAT(v_id_permission_user, ',', v_id_permission_user_admin, ',', v_id_permission_store_admin); + SET a_get_all_user := IFNULL(a_get_all_user, 1); + SET a_get_inactive_user := IFNULL(a_get_inactive_user, 0); + SET a_get_first_user_only := IFNULL(a_get_first_user_only, 0); SET a_ids_user := TRIM(IFNULL(a_ids_user, '')); SET a_ids_user_auth0 := TRIM(IFNULL(a_ids_user_auth0, '')); + SET a_debug := IFNULL(a_debug, 0); + + IF a_debug = 1 THEN + SELECT + a_id_user + , a_id_user_auth0 + , a_get_all_user + , a_get_inactive_user + , a_get_first_user_only + , a_ids_user + , a_ids_user_auth0 + , a_debug + ; + END IF; DROP TEMPORARY TABLE IF EXISTS tmp_User; DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error; CREATE TEMPORARY TABLE tmp_User ( - id_user INT NOT NULL, - rank_user INT NULL + id_user INT NULL + , rank_user INT NULL + , can_admin_store BIT NULL + , can_admin_user BIT NULL ); CREATE TEMPORARY TABLE tmp_Msg_Error ( display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT, - guid BINARY(36) NOT NULL, + -- guid BINARY(36) NOT NULL, id_type INT NOT NULL, code VARCHAR(50) NOT NULL, msg VARCHAR(4000) NOT NULL ); + CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Split ( + substring VARCHAR(4000) NOT NULL + , as_int INT NULL + ); + IF ISNULL(a_id_user) AND NOT ISNULL(a_id_user_auth0) THEN - SET a_id_user := (SELECT U.id_user FROM Shop_User U WHERE U.id_user_auth0 LIKE CONCAT('%', a_id_user_auth0, '%') LIMIT 1); + SET a_id_user := (SELECT U.id_user FROM partsltd_prod.Shop_User U WHERE U.id_user_auth0 = a_id_user_auth0 LIMIT 1); -- LIKE CONCAT('%', a_id_user_auth0, '%') LIMIT 1); END IF; IF ISNULL(a_id_user) THEN @@ -68,150 +99,352 @@ BEGIN ) VALUES ( v_guid, - v_id_type_error_data, - v_code_error_data, + v_id_type_error_bad_data, + v_code_error_bad_data, CONCAT('User ID required for authorisation.') ) ; END IF; - SET v_has_filter_user := CASE WHEN a_ids_user = '' AND a_ids_user_auth0= '' THEN 0 ELSE 1 END; + SET v_has_filter_user := CASE WHEN a_ids_user = '' THEN 0 ELSE 1 END; + SET v_has_filter_user_auth0 := CASE WHEN a_ids_user_auth0 = '' THEN 0 ELSE 1 END; - IF v_has_filter_user THEN - INSERT INTO tmp_User ( - id_user - -- , active - , rank_user - ) - SELECT - DISTINCT U.id_user - -- S.active - , RANK() OVER (ORDER BY id_user ASC) AS rank_user - FROM Shop_User U - WHERE 1=1 - AND ( - FIND_IN_SET(U.id_user, a_ids_user) > 0 - OR FIND_IN_SET(U.id_user_auth0, a_ids_user_auth0) > 0 - ) - AND ( - a_get_inactive_user - OR U.active - ) - /*Shop_Calc_User_Temp UE_T - WHERE 1=1 - AND UE_T.guid = v_guid - AND UE_T.active = 1 - */ + IF a_debug = 1 THEN + SELECT + v_has_filter_user + , v_has_filter_user_auth0 ; - - IF a_get_first_user_only THEN - DELETE t_U - FROM tmp_User t_U - WHERE t_U.rank_user > 1 - ; - END IF; END IF; - -- Permissions - IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN - -- SELECT v_guid, a_id_user, false, v_id_permission_product, v_id_access_level_view, v_ids_permutation_permission; - -- select * from Shop_Calc_User_Temp; + -- User IDs + IF (NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) AND v_has_filter_user = 1) THEN + CALL partsltd_prod.p_split(v_guid, a_ids_user, ',', FALSE); - CALL p_shop_calc_user( - v_guid, -- guid - a_id_user, -- ids_user - FALSE, -- get_inactive_user - CONCAT(v_id_permission_user, ',', v_id_permission_user_admin, ',', v_id_permission_store_admin), -- ids_permission - v_id_access_level_view, -- ids_access_level - '' -- ids_product + DELETE FROM tmp_Split; + + INSERT INTO tmp_Split ( + substring + , as_int + ) + SELECT + substring + , CONVERT(substring, DECIMAL(10,0)) AS as_int + FROM partsltd_prod.Split_Temp + WHERE 1=1 + AND GUID = v_guid + AND NOT ISNULL(substring) + AND substring != '' + ; + + CALL partsltd_prod.p_clear_split_temp( v_guid ); + END IF; + + IF (NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) AND v_has_filter_user = 1) THEN + IF EXISTS ( + SELECT * + FROM tmp_Split t_S + LEFT JOIN partsltd_prod.Shop_User U ON t_S.as_int = U.id_user + WHERE + ISNULL(t_S.as_int) + OR ISNULL(U.id_user) + ) THEN + INSERT INTO tmp_Msg_Error ( + -- guid, + id_type, + code, + msg + ) + SELECT + -- v_guid, + v_id_type_error_bad_data, + v_code_error_bad_data, + CONCAT('Invalid or inactive User IDs: ', IFNULL(GROUP_CONCAT(t_S.substring SEPARATOR ', '), 'NULL')) + FROM tmp_Split t_S + LEFT JOIN partsltd_prod.Shop_User U ON t_S.as_int = U.id_user + WHERE + ISNULL(t_S.as_int) + OR ISNULL(U.id_user) + ; + ELSE + INSERT INTO tmp_User ( + id_user + , rank_user + ) + SELECT + U.id_user + , RANK() OVER (ORDER BY U.id_user DESC) AS rank_user + FROM tmp_Split t_S + RIGHT JOIN partsltd_prod.Shop_User U ON t_S.as_int = U.id_user + WHERE + ( + a_get_all_user = 1 + OR ( + v_has_filter_user = 1 + AND NOT ISNULL(t_S.as_int) + ) + ) + AND ( + a_get_inactive_user = 1 + OR U.active = 1 + ) + ; + END IF; + END IF; + + -- Auth0 User IDs + IF (NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) AND v_has_filter_user_auth0 = 1) THEN + CALL partsltd_prod.p_split(v_guid, a_ids_user_auth0, ',', FALSE); + + DELETE FROM tmp_Split; + + INSERT INTO tmp_Split ( + substring + ) + SELECT + substring + FROM partsltd_prod.Split_Temp + WHERE 1=1 + AND GUID = v_guid + AND NOT ISNULL(substring) + AND substring != '' + ; + + CALL partsltd_prod.p_clear_split_temp( v_guid ); + END IF; + + IF (NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) AND v_has_filter_user_auth0 = 1) THEN + IF EXISTS ( + SELECT * + FROM tmp_Split t_S + LEFT JOIN partsltd_prod.Shop_User U ON t_S.substring = U.id_user_auth0 + WHERE + ISNULL(t_S.substring) + OR ISNULL(U.id_user_auth0) + ) THEN + INSERT INTO tmp_Msg_Error ( + -- guid, + id_type, + code, + msg + ) + SELECT + -- v_guid, + v_id_type_error_bad_data, + v_code_error_bad_data, + CONCAT('Invalid or inactive Auth0 User IDs: ', IFNULL(GROUP_CONCAT(t_S.substring SEPARATOR ', '), 'NULL')) + FROM tmp_Split t_S + LEFT JOIN partsltd_prod.Shop_User U ON t_S.substring = U.id_user_auth0 + WHERE + ISNULL(t_S.substring) + OR ISNULL(U.id_user_auth0) + ; + ELSE + SET v_rank_max := IFNULL((SELECT rank_user FROM tmp_User ORDER BY rank_user DESC LIMIT 1), 0); + + INSERT INTO tmp_User ( + id_user + , rank_user + ) + SELECT + U.id_user + , v_rank_max + (RANK() OVER (ORDER BY U.id_user DESC)) AS rank_user + FROM tmp_Split t_S + RIGHT JOIN partsltd_prod.Shop_User U ON t_S.substring = U.id_user_auth0 + WHERE + ( + a_get_all_user = 1 + OR ( + v_has_filter_user_auth0 = 1 + AND NOT ISNULL(t_S.substring) + ) + ) + AND ( + a_get_inactive_user = 1 + OR U.active = 1 + ) + ; + END IF; + END IF; + + IF a_debug = 1 THEN + SELECT * FROM tmp_User; + END IF; + + IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN + IF a_get_first_user_only THEN + DELETE t_U + FROM tmp_User t_U + WHERE t_U.rank_user > 1 + ; + END IF; + END IF; + + IF a_debug = 1 THEN + SELECT * FROM tmp_User; + END IF; + + -- Can admin store + IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN + IF a_debug = 1 THEN + SELECT + v_guid -- guid + , a_id_user -- ids_user + , FALSE -- get_inactive_user + , v_id_permission_store_admin -- ids_permission + , v_id_access_level_admin -- ids_access_level + , '' -- ids_product + , 0 -- a_debug + ; + SELECT * FROM partsltd_prod.Shop_Calc_User_Temp; + END IF; + + CALL partsltd_prod.p_shop_calc_user( + v_guid -- guid + , a_id_user -- ids_user + , FALSE -- get_inactive_user + , v_id_permission_store_admin -- ids_permission + , v_id_access_level_admin -- ids_access_level + , '' -- ids_product + , 0 -- a_debug ); - -- select * from Shop_Calc_User_Temp; + IF a_debug = 1 THEN + SELECT * FROM partsltd_prod.Shop_Calc_User_Temp WHERE GUID = v_guid; + END IF; + + UPDATE tmp_User t_U + INNER JOIN partsltd_prod.Shop_Calc_User_Temp CUT + ON CUT.GUID = v_guid + AND t_U.id_user = CUT.id_user + SET t_U.can_admin_store = CUT.can_admin + ; + + CALL partsltd_prod.p_shop_clear_calc_user( v_guid, FALSE ); + END IF; + + -- Can admin user + IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN + IF a_debug = 1 THEN + SELECT + v_guid -- guid + , a_id_user -- ids_user + , FALSE -- get_inactive_user + , v_id_permission_user_admin -- ids_permission + , v_id_access_level_admin -- ids_access_level + , '' -- ids_product + , 0 -- a_debug + ; + SELECT * FROM partsltd_prod.Shop_Calc_User_Temp; + END IF; + + CALL partsltd_prod.p_shop_calc_user( + v_guid -- guid + , a_id_user -- ids_user + , FALSE -- get_inactive_user + , v_id_permission_user_admin -- ids_permission + , v_id_access_level_admin -- ids_access_level + , '' -- ids_product + , 0 -- a_debug + ); + + IF a_debug = 1 THEN + SELECT * FROM partsltd_prod.Shop_Calc_User_Temp WHERE GUID = v_guid; + END IF; + + UPDATE tmp_User t_U + INNER JOIN partsltd_prod.Shop_Calc_User_Temp CUT + ON CUT.GUID = v_guid + AND t_U.id_user = CUT.id_user + SET t_U.can_admin_user = CUT.can_admin + ; + + CALL partsltd_prod.p_shop_clear_calc_user( v_guid, FALSE ); + END IF; + + -- Permissions + IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN + IF a_debug = 1 THEN + SELECT + v_guid -- guid + , a_id_user -- ids_user + , FALSE -- get_inactive_user + , v_ids_permission_required -- ids_permission + , v_id_access_level_view -- ids_access_level + , '' -- ids_product + , 0 -- a_debug + ; + SELECT * FROM partsltd_prod.Shop_Calc_User_Temp; + END IF; + + CALL partsltd_prod.p_shop_calc_user( + v_guid -- guid + , a_id_user -- ids_user + , FALSE -- get_inactive_user + , v_ids_permission_required -- ids_permission + , v_id_access_level_view -- ids_access_level + , '' -- ids_product + , 0 -- a_debug + ); + + IF a_debug = 1 THEN + SELECT * FROM partsltd_prod.Shop_Calc_User_Temp WHERE GUID = v_guid; + END IF; IF NOT EXISTS ( SELECT can_view - FROM Shop_Calc_User_Temp UE_T + FROM partsltd_prod.Shop_Calc_User_Temp CUT WHERE 1=1 - AND UE_T.GUID = v_guid - AND UE_T.id_permission_required = v_id_permission_user + AND CUT.GUID = v_guid + AND can_view = 1 + -- AND FIND_IN_SET(v_ids_permission_required, CUT.id_permission_required) > 0 ) THEN INSERT INTO tmp_Msg_Error ( - guid, id_type, code, msg ) VALUES ( - v_guid, - v_id_type_error_data, - v_code_error_data, - CONCAT('You do not have view permissions for ', (SELECT name FROM Shop_Permission WHERE id_permission = v_id_permission_user LIMIT 1)) + v_id_type_error_bad_data, + v_code_error_bad_data, + -- CONCAT('You do not have view permissions for ', (SELECT name FROM partsltd_prod.Shop_Permission WHERE id_permission = v_id_permission_user LIMIT 1)) + -- CONCAT('You do not have view permissions for ', (SELECT GROUP_CONCAT(name SEPARATOR ', ') FROM partsltd_prod.Shop_Permission WHERE FIND_IN_SET(v_id_permission_user, id_permission) > 0)) + CONCAT('You do not have view permissions for ', (SELECT name FROM partsltd_prod.Shop_Permission P INNER JOIN partsltd_prod.Shop_Calc_User_Temp CUT ON P.id_permission = CUT.id_permission_required WHERE GUID = v_guid AND IFNULL(can_view, 0) = 0 LIMIT 1)) -- WHERE IFNULL(CUT.can_view, 0) = 0 ) ; + ELSE + -- INSERT INTO + SET a_debug := a_debug; END IF; + + CALL partsltd_prod.p_shop_clear_calc_user( v_guid, FALSE ); END IF; -- Returns - /* NULL record required for flask sql_alchemy to detect result set - IF EXISTS (SELECT * FROM tmp_Msg_Error WHERE GUID = v_guid) THEN + /* NULL record required for flask sql_alchemy to detect result set */ + IF EXISTS (SELECT * FROM tmp_Msg_Error) THEN DELETE FROM tmp_User; + INSERT INTO tmp_User ( id_user ) + VALUES ( NULL ); END IF; - */ - IF NOT EXISTS (SELECT * FROM tmp_Msg_Error WHERE GUID = v_guid) THEN - SELECT - U.id_user - , U.id_user_auth0 - , U.firstname - , U.surname - , U.email - , U.is_email_verified - , U.id_currency_default - , U.id_region_default - , U.is_included_VAT_default - , U.is_super_user - , UE_T_STORE.can_admin_store AS can_admin_store - , UE_T_USER.can_admin_user AS can_admin_user - FROM tmp_User t_U - INNER JOIN Shop_User U ON t_U.id_user = U.id_user - INNER JOIN ( - SELECT - id_user - , id_permission_required - , can_admin AS can_admin_store - FROM Shop_Calc_User_Temp UE_T_STORE - WHERE 1=1 - AND UE_T_STORE.guid = v_guid - AND UE_T_STORE.id_permission_required = v_id_permission_store_admin - ) UE_T_STORE ON t_U.id_user = UE_T_STORE.id_user - INNER JOIN ( - SELECT - id_user - , id_permission_required - , can_admin AS can_admin_user - FROM Shop_Calc_User_Temp UE_T_USER - WHERE 1=1 - AND UE_T_USER.guid = v_guid - AND UE_T_USER.id_permission_required = v_id_permission_user_admin - ) UE_T_USER ON t_U.id_user = UE_T_USER.id_user - ; - ELSE - SELECT - NULL AS id_user - , NULL AS id_user_auth0 - , NULL AS firstname - , NULL AS surname - , NULL AS email - , NULL AS is_email_verified - , NULL AS id_currency_default - , NULL AS id_region_default - , NULL AS is_included_VAT_default - , NULL AS is_super_user - , NULL AS can_admin_store - , NULL AS can_admin_user - ; - END IF; + + SELECT + U.id_user + , U.id_user_auth0 + , U.firstname + , U.surname + , U.email + , U.is_email_verified + , U.id_currency_default + , U.id_region_default + , U.is_included_VAT_default + , U.is_super_user + , t_U.can_admin_store + , t_U.can_admin_user + FROM tmp_User t_U + INNER JOIN partsltd_prod.Shop_User U ON t_U.id_user = U.id_user + ; # Errors SELECT @@ -221,27 +454,33 @@ BEGIN MET.name, MET.description FROM tmp_Msg_Error t_ME - INNER JOIN Shop_Msg_Error_Type MET + INNER JOIN partsltd_prod.Shop_Msg_Error_Type MET ON t_ME.id_type = MET.id_type - WHERE guid = v_guid ; + IF a_debug = 1 THEN + SELECT * FROM tmp_User; + END IF; + -- Clean up DROP TEMPORARY TABLE IF EXISTS tmp_User; DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error; /* - DELETE FROM Shop_Calc_User_Temp + DELETE FROM partsltd_prod.Shop_Calc_User_Temp WHERE GUID = v_guid; */ - CALL p_shop_clear_calc_user(v_guid); + + IF a_debug = 1 THEN + CALL partsltd_prod.p_debug_timing_reporting ( v_time_start ); + END IF; END // DELIMITER ;; - /* + CALL p_get_many_user ( NULL # a_id_user , 'auth0|6582b95c895d09a70ba10fef' # a_id_user_auth0 @@ -249,13 +488,15 @@ CALL p_get_many_user ( , 0 # a_get_inactive_user , 0 # a_get_first_user_only , NULL # a_ids_user - , 'auth0|6582b95c895d09a70ba10fef' # a_ids_user_auth0 # ' -- + , 'auth0|6582b95c895d09a70ba10fef' # a_ids_user_auth0 + , 1 -- a_debug ); -select * from Shop_Calc_User_Temp; -delete from Shop_Calc_User_Temp; + +select * FROM partsltd_prod.Shop_Calc_User_Temp; +delete FROM partsltd_prod.Shop_Calc_User_Temp; SELECT * -FROM SHOP_USER; +FROM partsltd_prod.Shop_USER; CALL p_get_many_user( NULL -- :a_id_user, diff --git a/static/MySQL/9000_populate.sql b/static/MySQL/9000_populate.sql index c4e1836c..7953450c 100644 --- a/static/MySQL/9000_populate.sql +++ b/static/MySQL/9000_populate.sql @@ -86,6 +86,14 @@ VALUES ; */ +# Addresses +INSERT INTO Shop_Address ( + id_region, postcode, address_line_1, address_line_2, city, county +) +VALUES ( + 1, 'CV22 6DN', '53 Alfred Green Close', '', 'Rugby', 'Warwickshire' +); + # Plants INSERT INTO Shop_Plant ( code, name, id_address, id_user_manager @@ -552,7 +560,10 @@ VALUES (4, 'SALES_AND_PURCHASING', 'Sales and Purchasing'), (5, 'MANUFACTURING', 'Manufacturing') ; - +/* +select * from Shop_Permission +select * from Shop_Role_Permission_Link +*/ # Permissions INSERT INTO Shop_Permission ( display_order, code, name, id_permission_group, id_access_level_required @@ -627,8 +638,8 @@ VALUES (1, 1) ; -# Addresses -INSERT INTO Shop_Address ( +# User Addresses +INSERT INTO Shop_User_Address ( id_user, id_region, name_full, phone_number, postcode, address_line_1, address_line_2, city, county ) SELECT U.id_user, 1, CONCAT(U.firstname, ' ', U.surname), '07375 571430', 'CV22 6DN', '53 Alfred Green Close', '', 'Rugby', 'Warwickshire' @@ -697,7 +708,7 @@ INSERT INTO Shop_Supplier ( , id_currency ) VALUES - ('Malt Kiln Farm Shop', NULL, NULL, 2, '01788 832640', NULL, 'farmshop@maltkilnfarmshop.co.uk', 'https://www.maltkilnfarmshop.co.uk/', 1) + ('Malt Kiln Farm Shop', NULL, NULL, 1, '01788 832640', NULL, 'farmshop@maltkilnfarmshop.co.uk', 'https://www.maltkilnfarmshop.co.uk/', 1) ; /* diff --git a/static/MySQL/9010_anal.sql b/static/MySQL/9010_anal.sql index d9277844..65229fa0 100644 --- a/static/MySQL/9010_anal.sql +++ b/static/MySQL/9010_anal.sql @@ -1,6 +1,6 @@ - +/* SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES @@ -24,4 +24,7 @@ FROM WHERE TABLE_SCHEMA = 'PARTS' -- AND TABLE_NAME = 'your_table_name' -; \ No newline at end of file +; + +*/ + diff --git a/static/MySQL/temp.txt b/static/MySQL/temp.txt index b26ac673..d9b0aa72 100644 --- a/static/MySQL/temp.txt +++ b/static/MySQL/temp.txt @@ -2,6 +2,7 @@ 1000_tbl_Shop_Product_Change_Set.sql 1000_tbl_Split_Temp.sql 1001_tbl_Shop_User_Change_Set.sql +1001_tbl_Split_Key_Value_Pair_Csv_Temp.sql 1002_tbl_Shop_Sales_And_Purchasing_Change_Set.sql 1003_tbl_Shop_Access_Level.sql 1004_tbl_Shop_Access_Level_Audit.sql @@ -18,7 +19,9 @@ 1103_tbl_Shop_Region_Branch.sql 1104_tbl_Shop_Region_Branch_Audit.sql 1105_tbl_Shop_Region_Branch_Temp.sql +1106_tbl_Shop_Address.sql 1106_tbl_Shop_Plant.sql +1107_tbl_Shop_Address_Audit.sql 1107_tbl_Shop_Plant_Audit.sql 1108_tbl_Shop_Plant_Temp.sql 1109_tbl_Shop_Storage_Location.sql @@ -67,9 +70,7 @@ 1233_tbl_Shop_Discount.sql 1234_tbl_Shop_Discount_Audit.sql 1236_tbl_Shop_Discount_Region_Currency_Link.sql -1236_tbl_Shop_Product_Currency_Region_Link.sql 1237_tbl_Shop_Discount_Region_Currency_Link_Audit.sql -1237_tbl_Shop_Product_Currency_Region_Link_Audit.sql 1300_tbl_Shop_Permission_Group.sql 1301_tbl_Shop_Permission_Group_Audit.sql 1303_tbl_Shop_Permission.sql @@ -82,8 +83,8 @@ 1313_tbl_Shop_User_Audit.sql 1315_tbl_Shop_User_Role_Link.sql 1316_tbl_Shop_User_Role_Link_Audit.sql -1318_tbl_Shop_Address.sql -1319_tbl_Shop_Address_Audit.sql +1318_tbl_Shop_User_Address.sql +1319_tbl_Shop_User_Address_Audit.sql 1321_tbl_Shop_User_Basket.sql 1322_tbl_Shop_User_Basket_Audit.sql 1397_tbl_Shop_Order_Status.sql @@ -118,6 +119,7 @@ 3014_tri_Shop_Image_Type.sql 3100_tri_Shop_Region.sql 3103_tri_Shop_Region_Branch.sql +3106_tri_Shop_Address.sql 3109_tri_Shop_Storage_Location.sql 3115_tri_Shop_Currency.sql 3118_tri_Shop_Tax_Or_Surcharge.sql @@ -140,7 +142,7 @@ 3309_tri_Shop_Role_Permission_Link.sql 3312_tri_Shop_User.sql 3315_tri_Shop_User_Role_Link.sql -3318_tri_Shop_Address.sql +3318_tri_Shop_User_Address.sql 3321_tri_Shop_User_Basket.sql 3324_tri_Shop_User_Order_Status.sql 3400_tri_Shop_Supplier.sql @@ -157,24 +159,31 @@ 6000_p_split.sql 6001_p_clear_split_temp.sql 6001_p_validate_guid.sql +6003_p_split_key_value_pair_csv.sql +6004_p_clear_split_key_value_pair_csv_temp.sql 6206_fn_shop_get_product_permutation_name.sql 6500_p_shop_calc_user.sql 6501_p_shop_clear_calc_user.sql 7003_p_shop_get_many_access_level.sql 7101_p_shop_get_many_region.sql +7106_p_shop_get_many_plant.sql +7109_p_shop_get_many_storage_location.sql 7116_p_shop_get_many_currency.sql 7122_p_shop_get_many_unit_measurement.sql 7200_p_shop_save_product_category.sql 7200_p_shop_save_product_category_test.sql 7202_p_shop_clear_calc_product_permutation.sql 7203_p_shop_save_product.sql +7203_p_shop_save_product_test.sql 7204_p_shop_calc_product_permutation.sql 7204_p_shop_get_many_product.sql 7205_p_shop_get_many_stripe_product_new.sql -7206_p_shop_save_permutation.sql 7206_p_shop_save_product_permutation.sql +7210_fn_shop_get_id_product_permutation_from_variation_csv_list.sql 7210_p_shop_get_many_product_variation.sql 7219_p_shop_get_many_stock_item.sql +7220_p_shop_save_stock_item.sql +7220_p_shop_save_stock_item_test.sql 7221_p_get_many_shop_product_price_and_discount_and_delivery_option.sql 7223_p_shop_get_many_stripe_price_new.sql 7312_p_shop_save_user.sql @@ -193,4 +202,3 @@ 9000_populate.sql 9001_view.sql 9010_anal.sql -DEPRECATED diff --git a/static/css/components/table.css b/static/css/components/table.css index 89830f09..73544f5d 100644 --- a/static/css/components/table.css +++ b/static/css/components/table.css @@ -33,3 +33,15 @@ tr { visibility: hidden; } */ + +table textarea { + width: 95% !important; +} + +table select { + width: 100% !important; +} + +table input { + width: 90% !important; +} \ No newline at end of file diff --git a/static/css/pages/store/product_permutations.css b/static/css/pages/store/product_permutations.css index 8a5e45a4..7c345c82 100644 --- a/static/css/pages/store/product_permutations.css +++ b/static/css/pages/store/product_permutations.css @@ -107,17 +107,6 @@ min-width: 6vh; } -textarea { - width: 95% !important; -} - -select { - width: 100% !important; -} - -input { - width: 90% !important; -} td > input, td > select, td > textarea, .container-input > input, .container-input > select, .container-input > textarea { border: 2px solid var(--c_purple); diff --git a/static/css/pages/store/stock_items.css b/static/css/pages/store/stock_items.css index 295792a0..3f980784 100644 --- a/static/css/pages/store/stock_items.css +++ b/static/css/pages/store/stock_items.css @@ -4,36 +4,82 @@ th, td { } - -.category { - width: 12%; +#tableMain { + max-width: 90vw; } -.product { - width: 12%; +#tableMain thead tr th.category, #tableMain tbody tr td.category { + width: 8vh; + min-width: 8vh; } -.variations { - width: 12%; -} -.currency { - width: 12%; -} -.cost-local-VAT-incl { - width: 10%; -} -.date-puchased, .date-received, .date-unsealed, .date-expiration, .date-consumed { - width: 6%; -} -.storage-location { - width: 12%; -} -.active { - width: 5%; +#tableMain thead tr th.product, #tableMain tbody tr td.product, +#tableMain thead tr th.storage_location, #tableMain tbody tr td.storage_location { + width: 10vh; + min-width: 10vh; } -.row-new { - visibility: hidden; +#tableMain thead tr th.product_variations.collapsed, #tableMain tbody tr td.product_variations.collapsed { + width: 10vh; + min-width: 10vh; + display: table-cell !important; +} +#tableMain thead tr th.product_variations, #tableMain tbody tr td.product_variations { + width: 20vh; + min-width: 20vh; +} +#tableMain tbody tr td.product_variations table thead tr th, #tableMain tbody tr td.product_variations table tbody tr td { + width: 8vh; + min-width: 8vh; +} +#tableMain tbody tr td.product_variations table thead tr th:last-of-type, #tableMain tbody tr td.product_variations table tbody tr td:last-of-type { + width: 4vh; + min-width: 4vh; } -textarea, select, input { - width: 100% !important; +#tableMain thead tr th.id_currency_cost.collapsed, #tableMain tbody tr td.id_currency_cost.collapsed { + width: 9vh; + min-width: 9vh; } +#tableMain thead tr th.id_currency_cost, #tableMain tbody tr td.id_currency_cost { + width: 11vh; + min-width: 11vh; +} + +#tableMain thead tr th.cost_local_vat_excl, #tableMain tbody tr td.cost_local_vat_excl, +#tableMain thead tr th.cost_local_vat_incl, #tableMain tbody tr td.cost_local_vat_incl { + width: 9vh; + min-width: 9vh; +} + +#tableMain thead tr th.storage-location.collapsed, #tableMain tbody tr td.storage-location.collapsed { + width: 10vh; + min-width: 10vh; + display: table-cell !important; +} +#tableMain thead tr th.storage-location, #tableMain tbody tr td.storage-location { + width: 20vh; + min-width: 20vh; +} +#tableMain tbody tr td.storage-location table thead tr th, #tableMain tbody tr td.storage-location table tbody tr td { + width: 8vh; + min-width: 8vh; +} +#tableMain tbody tr td.storage-location table thead tr th:last-of-type, #tableMain tbody tr td.storage-location table tbody tr td:last-of-type { + width: 4vh; + min-width: 4vh; +} + +#tableMain thead tr th.active, #tableMain tbody tr td.active, +#tableMain thead tr th.is_sealed, #tableMain tbody tr td.is_sealed, +#tableMain thead tr th.is_consumed, #tableMain tbody tr td.is_consumed { + width: 6vh; + min-width: 6vh; +} + +#tableMain thead tr th.date_purchased, #tableMain tbody tr td.date_purchased, +#tableMain thead tr th.date_received, #tableMain tbody tr td.date_received, +#tableMain thead tr th.date_unsealed, #tableMain tbody tr td.date_unsealed, +#tableMain thead tr th.date_expiration, #tableMain tbody tr td.date_expiration, +#tableMain thead tr th.date_consumed, #tableMain tbody tr td.date_consumed { + width: 17vh; + min-width: 17vh; +} \ No newline at end of file diff --git a/static/dist/css/main.bundle.css b/static/dist/css/main.bundle.css index c229ab4c..05b86a66 100644 --- a/static/dist/css/main.bundle.css +++ b/static/dist/css/main.bundle.css @@ -644,6 +644,17 @@ tr { } */ +table textarea { + width: 95% !important; +} + +table select { + width: 100% !important; +} + +table input { + width: 90% !important; +} button.collapsed { diff --git a/static/dist/css/store_product_permutations.bundle.css b/static/dist/css/store_product_permutations.bundle.css index f5aac066..ff0283be 100644 --- a/static/dist/css/store_product_permutations.bundle.css +++ b/static/dist/css/store_product_permutations.bundle.css @@ -160,17 +160,6 @@ min-width: 6vh; } -textarea { - width: 95% !important; -} - -select { - width: 100% !important; -} - -input { - width: 90% !important; -} td > input, td > select, td > textarea, .container-input > input, .container-input > select, .container-input > textarea { border: 2px solid var(--c_purple); diff --git a/static/dist/css/store_stock_items.bundle.css b/static/dist/css/store_stock_items.bundle.css index 99a06b67..8ca65b65 100644 --- a/static/dist/css/store_stock_items.bundle.css +++ b/static/dist/css/store_stock_items.bundle.css @@ -57,37 +57,82 @@ th, td { } - -.category { - width: 12%; +#tableMain { + max-width: 90vw; } -.product { - width: 12%; +#tableMain thead tr th.category, #tableMain tbody tr td.category { + width: 8vh; + min-width: 8vh; } -.variations { - width: 12%; -} -.currency { - width: 12%; -} -.cost-local-VAT-incl { - width: 10%; -} -.date-puchased, .date-received, .date-unsealed, .date-expiration, .date-consumed { - width: 6%; -} -.storage-location { - width: 12%; -} -.active { - width: 5%; +#tableMain thead tr th.product, #tableMain tbody tr td.product, +#tableMain thead tr th.storage_location, #tableMain tbody tr td.storage_location { + width: 10vh; + min-width: 10vh; } -.row-new { - visibility: hidden; +#tableMain thead tr th.product_variations.collapsed, #tableMain tbody tr td.product_variations.collapsed { + width: 10vh; + min-width: 10vh; + display: table-cell !important; +} +#tableMain thead tr th.product_variations, #tableMain tbody tr td.product_variations { + width: 20vh; + min-width: 20vh; +} +#tableMain tbody tr td.product_variations table thead tr th, #tableMain tbody tr td.product_variations table tbody tr td { + width: 8vh; + min-width: 8vh; +} +#tableMain tbody tr td.product_variations table thead tr th:last-of-type, #tableMain tbody tr td.product_variations table tbody tr td:last-of-type { + width: 4vh; + min-width: 4vh; } -textarea, select, input { - width: 100% !important; +#tableMain thead tr th.id_currency_cost.collapsed, #tableMain tbody tr td.id_currency_cost.collapsed { + width: 9vh; + min-width: 9vh; +} +#tableMain thead tr th.id_currency_cost, #tableMain tbody tr td.id_currency_cost { + width: 11vh; + min-width: 11vh; } +#tableMain thead tr th.cost_local_vat_excl, #tableMain tbody tr td.cost_local_vat_excl, +#tableMain thead tr th.cost_local_vat_incl, #tableMain tbody tr td.cost_local_vat_incl { + width: 9vh; + min-width: 9vh; +} + +#tableMain thead tr th.storage-location.collapsed, #tableMain tbody tr td.storage-location.collapsed { + width: 10vh; + min-width: 10vh; + display: table-cell !important; +} +#tableMain thead tr th.storage-location, #tableMain tbody tr td.storage-location { + width: 20vh; + min-width: 20vh; +} +#tableMain tbody tr td.storage-location table thead tr th, #tableMain tbody tr td.storage-location table tbody tr td { + width: 8vh; + min-width: 8vh; +} +#tableMain tbody tr td.storage-location table thead tr th:last-of-type, #tableMain tbody tr td.storage-location table tbody tr td:last-of-type { + width: 4vh; + min-width: 4vh; +} + +#tableMain thead tr th.active, #tableMain tbody tr td.active, +#tableMain thead tr th.is_sealed, #tableMain tbody tr td.is_sealed, +#tableMain thead tr th.is_consumed, #tableMain tbody tr td.is_consumed { + width: 6vh; + min-width: 6vh; +} + +#tableMain thead tr th.date_purchased, #tableMain tbody tr td.date_purchased, +#tableMain thead tr th.date_received, #tableMain tbody tr td.date_received, +#tableMain thead tr th.date_unsealed, #tableMain tbody tr td.date_unsealed, +#tableMain thead tr th.date_expiration, #tableMain tbody tr td.date_expiration, +#tableMain thead tr th.date_consumed, #tableMain tbody tr td.date_consumed { + width: 17vh; + min-width: 17vh; +} diff --git a/static/dist/js/main.bundle.js b/static/dist/js/main.bundle.js index fe0503a7..b6ca1f58 100644 --- a/static/dist/js/main.bundle.js +++ b/static/dist/js/main.bundle.js @@ -1,2 +1,2 @@ /*! For license information please see main.bundle.js.LICENSE.txt */ -(()=>{"use strict";(()=>{function e(t){return e="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},e(t)}function t(e,t){for(var n=0;n0)if(r)t=!1;else if("string"!=typeof e[0])t=!1;else for(var n=0;n0)}},{key:"getDataContentType",value:function(t){var r=null,n="";return e.isEmpty(t)||("string"==typeof t?(r=t,n="application/x-www-form-urlencoded; charset=UTF-8"):(r=JSON.stringify(t),n="application/json; charset=UTF-8")),{Data:r,ContentType:n}}},{key:"arrayContainsItem",value:function(t,r){var n=!1;if(!e.isEmpty(t)&&!e.isEmpty(r))if(t[0]instanceof jQuery){for(var o=0;o=0;--i){var a=this.tryEntries[i],u=a.completion;if("root"===a.tryLoc)return o("end");if(a.tryLoc<=this.prev){var l=n.call(a,"catchLoc"),c=n.call(a,"finallyLoc");if(l&&c){if(this.prev=0;--r){var o=this.tryEntries[r];if(o.tryLoc<=this.prev&&n.call(o,"finallyLoc")&&this.prev=0;--t){var r=this.tryEntries[t];if(r.finallyLoc===e)return this.complete(r.completion,r.afterLoc),F(r),v}},catch:function(e){for(var t=this.tryEntries.length-1;t>=0;--t){var r=this.tryEntries[t];if(r.tryLoc===e){var n=r.completion;if("throw"===n.type){var o=n.arg;F(r)}return o}}throw Error("illegal catch attempt")},delegateYield:function(t,r,n){return this.delegate={iterator:q(t),resultName:r,nextLoc:n},"next"===this.method&&(this.arg=e),v}},t}function b(e,t,r,n,o,i,a){try{var u=e[i](a),l=u.value}catch(e){return void r(e)}u.done?t(l):Promise.resolve(l).then(n,o)}function k(e){return function(){var t=this,r=arguments;return new Promise((function(n,o){var i=e.apply(t,r);function a(e){b(i,n,o,a,u,"next",e)}function u(e){b(i,n,o,a,u,"throw",e)}a(void 0)}))}}function P(e,t){for(var r=0;r1&&void 0!==c[1]?c[1]:"GET",o=c.length>2&&void 0!==c[2]?c[2]:null,i=c.length>3&&void 0!==c[3]?c[3]:null,a=e.getUrlFromHash(r,i),u={method:n,headers:{"Content-Type":"application/json","X-CSRFToken":e.getCsrfToken()}},!o||"POST"!==n&&"PUT"!==n&&"PATCH"!==n||(u.body=JSON.stringify(o)),console.log("API request:",n,a,o),t.prev=7,t.next=10,fetch(a,u);case 10:if((l=t.sent).ok){t.next=13;break}throw new Error("HTTP error! status: ".concat(l.status));case 13:return t.next=15,l.json();case 15:return t.abrupt("return",t.sent);case 18:throw t.prev=18,t.t0=t.catch(7),console.error("API request failed:",t.t0),t.t0;case 22:case"end":return t.stop()}}),t,null,[[7,18]])}))),function(e){return d.apply(this,arguments)})},{key:"getUrlFromHash",value:function(t){var r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null;null==t&&(t=hashPageHome),console.log("getUrlFromHash:"),console.log("base url: "+_pathHost+"\nhash: "+t+"\nparams: "+r);var n=e.parameteriseUrl(_pathHost+t,r);return console.log("url: "+n),n}},{key:"parameteriseUrl",value:function(e,t){return t&&(e+="?"+new URLSearchParams(t).toString()),e}},{key:"goToUrl",value:function(e){window.location.href=e}},{key:"goToHash",value:function(t){var r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null,n=e.getUrlFromHash(t,r);e.goToUrl(n)}},{key:"loginUser",value:(p=k(m().mark((function t(){var r;return m().wrap((function(t){for(;;)switch(t.prev=t.next){case 0:return(r={})[keyCallback]=l.getHashPageCurrent(),t.next=4,e.request(hashPageUserLogin,"POST",r);case 4:return t.abrupt("return",t.sent);case 5:case"end":return t.stop()}}),t)}))),function(){return p.apply(this,arguments)})},{key:"getCategories",value:(y=k(m().mark((function t(){return m().wrap((function(t){for(;;)switch(t.prev=t.next){case 0:return t.next=2,e.request(hashGetStoreProductCategory);case 2:return t.abrupt("return",t.sent);case 3:case"end":return t.stop()}}),t)}))),function(){return y.apply(this,arguments)})},{key:"getCategoriesByFilters",value:(f=k(m().mark((function t(r){return m().wrap((function(t){for(;;)switch(t.prev=t.next){case 0:e.goToHash(hashPageStoreProductCategories,r);case 1:case"end":return t.stop()}}),t)}))),function(e){return f.apply(this,arguments)})},{key:"saveCategories",value:(s=k(m().mark((function t(r,n,o){var i;return m().wrap((function(t){for(;;)switch(t.prev=t.next){case 0:return(i={})[flagFormFilters]=l.convertForm2JSON(n),i[flagProductCategory]=r,i[flagComment]=o,t.next=6,e.request(hashSaveStoreProductCategory,"POST",i);case 6:return t.abrupt("return",t.sent);case 7:case"end":return t.stop()}}),t)}))),function(e,t,r){return s.apply(this,arguments)})},{key:"getProducts",value:(c=k(m().mark((function t(){return m().wrap((function(t){for(;;)switch(t.prev=t.next){case 0:return t.next=2,e.request(hashGetStoreProduct);case 2:return t.abrupt("return",t.sent);case 3:case"end":return t.stop()}}),t)}))),function(){return c.apply(this,arguments)})},{key:"getProductsByFilters",value:(u=k(m().mark((function t(r){return m().wrap((function(t){for(;;)switch(t.prev=t.next){case 0:e.goToHash(hashPageStoreProducts,r);case 1:case"end":return t.stop()}}),t)}))),function(e){return u.apply(this,arguments)})},{key:"saveProducts",value:(a=k(m().mark((function t(r,n,o){var i;return m().wrap((function(t){for(;;)switch(t.prev=t.next){case 0:return(i={})[flagFormFilters]=l.convertForm2JSON(n),i[flagProduct]=r,i[flagComment]=o,t.next=6,e.request(hashSaveStoreProduct,"POST",i);case 6:return t.abrupt("return",t.sent);case 7:case"end":return t.stop()}}),t)}))),function(e,t,r){return a.apply(this,arguments)})},{key:"getProductPermutations",value:(i=k(m().mark((function t(){return m().wrap((function(t){for(;;)switch(t.prev=t.next){case 0:return t.next=2,e.request(hashGetStoreProductPermutation);case 2:return t.abrupt("return",t.sent);case 3:case"end":return t.stop()}}),t)}))),function(){return i.apply(this,arguments)})},{key:"getProductPermutationsByFilters",value:(o=k(m().mark((function t(r){return m().wrap((function(t){for(;;)switch(t.prev=t.next){case 0:e.goToHash(hashPageStoreProductPermutations,r);case 1:case"end":return t.stop()}}),t)}))),function(e){return o.apply(this,arguments)})},{key:"saveProductPermutations",value:(n=k(m().mark((function t(r,n,o){var i;return m().wrap((function(t){for(;;)switch(t.prev=t.next){case 0:return(i={})[flagFormFilters]=l.convertForm2JSON(n),i[flagProductPermutation]=r,i[flagComment]=o,t.next=6,e.request(hashSaveStoreProductPermutation,"POST",i);case 6:return t.abrupt("return",t.sent);case 7:case"end":return t.stop()}}),t)}))),function(e,t,r){return n.apply(this,arguments)})}],r&&P(t,r),Object.defineProperty(t,"prototype",{writable:!1}),t;var t,r,n,o,i,a,u,c,s,f,y,p,d}();function w(e){return w="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},w(e)}function E(e,t){for(var r=0;r at "+r[keyPostcode]+"",document.querySelectorAll(idOverlayInfoBilling).css("display","none"),document.querySelectorAll(idOverlayInfoBilling).querySelector("form").classList.add(flagSubmitted)}else document.querySelectorAll(idContainerInfoDelivery).querySelector("div").innerHTML=""+r[keyNameFull]+" at "+r[keyPostcode]+"",document.querySelectorAll(idOverlayInfoDelivery).css("display","none"),document.querySelectorAll(idOverlayInfoDelivery).querySelector("form").classList.add(flagSubmitted)}},{key:"convertFormBilling2JSON",value:function(e,t){var r;r=document.querySelectorAll(t).querySelector("form"),r=document.querySelectorAll(idOverlayInfoDelivery).querySelector("form"),console.log("converting billing form to json\nform ID: "+r.id),e[keyForm]=convertForm2JSON(r);var n=[keyNameFull,keyPhoneNumber,keyPostcode,keyAddress1,keyAddress2,keyCity,keyCounty];for(var o in console.log("ajaxData:"),console.log(e),e[keyForm][keyInfoIdentical]=getElementValueCurrent(r.querySelector("#"+keyInfoIdentical)),n)t==idOverlayInfoBilling&&e[keyForm][keyInfoIdentical]?e[keyForm][n[o]]=getElementValueCurrent((void 0).querySelector("#"+n[o])):e[keyForm][n[o]]=getElementValueCurrent(r.querySelector("#"+n[o]));return console.log("ajaxData:"),console.log(e),e}},{key:"hookupButtonCheckoutSession",value:function(){var e=document.querySelectorAll(idButtonCheckout);e.classList.remove(flagInitialised),y.initialiseEventHandler(idButtonCheckout,flagInitialised,(function(){e.removeEventListener("click"),e.addEventListener("click",(function(e){var t=v.getLocalStorage(keyBasket),r={};r[keyBasket]=t,r=convertFormBilling2JSON(r,idOverlayInfoDelivery),(r=convertFormBilling2JSON(r,idOverlayInfoBilling))[key_code_currency]=getCurrencySelected(),ajaxJSONData("checkout session",mapHashToController(hashPageStoreCheckout),r,handleResponseCheckout,!1)}))}))}},{key:"handleResponseCheckout",value:function(e){window.location.href=e.data[keyUrlCheckout]}},{key:"hookupButtonFormBillingCopy",value:function(){y.initialiseEventHandler(idButtonFormBillingCopy,flagInitialised,(function(){document.querySelectorAll(idButtonFormBillingCopy).addEventListener("click",(function(e){var t=[keyNameFull,keyPhoneNumber,keyPostcode,keyAddress1,keyAddress2,keyCity,keyCounty],r=document.querySelectorAll(idOverlayInfoBilling).querySelector("form"),n=document.querySelectorAll(idOverlayInfoDelivery).querySelector("form");for(var o in t)r.querySelector("#"+t[o]).value=getElementValueCurrent(n.querySelector("#"+t[o]))}))}))}},{key:"leave",value:function(){!function(e,t,r){var n=Ke(We(e.prototype),"leave",r);return"function"==typeof n?function(e){return n.apply(r,e)}:n}(t,0,this)([])}}])}(F);function Ze(e){return Ze="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},Ze(e)}function et(e,t){for(var r=0;r3&&void 0!==arguments[3]?arguments[3]:null;return{text:e[t],value:e[r],selected:e[r]==n}}},{key:"getOptionJsonFromObjectJson",value:function(t){var r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:null,n=t[flagNameAttrOptionText],o=t[flagNameAttrOptionValue];return console.log({objectJson:t,keyText:n,keyValue:o}),e.getOptionJsonFromObjectJsonAndKeys(t,n,o,r)}}])}();function yt(e){return yt="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},yt(e)}function pt(e,t){for(var r=0;r1&&void 0!==arguments[1]&&arguments[1];if(arguments.length>0&&void 0!==arguments[0]&&arguments[0]){var o=this.getLocalStoragePage()[flagFormFilters],i=this.getFormFilters(),a=l.convertForm2JSON(i);n.areEqualDicts(o,a)||this.callFilterTableContent(o)}else Et(t,"sharedInitialize",this,3)([]),this.hookupFilters(),this.hookupButtonsAddSaveCancel(),this.hookupTableMain(),T.hookup((function(){r?e.saveRecordsTableDirtySinglePageApp():e.saveRecordsTableDirty()}))}},{key:"hookupFilters",value:function(){if(this.constructor===t)throw new Error("Subclass of TableBasePage must implement method hookupFilters().")}},{key:"sharedHookupFilters",value:function(){this.hookupButtonApplyFilters()}},{key:"hookupFilterActive",value:function(){this.hookupFilter(flagActive)}},{key:"hookupFilter",value:function(e){var r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:function(e,r){return t.isDirtyFilter(r)},n=idFormFilters+" ."+e;this.hookupEventHandler("change",n,r)}},{key:"hookupFilterIsNotEmpty",value:function(){this.hookupFilter(flagIsNotEmpty)}},{key:"hookupButtonApplyFilters",value:function(){var e=this;this.hookupEventHandler("click",idButtonApplyFilters,(function(t,r){t.stopPropagation(),e.getAndLoadFilteredTableContent()}))}},{key:"getAndLoadFilteredTableContent",value:function(){var e=this.getFormFilters(),t=l.convertForm2JSON(e);this.leave(),this.callFilterTableContent(t).catch((function(e){return console.error("Error:",e)}))}},{key:"getFormFilters",value:function(){return document.querySelector(idFormFilters)}},{key:"callbackLoadTableContent",value:function(e){this.getTableMain().querySelector("tbody").querySelectorAll("tr").forEach((function(e){e.remove()}));var t=e.data[flagRows];!n.isEmpty(t)&&t.every((function(e){return e.hasOwnProperty("display_order")}))&&(t=t.sort((function(e,t){return e.display_order-t.display_order}))),t.forEach(this.loadRowTable.bind(this)),this.hookupTableMain()}},{key:"getTableMain",value:function(){return document.querySelector(idTableMain)}},{key:"loadRowTable",value:function(e){throw new Error("Subclass of TableBasePage must implement method loadRowTable().")}},{key:"getAndLoadFilteredTableContentSinglePageApp",value:function(){var e=this,t=this.getFormFilters(),r=l.convertForm2JSON(t);this.callFilterTableContent(r).then((function(t){console.log("Table data received:",t),e.callbackLoadTableContent(t)})).catch((function(e){return console.error("Error:",e)}))}},{key:"hookupButtonsAddSaveCancel",value:function(){this.hookupButtonAddRowTable(),this.hookupButtonSave(),this.hookupButtonCancel(),this.toggleShowButtonsSaveCancel(!1)}},{key:"saveRecordsTableDirty",value:function(){var e=this,t=this.getTableRecords(!0);if(0!=t.length){var r=this.getFormFilters(),n=l.getElementValueCurrent(document.querySelector(idTextareaConfirm));this.callSaveTableContent(t,r,n).then((function(t){t[flagStatus]==flagSuccess?(console.log("Records saved!"),console.log("Data received:",t),e.getAndLoadFilteredTableContent()):(console.log("error: ",t[flagMessage]),bt.show(t[flagMessage]))})).catch((function(e){return console.error("Error:",e)}))}else bt.show("No records to save")}},{key:"getTableRecords",value:function(){var e,t=this,r=arguments.length>0&&void 0!==arguments[0]&&arguments[0],n=this.getTableMain(),o=[];return n.querySelectorAll("tbody tr").forEach((function(n){r&&!n.classList.contains(flagDirty)||(e=t.getJsonRow(n),o.push(e))})),o}},{key:"getJsonRow",value:function(e){throw new Error("Subclass of TableBasePage must implement method getJsonRow().")}},{key:"saveRecordsTableDirtySinglePageApp",value:function(){var e=this,t=this.getTableRecords(!0);if(0!=t.length){var r=this.getFormFilters(),n=l.getElementValueCurrent(document.querySelector(idTextareaConfirm));this.callSaveTableContent(t,r,n).then((function(t){t[flagStatus]==flagSuccess?(console.log("Records saved!"),console.log("Data received:",t),e.callbackLoadTableContent(t)):(console.log("error: ",t[flagMessage]),bt.show(t[flagMessage]))})).catch((function(e){return console.error("Error:",e)}))}else bt.show("No records to save")}},{key:"hookupButtonCancel",value:function(){y.initialiseEventHandler(idFormFilters+" button."+flagCancel,flagInitialised,(function(e){e.addEventListener("click",(function(e){e.stopPropagation(),getAndLoadFilteredTableContent()})),e.classList.add(flagCollapsed)}))}},{key:"hookupButtonAddRowTable",value:function(){var e=this;this.hookupEventHandler("click",idFormFilters+" button."+flagAdd,(function(t,r){t.stopPropagation();var n=document.querySelector(idTableMain+" tbody"),o=_rowBlank.cloneNode(!0);o.classList.remove(flagInitialised),o.querySelectorAll("."+flagInitialised).forEach((function(e){e.classList.remove(flagInitialised)})),e.initialiseRowNew(o),n.appendChild(o),e.hookupTableMain()}))}},{key:"initialiseRowNew",value:function(e){throw new Error("Subclass of TableBasePage must implement method initialiseRowNew().")}},{key:"hookupTableMain",value:function(){var e=this;if(this.constructor===t)throw new Error("Must implement hookupTableMain() method.");null==_rowBlank&&y.initialiseEventHandler(idTableMain,flagInitialised,(function(t){e.cacheRowBlank()}))}},{key:"cacheRowBlank",value:function(){var e=idTableMain+" tbody tr."+flagRowNew,t=document.querySelector(e);console.log("row blank temp: ",t),_rowBlank=t.cloneNode(!0),document.querySelectorAll(e).forEach((function(e){e.remove()}))}},{key:"hookupSlidersDisplayOrderTable",value:function(){var e=idTableMain+" tbody tr td."+flagDisplayOrder+" input."+flagSlider+"."+flagDisplayOrder;this.hookupChangeHandlerTableCells(e)}},{key:"hookupChangeHandlerTableCells",value:function(e){var t=this,r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:function(e,r){t.handleChangeElementCellTable(e,r)};y.initialiseEventHandler(e,flagInitialised,(function(e){e.addEventListener("change",(function(t){r(t,e)})),t.handleChangeElementCellTable(null,e)}))}},{key:"handleChangeElementCellTable",value:function(e,t){var r=l.getRowFromElement(t),n=l.getCellFromElement(t),o=l.hasDirtyChildrenContainer(r),i=t.classList.contains(flagDirty),a=l.updateAndCheckIsElementDirty(t);if(a!=i){l.handleDirtyElement(n,a);var u=l.hasDirtyChildrenContainer(r);if(u!=o){l.handleDirtyElement(r,u);var c=this.getTableRecords(!0).length>0;this.toggleShowButtonsSaveCancel(c)}}}},{key:"hookupChangeHandlerTableCellsWhenNotCollapsed",value:function(e){var t=this,r=arguments.length>1&&void 0!==arguments[1]?arguments[1]:function(e,r){r.classList.contains(flagCollapsed)||t.handleChangeElementCellTable(e,r)};this.hookupEventHandler("change",e,r)}},{key:"hookupTextareasCodeTable",value:function(){this.hookupChangeHandlerTableCells(idTableMain+" tbody tr td."+flagCode+" textarea")}},{key:"hookupTextareasNameTable",value:function(){this.hookupChangeHandlerTableCells(idTableMain+" tbody tr td."+flagName+" textarea")}},{key:"hookupTextareasDescriptionTable",value:function(){this.hookupChangeHandlerTableCells(idTableMain+" tbody tr td."+flagDescription+" textarea")}},{key:"hookupInputsActiveTable",value:function(){this.hookupChangeHandlerTableCells(idTableMain+" tbody tr td."+flagActive+' input[type="checkbox"]')}},{key:"hookupTdsAccessLevel",value:function(){var e=idTableMain+" tbody td."+flagAccessLevel;this.hookupTableCellDdlPreviews(e,ht.getListFromDict(accessLevels))}},{key:"hookupTableCellDdlPreviews",value:function(e,t){var r=this,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:function(e,t){r.hookupTableCellDdls(e,t)};this.hookupEventHandler("click",e,(function(o,i){r.handleClickTableCellDdlPreview(o,i,t,e,(function(e,t){n(e,t)}))}))}},{key:"hookupTableCellDdls",value:function(e){var t=this;this.hookupEventHandler("change",e,(function(e,r){t.handleChangeTableCellDdl(e,r)}))}},{key:"handleClickTableCellDdlPreview",value:function(e,t,r,n){var o=this,i=arguments.length>4&&void 0!==arguments[4]?arguments[4]:function(e,t){o.hookupTableCellDdls(e,t)};if(!t.querySelector("select")){console.log("click table cell ddl preview");var a=t.cloneNode(!0);t.parentNode.replaceChild(a,t);var u=a.getAttribute(attrValueCurrent);a.innerHTML="";var c,s,f=document.createElement("select");l.setElementValuesCurrentAndPrevious(f,l.getElementAttributeValueCurrent(a)),console.log({optionObjectList:r,cellSelector:n}),r.forEach((function(e){c=ft.getOptionJsonFromObjectJson(e,u),s=l.createOption(c),f.appendChild(s)})),a.appendChild(f),i(n+" select")}}},{key:"handleChangeTableCellDdl",value:function(e,t){var r=l.getRowFromElement(t),n=l.getCellFromElement(t);console.log("td: ",n);var o=l.hasDirtyChildrenContainer(r),i=t.classList.contains(flagDirty),a=l.updateAndCheckIsElementDirty(t);if(console.log("isDirtyElement: ",a),console.log("wasDirtyElement: ",i),a!=i){l.handleDirtyElement(n,a);var u=t.options[t.selectedIndex];l.setElementAttributeValueCurrent(n,u.value);var c=l.hasDirtyChildrenContainer(r);if(console.log("isNowDirtyRow: ",c),console.log("wasDirtyRow: ",o),c!=o){l.handleDirtyElement(r,c);var s=this.getTableRecords(!0),f=s.length>0;console.log("dirty records:",s),console.log("existsDirtyRecord:",f),this.toggleShowButtonsSaveCancel(f)}}}},{key:"hookupTableCellDDlPreviewsWhenNotCollapsed",value:function(e,t){var r=this,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:function(e,t){r.hookupTableCellDdls(e,t)};this.hookupEventHandler("click",e,(function(o,i){var a=i.querySelector("div");a&&!a.classList.contains(flagCollapsed)&&r.handleClickTableCellDdlPreview(o,i,t,e,(function(e,t){n(e,t)}))}))}},{key:"leave",value:function(){if(this.constructor===t)throw new Error("Must implement leave() method.");Et(t,"leave",this,3)([]);var e=this.getFormFilters(),r={};r[flagFormFilters]=l.convertForm2JSON(e),this.setLocalStoragePage(r)}},{key:"toggleColumnHasClassnameFlag",value:function(e,t,r){var n=this.getTableMain(),o=n.querySelector("th."+e),i=o.classList.contains(r);if(t!=i){var a=n.querySelectorAll("td."+e);l.toggleElementHasClassnameFlag(o,t,r),a.forEach((function(e){l.toggleElementHasClassnameFlag(e,t,r)}))}}}],[{key:"isDirtyFilter",value:function(e){var t=l.updateAndCheckIsElementDirty(e);if(t){var r=document.querySelector(idTableMain+" tbody");r.querySelectorAll("tr").remove(),r.appendChild(document.createElement('
Press "Apply Filters" to refresh the table.
'))}return t}}])}(F);function It(e){return It="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},It(e)}function Ft(e,t){var r="undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(!r){if(Array.isArray(e)||(r=function(e,t){if(e){if("string"==typeof e)return Lt(e,t);var r={}.toString.call(e).slice(8,-1);return"Object"===r&&e.constructor&&(r=e.constructor.name),"Map"===r||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?Lt(e,t):void 0}}(e))||t&&e&&"number"==typeof e.length){r&&(e=r);var n=0,o=function(){};return{s:o,n:function(){return n>=e.length?{done:!0}:{done:!1,value:e[n++]}},e:function(e){throw e},f:o}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var i,a=!0,u=!1;return{s:function(){r=r.call(e)},n:function(){var e=r.next();return a=e.done,e},e:function(e){u=!0,i=e},f:function(){try{a||null==r.return||r.return()}finally{if(u)throw i}}}}function Lt(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,n=Array(t);r",e))})),t.addEventListener("change",(function(e){loadPermutations()}))}));var r=document.querySelectorAll(idFilterIsOutOfStock);y.initialiseEventHandler(r,flagInitialised,(function(){r.addEventListener("change",(function(e){loadPermutations()}))}));var n=document.querySelectorAll(idFilterQuantityMin);y.initialiseEventHandler(n,flagInitialised,(function(){n.addEventListener("change",(function(e){loadPermutations()}))}));var o=document.querySelectorAll(idFilterQuantityMax);y.initialiseEventHandler(o,flagInitialised,(function(){o.addEventListener("change",(function(e){loadPermutations()}))}))}},{key:"loadPermutations",value:function(){var e=document.querySelectorAll(idFormFiltersPermutations),t={};t[keyForm]=convertForm2JSON(e),t.csrf_token=t[keyForm].csrf_token,console.log("ajaxData:"),console.log(t),ajaxJSONData("permutations",mapHashToController(hashPageStorePermutationsPost),t,callbackLoadPermutations,!1,{"X-CSRFToken":t.csrf_token})}},{key:"callbackLoadPermutations",value:function(e){console.log("ajax:"),console.log(e.data);var t,r,n,o=document.querySelectorAll(idTableMain);(t=o.querySelector("tbody")).querySelector("tr").remove(),$.each(e.data,(function(e,o){r=_rowBlank.cloneNode(!0),(r=document.querySelectorAll(r)).classList.remove(flagRowNew),console.log("applying data row: ",o),r.querySelector("td."+flagProductCategory+" select").val(o[attrIdProductCategory]),n=r.querySelector("td."+flagProduct+" select"),listProducts.forEach((function(e){e[attrIdProductCategory]==o[attrIdProductCategory]&&n.appendChild(document.createElement("