biz9-logic 4.8.260 → 4.8.264

package/biz9_config

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

package/index.js

@@ -187,12 +187,11 @@ class Stat_Logic {
 	static STAT_ORDER_ADD_ID='5';
 	static STAT_REVIEW_ADD_ID='6';
 	*/
-	static get_new = (item_data_type,user_id,stat_type_id,item_list,option)=>{
+	static get_new = (user_id,stat_type_id,parent_item_list)=>{
 		return {
-			item_data_type:item_data_type,
 			user_id:user_id,
 			stat_type_id:stat_type_id,
-			item_list:item_list,
+			parent_item_list:parent_item_list,
 		}
 	}
 }
@@ -217,75 +216,60 @@ class Page_Logic {
 	};
 }
 class Order_Logic {
-	static get_order_number = () => {
+	static get_new = (cart) => {
+		let order = DataItem.get_new(DataType.ORDER,0,{
+			order_number:Order_Logic.get_new_order_number(),
+			parent_data_type:cart.parent_data_type,
+			user_id:cart.user_id,
+			cart_number:cart.cart_number,
+			grand_total:cart.grand_total,
+			order_item_list:[]
+		});
+		cart.cart_item_list.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,
+				parent_id:cart_item.parent_id,
+				user_id:order.user_id,
+				quanity:cart_item.quanity,
+				order_sub_item_list:[]
+			});
+			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,
+					parent_data_type:cart_sub_item.parent_data_type,
+					parent_id:cart_sub_item.parent_id,
+					user_id:order.user_id,
+					quanity:cart_sub_item.quanity
+				})
+				order_item.order_sub_item_list.push(order_sub_item);
+			});
+
+			order.order_item_list.push(order_item);
+
+		});
+		return order;
+	};
+
+	static get_new_order_number = () => {
 		return FieldType.ORDER_NUMBER + Num.get_id(99999);
 	};
-	static get_transaction_id = () => {
+	static get_new_transaction_id = () => {
 		return FieldType.TRANSACTION_ID + Num.get_id(99999);
 	};
 }
 class Cart_Logic {
-	static get_cart_number = () => {
+	static get_new = (parent_data_type) => {
+		return DataItem.get_new(DataType.CART,0,{cart_number:Cart_Logic.get_new_cart_number(),parent_data_type:parent_data_type,grand_total:0,cart_item_list:[]});
+	};
+	static get_new_cart_number = () => {
 		return FieldType.CART_NUMBER + Num.get_id(99999);
 	};
-	static get_cart = (user_id) => {
-		return DataItem.get_new(DataType.CART,0,{user_id:user_id,cart_number:Cart_Logic.get_cart_number(),quanity:1,grand_total:0,cart_item_list:[]});
-	};
-	static get_cart_item = (item_data_type,item_id,cart_number,user_id,quanity) =>{
-		return DataItem.get_new(DataType.CART_ITEM,0,{item_data_type:item_data_type,item_id:item_id,cart_number:cart_number,user_id:user_id,quanity:quanity,sub_total:0,cart_sub_item_list:[]});
-	};
-	static get_test_item = (cart_item_id,cart_number,user_id,item_data_type,item_id,option) =>{
-		option = Field_Logic.get_option(DataType.CART_ITEM,option?option:{generate_id:Str.check_is_null(cart_item_id)? true : false  });
-		let cart_item = DataItem.get_new(DataType.CART_ITEM,Num.get_guid(),Field_Logic.get_test("Cart Item "+Num.get_id(),option));
-		cart_item.cart_item_id = cart_item_id;
-		cart_item.cart_number = cart_number;
-		cart_item.user_id = user_id;
-		cart_item.item_data_type = item_data_type;
-		cart_item.item_id = item_id;
-		if(option.get_cart_sub_item){
-			cart_item.cart_sub_item_list = [];
-			for(let a = 0;a<option.cart_sub_item_count;a++){
-				let cart_sub_item = Cart_Logic.get_test_sub_item(cart_number,user_id,cart_item.id,item_data_type,item_id,{get_value:true,get_cart_sub_item:option.get_cart_sub_item,cart_sub_item_count:option.cart_sub_item_count});
-				cart_item.cart_sub_item_list.push(cart_sub_item);
-			}
-		}
-		return cart_item;
-	};
-	static get_test_sub_item = (cart_number,user_id,cart_item_id,parent_data_type,parent_id,option) =>{
-		option = Field_Logic.get_option(DataType.CART_SUB_ITEM,option?option:{});
-		let item_blank = Item_Logic.get_test('Sub Item '+Num.get_id(),DataType.ITEM,0,{generate_id:true});
-		let cart_sub_item = DataItem.get_new(DataType.CART_SUB_ITEM,Num.get_guid(),Field_Logic.get_test("Cart Sub Item "+Num.get_id(),option));
-		cart_sub_item.cart_number = cart_number;
-		cart_sub_item.user_id = user_id;
-		cart_sub_item.cart_item_id = cart_item_id;
-		cart_sub_item.parent_data_type = item_blank.data_type;
-		cart_sub_item.parent_id = item_blank.id;
-		cart_sub_item.cost = Field_Logic.get_test_cost();
-		cart_sub_item.parent_item = item_blank;
-		return cart_sub_item;
+	static get_new_cart_item = (parent_data_type,parent_id,cart_number,quanity) =>{
+		return DataItem.get_new(DataType.CART_ITEM,0,{parent_data_type:parent_data_type,parent_id:parent_id,cart_number:cart_number,quanity:quanity,cart_sub_item_list:[]});
 	};
-	static get_test_list = (option) =>{
-		option = Field_Logic.get_option(DataType.PRODUCT,option?option:{});
-		let item_list = [];
-		for(let a=0;a<option.product_count+1;a++){
-			item_list.push(Product_Logic.get_test("Product "+String(parseInt(a+1)),option));
-		}
-		return item_list;
-	}
-	static get_test_list_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 item_count = 0;
-		for(let a=0;a<category_list.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);
-			}
-		}
-		return [category_list,product_list]
+	static get_new_cart_sub_item = (parent_data_type,parent_id,cart_number,quanity) =>{
+		return DataItem.get_new(DataType.CART_ITEM,0,{parent_data_type:parent_data_type,parent_id:parent_id,cart_number:cart_number,quanity:quanity});
 	};
 }
 class Product_Logic {
@@ -821,22 +805,19 @@ class FieldType {
 	static CART_NUMBER="CA-";
 	static TRANSACTION_ID="TR-";
 
-	static PAYMENT_PLAN_PENDING="Pending";
+	static ORDER_PAYMENT_STATUS_OPEN="Open";
+	static ORDER_PAYMENT_STATUS_COMPLETE="Complete";
+
+	static PAYMENT_PLAN_TYPE_PENDING="Pending";
 	static PAYMENT_PLAN_TYPE_1="1 Payment";
 	static PAYMENT_PLAN_TYPE_2="2 Payments";
 	static PAYMENT_PLAN_TYPE_3="3 Payments";
 	static PAYMENT_PLAN_TYPE_4="4 Payments";
 
-	static ORDER_STATUS_CART="Cart";
-	static ORDER_STATUS_NEW="New";
-	static ORDER_STATUS_PENDING="Pending";
-	static ORDER_STATUS_PAYMENT="Payment Plan";
-	static ORDER_STATUS_COMPLETE="Complete";
-
-	static ORDER_PAYMENT_TYPE_STRIPE="Stripe";
-	static ORDER_PAYMENT_TYPE_CASH="Cash";
-	static ORDER_PAYMENT_TYPE_OTHER="Other";
-	static ORDER_PAYMENT_TYPE_TEST="Test";
+	static PAYMENT_TYPE_STRIPE="Stripe";
+	static PAYMENT_TYPE_CASH="Cash";
+	static PAYMENT_TYPE_OTHER="Other";
+	static PAYMENT_TYPE_TEST="Test";
 
 	static APP_TYPE_MOBILE="Mobile";
 	static APP_TYPE_WEBSITE="Website";
@@ -1078,12 +1059,10 @@ class Faq_Logic {
 	}
 }
 class Favorite_Logic {
-	static get_new = (item_data_type,item_id,user_id,option) =>{
-		option = Field_Logic.get_option(DataType.FAVORITE,option?option:{});
+	static get_new = (parent_data_type,parent_id) =>{
 		let favorite = DataItem.get_new(DataType.FAVORITE,0,{
-			item_data_type:item_data_type,
+			item_data_type:itemitem_data_type,
 			item_id:item_id,
-			user_id:user_id,
 		});
 		return favorite;
 	}
@@ -1113,11 +1092,10 @@ class Favorite_Logic {
 	}
 }
 class Review_Logic {
-	static get_new = (item_data_type,item_id,user_id,title,comment,rating) =>{
+	static get_new = (item_data_type,item_id,title,comment,rating) =>{
 		return DataItem.get_new(DataType.REVIEW,0,{
 			item_data_type:item_data_type,
 			item_id:item_id,
-			user_id:user_id,
 
 			title:title ? title : "",
 			comment:comment ? comment : "",
@@ -1340,12 +1318,12 @@ class Item_Url {
 		let action_url = "item/post_cms/"+data_type+"/"+id;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
-	static review = (app_id,url,item_data_type,page_current,page_size,params) => {
-		let action_url="item/review/"+item_data_type+"/"+page_current+"/"+page_size;
+	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 post_review = (app_id,url,item_data_type,item_id,params) => {
-		let action_url="item/post_review/"+item_data_type+"/"+item_id;
+	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 content = (app_id,url,key,params) => {
@@ -1356,12 +1334,12 @@ class Item_Url {
 		let action_url="item/custom_field/"+data_type+"/"+key;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
-	static favorite = (app_id,url,item_data_type,page_current,page_size,params) => {
-		let action_url="item/favorite/"+item_data_type+"/"+page_current+"/"+page_size;
+	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,item_data_type,item_id,params) => {
-		let action_url="item/post_favorite"+item_data_type+"/"+item_id;
+	static post_favorite = (app_id,url,parent_data_type,item_id,params) => {
+		let action_url="item/post_favorite"+parent_data_type+"/"+item_id;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
 	static post_field_value = (app_id,url,item_data_type,item_id,value_id,params) => {

package/package.json

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