biz9-logic 4.9.17 → 4.9.20

package/biz9_config

@@ -1,4 +1,4 @@
-VERSION='8.8.7'
+VERSION='8.9.0'
 TITLE='BiZ9-Logic';
 REPO='git@github.com:biz9framework/biz9-logic.git';
 BRANCH='main';

package/index.js

@@ -86,36 +86,31 @@ class Title {
 	static ORDER_TRANSACTION_ID="TR-";
 	static ORDER_PAYMENT_STATUS_OPEN="Open";
 	static ORDER_PAYMENT_STATUS_COMPLETE="Complete";
-	static ORDER_PAYMENT_PLAN_PENDING="Pending";
 	static ORDER_PAYMENT_PLAN_1="1 Payment";
 	static ORDER_PAYMENT_PLAN_2="2 Payments";
 	static ORDER_PAYMENT_PLAN_3="3 Payments";
 	static ORDER_PAYMENT_PLAN_4="4 Payments";
+	static ORDER_PAYMENT_PLAN_5="5 Payments";
 	static ORDER_PAYMENT_METHOD_STRIPE="Stripe";
 	static ORDER_PAYMENT_METHOD_CASH="Cash";
 	static ORDER_PAYMENT_METHOD_OTHER="Other";
 	static ORDER_PAYMENT_METHOD_TEST="Test";
-
 	//cart
 	static CART_NUMBER="CA-";
-
 	//data_type
 	static DATA_TYPE_BLOG_POST="Blog Post";
 	static DATA_TYPE_CATEGORY="Category";
 	static DATA_TYPE_CONTENT="Content";
-
 	//role
 	static USER_ROLE_SUPER_ADMIN='Super Admin';
 	static USER_ROLE_ADMIN='Admin';
 	static USER_ROLE_MANAGER='Manager';
 	static USER_ROLE_USER='User';
 	static USER_ROLE_GUEST='Guest';
-
 	//app
 	static APP_MOBILE="Mobile";
 	static APP_WEBSITE="Website";
 	static APP_LANDING="Landing";
-
 	//social
 	static SOCIAL_URL_FACEBOOK="https://facebook.com/";
 	static SOCIAL_URL_TWITTER="https://twitter.com/";
@@ -470,8 +465,8 @@ class Order_Logic {
 				parent_data_type:cart_item.parent_data_type,
 				parent_id:cart_item.parent_id,
 				user_id:order.user_id,
-				quanity:cart_item.quanity,
-				cost:cart_item.cost,
+				quanity:cart_item.quanity?cart_item.quanity:0,
+				cost:cart_item.cost?cart_item.cost:0,
 				order_sub_item_list:[]
 			});
 			cart_item.cart_sub_item_list.forEach(cart_sub_item => {
@@ -480,8 +475,8 @@ class Order_Logic {
 					parent_data_type:cart_sub_item.parent_data_type,
 					parent_id:cart_sub_item.parent_id,
 					user_id:order.user_id,
-					quanity:cart_sub_item.quanity,
-					cost:cart_sub_item.cost
+					quanity:cart_sub_item.quanity?cart_sub_item.quanity:0,
+					cost:cart_sub_item.cost?cart_sub_item.cost:0
 				})
 				order_item.order_sub_item_list.push(order_sub_item);
 			});
@@ -496,10 +491,11 @@ class Order_Logic {
 				order_number:order_number,
 				payment_method_type:payment_method_type,
 				payment_amount:payment_amount,
-				transaction_id:Order_Logic.TRANSACTION_ID + Num.get_id(99999)
+				payment_amount:payment_amount,
+				transaction_id:Title.ORDER_TRANSACTION_ID + Num.get_id(99999)
 			});
 	};
-	 static get_total = (order) => {
+ 	static get_total = (order) => {
         let grand_total = 0;
         order.order_item_list.forEach(order_item => {
             order_item.sub_total = 0;
@@ -515,19 +511,26 @@ class Order_Logic {
                 }
             });
         });
-		 order.grand_total = grand_total;
+		order.grand_total = grand_total;
         return order;
     };
 }
 class Cart_Logic {
-	static get_new = (parent_data_type,user_id) => {
-		return DataItem.get_new(DataType.CART,0,{user_id:user_id,cart_number:Title.CART_NUMBER + Num.get_id(99999),parent_data_type:parent_data_type,grand_total:0,cart_item_list:[]});
+	static get_new = (parent_data_type,user_id,option) => {
+		option = option?option:{get_payment_plan:false,payment_plan:Title.ORDER_PAYMENT_PLAN_1,payment_plan_status:Title.ORDER_PAYMENT_STATUS_OPEN};
+		Log.w('rrrrr',option);
+		let order = DataItem.get_new(DataType.CART,0,{user_id:user_id,cart_number:Title.CART_NUMBER + Num.get_id(99999),parent_data_type:parent_data_type,grand_total:0,cart_item_list:[]});
+		if(option.get_payment_plan){
+			order.payment_plan = option.payment_plan;
+			order.payment_status = option.payment_plan_status;
+		}
+		return order;
 	};
 	static get_new_cart_item = (parent_data_type,parent_id,cart_number,quanity,cost) =>{
-		return DataItem.get_new(DataType.CART_ITEM,0,{parent_data_type:parent_data_type,parent_id:parent_id,cart_number:cart_number,quanity:quanity,cost:cost?cost:0,cart_sub_item_list:[]});
+		return DataItem.get_new(DataType.CART_ITEM,0,{parent_data_type:parent_data_type,parent_id:parent_id,cart_number:cart_number,quanity:quanity?quanity:0,cost:cost?cost:0,cart_sub_item_list:[]});
 	};
 	static get_new_cart_sub_item = (parent_data_type,parent_id,cart_number,quanity,cost) =>{
-		return DataItem.get_new(DataType.CART_SUB_ITEM,0,{parent_data_type:parent_data_type,parent_id:parent_id,cart_number:cart_number,quanity:quanity,cost:cost?cost:0});
+		return DataItem.get_new(DataType.CART_SUB_ITEM,0,{parent_data_type:parent_data_type,parent_id:parent_id,cart_number:cart_number,quanity:quanity?quanity:0,cost:cost?cost:0});
 	};
     static get_total = (cart) => {
         let grand_total = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "biz9-logic",
-  "version": "4.9.17",
+  "version": "4.9.20",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/test.js

@@ -1,5 +1,5 @@
 const series = require('async-series');
-const {DataItem,DataType,Page_Logic,Product_Logic,Type,Stat_Logic,Service_Logic,Blog_Post_Logic,Event_Logic,Demo_Logic,Cart_Logic} = require('./index');
+const {DataItem,DataType,Page_Logic,Product_Logic,Type,Title,Stat_Logic,Service_Logic,Blog_Post_Logic,Event_Logic,Demo_Logic,Cart_Logic} = require('./index');
 const {Log,Num,Str} = require('biz9-utility');
 const {Scriptz}= require('biz9-scriptz');
 
@@ -31,40 +31,21 @@ describe("connect", () => {
         series([
             function(call) {
                 console.log('CONNECT-START');
-                //console.log(Cart_Logic.get_new(DataType.PRODUCT,123));
-                //console.log(Type.get_title(Str.get_title(DataType.BLOG_POST)));
-                console.log(Type.get_title(DataType.BLOG_POST));
-                /*
-
-                let post_type_list = [
-                Demo_Logic.get_new_type('Computer 1',{
-                    get_category:true,category_count:12,category_data_type:DataType.PRODUCT,categorys:'',
-                   get_item:true,item_count:500,item_data_type:DataType.PRODUCT,items:null}),
-                Demo_Logic.get_new_type('Computer 2',{
-                    get_category:true,category_count:12,category_data_type:DataType.PRODUCT,categorys:'',
-                   get_item:true,item_count:500,item_data_type:DataType.PRODUCT,items:null})
-                ];
 
-                Log.w('post_type_list',post_type_list);
+                let post_cart = Cart_Logic.get_new(DataType.PRODUCT,0,{get_payment_plan:true,payment_plan:Title.ORDER_PAYMENT_PLAN_1,payment_plan_status:Title.ORDER_PAYMENT_STATUS_OPEN});
+                /*
+                let post_cart_list = [];
+                let post_cart_item = Cart_Logic.get_new_cart_item(DataType.PRODUCT,123,post_cart.cart_number,1,30);
+                let post_cart_sub_item = Cart_Logic.get_new_cart_sub_item(DataType.PRODUCT,1234,post_cart.cart_number,1,10);
+                let post_cart_sub_item_2 = Cart_Logic.get_new_cart_sub_item(DataType.PRODUCT,1234,post_cart.cart_number,1,30);
+                post_cart_item.cart_sub_item_list.push(post_cart_sub_item);
+                post_cart_item.cart_sub_item_list.push(post_cart_sub_item_2);
+                post_cart.cart_item_list.push(post_cart_item);
+                */
 
-                let post_item_count = 0;
-                let post_category_count = 0;
-                for(const item_type of post_type_list){
-                    for(const item_cat of item_type.categorys){
-                        post_category_count = post_category_count+1;
-                        if(!item_cat.items){
-                            item_cat.items = []
-                        }
-                            for(const item_item of item_cat.items){
-                                post_item_count = post_item_count+1;
-                            }
-                    }
-                };
+                Log.w('post_cart',post_cart);
+                //Log.w('post_cart_2',Cart_Logic.get_total(post_cart));
 
-                Log.w('post_type_list',post_type_list);
-                Log.w('post_type_list',post_type_list[0].categorys);
-                */
-                //Log.w('post_item_count',post_item_count);
 
                 console.log('CONNECT-END');
                 //call();