biz9-logic 4.9.62 → 4.9.68

package/biz9_config

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

package/index.js

@@ -199,14 +199,31 @@ class Type {
 	static APP_LINK_TYPE_CMS='cms';
 
 	//field
-	static ID='id';
+	static ASC='asc';
+	static BLANK='blank';
+	static CART_ITEM_LIST='cart_item_list';
+	static CART_SUB_ITEM_LIST='cart_sub_item_list';
 	static DATA_TYPE='data_type';
+	static DESC='desc';
 	static DATE_CREATE='date_create';
 	static DATE_SAVE='date_save';
+	static ID='id';
+	static N_A='n/a';
+	static USER='user';
+	static USER_ID='user_id';
+	static CART_ITEM_LIST='cart_item_list';
+	static CART_SUB_ITEM_LIST='cart_sub_item_list';
+	static ORDER_ITEM_LIST='order_item_list';
+	static ORDER_SUB_ITEM_LIST='order_sub_item_list';
 	static PARENT_ID='parent_id';
+	static PARENT_ITEM='parent_item';
 	static PARENT_DATA_TYPE='parent_data_type';
 	static SETTING_VISIBLE='setting_visible';
 	static SOURCE='source';
+	static SOURCE_ID='source_id';
+	static SOURCE_PARENT_ID='source_parent_id';
+	static TITLE='title';
+	static TITLE_URL='title_url';
 
 	//page
 	static PAGE_ABOUT='about';
@@ -299,7 +316,6 @@ class Type {
 			{title:Type.get_title(Type.STAT_VIEW),type:Type.STAT_VIEW,label:Type.get_title(Type.STAT_VIEW),value:Type.STAT_VIEW},
 		]
 	};
-
 	static get_data_type_list = () =>{
 		return [
 			{title:Type.get_title(DataType.BLOG_POST),type:DataType.BLOG_POST,label:Type.get_title(DataType.BLOG_POST),value:DataType.BLOG_POST},
@@ -342,8 +358,7 @@ class Type {
 			{title:Type.get_title(Type.APP_LINK_TYPE_APPLE_STORE),type:Type.APP_LINK_TYPE_APPLE_STORE,label:Type.get_title(Type.APP_LINK_TYPE_APPLE_STORE),value:Type.APP_LINK_TYPE_APPLE_STORE},
 		]
 	};
-
-
+	//9_get_title
 	static get_title = (type,option)=>{
 		/* option
 		 * get_lowercase = ex. true,false / def. false
@@ -355,65 +370,71 @@ class Type {
 		option = option ? option : {get_lowercase:false,get_plural:false,get_url:false};
 		switch(type){
 			case Type.STAT_CART:
-				return "Cart";
+				r_type = "Cart";
 				break;
 			case Type.STAT_CART_ITEM:
-				return "Cart Item";
+				r_type = "Cart Item";
 				break;
 			case Type.STAT_CART_SUB_ITEM:
-				return "Cart Sub Item";
+				r_type = "Cart Sub Item";
 				break;
 			case Type.STAT_FAVORITE:
-				return "Favorite";
+				r_type = "Favorite";
 				break;
 			case Type.STAT_LIKE:
-				return "Like";
+				r_type = "Like";
 				break;
 			case Type.STAT_LOGIN:
-				return "Login";
+				r_type = "Login";
 				break;
 			case Type.STAT_ORDER:
-				return "Order";
+				r_type = "Order";
 				break;
 			case Type.STAT_ORDER_ITEM:
-				return "Order Item";
+				r_type = "Order Item";
 				break;
 			case Type.STAT_ORDER_SUB_ITEM:
-				return "Order Sub Item";
+				r_type = "Order Sub Item";
 				break;
 			case Type.STAT_ORDER_PAYMENT:
-				return "Order Payment";
+				r_type = "Order Payment";
 				break;
 			case Type.STAT_REGISTER:
-				return "Register";
+				r_type = "Register";
 				break;
 			case Type.STAT_REVIEW:
-				return "Review";
+				r_type = "Review";
 				break;
 			case Type.STAT_VIEW:
-				return "View";
+				r_type = "View";
 				break;
 			case Type.APP_ENV_TEST:
-				return "Testing";
+				r_type = "Testing";
 				break;
 			case Type.APP_ENV_STAGE:
-				return "Staging";
+				r_type = "Staging";
 				break;
 			case Type.APP_ENV_PROD:
-				return "Production";
+				r_type = "Production";
 				break;
 			case Type.APP_LINK_TYPE_WEBSITE:
-				return "Website";
+				r_type = "Website";
 				break;
 			case Type.APP_LINK_TYPE_GOOGLE_PLAY:
-				return "Google Play";
+				r_type = "Google Play";
 				break;
 			case Type.APP_LINK_TYPE_APPLE_STORE:
-				return "Apple Store";
+				r_type = "Apple Store";
 				break;
 			case Type.APP_LINK_TYPE_CMS:
-				return "Content Management System";
+				r_type = "Content Management System";
 				break;
+
+			case Type.ID:
+				r_type = "ID";
+			case Type.N_A:
+				r_type = "N/A";
+
 			case Type.PAGE_ABOUT:
 			case Type.PAGE_BLOG_POST:
 			case Type.PAGE_BLOG_POST_DETAIL:
@@ -492,7 +513,10 @@ class Type {
 				r_type = r_type.replace(" ","_").toLowerCase();
 			}
 			return r_type;
-	}
+	};
+	static get_type_title = (data_type) => {
+		return String(data_type.replaceAll('_',' ').replaceAll('dt','').replace('biz','')).trim();
+	};
 }
 class Stat_Logic {
 	static get_new = (parent_data_type,parent_id,stat_type,user_id,post_data) => {
@@ -512,7 +536,18 @@ class Stat_Logic {
 		let filter_stat = {};
 		for(const prop in post_data) {
     		const value = post_data[prop];
-			if (!Array.isArray(value)  && prop != Type.SOURCE && prop != Type.DATE_CREATE && prop != Type.DATE_SAVE  && prop != Type.DATA_TYPE && prop != Type.ID) {
+			if (!Array.isArray(value)
+				&& prop != Type.SOURCE
+				&& prop != Type.DATE_CREATE
+				&& prop != Type.DATE_SAVE
+				&& prop != Type.DATA_TYPE
+  				&& prop != Type.CART_ITEM_LIST
+				&& prop != Type.CART_SUB_ITEM_LIST
+                && prop != Type.ORDER_ITEM_LIST
+				&& prop != Type.ORDER_SUB_ITEM_LIST
+                && prop != Type.SOURCE
+				&& prop != Type.SOURCE_ID
+				&& prop != Type.ID) {
 			 		filter_stat[prop] = post_data[prop];
     			}
   		}
@@ -576,6 +611,17 @@ class Order_Logic {
 			grand_total:cart.grand_total,
 			order_item_list:[]
 		});
+		for(const key in cart) {
+			if(!Str.check_is_null(cart[key])
+				&& key != Type.ID && key != Type.DATA_TYPE
+				&& key != Type.PARENT_ITEM && key != Type.USER
+                && key != Type.CART_ITEM_LIST && key != Type.CART_SUB_ITEM_LIST
+                && key != Type.ORDER_ITEM_LIST && key != Type.ORDER_SUB_ITEM_LIST
+                && key != Type.SOURCE && key != Type.SOURCE_ID
+                && key != Type.DATE_CREATE && key != Type.DATE_SAVE){
+				order[key] = cart[key];
+             }
+        }
 		if(option.get_payment_plan){
 			order.payment_plan = option.payment_plan;
 			order.payment_status = option.payment_plan_status;
@@ -590,6 +636,17 @@ class Order_Logic {
 				cost:cart_item.cost?cart_item.cost:0,
 				order_sub_item_list:[]
 			});
+		for(const key in cart_item){
+			if(!Str.check_is_null(cart_item[key])
+				&& key != Type.ID && key != Type.DATA_TYPE
+				&& key != Type.PARENT_ITEM && key != Type.USER
+                && key != Type.CART_ITEM_LIST && key != Type.CART_SUB_ITEM_LIST
+                && key != Type.ORDER_ITEM_LIST && key != Type.ORDER_SUB_ITEM_LIST
+                && key != Type.SOURCE && key != Type.SOURCE_ID
+                && key != Type.DATE_CREATE && key != Type.DATE_SAVE){
+					order_item[key] = cart_item[key];
+             }
+        }
 			cart_item.cart_sub_item_list.forEach(cart_sub_item => {
 				let order_sub_item = DataItem.get_new(DataType.ORDER_SUB_ITEM,0,{
 					order_number:order.order_number,
@@ -599,6 +656,17 @@ class Order_Logic {
 					quanity:cart_sub_item.quanity?cart_sub_item.quanity:0,
 					cost:cart_sub_item.cost?cart_sub_item.cost:0
 				})
+				for(const key in cart_sub_item){
+					if(!Str.check_is_null(cart_sub_item[key])
+						&& key != Type.ID && key != Type.DATA_TYPE
+						&& key != Type.PARENT_ITEM && key != Type.USER
+                		&& key != Type.CART_ITEM_LIST && key != Type.CART_SUB_ITEM_LIST
+                		&& key != Type.ORDER_ITEM_LIST && key != Type.ORDER_SUB_ITEM_LIST
+                		&& key != Type.SOURCE && key != Type.SOURCE_ID
+                		&& key != Type.DATE_CREATE && key != Type.DATE_SAVE){
+						order_sub_item[key] = cart_sub_item[key];
+             		}
+        		}
 				order_item.order_sub_item_list.push(order_sub_item);
 			});
 			order.order_item_list.push(order_item);
@@ -1744,7 +1812,7 @@ class App_Logic {
 		return {data_type:data_type,filter:filter,sort_by:sort_by,page_current:page_current,page_size:page_size};
 	}
 	static get_not_found = (data_type,id,option) =>{
-		option=option?option:{app_id:'blank'};
+		option=option?option:{};
 		if(data_type != DataType.USER){
 		if(!id){
 			id=0;
@@ -1756,9 +1824,6 @@ class App_Logic {
 		item.title_url = Str.get_title_url(item.title);
 		item.images = [];
 		item.items = [];
-		if(option.app_id){
-			item.app_id = option.app_id;
-		}
 		return item;
 		}else{
 		let user = User_Logic.get_test("",{get_blank:true})
@@ -1769,9 +1834,6 @@ class App_Logic {
 		user.title_url = Str.get_title_url(user.title);
 		user.images = [];
 		user.items = [];
-		if(option.app_id){
-			user.app_id = option.app_id;
-		}
 		return user;
 		}
 
@@ -1831,8 +1893,7 @@ class App_Logic {
 			item_count:item_count?item_count:0,
 			page_count:page_count?page_count:1,
 			filter:filter?filter:{},
-			data_list:data_list?data_list:[],
-			app_id:app_id?app_id:null,
+			data_list:data_list?data_list:[]
 		}
 	}
 }

package/package.json

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