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

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

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

{trex-model-1.5.6 → 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.6',
+     version='1.5.8',
      author="Jack Lok",
      author_email="sglok77@gmail.com",
      description="TRex database module package",

{trex-model-1.5.6 → 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.6
+Version: 1.5.8
 Summary: TRex database module package
 Home-page: https://bitbucket.org/lokjac/trex-model
 Author: Jack Lok

{trex-model-1.5.6 → trex-model-1.5.8}/trexmodel/models/datastore/loyalty_models.py

@@ -20,18 +20,23 @@ class LoyaltyDeviceSetting(BaseNModel,DictModel):
     '''
     merchant_acct as ancestor
     '''
-    device_name             = ndb.StringProperty(required=True)
-    activation_code         = ndb.StringProperty(required=True)
-    device_id               = ndb.StringProperty(required=False)
-    activated               = ndb.BooleanProperty(required=True, default=False)
-    assigned_outlet         = ndb.KeyProperty(name="assigned_outlet", kind=Outlet)
-    created_datetime        = ndb.DateTimeProperty(required=True, auto_now_add=True)
-    activated_datetime      = ndb.DateTimeProperty(required=False)
-    testing                 = ndb.BooleanProperty(required=False, default=False)
-    device_details          = ndb.JsonProperty()
+    device_name                     = ndb.StringProperty(required=True)
+    activation_code                 = ndb.StringProperty(required=True)
+    device_id                       = ndb.StringProperty(required=False)
+    enable_lock_screen              = ndb.BooleanProperty(required=True, default=False)
+    lock_screen_code                = ndb.StringProperty(required=False, default='')
+    lock_screen_length_in_second    = ndb.IntegerProperty(required=False, default=30)
+    activated                       = ndb.BooleanProperty(required=True, default=False)
+    assigned_outlet                 = ndb.KeyProperty(name="assigned_outlet", kind=Outlet)
+    created_datetime                = ndb.DateTimeProperty(required=True, auto_now_add=True)
+    activated_datetime              = ndb.DateTimeProperty(required=False)
+    testing                         = ndb.BooleanProperty(required=False, default=False)
+    device_details                  = ndb.JsonProperty()
     
     dict_properties = ['device_name', 'activation_code', 'device_id', 'activated', 'assigned_outlet_key', 
-                       'activated_datetime', 'created_datetime', 'device_details']
+                       'activated_datetime', 'created_datetime', 'device_details',
+                       'enable_lock_screen', 'lock_screen_code', 'lock_screen_length_in_second'
+                       ]
     
     @property
     def device_tokens_list(self):
@@ -61,7 +66,11 @@ class LoyaltyDeviceSetting(BaseNModel,DictModel):
         return self.assigned_outlet_entity.merchant_acct_entity
     
     @staticmethod
-    def create(device_name, merchant_acct, assign_outlet):
+    def create(device_name, merchant_acct, assign_outlet,
+               enable_lock_screen,
+               lock_screen_code,
+               lock_screen_length_in_second,
+               ):
         activation_code = random_number(16)
         checking_activation_device_setting = LoyaltyDeviceSetting.get_by_activation_code(activation_code)
         regenerate_activation_code = False
@@ -77,10 +86,13 @@ class LoyaltyDeviceSetting(BaseNModel,DictModel):
             
         
         device_setting = LoyaltyDeviceSetting(
-                                parent                  = merchant_acct.create_ndb_key(),
-                                device_name             = device_name,
-                                activation_code         = activation_code,
-                                assigned_outlet         = assign_outlet.create_ndb_key(),
+                                parent                          = merchant_acct.create_ndb_key(),
+                                device_name                     = device_name,
+                                activation_code                 = activation_code,
+                                assigned_outlet                 = assign_outlet.create_ndb_key(),
+                                enable_lock_screen              = enable_lock_screen,
+                                lock_screen_code                = lock_screen_code,
+                                lock_screen_length_in_second    = lock_screen_length_in_second,
                                 
                                 )
         
@@ -88,10 +100,17 @@ class LoyaltyDeviceSetting(BaseNModel,DictModel):
         return device_setting
     
     @staticmethod
-    def update(pos_setting_key, device_name, assigned_outlet):
-        checking_device_setting                         = LoyaltyDeviceSetting.fetch(pos_setting_key)
-        checking_device_setting.device_name             = device_name
-        checking_device_setting.assigned_outlet         = assigned_outlet.create_ndb_key()
+    def update(pos_setting_key, device_name, assigned_outlet,
+               enable_lock_screen,
+               lock_screen_code,
+               lock_screen_length_in_second,
+               ):
+        checking_device_setting                                 = LoyaltyDeviceSetting.fetch(pos_setting_key)
+        checking_device_setting.device_name                     = device_name
+        checking_device_setting.assigned_outlet                 = assigned_outlet.create_ndb_key()
+        checking_device_setting.enable_lock_screen              = enable_lock_screen
+        checking_device_setting.lock_screen_code                = lock_screen_code
+        checking_device_setting.lock_screen_length_in_second    = lock_screen_length_in_second
         checking_device_setting.put()
         
         return checking_device_setting
@@ -152,7 +171,15 @@ class LoyaltyDeviceSetting(BaseNModel,DictModel):
         if self.device_details:
             found_device_details_list_by_platform = self.device_details.get(platform)
             if found_device_details_list_by_platform:
+                self.device_details[platform] = {
+                                                'device_token'              : device_token,
+                                                'last_updated_datetime'     : datetime.utcnow().strftime("%d-%m-%Y %H:%M:%S"),
+                                                }
+                                                        
+                
+                '''
                 is_found = False
+                
                 for device_details_by_platform in  found_device_details_list_by_platform:
                     device_token_by_platform = device_details_by_platform.get('device_token')
                     if device_token_by_platform:
@@ -168,21 +195,18 @@ class LoyaltyDeviceSetting(BaseNModel,DictModel):
                                                                 }
                                                             )
                         
-                    
+                '''    
             else:
-                self.device_details[platform] = [
-                                                    {
-                                                    'device_token'              : device_token,
-                                                    'last_updated_datetime'     : datetime.utcnow().strftime("%d-%m-%Y %H:%M:%S"),
-                                                    }
-                                                ]
+                self.device_details[platform] = {
+                                                'device_token'              : device_token,
+                                                'last_updated_datetime'     : datetime.utcnow().strftime("%d-%m-%Y %H:%M:%S"),
+                                                }
         else:
             self.device_details = {
-                                    platform : [
-                                                {
+                                    platform :  {
                                                     'device_token'              : device_token,
                                                     'last_updated_datetime'     : datetime.utcnow().strftime("%d-%m-%Y %H:%M:%S"),
                                                     }
-                                                ]
+                                                
                                 }
         self.put()    

{trex-model-1.5.6 → 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,
@@ -247,8 +248,11 @@ def construct_setting_by_outlet(outlet, device_setting=None):
                 'membership_configurations'         : merchant_acct.membership_configuration, 
                 } 
     if device_setting:
-        setting['activation_code']  = device_setting.activation_code
-        setting['device_name']      = device_setting.device_name
-        setting['device_id']        = device_setting.device_id
+        setting['activation_code']              = device_setting.activation_code
+        setting['device_name']                  = device_setting.device_name
+        setting['device_id']                    = device_setting.device_id
+        setting['enable_lock_screen']           = device_setting.enable_lock_screen
+        setting['lock_screen_code']             = device_setting.lock_screen_code
+        setting['lock_screen_length_in_second'] = device_setting.lock_screen_length_in_second
         
     return setting