biz9-logic 4.9.27 → 4.9.33

package/biz9_config

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

package/index.js

@@ -127,7 +127,11 @@ class Demo_Logic {
 			let category_title_list = [];
 			if(option.categorys){
 				category_title_list = option.categorys.split(',');
+				option.category_count = category_title_list.length;
 			}else{
+				if(!option.category_count){
+					option.category_count = 1;
+				}
 				for(let a = 1;a<parseInt(option.category_count)+1;a++){
 					category_title_list.push(title + " Category " +a);
 				}
@@ -140,12 +144,14 @@ class Demo_Logic {
 			let item_title_list = [];
 			if(option.items){
 				item_title_list = option.items.split(',');
+				option.item_count = item_title_list.length;
 			}else{
 					for(let b = 1;b<parseInt(option.item_count)+1;b++){
-						item_title_list.push(title+" " +Type.get_title(item.categorys[Num.get_id(item.categorys.length)].category)+" "+ b);
+						item_title_list.push(title+" " +Type.get_title(item.categorys[Num.get_id(option.category_count)].category)+" "+ b);
 					}
 			}
-			const cat_item = item.categorys[Num.get_id(item.categorys.length)];
+			for(let a = 0;a < option.item_count; a++){
+			const cat_item = item.categorys[Num.get_id(option.category_count)];
 			if(!cat_item.items){
 				cat_item.items = [];
 			}
@@ -162,13 +168,12 @@ class Demo_Logic {
 						child_item.note = Field_Logic.get_test_note(),
 						cat_item.items.push(child_item);
 				}
+			}
 		}
 		return item;
 	};
 }
-
 class Type {
-
 	static get_stat_type_list = () =>{
 		return [
 			{title:Type.get_title(Type.STAT_VIEW),type:Type.STAT_VIEW,label:Type.get_title(Type.STAT_VIEW),value:Type.STAT_VIEW},
@@ -178,10 +183,10 @@ class Type {
 			{title:Type.get_title(Type.STAT_FAVORITE),type:Type.STAT_FAVORITE,label:Type.get_title(Type.STAT_FAVORITE),value:Type.STAT_FAVORITE},
 			{title:Type.get_title(Type.STAT_CART),type:Type.STAT_CART,label:Type.get_title(Type.STAT_CART),value:Type.STAT_CART},
 			{title:Type.get_title(Type.STAT_ORDER),type:Type.STAT_ORDER,label:Type.get_title(Type.STAT_ORDER),value:Type.STAT_ORDER},
+			{title:Type.get_title(Type.STAT_ORDER_PAYMENT),type:Type.STAT_ORDER_PAYMENT,label:Type.get_title(Type.STAT_ORDER_PAYMENT),value:Type.STAT_ORDER_PAYMENT},
 			{title:Type.get_title(Type.STAT_REVIEW),type:Type.STAT_REVIEW,label:Type.get_title(Type.STAT_REVIEW),value:Type.STAT_REVIEW},
 		]
 	};
-
 	//page
 	static PAGE_ABOUT='about';
 	static PAGE_CONTACT='contact';
@@ -211,6 +216,7 @@ class Type {
 	static STAT_FAVORITE='favorite_post';
 	static STAT_CART='cart_post';
 	static STAT_ORDER='order_post';
+	static STAT_ORDER_PAYMENT='order_payment_post';
 	static STAT_REVIEW='review_post';
 	//template
 	static TEMPLATE_PRIMARY='primary';
@@ -394,37 +400,59 @@ class Stat_Logic {
 		let action_url="item/search_activity";
 		return get_cloud_url_main(app_id,url,action_url,param);
 	};
-	static get_new = (user_id,parent_data_type,parent_id,stat_type,data)=>{
-		return {
-			user_id:user_id,
-			parent_data_type:parent_data_type,
-			parent_id:parent_id,
-			type:stat_type,
-			data:data
-		}
-	}
 	static get_new_user = (user_id,stat_type,data)=>{
 		return {
 			user_id:user_id,
 			type:stat_type,
 			data:data,
 		}
-	}
+	};
 	static get_new = (user_id,stat_type,parent_item_list,data)=>{
-		return {
-			user_id:user_id,
-			type:stat_type,
-			parent_item_list:parent_item_list,
-			data:data,
-		}
-	}
+		let stat_list = [];
+		for(const item of parent_item_list){
+			let stat = DataItem.get_new(DataType.STAT,0);
+			stat.user_id=user_id;
+			stat.type=stat_type;
+			if(item.parent_id){
+				stat.parent_id=item.parent_id;
+			}
+			if(item.parent_data_type==DataType.PRODUCT || item.parent_data_type==DataType.SERVICE  || item.parent_data_type==DataType.EVENT ){
+				stat.parent_data_type=item.parent_data_type;
+				stat.parent_id=item.parent_id;
+				stat.parent_cost = item.cost;
+				stat.parent_quanity = item.quanity;
+			}
+			if(item.data_type==DataType.CART_ITEM){
+				stat.parent_data_type=item.parent_data_type;
+				stat.parent_id=item.parent_id;
+				stat.parent_cart_id = item.cart_id;
+				stat.parent_cart_number = item.cart_number;
+			}
+			if(item.data_type==DataType.ORDER){
+				stat.parent_data_type=item.data_type;
+				stat.parent_id=item.id;
+				stat.parent_order_id = item.order_id;
+				stat.parent_order_number = item.order_number;
+			}
+			if(item.data_type==DataType.ORDER_PAYMENT){
+				stat.parent_data_type=item.data_type;
+				stat.parent_id=item.id;
+				stat.parent_order_number = item.order_number;
+				stat.parent_payment_method_type = item.payment_method_type;
+				stat.parent_payment_amount = item.payment_amount;
+				stat.parent_transaction_id = item.transaction_id;
+			}
+			stat_list.push(stat);
+		};
+		return stat_list;
+	};
 	static get_new_activity = (user_id,stat_type,activity_data)=>{
 		return {
 			user_id:user_id,
 			type:stat_type,
 			activity:data,
 		}
-	}
+	};
 }
 class Page_Logic {
 	static get_page_list(){

package/package.json

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

package/test.js

@@ -30,11 +30,63 @@ describe("connect", () => {
     it("_connect", () => {
         series([
             function(call) {
-                console.log('CONNECT-START');
+            console.log('CONNECT-CMS-DEMO-START');
 
-                let post_cart = {};
+        let category_type = DataType.PRODUCT;
+        let category_count = 12;
+        let item_count = 500;
+        let category_type_title_list = ['Add On','Admin Panel','Hosting','Landing Page','Mobile','Website'];
+        let category_title_list = ['Beauty','Church','Fashion','Food Trucks','Health Care','Music','Pets','Services','Service Repair','Sports','Trucking'];
+        let item_title_list = [];
+		let post_type_list = [];
+        let val_category_title = '';
+        let cat_max = 0;
+        let option = {get_category:true,category_count:category_count,category_data_type:category_type,categorys:val_category_title?val_category_title:null,
+                   get_item:true,item_count:item_count,item_data_type:category_type,items:null}
+
+        if(category_title_list.length >0){
+            cat_max = category_title_list.length;
+        }else{
+            if(category_count.length){
+                cat_max = category_count;
+            }else{
+                cat_max = 0;
+            }
+        }
+        option.item_count = item_count / cat_max;
+        for(const item of category_type_title_list){
+            post_type_list.push(
+            Demo_Logic.get_new_type(item,option));
+        }
+
+        Log.w('post_type_list',post_type_list);
+        //Log.w('category_type_title_list',category_type_title_list);
+        //Log.w('category_title_list',category_title_list);
+        //Log.w('option',option);
+
+        /*
+        let post_category_count = 0;
+        let post_item_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;
+                }
+            }
+        };
+        let data = await App_User_Data.post(Url.CMS_DEMO_POST,{data_type:category_type,type_list:post_type_list,option:option});
+        alert_prop.current.showValidation("Demo OK. "+ post_type_list.length + " Types "+ category_count+" Categorys "+" "+item_count+" " +" Items");
+        */
+        console.log('CONNECT-CMS-DEMO-SUCCESS');
+
+            },
+            function(call) {
+                //console.log('CONNECT-START');
                 //let post_cart = Cart_Logic.get_new(DataType.PRODUCT,0,);
-                Log.w('11_type',Type.get_stat_list());
                 //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);
@@ -47,7 +99,7 @@ describe("connect", () => {
                 //Log.w('post_order',Order_Logic.get_new(post_cart,{get_payment_plan:true,payment_plan:Title.ORDER_PAYMENT_PLAN_1,payment_plan_status:Title.ORDER_PAYMENT_STATUS_OPEN}));
                 //Log.w('post_cart_2',Cart_Logic.get_total(post_cart));
 
-                console.log('CONNECT-END');
+                //console.log('CONNECT-END');
                 //call();
             },
             function(call) {