trex-model 0.2.17__tar.gz → 1.0.1__tar.gz

{trex-model-0.2.17/trex_model.egg-info → trex-model-1.0.1}/PKG-INFO

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

{trex-model-0.2.17 → trex-model-1.0.1}/setup.py

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

{trex-model-0.2.17 → trex-model-1.0.1/trex_model.egg-info}/PKG-INFO

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

{trex-model-0.2.17 → trex-model-1.0.1}/trexmodel/models/datastore/customer_models.py

@@ -586,6 +586,10 @@ class CustomerMembership(BaseNModel, DictModel):
     def merchant_membership_key(self):
         return self.merchant_membership.urlsafe().decode('utf-8')
     
+    @property
+    def merchant_acct_entity(self):
+        return MerchantAcct.fetch(self.merchant_acct.urlsafe())
+    
     @property
     def merchant_membership_entity(self):
         return MerchantMembership.fetch(self.merchant_membership.urlsafe())
@@ -685,10 +689,11 @@ class CustomerMembership(BaseNModel, DictModel):
             
         expiry_date = merchant_membership.calc_expiry_date(start_date=entitled_datetime)
         logger.debug('expiry_date=%s', expiry_date)
-        
+        merchant_acct = merchant_membership.merchant_acct
         customer_membership = CustomerMembership(
                                 parent                  = customer.create_ndb_key(),
                                 merchant_membership     = merchant_membership.create_ndb_key(),
+                                merchant_acct           = merchant_acct.create_ndb_key(),
                                 entitled_datetime       = entitled_datetime,
                                 entitled_date           = entitled_datetime.date(),
                                 expiry_date             = expiry_date,    
@@ -705,22 +710,50 @@ class CustomerMembership(BaseNModel, DictModel):
         
         
     @staticmethod
-    def renew(customer, merchant_membership, renewed_datetime=None):
+    def renew(customer, merchant_membership, renewed_datetime=None, renewed_outlet=None, renewed_by=None):
         
         customer_membership = CustomerMembership.get_by_customer_and_merchant_membership(customer, merchant_membership)
         if customer_membership is not None:
             if renewed_datetime is None:
                 renewed_datetime = datetime.utcnow()
-                
-            customer_membership.renewed_datetime        = renewed_datetime
-            customer_membership.renewed_date            = renewed_datetime.date()
-            customer_membership.previous_expiry_date    = customer_membership.expiry_date
-            customer_membership.expiry_date             = merchant_membership.calc_expiry_date(start_date=renewed_datetime)
-            customer_membership.put()
             
-            return True
+            merchant_acct   = merchant_membership.merchant_acct
+            expiry_date     = customer_membership.expiry_date 
+            renewed_date    = renewed_datetime.date()
+            valid_to_renew  = False
+            
+            day_difference  = (expiry_date - renewed_date).days
+            logger.debug('day_difference=%s', day_difference)
+            if day_difference>=0:
+                logger.debug('advance renew')
+                if day_difference<merchant_acct.membership_renew_advance_day:
+                    logger.debug('within configured advance renew')
+                    valid_to_renew = True
+                else: 
+                    logger.debug('not within configured advance renew')
+            else:
+                logger.debug('late renew') 
+                if abs(day_difference)<merchant_acct.membership_renew_late_day:
+                    logger.debug('within configured late renew')
+                    valid_to_renew = True
+                else: 
+                    logger.debug('not within configured late renew')
+            
+            if valid_to_renew:    
+                customer_membership.renewed_datetime        = renewed_datetime
+                customer_membership.renewed_date            = renewed_datetime.date()
+                customer_membership.previous_expiry_date    = customer_membership.expiry_date
+                customer_membership.expiry_date             = merchant_membership.calc_expiry_date(start_date=renewed_datetime)
+                customer_membership.renewed_outlet          = renewed_outlet.create_ndb_key()
+                customer_membership.renewed_by              = renewed_by.create_ndb_key()
+                customer_membership.renewed_by_username     = renewed_by.username
+                customer_membership.put()
+                
+                return customer_membership
+            else:
+                raise Exception('Renewal not within configured advance date or late date')
         else:
-            return False
+            raise Exception('Membership is not found')
         
     def revert_renewal(self):
         

{trex-model-0.2.17 → trex-model-1.0.1}/trexmodel/models/datastore/merchant_models.py

@@ -96,7 +96,10 @@ class MerchantAcct(MerchantMin):
     
     @property
     def program_configuration_list(self):
-        return self.published_program_configuration.get('programs')
+        if is_not_empty(self.published_program_configuration):
+            return  self.published_program_configuration.get('programs')
+        else:
+            return []
     
     
     @property
@@ -104,12 +107,29 @@ class MerchantAcct(MerchantMin):
         return is_not_empty(self.tier_membership_configuration)
     
     
+    @property
+    def days_of_return_policy(self):
+        return self.program_settings.get('days_of_return_policy') or MerchantAcct.default_program_settings().get('days_of_return_policy')
+    
+    @property
+    def days_of_repeat_purchase_measurement(self):
+        return self.program_settings.get('days_of_repeat_purchase_measurement') or MerchantAcct.default_program_settings().get('days_of_repeat_purchase_measurement')
+    
+    @property
+    def membership_renew_advance_day(self):
+        return self.program_settings.get('membership_renew_advance_day') or MerchantAcct.default_program_settings().get('membership_renew_advance_day')
+    
+    @property
+    def membership_renew_late_day(self):
+        return self.program_settings.get('membership_renew_late_day') or MerchantAcct.default_program_settings().get('membership_renew_late_day')
+    
     @staticmethod
     def default_program_settings():
         return {
                 'days_of_return_policy'                 : 3,
                 'days_of_repeat_purchase_measurement'   : 7,
-                
+                'membership_renew_advance_day'          : 7,
+                'membership_renew_late_day'             : 30,
                 }   
     
     

{trex-model-0.2.17 → trex-model-1.0.1}/trexmodel/models/datastore/redeem_models.py

@@ -76,7 +76,7 @@ class CustomerRedemption(BaseNModel, DictModel):
     reverted_by_username        = ndb.StringProperty(required=False)
     
     is_tier_program_redemption  = ndb.BooleanProperty(required=False, default=False) 
-    tier_program_transaction_id = ndb.StringProperty(required=True)
+    tier_program_transaction_id = ndb.StringProperty(required=False)
     
     
     dict_properties         = ['transaction_id', 'invoice_id', 'remarks', 'redeemed_amount', 'reward_format',

{trex-model-0.2.17 → trex-model-1.0.1}/trexmodel/models/datastore/transaction_models.py

@@ -25,17 +25,17 @@ from trexmodel.models.datastore.reward_models import CustomerPointReward,\
 
 logger = logging.getLogger('model')
 
-
-class CustomerTransaction(BaseNModel, DictModel):
-    '''
-    
-    '''
+class SalesTransaction(BaseNModel, DictModel):
     transact_merchant           = ndb.KeyProperty(name="transact_merchant", kind=MerchantAcct)
     transact_outlet             = ndb.KeyProperty(name="transact_outlet", kind=Outlet)
     
     transact_datetime           = ndb.DateTimeProperty(required=True)
     created_datetime            = ndb.DateTimeProperty(required=True, auto_now=True)
     
+    reverted_datetime           = ndb.DateTimeProperty(required=False)
+    reverted_by                 = ndb.KeyProperty(name="reverted_by", kind=MerchantUser)
+    reverted_by_username        = ndb.StringProperty(required=False)
+    
     transact_timestamp          = ndb.FloatProperty(required=False)
     
     transaction_id              = ndb.StringProperty(required=True)
@@ -51,6 +51,117 @@ class CustomerTransaction(BaseNModel, DictModel):
     
     sales_channel               = ndb.StringProperty(required=False)
     
+    is_revert                   = ndb.BooleanProperty(required=False, default=False)
+    is_sales_transaction        = ndb.BooleanProperty(required=False, default=True)
+    allow_to_revert             = ndb.BooleanProperty(required=False, default=True)
+    
+    reward_expiry_date          = ndb.DateProperty(required=False)
+    
+    dict_properties         = [
+                               'transaction_id', 'invoice_id', 'remarks', 'system_remarks', 'tax_amount', 'transact_amount', 
+                               'transact_customer_acct', 'transact_outlet_details', 'transact_merchant_acct',
+                               'transact_datetime', 'created_datetime',  'transact_outlet_key', 
+                               'is_sales_transaction', 'allow_to_revert', 'reward_expiry_date',
+                               'transact_by', 'transact_by_username', 
+                               
+                               ]
+    
+    @property
+    def transact_customer_key(self):
+        return ''
+    
+    @property
+    def transact_merchant_acct(self):
+        return MerchantAcct.fetch(self.transact_merchant.urlsafe())
+    
+    @property
+    def transact_outlet_key(self):
+        if self.transact_outlet:
+            return self.transact_outlet.urlsafe().decode('utf-8')
+    
+    @property
+    def transact_merchant_acct_key(self):
+        return self.transact_merchant.urlsafe().decode('utf-8')
+
+    @property
+    def transact_by_user(self):
+        if self.transact_by:
+            return MerchantUser.fetch(self.transact_by.urlsafe())
+        
+    @property
+    def transact_user_acct_key(self):
+        return self.transact_by.urlsafe()
+        
+    @property
+    def after_deduct_tax_sales_amount(self):
+        if self.tax_amount:
+            return self.transact_amount - self.tax_amount
+        else:
+            return self.transact_amount
+    
+    @classmethod
+    def get_by_invoice_id(cls, invoice_id):
+        return cls.query(cls.invoice_id==invoice_id).get()
+    
+    @staticmethod
+    def create(transact_amount=.0, tax_amount=.0, invoice_id=None, remarks=None, system_remarks=None,
+               transact_outlet=None, transact_by=None, transact_datetime=None, 
+               
+               ):
+        
+        transact_by_username = None
+        
+        if is_not_empty(transact_by):
+            if isinstance(transact_by, MerchantUser):
+                transact_by_username = transact_by.username
+
+        
+        transaction_id = generate_transaction_id()
+        
+        if transact_datetime is None:
+            transact_datetime = datetime.utcnow()
+        
+        logger.debug('generated transaction_id=%s', transaction_id)
+        logger.debug('invoice_id=%s', invoice_id)
+        logger.debug('tax_amount=%s', tax_amount)
+        logger.debug('transact_amount=%s', transact_amount)
+        logger.debug('transact_datetime=%s', transact_datetime)
+        logger.debug('transact_by_username=%s', transact_by_username)
+        logger.debug('system_remarks=%s', system_remarks)
+        
+        customer_transaction = SalesTransaction(
+                                transact_merchant               = transact_outlet.merchant_acct_entity.create_ndb_key(),
+                                transact_outlet                 = transact_outlet.create_ndb_key() if transact_outlet else None,
+                                
+                                tax_amount                      = tax_amount,
+                                transact_amount                 = transact_amount,
+                                
+                                transaction_id                  = transaction_id,
+                                invoice_id                      = invoice_id,
+                                remarks                         = remarks,
+                                system_remarks                  = system_remarks,
+                                
+                                transact_by                     = transact_by.create_ndb_key() if transact_by else None,
+                                transact_by_username            = transact_by_username,
+                                
+                                transact_datetime               = transact_datetime,
+                                
+                                is_sales_transaction            = True,
+                                allow_to_revert                 = True,
+                                
+                                )
+        
+        customer_transaction.put()
+        #customer.put()
+        
+        return customer_transaction
+    
+class CustomerTransaction(SalesTransaction):
+    '''
+    Customer as ancestor
+    '''
+    
+    
     entitled_reward_summary     = ndb.JsonProperty()
     entitled_voucher_summary    = ndb.JsonProperty()
     entitled_prepaid_summary    = ndb.JsonProperty()
@@ -58,16 +169,13 @@ class CustomerTransaction(BaseNModel, DictModel):
     
     reward_giveaway_method      = ndb.StringProperty(required=False, default=program_conf.PROGRAM_REWARD_GIVEAWAY_METHOD_SYSTEM)
     
-    allow_to_revert             = ndb.BooleanProperty(required=False, default=True)
     
-    is_revert                   = ndb.BooleanProperty(required=False, default=False)
-    reverted_datetime           = ndb.DateTimeProperty(required=False)
-    reverted_by                 = ndb.KeyProperty(name="reverted_by", kind=MerchantUser)
-    reverted_by_username        = ndb.StringProperty(required=False)
+    
+    is_from_instant_transaction = ndb.BooleanProperty(required=False, default=False)
     
     is_reward_redeemed          = ndb.BooleanProperty(required=False, default=False)
     
-    is_sales_transaction        = ndb.BooleanProperty(required=False, default=True)
+    
     
     is_membership_purchase      = ndb.BooleanProperty(required=False, default=False)
     is_membership_renew         = ndb.BooleanProperty(required=False, default=False)
@@ -120,23 +228,6 @@ class CustomerTransaction(BaseNModel, DictModel):
     def transact_customer_acct(self):
         return Customer.fetch(self.key.parent().urlsafe())
     
-    @property
-    def transact_user_acct_key(self):
-        return Customer.fetch(self.key.parent().urlsafe()).registered_user_acct_key
-    
-    @property
-    def transact_merchant_acct(self):
-        return MerchantAcct.fetch(self.transact_merchant.urlsafe())
-    
-    @property
-    def transact_outlet_key(self):
-        if self.transact_outlet:
-            return self.transact_outlet.urlsafe().decode('utf-8')
-    
-    @property
-    def transact_merchant_acct_key(self):
-        return self.transact_merchant.urlsafe().decode('utf-8')
-    
     @property
     def transact_customer_key(self):
         return self.key.parent().urlsafe().decode('utf-8')
@@ -146,22 +237,16 @@ class CustomerTransaction(BaseNModel, DictModel):
         if self.transact_outlet:
             return Outlet.fetch(self.transact_outlet.urlsafe())
     
-    @property
-    def transact_by_user(self):
-        if self.transact_by:
-            return MerchantUser.fetch(self.transact_by.urlsafe())
-        
-    @property
-    def after_deduct_tax_sales_amount(self):
-        if self.tax_amount:
-            return self.transact_amount - self.tax_amount
-        else:
-            return self.transact_amount
     
     @property
     def purchased_merchant_membership_key(self):
         if self.purchased_merchant_membership:
             return self.purchased_merchant_membership.urlsafe().decode('utf-8')
+        
+    @property
+    def purchased_merchant_membership_entity(self):
+        if self.purchased_merchant_membership:
+            return MerchantMembership.fetch(self.purchased_merchant_membership.urlsafe())    
     
     @property
     def purchased_customer_membership_entity(self):
@@ -453,10 +538,6 @@ class CustomerTransaction(BaseNModel, DictModel):
     def get_by_transaction_id(transaction_id):
         return CustomerTransaction.query(CustomerTransaction.transaction_id==transaction_id).get()
     
-    @staticmethod
-    def get_by_invoice_id(invoice_id):
-        return CustomerTransaction.query(CustomerTransaction.invoice_id==invoice_id).get()
-    
     @staticmethod
     def list_transaction_by_date(transact_date, transact_outlet=None, including_reverted_transaction=True, offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False):