biz9-logic 4.8.277 → 4.8.280

package/biz9_config

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

package/index.js

@@ -250,11 +250,11 @@ class Order_Logic {
 		});
 		return order;
 	};
-	static get_new_order_payment = (order_number,payment_method,payment_amount) => {
+	static get_new_order_payment = (order_number,payment_method_type,payment_amount) => {
 		return DataItem.get_new(DataType.ORDER_PAYMENT,0,
 			{
 				order_number:order_number,
-				payment_method:payment_method,
+				payment_method_type:payment_method_type,
 				payment_amount:payment_amount,
 				transaction_id:FieldType.TRANSACTION_ID + Num.get_id(99999)
 			});
@@ -779,6 +779,7 @@ class FieldType {
 	static DATE_CREATE='date_create';
 	static DATE_SAVE='date_save';
 
+	static USER_ROLE_SUPER_ADMIN='super_admin';
 	static USER_ROLE_ADMIN='admin';
 	static USER_ROLE_MANAGER='manager';
 	static USER_ROLE_USER='user';
@@ -838,6 +839,21 @@ class FieldType {
 	static ITEM_FIELD_VALUE_TYPE_NOTE="note";
 	static ITEM_FIELD_VALUE_TYPE_PHOTO="photo";
 	static ITEM_FIELD_VALUE_TYPE_LIST="list";
+
+	static get_title(field_type){
+		switch(field_type){
+			case FieldType.USER_ROLE_SUPER_ADMIN:
+				return "Super Admin";
+			case FieldType.USER_ROLE_ADMIN:
+				return "Admin";
+			case FieldType.USER_ROLE_Manager:
+				return "Manager";
+			case FieldType.USER_ROLE_USER:
+				return "User";
+			case FieldType.USER_ROLE_GUEST:
+				return "Guest";
+		}
+	}
 }
 class Social {
 	static FACEBOOK_URL="https://facebook.com/";
@@ -911,6 +927,7 @@ class DataType {
 	static PAGE='page_biz';
 	static REVIEW='review_biz';
 	static SERVICE='service_biz';
+	static SECURITY='security_biz';
 	static STAT='stat_biz';
 	static TEMPLATE='template_biz';
 	static USER='user_biz';
@@ -1210,12 +1227,16 @@ class User_Url {
 	};
 }
 class Item_Url {
-	static post_cms = (app_id,url,data_type,id,params) => {
-		let action_url = "item/post_cms/"+data_type+"/"+id;
+	static activity = (app_id,url,params) => {
+		let action_url="item/activity";
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
-	static post_field_value = (app_id,url,item_data_type,parent_item_id,value_id,params) => {
-		let action_url="item/post_field_value/"+item_data_type+"/"+parent_item_id;
+	static cart = (app_id,url,cart_number,params) => {
+		let action_url="item/cart"+cart_number;
+		return get_cloud_url_main(app_id,url,action_url,params);
+	};
+	static content = (app_id,url,key,params) => {
+		let action_url="item/content/"+key;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
 	static content = (app_id,url,key,params) => {
@@ -1226,58 +1247,58 @@ class Item_Url {
 		let action_url="item/custom_field/"+data_type+"/"+key;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
-	static review = (app_id,url,parent_data_type,page_current,page_size,params) => {
-		let action_url="item/review/"+parent_data_type+"/"+page_current+"/"+page_size;
+	static delete_order = (app_id,url,id,params) => {
+		let action_url="item/delete_order/"+id;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
-	static post_review = (app_id,url,parent_data_type,item_id,params) => {
-		let action_url="item/post_review/"+parent_data_type+"/"+item_id;
+	static delete_cart = (app_id,url,id,params) => {
+		let action_url="item/delete_cart"+id;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
 	static favorite = (app_id,url,parent_data_type,page_current,page_size,params) => {
 		let action_url="item/favorite/"+parent_data_type+"/"+page_current+"/"+page_size;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
-	static post_favorite = (app_id,url,parent_data_type,parent_item_id,params) => {
-		let action_url="item/post_favorite"+parent_data_type+"/"+parent_item_id;
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
-	static cart = (app_id,url,cart_number,params) => {
-		let action_url="item/cart"+cart_number;
+	static order = (app_id,url,order_number,params) => {
+		let action_url="item/order/"+order_number;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
 	static post_cart = (app_id,url,parent_data_type,params) => {
 		let action_url="item/post_cart/"+parent_data_type;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
-	static delete_cart = (app_id,url,id,params) => {
-		let action_url="item/delete_cart"+id;
+	static post_cms = (app_id,url,data_type,id,params) => {
+		let action_url = "item/post_cms/"+data_type+"/"+id;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
-	static order = (app_id,url,order_number,params) => {
-		let action_url="item/order/"+order_number;
+	static post_favorite = (app_id,url,parent_data_type,parent_item_id,params) => {
+		let action_url="item/post_favorite"+parent_data_type+"/"+parent_item_id;
+		return get_cloud_url_main(app_id,url,action_url,params);
+	};
+	static post_field_value = (app_id,url,item_data_type,parent_item_id,value_id,params) => {
+		let action_url="item/post_field_value/"+item_data_type+"/"+parent_item_id;
+		return get_cloud_url_main(app_id,url,action_url,params);
+	};
+	static post_review = (app_id,url,parent_data_type,item_id,params) => {
+		let action_url="item/post_review/"+parent_data_type+"/"+item_id;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
 	static post_order = (app_id,url,params) => {
 		let action_url="item/post_order";
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
-	static search_order = (app_id,url,parent_data_type,params) => {
-		let action_url="item/search_order/"+parent_data_type;
+	static review = (app_id,url,parent_data_type,page_current,page_size,params) => {
+		let action_url="item/review/"+parent_data_type+"/"+page_current+"/"+page_size;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
-	static delete_order = (app_id,url,id,params) => {
-		let action_url="item/delete_order/"+id;
+	static search_order = (app_id,url,parent_data_type,params) => {
+		let action_url="item/search_order/"+parent_data_type;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
 	static template = (app_id,url,key,params) => {
 		let action_url="item/template/"+key;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
-	static content = (app_id,url,key,params) => {
-		let action_url="item/content/"+key;
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
 }
 class Category_Url {
 	static detail = (app_id,url,key,params) => {

package/package.json

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

package/test.js

@@ -36,13 +36,13 @@ describe("connect", () => {
                 //console.log(gallery);
                 //console.log('ITEM-END');
                 console.log('aaaaaaaaaa');
-                console.log(Item_Logic.get_field_value_title(FieldType.ITEM_FIELD_VALUE_TYPE_LIST,1,1));
+                console.log(FieldType.get_title(FieldType.USER_ROLE_ADMIN));
                 console.log('bbbbbb');
                 let page = Page_Logic.get_test();
                 //page[Item_Logic.get_field_value_title(FieldType.ITEM_FIELD_VALUE_TYPE_TEXT,1)] = 'apple';
-                page[Item_Logic.get_field_value_title(FieldType.ITEM_FIELD_VALUE_TYPE_LIST,1,1)] = 'cool';
-                page[Item_Logic.get_field_value_title('list',1,2)] = 'apple';
-                page[Item_Logic.get_field_value_title('list',1,3)] = 'sauce';
+                //page[Item_Logic.get_field_value_title(FieldType.ITEM_FIELD_VALUE_TYPE_LIST,1,1)] = 'cool';
+                //page[Item_Logic.get_field_value_title('list',1,2)] = 'apple';
+                //page[Item_Logic.get_field_value_title('list',1,3)] = 'sauce';
                 //Log.w('page',page);
                 //Log.w('text_1_value',Item_Logic.get_field_value_value(FieldType.ITEM_FIELD_VALUE_TYPE_TEXT,page,1));
                 Log.w('list_1_value',Item_Logic.get_field_value_value(FieldType.ITEM_FIELD_VALUE_TYPE_LIST,page,1));