biz9-logic 10.0.76 → 10.0.79

package/biz9_config

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

package/index.js

@@ -164,18 +164,13 @@ class Type {
 	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_IMAGES='Images';
 	static TITLE_GROUP='Group';
 	static TITLE_N_A='N/A';
-	static TITLE_IMAGES='Images';
-	static TITLE_ITEMS='Items';
-	static TITLE_ONE='One';
 	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 Sub Items';
 	static TITLE_ORDER_STATUS_NEW="New";
@@ -238,6 +233,12 @@ class Type {
 	static PAGE_SERVICE='service';
 	static PAGE_SERVICE_HOME='service_home';
 	static PAGE_SERVICE_SEARCH='service_search';
+    //search
+	static SEARCH_ITEMS='items';
+	static SEARCH_ONE='one';
+	static SEARCH_COUNT='count';
+    static SEARCH_SORT_BY_ASC='asc';
+	static SEARCH_SORT_BY_DESC='desc';
 	//stat
 	static STAT_CART='cart_post';
 	static STAT_CART_ITEM='cart_item_post';
@@ -2288,9 +2289,9 @@ class Data_Logic {
 	}
 	static get_search_group = (option) => {
 		option = option ? option : {};
-		let type  = option.type ? option.type : Type.TITLE_ITEMS;
+		let type  = option.type ? option.type : Type.SEARCH_ITEMS;
 		let field = option.field ? option.field : {};
-		let title = option.title ? option.title : {};
+		let title = option.title ? Str.get_title_url(option.title) : {};
 		let image_show = option.image_show ? option.image_show : {};
 		let image = option.image ? option.image : {show:false};
 		let page_current = option.page_current ? option.page_current : 1;
@@ -2299,25 +2300,27 @@ class Data_Logic {
 	}
 	static get_search_foreign = (type,foreign_data_type,foreign_field,parent_field,option) => {
 		option = option ? option : {};
-		type = type ? type : Type.TITLE_ITEMS;
+		type = type ? type : Type.SEARCH_ITEMS;
 		foreign_data_type = foreign_data_type ? foreign_data_type : Str.get_title_url(Data_Logic.get_data_type_by_type(foreign_data_type,{plural:true}));
 		foreign_field = foreign_field ? foreign_field : Type.FIELD_PARENT_ID;
 		parent_field = parent_field ? parent_field : parent_field;
 		let field = option.field ? option.field : null;
-		let title = option.title ? option.title : Str.get_title_url(Data_Logic.get_data_type_by_type(foreign_data_type,{plural:true}));
+		let title = option.title ? Str.get_title_url(option.title) : Str.get_title_url(Data_Logic.get_data_type_by_type(foreign_data_type,{plural:true}));
 		let page_current = option.page_current ? option.page_current : 1;
 		let page_size = option.page_size ? option.page_size : 0;
 		return {type:type,foreign_data_type:foreign_data_type,foreign_field:foreign_field,parent_field:parent_field,type:type,field:field,title:title,page_current:page_current,page_size:page_size};
 	}
 	static get_search_join = (type,search,option) => {
 		option = option ? option : {};
-		type = type ? type : Type.TITLE_ITEMS;
+		type = type ? type : Type.SEARCH_ITEMS;
 		search = search ? search : Data_Logic.get_search(Type.DATA_BLANK,{},{},1,0);
 		let field = option.field ? option.field : {};
-		let title = option.title ? option.title : Str.get_title_url(Data_Logic.get_data_type_by_type(search.data_type,{plural:true}));
-		let page_current = option.page_current ? option.page_current : 1;
+		let distinct = option.distinct ? option.distinct : null; //distinct:{field:'title',sort_by:Type.SEARCH_SORT_BY_DESC}
+		let title = option.title ? Str.get_title_url(option.title) : Str.get_title_url(Data_Logic.get_data_type_by_type(search.data_type,{plural:true}));
+		let foreigns = option.foreigns ? option.foreigns : [];
+	    let page_current = option.page_current ? option.page_current : 1;
 		let page_size = option.page_size ? option.page_size : 0;
-		return {type:type,search:search,field:field,title:title,page_current:page_current,page_size:page_size};
+		return {type:type,search:search,field:field,title:title,distinct:distinct,foreigns:foreigns,page_current:page_current,page_size:page_size};
 	}
 	static copy = (data_type,item)=>{
 		let copy_item = Data_Logic.get_new(data_type,0);

package/package.json

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

package/test.js

@@ -55,14 +55,20 @@ describe("connect", () => {
                 // -- ORDER START -- //
                 // -- order start //
                 let order = Order_Logic.get(cart,{order_code:'OR'});
-                Log.w('order',order);
-                Log.w('order_items',order.order_items[0]);
+                //Log.w('order',order);
+                //Log.w('order_items',order.order_items[0]);
                 // -- order end //
                 // -- order item start //
                 // -- order item end //
 
                 // -- ORDER END -- //
 
+                // -- LIST START -- //
+                let data_type = Data_Logic.get_data_type_by_type(Type.DATA_PRODUCT,{plural:true});
+                Log.w('my_data_type',data_type);
+
+                // -- LIST END -- //
+
                 // -->
                 //let parent = Data_Logic.get_new(Type.DATA_PRODUCT,0);
                 //let parent = Data_Logic.get_new(Type.DATA_PRODUCT,0,{test:true,count:3,blank:false,data:{field_1:'apple'}});