biz9-logic 10.0.16 → 10.0.22

package/biz9_config

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

package/index.js

@@ -18,6 +18,7 @@ class Message {
 	static USER_EMAIL_NEW_CONFIRM_BAD="The New and Confirm Email Dont Match.";
 	static USER_PASSWORD_NEW_CONFIRM_BAD="The New and Confirm Password Dont Match.";
 	static USER_PASSWORD_BAD="Please Enter A Valid Password.";
+	static USER_PASSWORD_NOT_VALID="Password must be between 7 and 15 characters long, have at least one uppercase and lowercase letter, and also contain at least one digit and one special character.";
 	static USER_EMAIL_NOT_UNIQUE="Email Not Availble. Please Choose Another.";
 	static USER_USERNAME_BAD="Please Enter A Valid Username.";
 	static USER_USERNAME_NOT_UNIQUE="Username Not Availble. Please Choose Another.";
@@ -37,7 +38,29 @@ class Item_Logic {
 		const item = DataItem.get_new(data_type,0,{title:title,title_url:Str.get_title_url(title),setting_visible:"1"});
 		return item;
 	};
-
+	static copy = (data_type,item)=>{
+		let copy_item = DataItem.get_new(data_type,0);
+		const keys = Object.keys(item);
+			keys.forEach(key => {
+				if(
+					key!=Type.FIELD_ID&&
+					key!=Type.FIELD_SOURCE&&
+					key!=Type.FIELD_TITLE&&
+					key!=Type.FIELD_TITLE_URL&&
+					key!=Type.FIELD_DATE_CREATE&&
+					key!=Type.FIELD_DATE_SAVE&&
+					key!=Type.TITLE_OBJ&&
+					key!=Type.TITLE_USER&&
+					key!=Type.TITLE_GROUP&&
+					key!=Type.TITLE_ITEM&&
+					!Obj.check_is_array(item[key])&&
+					Obj.check_is_value(item[key])
+			){
+					copy_item[key]=item[key];
+				}
+			});
+		return copy_item;
+	};
 	static bind_child_parent_obj = (child_obj,parent_obj)=>{
 		for(const prop in parent_obj) {
 			child_obj['parent_'+prop] = parent_obj[prop];
@@ -50,18 +73,18 @@ class Item_Logic {
 		option = Field_Logic.get_option(data_type,option?option:{});
 		let item = DataItem.get_new(data_type,0,Field_Logic.get_test(title,option));
 		if(option.get_item){
-			item.items = Sub_Item_Logic.get_test_list(item,item,option);
-			item = Sub_Item_Logic.bind_parent_child_list(item,item.items);
+			item.items = Sub_Item_Logic.get_test_items(item,item,option);
+			item = Sub_Item_Logic.bind_parent_child_items(item,item.items);
 		}
 		return item;
 	}
-static get_test_list = (data_type,option) =>{
+static get_test_items = (data_type,option) =>{
 		option = Field_Logic.get_option(data_type,option?option:{});
-		let item_list = [];
+		let items = [];
 		for(let a=0;a<parseInt(option.item_count)+1;a++){
-			item_list.push(Item_Logic.get_test("Item " +String(parseInt(a+1)),data_type,option));
+			items.push(Item_Logic.get_test("Item " +String(parseInt(a+1)),data_type,option));
 		}
-		return item_list;
+		return items;
 	}
 }
 class Title {
@@ -130,36 +153,36 @@ class Demo_Logic {
 		option = option ? option : {get_category:false,category_count:6,categorys:'',category_data_type:DataType.BLANK,get_item:false,items:'',item_data_type:DataType.BLANK,item_count:6}; const item = Item_Logic.get_new(title,DataType.TYPE); //category
 		if(option.get_category){
 			item.categorys = [];
-			let category_title_list = [];
+			let category_titles = [];
 			if(option.categorys){
-				category_title_list = option.categorys.split(',');
-				option.category_count = category_title_list.length;
+				category_titles = option.categorys.split(',');
+				option.category_count = category_titles.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);
+					category_titles.push(Title.CATEGORY+" "+a);
 				}
 			}
-			category_title_list.forEach(cat_item => {
+			category_titles.forEach(cat_item => {
 				item.categorys.push(Category_Logic.get_new(cat_item,item.title,option.category_data_type));
 			});
 		}
 		//item
 		if(option.get_item){
-			let full_item_list = [];
+			let full_items = [];
 
-			let item_title_list = [];
+			let item_titles = [];
 			if(option.items){
-				item_title_list = option.items.split(',');
-				option.item_count = item_title_list.length;
+				item_titles = option.items.split(',');
+				option.item_count = item_titles.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(option.category_count)].category)+" "+ b);
+						item_titles.push(title+" " +Type.get_title(item.categorys[Num.get_id(option.category_count)].category)+" "+ b);
 					}
 			}
-			for(const child_item_title of item_title_list){
+			for(const child_item_title of item_titles){
 				const cat_item = item.categorys[Num.get_id(option.category_count)];
 					if(!cat_item.items){
 						cat_item.items = [];
@@ -175,7 +198,7 @@ class Demo_Logic {
 						child_item.description =Title.DESCRIPTION+" "+ String(Num.get_id());
 						child_item.note = Field_Logic.get_test_note(),
 						cat_item.items.push(child_item);
-						full_item_list.push(child_item);
+						full_items.push(child_item);
 				}
 		}
 		return item;
@@ -190,35 +213,73 @@ class Type {
 	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 OBJ='obj';
-	static LIST='list';
-	static COUNT='count';
-	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';
+    static FIELD_AUTHOR = 'author';
+ 	static FIELD_CATEGORY = 'category';
+    static FIELD_CATEGORY_TYPE = 'category_type';
+    static FIELD_COST = 'cost';
+	static FIELD_DATA_TYPE='data_type';
+	static FIELD_DATE_CREATE='date_create';
+	static FIELD_DATE_SAVE='date_save';
+	static FIELD_DATE = 'date';
+    static FIELD_DESCRIPTION = 'description';
+    static FIELD_EDIT_LOCATION = 'edit_location';
+	static FIELD_ID='id';
+    static FIELD_IMAGE_FILENAME = 'image_filename';
+    static FIELD_LOCATION = 'location';
+    static FIELD_MEETING_LINK = 'meeting_link';
+    static FIELD_NOTE = 'note';
+    static FIELD_OLD_COST = 'old_cost';
+ 	static FIELD_PARAM = 'param';
+	static FIELD_PARENT_DATA_TYPE='parent_data_type';
+	static FIELD_PARENT_ID='parent_id';
+	static FIELD_ROLE = 'role';
+	static FIELD_SOURCE='source';
+	static FIELD_SOURCE_DATA_TYPE='source_data_type';
+	static FIELD_SOURCE_ID='source_id';
+	static FIELD_SOURCE_PARENT_ID='source_parent_id';
+    static FIELD_SETTING_VISIBLE = 'setting_visible';
+    static FIELD_SETTING_DELETE_PROTECTION = 'setting_delete_protection';
+    static FIELD_SETTING_SORT_TYPE = 'setting_delete_sort_type';
+    static FIELD_STOCK = 'stock';
+    static FIELD_TAG = 'tag';
+    static FIELD_TIME = 'time';
+    static FIELD_TITLE='title';
+	static FIELD_TITLE_URL='title_url';
+    static FIELD_TYPE = 'type';
+    static FIELD_URL = 'url';
+ 	static FIELD_USER_CITY = 'city';
+    static FIELD_USER_COUNTRY = 'country';
+    static FIELD_USER_EMAIL = 'email';
+    static FIELD_USER_FIRST_NAME = 'first_name';
+    static FIELD_USER_GENDER = 'gender';
+	static FIELD_USER_ID='user_id';
+    static FIELD_USER_LAST_NAME = 'last_name';
+    static FIELD_USER_USERNAME = 'username';
+    static FIELD_USER_PASSWORD = 'password';
+    static FIELD_USER_STATE = 'state';
+    static FIELD_VALUE = 'value';
+    static FIELD_WEBSITE = 'website';
+	//title
+	static TITLE_BLANK='blank';
+	static TITLE_CART_ITEMS='cart_items';
+	static TITLE_CART_SUB_ITEMS='cart_sub_items';
+	static TITLE_CART_ITEMS='cart_items';
+	static TITLE_CART_SUB_ITEMS='cart_sub_items';
+	static TITLE_COUNT='count';
+	static TITLE_GROUP='group';
+	static TITLE_N_A='n/a';
+	static TITLE_ITEMS='items';
+	static TITLE_OBJ='obj';
+	static TITLE_ORDER_ITEMS='order_items';
+	static TITLE_ORDER_SUB_ITEMS='order_sub_items';
+	static TITLE_PARENT_ITEM='parent_item';
+	static TITLE_USER='user';
+	static TITLE_SORT_BY_ASC='asc';
+	static TITLE_SORT_BY_DESC='desc';
+	static TITLE_STAT_ITEMS='stat_items';
+	static TITLE_STAT_SUB_ITEMS='stat_items';
 	//page
 	static PAGE_ABOUT='about';
 	static PAGE_CONTACT='contact';
@@ -266,7 +327,7 @@ class Type {
 	static FIELD_VALUE_TEXT="text";
 	static FIELD_VALUE_NOTE="note";
 	static FIELD_VALUE_IMAGE="image";
-	static FIELD_VALUE_LIST="list";
+	static FIELD_VALUE_ITEMS="items";
 	//user_role
 	static USER_ROLE_SUPER_ADMIN='super_admin';
 	static USER_ROLE_ADMIN='admin';
@@ -303,7 +364,7 @@ class Type {
 	static ORDER_STATUS_RETURNED="returned";
 	static ORDER_STATUS_ON_HOLD="on_hold";
 	static ORDER_STATUS_CANCELLED="cancelled";
-	static get_order_status_list(){
+	static get_order_statuses(){
 		return [
 			{value:Type.ORDER_STATUS_NEW,label:Title.ORDER_STATUS_NEW},
 			{value:Type.ORDER_STATUS_OPEN,label:Title.ORDER_STATUS_OPEN},
@@ -313,7 +374,7 @@ class Type {
 			{value:Type.ORDER_STATUS_CANCELLED,label:Title.ORDER_STATUS_CANCELLED},
 		];
 	};
-	static get_user_role_list(){
+	static get_user_roles(){
 		return [
 			{value:Type.USER_ROLE_ADMIN,label:Title.USER_ROLE_ADMIN},
 			{value:Type.USER_ROLE_MANAGER,label:Title.USER_ROLE_MANAGER},
@@ -321,7 +382,7 @@ class Type {
 			{value:Type.USER_ROLE_GUEST,label:Title.USER_ROLE_GUEST},
 		];
 	};
-	static get_page_list(){
+	static get_pages(){
 		return [
 			{value:Type.PAGE_ABOUT,label:Title.PAGE_ABOUT,url:Url.PAGE_ABOUT},
 			{value:Type.PAGE_BLOG_POST,label:Title.PAGE_BLOG_POST,url:Url.PAGE_BLOG_POST},
@@ -342,7 +403,7 @@ class Type {
 			{value:Type.PAGE_SERVICE_HOME,label:Title.PAGE_SERVICE_HOME,url:Url.PAGE_SERVICE_HOME},
 		];
 	};
-	static get_stat_type_list = () =>{
+	static get_stat_types = () =>{
 		return [
 			{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_CART_ITEM),type:Type.STAT_CART_ITEM,label:Type.get_title(Type.STAT_CART_ITEM),value:Type.STAT_CART_ITEM},
@@ -359,7 +420,7 @@ 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 = () =>{
+	static get_data_types = () =>{
 		return [
 			{title:Type.get_title(DataType.BLOG_POST),type:DataType.BLOG_POST,label:Type.get_title(DataType.BLOG_POST),value:DataType.BLOG_POST},
 			{title:Type.get_title(DataType.CATEGORY),type:DataType.CATEGORY,label:Type.get_title(DataType.CATEGORY),value:DataType.CATEGORY},
@@ -373,7 +434,7 @@ class Type {
 			{title:Type.get_title(DataType.SERVICE),type:DataType.SERVICE,label:Type.get_title(DataType.SERVICE),value:DataType.SERVICE}
 		]
 	};
-	static get_type_list = () =>{
+	static get_types = () =>{
 		return [
 			{title:Type.get_title(DataType.BLOG_POST),type:DataType.BLOG_POST,label:Type.get_title(DataType.BLOG_POST),value:DataType.BLOG_POST},
 			{title:Type.get_title(DataType.CATEGORY),type:DataType.CATEGORY,label:Type.get_title(DataType.CATEGORY),value:DataType.CATEGORY},
@@ -387,14 +448,14 @@ 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 = () =>{
+	static get_app_environments = () =>{
 		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 = () =>{
+	static get_app_links = () =>{
 		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},
@@ -585,17 +646,17 @@ class Stat_Logic {
 		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.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) {
+				&& prop != Type.FIELD_SOURCE
+				&& prop != Type.FIELD_DATE_CREATE
+				&& prop != Type.FIELD_DATE_SAVE
+				&& prop != Type.FIELD_DATA_TYPE
+  				&& prop != Type.TITLE_CART_ITEMS
+				&& prop != Type.TITLE_CART_SUB_ITEMS
+                && prop != Type.TITLE_ORDER_ITEMS
+				&& prop != Type.TITLE_ORDER_SUB_ITEMS
+                && prop != Type.FIELD_SOURCE
+				&& prop != Type.FIELD_SOURCE_ID
+				&& prop != Type.FIELD_ID) {
 			 		filter_stat[prop] = post_data[prop];
     			}
   		}
@@ -608,18 +669,18 @@ static get_test = (title,option) =>{
 		option = Field_Logic.get_option(DataType.PAGE,option?option:{});
 		let page = DataItem.get_new(DataType.PAGE,0,Field_Logic.get_test(title,option));
 		if(option.get_section){
-			page.items = Sub_Item_Logic.get_test_section_list(page,page,option);
-			page = Sub_Item_Logic.bind_parent_child_list(page,page.items);
+			page.items = Sub_Item_Logic.get_test_sections(page,page,option);
+			page = Sub_Item_Logic.bind_parent_child_items(page,page.items);
 		}
 		return page;
 	};
-	static get_test_list = (option) =>{
+	static get_test_items = (option) =>{
 		option = Field_Logic.get_option(DataType.PAGE,option?option:{});
-		let item_list = [];
+		let items = [];
 		for(let a=0;a<parseInt(option.page_count)+1;a++){
-			item_list.push(Page_Logic.get_test( "Page " +parseInt(a+1)? !option.get_blank : "",option));
+			items.push(Page_Logic.get_test( "Page " +parseInt(a+1)? !option.get_blank : "",option));
 		}
-		return item_list;
+		return items;
 	};
 }
 class Order_Logic {
@@ -632,23 +693,23 @@ class Order_Logic {
 			cart_number:cart.cart_number,
 			grand_total:cart.grand_total,
 			status:Type.ORDER_STATUS_NEW,
-			order_item_list:[]
+			order_items:[]
 		});
 		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){
+				&& key != Type.FIELD_ID && key != Type.FIELD_DATA_TYPE
+				&& key != Type.TITLE_PARENT_ITEM && key != Type.TITLE_USER
+                && key != Type.TITLE_CART_ITEMS && key != Type.TITLE_CART_SUB_ITEMS
+                && key != Type.TITLE_ORDER_ITEMS && key != Type.TITLE_ORDER_SUB_ITEMS
+                && key != Type.FIELD_SOURCE && key != Type.FIELD_SOURCE_ID
+                && key != Type.FIELD_DATE_CREATE && key != Type.FIELD_DATE_SAVE){
 				order[key] = cart[key];
              }
         }
 		if(option.get_payment_plan){
 			order.payment_plan = option.payment_plan;
 		}
-		cart.cart_item_list.forEach(cart_item => {
+		cart.cart_items.forEach(cart_item => {
 			let order_item = DataItem.get_new(DataType.ORDER_ITEM,0,{
 				order_number:order.order_number,
 				parent_data_type:cart_item.parent_data_type,
@@ -656,20 +717,20 @@ class Order_Logic {
 				user_id:order.user_id,
 				quanity:cart_item.quanity?cart_item.quanity:0,
 				cost:cart_item.cost?cart_item.cost:0,
-				order_sub_item_list:[]
+				order_sub_items:[]
 			});
 		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){
+				&& key != Type.FIELD_ID && key != Type.FIELD_DATA_TYPE
+				&& key != Type.TITLE_PARENT_ITEM && key != Type.TITLE_USER
+                && key != Type.TITLE_CART_ITEMS && key != Type.TITLE_CART_SUB_ITEMS
+                && key != Type.TITLE_ORDER_ITEMS && key != Type.TITLE_ORDER_SUB_ITEMS
+                && key != Type.FIELD_SOURCE && key != Type.FIELD_SOURCE_ID
+                && key != Type.FIELD_DATE_CREATE && key != Type.FIELD_DATE_SAVE){
 					order_item[key] = cart_item[key];
              }
         }
-			cart_item.cart_sub_item_list.forEach(cart_sub_item => {
+			cart_item.cart_sub_items.forEach(cart_sub_item => {
 				let order_sub_item = DataItem.get_new(DataType.ORDER_SUB_ITEM,0,{
 					order_number:order.order_number,
 					parent_data_type:cart_sub_item.parent_data_type,
@@ -680,18 +741,18 @@ class Order_Logic {
 				})
 				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){
+						&& key != Type.FIELD_ID && key != Type.DATA_TYPE
+						&& key != Type.TITLE_PARENT_ITEM && key != Type.TITLE_USER
+                		&& key != Type.TITLE_CART_ITEMS && key != Type.TITLE_CART_SUB_ITEMS
+                		&& key != Type.TITLE_ORDER_ITEMS && key != Type.TITLE_ORDER_SUB_ITEMS
+                		&& key != Type.FIELD_SOURCE && key != Type.FIELD_SOURCE_ID
+                		&& key != Type.FIELD_DATE_CREATE && key != Type.FIELD_DATE_SAVE){
 						order_sub_item[key] = cart_sub_item[key];
              		}
         		}
-				order_item.order_sub_item_list.push(order_sub_item);
+				order_item.order_sub_items.push(order_sub_item);
 			});
-			order.order_item_list.push(order_item);
+			order.order_items.push(order_item);
 		});
 		return order;
 	};
@@ -706,13 +767,13 @@ class Order_Logic {
 	};
  	static get_total = (order) => {
         let grand_total = 0;
-        order.order_item_list.forEach(order_item => {
+        order.order_items.forEach(order_item => {
             order_item.sub_total = 0;
             if(!isNaN(order_item.cost)){
                 order_item.sub_total = (order_item.sub_total + order_item.cost) * order_item.quanity;
                 grand_total = grand_total + order_item.sub_total;
             }
-            order_item.order_sub_item_list.forEach(order_sub_item => {
+            order_item.order_sub_items.forEach(order_sub_item => {
                 order_sub_item.sub_total = 0;
                 if(!isNaN(order_sub_item.cost)){
                     order_sub_item.sub_total = (order_sub_item.sub_total + order_sub_item.cost) * order_sub_item.quanity;
@@ -726,23 +787,23 @@ class Order_Logic {
 }
 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:[]});
+		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_items:[]});
 	};
 	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?quanity:0,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_items:[]});
 	};
 	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?quanity:0,cost:cost?cost:0});
 	};
     static get_total = (cart) => {
         let grand_total = 0;
-        cart.cart_item_list.forEach(cart_item => {
+        cart.cart_items.forEach(cart_item => {
             cart_item.sub_total = 0;
             if(!isNaN(cart_item.cost)){
                 cart_item.sub_total = (cart_item.sub_total + cart_item.cost) * cart_item.quanity;
                 grand_total = grand_total + cart_item.sub_total;
             }
-            cart_item.cart_sub_item_list.forEach(cart_sub_item => {
+            cart_item.cart_sub_items.forEach(cart_sub_item => {
                 cart_sub_item.sub_total = 0;
                 if(!isNaN(cart_sub_item.cost)){
                     cart_sub_item.sub_total = (cart_sub_item.sub_total + cart_sub_item.cost) * cart_sub_item.quanity;
@@ -762,15 +823,15 @@ static get_new = (title,type,category,option) => {
 		item.category = category = category?category:"";
 		return item;
 	};
-	static get_stock_list = () => {
-		const r_list=
+	static get_stocks = () => {
+		const stocks=
 			[
 				{ value: "0", label: "Out of Stock" },
 				{ value: "1", label: "Only 1 Left" },
 				{ value: "2", label: "Less Than 3 Left" },
 				{ value: "3", label: "Availble" }
 			];
-		return r_list;
+		return stocks;
 	};
 	static get_stock_by_value = (stock_val) => {
 		switch(stock_val)
@@ -814,7 +875,7 @@ static get_new = (title,type,category,option) => {
 			product.tag = "";
 		}
 		if(option.get_item){
-			product.items = Sub_Item_Logic.get_test_list(product,product,option);
+			product.items = Sub_Item_Logic.get_test_items(product,product,option);
 		}
 		return product;
 	};
@@ -826,49 +887,49 @@ static get_new = (title,type,category,option) => {
 		cart.cart_number = cart_number;
 		if(option.get_cart_item){
 			let product_option = {product_count:option.cart_item_count,generate_id:true};
-			let product_list = Product_Logic.get_test_list(product_option);
-			cart.cart_item_list = [];
-			for(let a = 0;a<product_list.length;a++){
-				let product_cart_item =Cart_Logic.get_test_item(cart_number,cart.id,user_id,product_list[a].data_type,product_list[a].id,{get_value:false,get_cart_sub_item:option.get_cart_sub_item,cart_sub_item_count:option.cart_sub_item_count,generate_id:true});
-				product_cart_item.item_item = product_list[a];
-				cart.cart_item_list.push(product_cart_item);
+			let products = Product_Logic.get_test_items(product_option);
+			cart.cart_items = [];
+			for(let a = 0;a<products.length;a++){
+				let product_cart_item =Cart_Logic.get_test_item(cart_number,cart.id,user_id,products[a].data_type,products[a].id,{get_value:false,get_cart_sub_item:option.get_cart_sub_item,cart_sub_item_count:option.cart_sub_item_count,generate_id:true});
+				product_cart_item.item_item = products[a];
+				cart.cart_items.push(product_cart_item);
 			}
 		}
 		return cart;
 	};
-	static get_test_list = (option) =>{
+	static get_test_items = (option) =>{
 		option = Field_Logic.get_option(DataType.PRODUCT,option?option:{});
-		let item_list = [];
+		let items = [];
 		for(let a=0;a<option.product_count+1;a++){
-			item_list.push(Product_Logic.get_test("Product "+String(parseInt(a+1)),option));
+			items.push(Product_Logic.get_test("Product "+String(parseInt(a+1)),option));
 		}
-		return item_list;
+		return items;
 	}
-	static get_test_list_by_category = (option) =>{
+	static get_test_items_by_category = (option) =>{
 		option = Field_Logic.get_option(DataType.PRODUCT,option?option:{});
-		let product_list = [];
-		let category_list = Category_Logic.get_type_category_list(DataType.PRODUCT,option.category_count);
+		let products = [];
+		let categorys = Category_Logic.get_type_categorys(DataType.PRODUCT,option.category_count);
 		let item_count = 0;
-		for(let a=0;a<category_list.length;a++){
+		for(let a=0;a<categorys.length;a++){
 			for(let b=0;b<option.product_count;b++){
 				item_count++;
 				let product = Product_Logic.get_test("Product "+String(parseInt(b+1)),option);
-				product.category = category_list[Num.get_id(category_list.length+1)].title;
-				product_list.push(product);
+				product.category = categorys[Num.get_id(categorys.length+1)].title;
+				products.push(product);
 			}
 		}
-		return [category_list,product_list]
+		return [categorys,products]
 	};
 }
 class Service_Logic {
-	static get_stock_list = () => {
-		const r_list=
+	static get_stocks = () => {
+		const stocks=
 			[
 				{ value: "0", label: "No Sessions Availble" },
 				{ value: "1", label: "Ready For Booking" },
 				{ value: "2", label: "No Sessions Availble" }
 			];
-		return r_list;
+		return stocks;
 	};
 	static get_stock_by_value = (stock_val) => {
 		switch(stock_val)
@@ -895,32 +956,32 @@ class Service_Logic {
 		service.stock = String(Num.get_id(3-1));
 		service.tag = "Tag "+ Num.get_id() + ", Tag "+Num.get_id() + ", Tag "+ Num.get_id();
 		if(option.get_item){
-			service.items = Sub_Item_Logic.get_test_list(service,service,option);
+			service.items = Sub_Item_Logic.get_test_items(service,service,option);
 		}
 		return service;
 	};
-	static get_test_list = (option) =>{
+	static get_test_items = (option) =>{
 		option = Field_Logic.get_option(DataType.SERVICE,option?option:{});
-		let item_list = [];
+		let items = [];
 		for(let a=0;a<parseInt(option.service_count)+1;a++){
-			item_list.push(Service_Logic.get_test("Service "+String(parseInt(a+1)),option));
+			items.push(Service_Logic.get_test("Service "+String(parseInt(a+1)),option));
 		}
-		return item_list;
+		return items;
 	}
-	static get_test_list_by_category = (option) =>{
+	static get_test_items_by_category = (option) =>{
 		option = Field_Logic.get_option(DataType.SERVICE,option?option:{});
-		let service_list = [];
-		let category_list = Category_Logic.get_type_category_list(DataType.SERVICE,option.category_count);
+		let services = [];
+		let categorys = Category_Logic.get_type_categorys(DataType.SERVICE,option.category_count);
 		let item_count = 0;
-		for(let a=0;a<category_list.length;a++){
+		for(let a=0;a<categorys.length;a++){
 			for(let b=0;b<parseInt(option.service_count);b++){
 				item_count++;
 				let service = Service_Logic.get_test("Service "+String(parseInt(b+1)),option);
-				service.category = category_list[Num.get_id(category_list.length+1)].title;
-				service_list.push(service);
+				service.category = categorys[Num.get_id(categorys.length+1)].title;
+				services.push(service);
 			}
 		}
-		return [category_list,service_list]
+		return [categorys,services]
 	};
 }
 class Content_Logic {
@@ -929,35 +990,35 @@ class Content_Logic {
 		option = Field_Logic.get_option(DataType.CONTENT,option?option:{});
 		let content = DataItem.get_new(DataType.CONTENT,0,Field_Logic.get_test(title,option));
 		if(option.get_item){
-			content.items = Sub_Item_Logic.get_test_section_list(content,content,option);
+			content.items = Sub_Item_Logic.get_test_sections(content,content,option);
 			if(option.get_item_bind){
-				content = Sub_Item_Logic.bind_parent_child_list(content,content.items);
+				content = Sub_Item_Logic.bind_parent_child_items(content,content.items);
 			}
 		}
 		return content;
 	};
-	static get_test_list = (option) =>{
+	static get_test_items = (option) =>{
 		option = Field_Logic.get_option(DataType.CONTENT,option?option:{});
-		let item_list = [];
+		let items = [];
 		for(let a=0;a<parseInt(option.content_count)+1;a++){
-			item_list.push(Content_Logic.get_test("Content " +String(parseInt(a+1)),option));
+			items.push(Content_Logic.get_test("Content " +String(parseInt(a+1)),option));
 		}
-		return item_list;
+		return items;
 	}
-	static get_test_list_by_category = (option) =>{
+	static get_test_items_by_category = (option) =>{
 		option = Field_Logic.get_option(DataType.CONTENT,option?option:{});
-		let content_list = [];
-		let category_list = Category_Logic.get_type_category_list(DataType.CONTENT,option.category_count);
+		let contents = [];
+		let categorys = Category_Logic.get_type_categorys(DataType.CONTENT,option.category_count);
 		let item_count = 0;
-		for(let a=0;a<category_list.length;a++){
+		for(let a=0;a<categorys.length;a++){
 			for(let b=0;b<parseInt(option.content_count);b++){
 				item_count++;
 				let content = Content_Logic.get_test("Content "+String(parseInt(b+1)),option);
-				content.category = category_list[Num.get_id(category_list.length+1)].title;
-				content_list.push(content);
+				content.category = categorys[Num.get_id(categorys.length+1)].title;
+				contents.push(content);
 			}
 		}
-		return [category_list,content_list]
+		return [categorys,contents]
 	};
 }
 class Template_Logic {
@@ -981,32 +1042,32 @@ class Blog_Post_Logic {
 			blog_post.tag = "";
 		}
 		if(option.get_item){
-			blog_post.items = Sub_Item_Logic.get_test_list(blog_post,blog_post,option);
+			blog_post.items = Sub_Item_Logic.get_test_items(blog_post,blog_post,option);
 		}
 		return blog_post;
 	};
-	static get_test_list = (option) =>{
+	static get_test_items = (option) =>{
 		option = Field_Logic.get_option(DataType.BLOG_POST,option?option:{});
-		let item_list = [];
+		let items = [];
 		for(let a=0;a<parseInt(option.blog_post_count)+1;a++){
-			item_list.push(Blog_Post_Logic.get_test("Blog Post " +String(parseInt(a+1)),option));
+			items.push(Blog_Post_Logic.get_test("Blog Post " +String(parseInt(a+1)),option));
 		}
-		return item_list;
+		return items;
 	}
-	static get_test_list_by_category = (option) =>{
+	static get_test_items_by_category = (option) =>{
 		option = Field_Logic.get_option(DataType.BLOG_POST,option?option:{});
-		let blog_post_list = [];
-		let category_list = Category_Logic.get_type_category_list(DataType.BLOG_POST,option.category_count);
+		let blog_posts = [];
+		let categorys = Category_Logic.get_type_categorys(DataType.BLOG_POST,option.category_count);
 		let item_count = 0;
-		for(let a=0;a<category_list.length;a++){
+		for(let a=0;a<categorys.length;a++){
 			for(let b=0;b<parseInt(option.blog_post_count);b++){
 				item_count++;
 				let blog_post = Blog_Post_Logic.get_test("Blog Post "+String(parseInt(b+1)),option);
-				blog_post.category = category_list[Num.get_id(category_list.length+1)].title;
-				blog_post_list.push(blog_post);
+				blog_post.category = categorys[Num.get_id(categorys.length+1)].title;
+				blog_posts.push(blog_post);
 			}
 		}
-		return [category_list,blog_post_list]
+		return [categorys,blog_posts]
 	};
 }
 class Gallery_Logic {
@@ -1022,21 +1083,21 @@ class Gallery_Logic {
 			gallery.website = "";
 		}
 		if(option.get_item){
-			gallery.items = Sub_Item_Logic.get_test_list(gallery,gallery,option);
+			gallery.items = Sub_Item_Logic.get_test_items(gallery,gallery,option);
 		}
 		return gallery;
 	};
 };
 class Event_Logic {
-	static get_stock_list = () => {
-		const r_list=
+	static get_stocks = () => {
+		const stocks =
 			[
 				{ value: "0", label: "Sold Out" },
 				{ value: "1", label: "Less Than 25 Tickets Remaining" },
 				{ value: "2", label: "Tickets Are Availble" },
 				{ value: "3", label: "Sold Out" },
 			];
-		return r_list;
+		return stocks;
 	};
 	static get_stock_by_value = (stock_val) => {
 		switch(stock_val)
@@ -1083,43 +1144,43 @@ class Event_Logic {
 			event.tag = "";
 		}
 		if(option.get_item){
-			event.items = Sub_Item_Logic.get_test_list(event,event,option);
+			event.items = Sub_Item_Logic.get_test_items(event,event,option);
 		}
 		return event;
 	};
-	static get_test_list = (option) =>{
+	static get_test_items = (option) =>{
 		option = Field_Logic.get_option(DataType.EVENT,option?option:{});
-		let item_list = [];
+		let items = [];
 		for(let a=0;a<parseInt(option.event_count)+1;a++){
-			item_list.push(Event_Logic.get_test("Event "+String(parseInt(a+1)),option));
+			items.push(Event_Logic.get_test("Event "+String(parseInt(a+1)),option));
 		}
-		return item_list;
+		return items;
 	}
-	static get_test_list_by_category = (option) =>{
+	static get_test_items_by_category = (option) =>{
 		option = Field_Logic.get_option(DataType.EVENT,option?option:{});
-		let event_list = [];
-		let category_list = Category_Logic.get_type_category_list(DataType.EVENT,option.category_count);
+		let events = [];
+		let categorys = Category_Logic.get_type_categorys(DataType.EVENT,option.category_count);
 		let item_count = 0;
-		for(let a=0;a<category_list.length;a++){
+		for(let a=0;a<categorys.length;a++){
 			for(let b=0;b<parseInt(option.event_count);b++){
 				item_count++;
 				let event = Event_Logic.get_test("Event "+String(parseInt(b+1)),option);
-				event.category = category_list[Num.get_id(category_list.length+1)].title;
-				event_list.push(event);
+				event.category = categorys[Num.get_id(categorys.length+1)].title;
+				events.push(event);
 			}
 		}
-		return [category_list,event_list]
+		return [categorys,events]
 	};
 }
 class Field_Logic {
-	static get_list_item_max_group_id = (value_id,item) => {
+	static get_item_max_group_id = (value_id,item) => {
 		let max_group_id = 0;
 		let full_prop_str = "";
 		for(const prop in item){
 			full_prop_str = String(prop + " "+full_prop_str);
 		}
 		for(let b = 1; b < 75; b++){
-			const exists = Str.check_if_str_exist(full_prop_str,"list_value_"+value_id+"_group_"+b);
+			const exists = Str.check_if_str_exist(full_prop_str,"items_value_"+value_id+"_group_"+b);
 			if(exists){
 				if(b>max_group_id){
 					max_group_id = b;
@@ -1128,7 +1189,7 @@ class Field_Logic {
 		}
 		return max_group_id;
 	}
-	static get_item_field_value_list = (data) => {
+	static get_item_field_values = (data) => {
 		let max_value_id = 1;
 		let max_group_id = 1;
 		let full_prop_str = "";
@@ -1136,14 +1197,14 @@ class Field_Logic {
 			full_prop_str = String(prop + " "+full_prop_str);
 		}
 		for(let a = 1; a < 75; a++){
-    		const exists = Str.check_if_str_exist(full_prop_str,"list_value_"+a);
+    		const exists = Str.check_if_str_exist(full_prop_str,"items_value_"+a);
 			if(exists){
 				if(a>max_value_id){
 					max_value_id = a;
 				}
 			}
 			for(let b = 1; b < 20; b++){
-				const exists = Str.check_if_str_exist(full_prop_str,"list_value_"+a+"_group_"+b);
+				const exists = Str.check_if_str_exist(full_prop_str,"items_value_"+a+"_group_"+b);
 				if(exists){
 					if(b>max_group_id){
 						max_group_id = b;
@@ -1152,7 +1213,7 @@ class Field_Logic {
 			}
 		}
 		for(let a = 1; a <= max_value_id+1; a++){
-			let sub_check_str = 'list_value_'+a;
+			let sub_check_str = 'items_value_'+a;
 			data[sub_check_str] = [];
 			for(let b = 1; b < max_group_id+1; b++){
 				let full_sub_check_str = sub_check_str+"_group_"+b;
@@ -1172,19 +1233,19 @@ class Field_Logic {
 		}
 		return data;
 	}
-	static get_item_field_value_type_list = () => {
+	static get_item_field_value_types = () => {
 		return [
 			{value:'text',label:'Text'},
 			{value:'note',label:'Note'},
 			{value:'image',label:'Image'},
-			{value:'list',label:'List'},
+			{value:'items',label:'List'},
 		];
 	};
 	static get_field_value_value = (value_type,item,value_id) =>{
-		if(value_type!=Type.FIELD_VALUE_LIST){
+		if(value_type!=Type.FIELD_VALUE_ITEMS){
 			return !Str.check_is_null(item[Field_Logic.get_field_value_title(value_type,value_id)]) ? item[Field_Logic.get_field_value_title(value_type,value_id)] : ""
 		}else{
-			return item[Field_Logic.get_field_value_list_title(value_id)] ?  item[Field_Logic.get_field_value_list_title(value_id)] : [];
+			return item[Field_Logic.get_field_value_items_title(value_id)] ?  item[Field_Logic.get_field_value_items_title(value_id)] : [];
 		}
 	};
 	static get_field_value_title = (value_type,value_id,group_id,sub_field_title) =>{
@@ -1198,11 +1259,11 @@ class Field_Logic {
 			case Type.FIELD_VALUE_IMAGE:
 				return 'image'+'_value_'+value_id;
 				break;
-			case Type.FIELD_VALUE_LIST:
+			case Type.FIELD_VALUE_ITEMS:
 				if(!group_id){
-					return 'list'+'_value_'+value_id;
+					return 'items'+'_value_'+value_id;
 				}else{
-					return 'list'+'_value_'+value_id +'_group_' +group_id+"_"+Str.get_title_url(sub_field_title);
+					return 'items'+'_value_'+value_id +'_group_' +group_id+"_"+Str.get_title_url(sub_field_title);
 				}
 				break;
 			default:
@@ -1245,31 +1306,30 @@ class Field_Logic {
 			item.id=Num.get_guid();
 		}
 		if(option.get_value){
-			item = Field_Logic.get_value_list(item,option);
+			item = Field_Logic.get_values(item,option);
 		}
 		if(option.fields){
-			let field_list = String(option.fields).split(',');
-			for(let a = 0; a<field_list.length;a++){
+			let field_items = String(option.fields).split(',');
+			for(let a = 0; a<field_items.length;a++){
 				if(option.get_blank == true){
-					if(item[field_list[a]]){
-						item[field_list[a]] = "";
+					if(item[field_items[a]]){
+						item[field_items[a]] = "";
 					}
 				}else{
-					if(!Str.check_is_null(field_list[a])){
-						item[Str.get_title_url(field_list[a])] = Str.get_title(field_list[a]) +"_" + Num.get_id();
+					if(!Str.check_is_null(field_items[a])){
+						item[Str.get_title_url(field_items[a])] = Str.get_title(field_items[a]) +"_" + Num.get_id();
 					}
 				}
 			}
 		}
 		return item;
 	}
-	//here
-	static get_field_value_list_title(value_id){
-		return 'list_value_'+value_id;
+	static get_field_value_items_title(value_id){
+		return 'items_value_'+value_id;
 	}
-	static get_value_list_group(item,value_id,group_id){
-		let full_str = 'list_value_'+value_id+"_group_"+group_id;
-		let new_list = [];
+	static get_value_items_group(item,value_id,group_id){
+		let full_str = 'items_value_'+value_id+"_group_"+group_id;
+		let items = [];
 		Log.w(full_str,full_str);
 		let count = 0;
 		for(const prop in item){
@@ -1277,12 +1337,12 @@ class Field_Logic {
 			if(prop.startsWith(full_str)){
 				count = count+1;
 				new_item[prop.replace(full_str+"_","")] = item[prop];
-				new_list.push(new_item);
+				items.push(new_item);
 			}
 		}
-		return new_list;
+		return items;
 	}
-	static get_value_list(item,option){
+	static get_values(item,option){
 		for(let b=0;b<parseInt(option.value_count);b++){
 			if(option.get_blank == false){
 				item['value_'+String(b+1)] = 'value ' + String(b+1);
@@ -1481,20 +1541,6 @@ class Favorite_Logic {
 			user_id:user_id
 		});
 	}
-	static old_get_favorite_by_list = (favorite_list,item_list) =>{
-		if(!item_list){
-			item_list = [];
-		}
-		if(item_list.length>0){
-		favorite_list.forEach(item => {
-			const item_match = item_list.find(item_find => item_find.id === item.parent_id);
-			if (item_match) {
-				item_match.is_favorite = true;
-			}
-		});
-		}
-		return item_list;
-	}
 	static get_user_search_filter = (item_data_type,user_id) =>{
 		return {
 			$and: [
@@ -1556,13 +1602,13 @@ class Review_Logic {
 		}
 		return review;
 	};
-	static get_test_list=(option)=>{
+	static get_test_items=(option)=>{
 		option = !Obj.check_is_empty(option) ? option : {review_count:19};
-		let item_list = [];
+		let items = [];
 		for(let a=0;a<option.review_count;a++){
-			item_list.push(Review_Logic.get_test(option));
+			items.push(Review_Logic.get_test(option));
 		}
-		return item_list;
+		return items;
 	};
 }
 class Admin_Logic {
@@ -1620,34 +1666,34 @@ class Category_Logic {
 		option = Field_Logic.get_option(DataType.CATEGORY,option?option:{});
 		let category = DataItem.get_new(DataType.CATEGORY,0,Field_Logic.get_test(title,option));
 		if(option.get_item){
-			category.items = Sub_Item_Logic.get_test_list(category,category,option);
+			category.items = Sub_Item_Logic.get_test_items(category,category,option);
 		}
 		return category;
 	};
-	static get_test_list = (option) =>{
+	static get_test_items = (option) =>{
 		option = Field_Logic.get_option(DataType.CATEGORY,option);
-		let item_list = [];
+		let items = [];
 		for(let a=0;a<option.category_count;a++){
-			item_list.push(Category_Logic.get_test("Category " +String(parseInt(a+1)),option));
+			items.push(Category_Logic.get_test("Category " +String(parseInt(a+1)),option));
 		}
-		return item_list;
+		return items;
 	}
-	static get_test_list_by_type = (type,option) =>{
+	static get_test_items_by_type = (type,option) =>{
 		option = Field_Logic.get_option(DataType.CATEGORY,option);
-		let category_list = [];
+		let categorys = [];
 		for(let a=0;a<option.category_count;a++){
 			let category = DataItem.get_new(DataType.CATEGORY,0,Field_Logic.get_test("Category " +String(parseInt(a+1)),option));
 			category.type = type;
-			category_list.push(category);
+			categorys.push(category);
 		}
-		return category_list;
+		return categorys;
 	};
-	static get_category_drop_down_list_by_list = (cat_list) => {
-		let category_list = [];
-		for(let a=0;a<cat_list.length;a++){
-			category_list.push({value:cat_list[a].title,label:cat_list[a].title});
+	static get_category_drop_down_by_items = (items) => {
+		let categorys = [];
+		for(let a=0;a<items.length;a++){
+			categorys.push({value:items[a].title,label:items[a].title});
 		}
-		return category_list;
+		return categorys;
 	};
 };
 class Storage {
@@ -1768,13 +1814,13 @@ class User_Logic {
 		}
 		return user;
 	};
-	static get_test_list = (option) =>{
+	static get_test_items = (option) =>{
 		option = Field_Logic.get_option(DataType.USER,option?option:{});
-		let item_list = [];
+		let items = [];
 		for(let a=0;a<option.user_count+1;a++){
-			item_list.push(User_Logic.get_test("User " +String(parseInt(a+1)),option));
+			items.push(User_Logic.get_test("User " +String(parseInt(a+1)),option));
 		}
-		return item_list;
+		return items;
 	}
 }
 class Sub_Item_Logic {
@@ -1794,31 +1840,31 @@ class Sub_Item_Logic {
 			}
 		);
 		if(option.get_value){
-			item = Field_Logic.get_value_list(item,option);
+			item = Field_Logic.get_values(item,option);
 		}
 		return item;
 	}
-	static get_test_list(parent_item,top_item,option){
+	static get_test_items(parent_item,top_item,option){
 		option = Field_Logic.get_option(DataType.SUB_ITEM,option?option:{});
-		let new_list = [];
+		let items = [];
 		for(let a=0;a<option.item_count;a++){
 			let item_title ="Item " + String(parseInt(a+1));
-			new_list.push(Sub_Item_Logic.get_test(item_title,parent_item,top_item,option));
+			items.push(Sub_Item_Logic.get_test(item_title,parent_item,top_item,option));
 		}
-		return new_list;
+		return items;
 	}
-	static get_test_section_list(parent_item,top_item,option){
-		let new_list = [];
+	static get_test_sections(parent_item,top_item,option){
+		let items = [];
 		for(let a=0;a<option.section_count;a++){
 			let item_title ="Section " + String(parseInt(a+1));
 			let item = Sub_Item_Logic.get_test(item_title,parent_item,top_item,option);
-			new_list.push(item);
+			items.push(item);
 		}
-		return new_list;
+		return items;
 	}
-	static bind_parent_child_list(item,item_list){
-		for(let a=0;a<item_list.length;a++){
-			item[Str.get_title_url(item_list[a].title)] = item_list[a];
+	static bind_parent_child_items(item,items){
+		for(let a=0;a<items.length;a++){
+			item[Str.get_title_url(items[a].title)] = items[a];
 		}
 		return item;
 	}
@@ -1827,7 +1873,7 @@ class App_Logic {
 	static get_url = (app_id,host,url,param) => {
 		return get_cloud_url_main(app_id,host,url,param);
 	};
-	static bind_item_parent_user_list = (item,parent_item,user)=>{
+	static bind_item_parent_users = (item,parent_item,user)=>{
 		for(const prop in parent_item) {
 			item['parent_'+prop] = parent_item[prop];
 		}
@@ -1836,11 +1882,11 @@ class App_Logic {
 		}
     	return item;
 	};
-	static bind_item_parent_user_list = (item_list)=>{
-		for(let item of item_list) {
+	static bind_item_parent_users = (items)=>{
+		for(let item of items) {
 			item = App_Logic.bind_item_parent_user_obj(item);
 		}
-    	return item_list;
+    	return items;
 	};
 	static bind_item_parent_user_obj = (item)=>{
 		if(!item.user){
@@ -1951,14 +1997,14 @@ class App_Logic {
 		}
 		return App_Logic.get_search(query.data_type,filter,sort_by,query.page_current,query.page_size);
 	}
-	static get_data_search_result = (app_id,data_type,item_count,page_count,filter,data_list,option) =>{
+	static get_data_search_result = (app_id,data_type,item_count,page_count,filter,items,option) =>{
 		return{
 			option:option?option:{},
 			data_type:data_type?data_type:DataType.BLANK,
 			item_count:item_count?item_count:0,
 			page_count:page_count?page_count:1,
 			filter:filter?filter:{},
-			data_list:data_list?data_list:[]
+			items:items?items:[]
 		}
 	}
 }
@@ -2009,7 +2055,7 @@ class Image_Logic {
         item.buffer = !Str.check_is_null(Str.get_file_type_from_base64(item_image.image_data)) ? Buffer.from(item_image.image_data.split(';base64,').pop(), 'base64') : null;
         return item;
     };
-	static get_process_list = (upload_dir,image_filename) =>{
+	static get_process_items = (upload_dir,image_filename) =>{
 		upload_dir = upload_dir ? upload_dir : "";
 		image_filename = image_filename ? image_filename : "";
 		return [
@@ -2087,7 +2133,7 @@ class Url {
 	static PING_GET="ping_get";
 	static PING_POST="ping_post";
 	static POST="main/crud/post";
-	static POST_LIST="main/crud/post_list";
+	static POST_ITEMS="main/crud/post_items";
 	static SEARCH="main/crud/search";
 	static DATABASE_INFO="main/crud/database_info";
 	//dashboard

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "biz9-logic",
-  "version": "10.0.16",
+  "version": "10.0.22",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -9,8 +9,9 @@
   "license": "MIT",
   "dependencies": {
     "async-series": "^0.0.1",
+    "biz9-logic": "^10.0.18",
     "biz9-scriptz": "^5.8.12",
-    "biz9-utility": "^3.8.68",
+    "biz9-utility": "^4.4.12",
     "jest": "^29.7.0",
     "moment": "^2.30.1"
   },

package/test.js

@@ -1,6 +1,6 @@
 const series = require('async-series');
-const {DataItem,DataType,Item_Logic,User_Logic,Page_Logic,Product_Logic,Type,Title,Stat_Logic,Service_Logic,Blog_Post_Logic,Event_Logic,Demo_Logic,Cart_Logic,Order_Logic,App_Logic,Field_Logic,Image_Logic} = require('./index');
-const {Log,Num,Str} = require('biz9-utility');
+const {DataItem,DataType,Item_Logic,User_Logic,Page_Logic,Product_Logic,Type,Title,Stat_Logic,Service_Logic,Blog_Post_Logic,Event_Logic,Demo_Logic,Cart_Logic,Order_Logic,App_Logic,Field_Logic,Image_Logic,Message} = require('./index');
+const {Log,Num,Str,Obj} = require('biz9-utility');
 const {Scriptz}= require('biz9-scriptz');
 
 /* --- TEST CONFIG START --- */
@@ -37,13 +37,6 @@ describe("connect", () => {
                 let parent_id = 3334;
                 let user_id = 0;
 
-                let image = DataItem.get_new(DataType.IMAGE,0);
-                image.base64 = 'fsadfsd';
-                image.parnet_id = '1';
-                image.apple = 'butter';
-                Log.w('88_image',image);
-                image = Image_Logic.get_new_by_base64(image);
-                Log.w('99_result',image);
 
                 //Log.w('Title',Type.get_title(Type.ORDER_STATUS_NEW));
                 //Log.w('Title 2',Type.get_title(Type.ORDER_STATUS_COMPLETE));