biz9-logic 4.9.60 → 4.9.66

package/biz9_config

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

package/index.js

@@ -189,15 +189,41 @@ class Demo_Logic {
 	};
 }
 class Type {
-//field
-	static ID='id';
+	//app_status
+	static APP_ENV_TEST='test';
+	static APP_ENV_STAGE='stage';
+	static APP_ENV_PROD='prod';
+	static APP_LINK_TYPE_WEBSITE='website';
+	static APP_LINK_TYPE_GOOGLE_PLAY='google_play';
+	static APP_LINK_TYPE_APPLE_STORE='apple_store';
+	static APP_LINK_TYPE_CMS='cms';
+
+	//field
+	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';
@@ -290,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},
@@ -319,6 +344,21 @@ class Type {
 			{title:Type.get_title(DataType.TYPE),type:DataType.TYPE,label:Type.get_title(DataType.TYPE),value:DataType.TYPE}
 		]
 	};
+	static get_app_environment_list = () =>{
+		return [
+			{title:Type.get_title(Type.APP_ENV_TEST),type:Type.APP_ENV_TEST,label:Type.get_title(Type.APP_ENV_TEST),value:Type.APP_ENV_TEST},
+			{title:Type.get_title(Type.APP_ENV_STAGE),type:Type.APP_ENV_STAGE,label:Type.get_title(Type.APP_ENV_STAGE),value:Type.APP_ENV_STAGE},
+			{title:Type.get_title(Type.APP_ENV_PROD),type:Type.APP_ENV_PROD,label:Type.get_title(Type.APP_ENV_PROD),value:Type.APP_ENV_PROD},
+		]
+	};
+	static get_app_link_list = () =>{
+		return [
+			{title:Type.get_title(Type.APP_LINK_TYPE_WEBSITE),type:Type.APP_LINK_TYPE_WEBSITE,label:Type.get_title(Type.APP_LINK_TYPE_WEBSITE),value:Type.APP_LINK_TYPE_WEBSITE},
+			{title:Type.get_title(Type.APP_LINK_TYPE_GOOGLE_PLAY),type:Type.APP_LINK_TYPE_GOOGLE_PLAY,label:Type.get_title(Type.APP_LINK_TYPE_GOOGLE_PLAY),value:Type.APP_LINK_TYPE_GOOGLE_PLAY},
+			{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
@@ -330,46 +370,72 @@ 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:
+				r_type = "Testing";
 				break;
-	case Type.PAGE_ABOUT:
+			case Type.APP_ENV_STAGE:
+				r_type = "Staging";
+				break;
+			case Type.APP_ENV_PROD:
+				r_type = "Production";
+				break;
+			case Type.APP_LINK_TYPE_WEBSITE:
+				r_type = "Website";
+				break;
+			case Type.APP_LINK_TYPE_GOOGLE_PLAY:
+				r_type = "Google Play";
+				break;
+			case Type.APP_LINK_TYPE_APPLE_STORE:
+				r_type = "Apple Store";
+				break;
+			case Type.APP_LINK_TYPE_CMS:
+				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:
 			case Type.PAGE_CONTACT:
@@ -447,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) => {
@@ -467,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];
     			}
   		}
@@ -531,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;
@@ -545,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,
@@ -554,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);

package/package.json

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

package/test.js

@@ -46,8 +46,9 @@ describe("connect", () => {
            item.user = user;
            item_list.push(item);
        }
+       Log.w('aaaaa',Type.get_app_link_list());
        //Log.w('item_list',item_list);
-       Log.w('bind_obj_list',App_Logic.bind_item_parent_user_list(item_list));
+       //Log.w('bind_obj_list',App_Logic.bind_item_parent_user_list(item_list));
 
        //item.id = 333;
        //item.items = ['a','b'];