trex-model 1.4.4__tar.gz → 1.4.5__tar.gz

{trex-model-1.4.4 → trex-model-1.4.5}/PKG-INFO

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

{trex-model-1.4.4 → trex-model-1.4.5}/setup.py

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

{trex-model-1.4.4 → trex-model-1.4.5}/trex_model.egg-info/PKG-INFO

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

{trex-model-1.4.4 → trex-model-1.4.5}/trexmodel/models/datastore/product_models.py

@@ -382,7 +382,7 @@ class Product(ProductBase, FullTextSearchable):
     product_sku                 = ndb.StringProperty(required=True)
     product_name                = ndb.StringProperty(required=True)
     product_desc                = ndb.StringProperty(required=False)
-    category_key                = ndb.StringProperty(required=False)  
+    category_key                = ndb.StringProperty(required=False)
     
     barcode                     = ndb.StringProperty(required=False)   
     
@@ -408,7 +408,8 @@ class Product(ProductBase, FullTextSearchable):
     
     fulltextsearch_field_name   = 'product_name'
     
-    dict_properties = ['product_sku', 'product_name', 'category_key', 'price', 'cost', 'product_desc', 'barcode', 'pos_settings', 'tax_details', 'product_modifier']
+    dict_properties = ['product_sku', 'product_name', 'category_key', 'price', 'cost', 
+                       'product_desc', 'barcode', 'pos_settings', 'tax_details', 'product_modifier']
     
     @property
     def product_default_image(self):
@@ -434,6 +435,7 @@ class Product(ProductBase, FullTextSearchable):
                             'label'                 : self.product_name,
                             'desc'                  : self.product_desc,
                             'price'                 : self.price,
+                            'category_key'          : self.category_key,
                             'barcode'               : self.barcode,   
                             'modifiers'             : modifier_setting_list_for_pos, 
                             'representation_on_pos' : self.pos_settings,
@@ -780,10 +782,9 @@ class ProductCatalogue(ProductBase):
         return total_count
     
     def publish(self):
-        if self.is_publish == False:
-            self.published_menu_settings = self.setting_details_for_pos
-            self.is_publish = True
-            self.put()
+        self.published_menu_settings = self.setting_details_for_pos
+        self.is_publish = True
+        self.put()
     
     def unpublish(self):
         self.is_publish = False

{trex-model-1.4.4 → trex-model-1.4.5}/trexmodel/models/datastore/user_models.py

@@ -6,7 +6,7 @@ Created on 10 Apr 2020
 from google.cloud import ndb
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 from trexlib.utils.string_util import random_number, random_string,\
-    is_empty
+    is_empty, is_not_empty
 from flask_login import UserMixin
 import logging  
 from trexlib.utils.security_util import generate_user_id, hash_password
@@ -37,14 +37,14 @@ class UserMin(BaseNModel, DictModel, UserMixin):
 
     locked                      = ndb.BooleanProperty(required=False, default=False)
     lock_expiry_datetime        = ndb.DateTimeProperty(required=False)
-    active                      = ndb.BooleanProperty(required=True, default=True)
+    active                      = ndb.BooleanProperty(required=True, default=True) 
     try_count                   = ndb.IntegerProperty(required=False)
     demo_account                = ndb.BooleanProperty(required=False, default=False)
     deleted                     = ndb.BooleanProperty(required=False, default=False)
+    signin_device_session       = ndb.JsonProperty()
     
     
-    
-    dict_properties             = ['user_id', 'name', 'email', 'gravatar_url', 'active', 'locked', 'lock_expiry_datetime']
+    dict_properties             = ['user_id', 'name', 'email', 'signin_device_session', 'gravatar_url', 'active', 'locked', 'lock_expiry_datetime']
     
     @classmethod
     #@cache.memoize(timeout=60)
@@ -63,6 +63,18 @@ class UserMin(BaseNModel, DictModel, UserMixin):
     def is_admin_user(self):
         return False
     
+    @property
+    def signin_device_id(self):
+        if is_not_empty(self.signin_device_session):
+            return self.signin_device_session.get('device_id')
+    
+    @property
+    def signin_expiry_datetime(self):
+        if is_not_empty(self.signin_device_session):
+            expiry_datetime_str =  self.signin_device_session.get('expiry_datetime')
+            if is_not_empty(expiry_datetime_str):
+                return datetime.strptime(expiry_datetime_str, '%d-%m-%Y %H:%M:%S')
+    
     def is_valid_password(self, checking_password):
         hashed_signin_password = hash_password(self.user_id, checking_password)
         
@@ -266,11 +278,11 @@ class UserBase(UserMin):
         
         if is_email_verified==False:
             created_user.email_vc                               = random_number(6)
-            created_user.email_vc_expiry_datetime               = datetime.now() + timedelta(minutes=10)
+            created_user.email_vc_expiry_datetime               = datetime.utcnow()() + timedelta(minutes=10)
         
         if is_mobile_phone_verified==False:
             created_user.mobile_phone_vc                        = random_number(6)
-            created_user.mobile_phone_vc_expiry_datetime        = datetime.now() + timedelta(minutes=10)
+            created_user.mobile_phone_vc_expiry_datetime        = datetime.utcnow() + timedelta(minutes=10)
         
         created_user.put()
         
@@ -379,7 +391,8 @@ class User(UserBase):
                                     'mobile_phone', 'email', 'password', 'name', 'birth_date', 'gender',
                                     'reference_code', 'country', 'state', 'city', 'postcode', 
                                     'address', 'redeem_pin', 'new_message_count', 'status',
-                                    'device_details',
+                                    'device_details', 'signin_device_session', 'referral_code',
+                                    'last_login_datetime',
                                     ]
 
     #unique_attributes = 'email,username'
@@ -387,7 +400,7 @@ class User(UserBase):
     audit_properties            = [
                                     'mobile_phone', 'email', 'password', 'name', 'birth_date', 'gender',
                                     'reference_code', 'country', 'state', 'city', 'postcode', 
-                                    'address', 'redeem_pin', 'status', 'device_details',
+                                    'address', 'redeem_pin', 'status', 'device_details', 
 
                                     ]