trex-model 1.5.7__tar.gz → 1.5.8__tar.gz

{trex-model-1.5.7 → trex-model-1.5.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: trex-model
-Version: 1.5.7
+Version: 1.5.8
 Summary: TRex database module package
 Home-page: https://bitbucket.org/lokjac/trex-model
 Author: Jack Lok

{trex-model-1.5.7 → trex-model-1.5.8}/setup.py

@@ -3,7 +3,7 @@ with open("README.md", "r") as fh:
     long_description = fh.read()
 setuptools.setup(
      name='trex-model',  
-     version='1.5.7',
+     version='1.5.8',
      author="Jack Lok",
      author_email="sglok77@gmail.com",
      description="TRex database module package",

{trex-model-1.5.7 → trex-model-1.5.8}/trex_model.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: trex-model
-Version: 1.5.7
+Version: 1.5.8
 Summary: TRex database module package
 Home-page: https://bitbucket.org/lokjac/trex-model
 Author: Jack Lok

{trex-model-1.5.7 → trex-model-1.5.8}/trexmodel/models/merchant_helpers.py

@@ -141,7 +141,7 @@ def construct_outlet_info(outlet):
             
         }
 
-def construct_setting_by_outlet(outlet, device_setting=None):
+def construct_setting_by_outlet(outlet, device_setting=None, is_pos_device=False):
 
 
     merchant_acct           = outlet.merchant_acct_entity
@@ -156,25 +156,26 @@ def construct_setting_by_outlet(outlet, device_setting=None):
                                 'currency'      : merchant_acct.currency_code,
                                 'locale'        : merchant_acct.locale,    
                                 }
+    if is_pos_device:
+        if dinning_option_list:
+            for d in dinning_option_list:
+                dinning_option_json.append({
+                                            'option_key'                : d.key_in_str,
+                                            'option_name'               : d.name,
+                                            'option_prefix'             : d.prefix,
+                                            'is_default'                : d.is_default,
+                                            'is_dinning_input'          : d.is_dinning_input,
+                                            'is_delivery_input'         : d.is_delivery_input,
+                                            'is_takeaway_input'         : d.is_takeaway_input,
+                                            'is_self_order_input'       : d.is_self_order_input,
+                                            'is_self_payment_mandatory' : d.is_self_payment_mandatory,
+                                            'dinning_table_is_required' : d.dinning_table_is_required,
+                                            'assign_queue'              : d.assign_queue,
+                                            })
     
-    if dinning_option_list:
-        for d in dinning_option_list:
-            dinning_option_json.append({
-                                        'option_key'                : d.key_in_str,
-                                        'option_name'               : d.name,
-                                        'option_prefix'             : d.prefix,
-                                        'is_default'                : d.is_default,
-                                        'is_dinning_input'          : d.is_dinning_input,
-                                        'is_delivery_input'         : d.is_delivery_input,
-                                        'is_takeaway_input'         : d.is_takeaway_input,
-                                        'is_self_order_input'       : d.is_self_order_input,
-                                        'is_self_payment_mandatory' : d.is_self_payment_mandatory,
-                                        'dinning_table_is_required' : d.dinning_table_is_required,
-                                        'assign_queue'              : d.assign_queue,
-                                        })
-    
-    
-    account_settings['dinning_option_list'] = dinning_option_json
+    if is_pos_device:
+        account_settings['dinning_option_list'] = dinning_option_json
+        
     if invoice_no_generation:
         account_settings['invoice_settings']    = {
                                                      'invoice_no_generators'    : invoice_no_generation.generators_list,