biz9-logic 4.8.116 → 4.8.118

package/biz9_config

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

package/index.js

@@ -205,16 +205,16 @@ class Order_Logic {
 	static get_order_id = () => {
 		return FieldType.ORDER_ID + Number.get_id();
 	}
-	static get_test_cart_item = (cart_id,user_id,parent_data_type,parent_id,option) =>{
-		option = Field_Logic.get_option(DataType.CART_ITEM,option?option:{});
+	static get_test_cart_item = (cart_item_id,cart_id,user_id,parent_data_type,parent_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,Number.get_guid(),Field_Logic.get_test("Cart Item "+Number.get_id(),option));
 		cart_item.cart_id = cart_id;
 		cart_item.user_id = user_id;
 		cart_item.parent_data_type = parent_data_type;
 		cart_item.parent_id = parent_id;
 		cart_item.cost = Field_Logic.get_test_cost();
-		cart_item.cart_sub_item_list = [];
 		if(option.get_cart_sub_item){
+		cart_item.cart_sub_item_list = [];
 			for(let a = 0;a<option.cart_sub_item_count;a++){
 				cart_item.cart_sub_item_list.push(Order_Logic.get_test_cart_sub_item(cart_id,user_id,cart_item.id,parent_data_type,parent_id,{get_value:true,get_cart_sub_item:option.get_cart_sub_item,cart_sub_item_count:option.cart_sub_item_count}));
 			}
@@ -296,6 +296,8 @@ class Product_Logic {
 		if(option.get_blank ==false){
 			product.cost = Field_Logic.get_test_cost();
 			product.old_cost = Field_Logic.get_test_cost();
+			product.cart_count = 0;
+			product.order_count = 0;
 			product.type = "Type "+String(Number.get_id());
 			product.sub_type = "Sub Type "+String(Number.get_id());
 			product.stock = String(Number.get_id(3-1));
@@ -313,21 +315,6 @@ class Product_Logic {
 		}
 		return product;
 	};
-	static get_test_cart = (cart_id,user_id,option) =>{
-		[cart_id,option] = Field_Logic.get_option_title("CART"+Number.get_id(),option);
-		option = Field_Logic.get_option(DataType.CART,option?option:{});
-		let cart = DataItem.get_new(DataType.CART,Number.get_guid(),Field_Logic.get_test(cart_id,option));
-		cart.user_id = user_id;
-		let product_option = {generate_id:true,product_count:option.cart_item_count};
-		let product_list = Product_Logic.get_test_list(product_option);
-		cart.cart_item_list = [];
-		if(option.get_cart_item){
-			for(let a = 0;a<option.cart_item_count;a++){
-				cart.cart_item_list.push(Order_Logic.get_test_cart_item(cart_id,user_id,product_list[a].data_type,product_list[a].id,{get_value:true,get_cart_sub_item:option.get_cart_sub_item,cart_sub_item_count:option.cart_sub_item_count}));
-			}
-		}
-		return cart;
-	};
 	static get_test_cart = (cart_id,user_id,option) =>{
 		[cart_id,option] = Field_Logic.get_option_title(cart_id,option);
 		option = Field_Logic.get_option(DataType.CART,option?option:{});
@@ -335,8 +322,8 @@ class Product_Logic {
 		cart.user_id = user_id;
 		let product_option = {generate_id:true,product_count:option.cart_item_count};
 		let product_list = Product_Logic.get_test_list(product_option);
-		cart.cart_item_list = [];
 		if(option.get_cart_item){
+		cart.cart_item_list = [];
 			for(let a = 0;a<option.cart_item_count;a++){
 				cart.cart_item_list.push(Order_Logic.get_test_cart_item(cart_id,user_id,product_list[a].data_type,product_list[a].id,{get_value:true,get_cart_sub_item:option.get_cart_sub_item,cart_sub_item_count:option.cart_sub_item_count}));
 			}
@@ -576,6 +563,7 @@ class Field_Logic {
 			category:option.category_title,
 			sub_note:sub_note,
 			note:note,
+			view_count:0,
 			id:0,
 			date_create:new moment().toISOString(),
 			date_save:new moment().toISOString()
@@ -785,12 +773,16 @@ class FieldType {
 	static DATE_CREATE='date_create';
 	static DATE_SAVE='date_save';
 	static STAT_VIEW_ID='1';
-	static STAT_LIKE_ID='2';
-	static STAT_POST_ID='3';
+	static STAT_LIKE_ADD_ID='2';
+	static STAT_FAVORITE_ADD_ID='3';
+	static STAT_CART_ADD_ID='4';
+	static STAT_ORDER_ADD_ID='5';
+	static STAT_REVIEW_ADD_ID='6';
 
 	static KEY_ADMIN="key_admin";
 	static KEY_APP_ID="key_app_id";
 	static KEY_BUSINESS="key_business";
+	static KEY_CART="key_cart";
 	static KEY_GUEST="key_guest";
 	static KEY_ORDER="key_order";
 	static KEY_USER="key_user";
@@ -1211,32 +1203,28 @@ class FAQ_Url {
 	};
 }
 class Order_Url {
-	static single_stripe_checkout = (biz9_config,data_type,key,params) => {
-		let action_url="order/single-stripe-checkout/"+data_type+"/"+key;
-		return get_cloud_url_main(biz9_config.APP_ID,biz9_config.URL,action_url,params);
-	};
-	static user_stripe_checkout = (biz9_config,user_id,params) => {
-		let action_url="order/cart-stripe-checkout/"+user_id;
+	static stripe_checkout = (biz9_config,cart_id,params) => {
+		let action_url="order/stripe-checkout/"+cart_id;
 		return get_cloud_url_main(biz9_config.APP_ID,biz9_config.URL,action_url,params);
 	};
-	static checkout_success = (biz9_config,order_id,params) => {
-		let action_url="order/cart-stripe-checkout/"+order_id;
+	static checkout_success = (biz9_config,cart_id,params) => {
+		let action_url="order/checkout-success/"+cart_id;
 		return get_cloud_url_main(biz9_config.APP_ID,biz9_config.URL,action_url,params);
 	};
-	static user_cart = (biz9_config,user_id,params) => {
-		let action_url="order/user-cart/"+order_id;
+	static cart_item_update = (biz9_config,cart_item_id,cart_id,user_id,parent_data_type,parent_id,params) => {
+		let action_url="order/cart-update/"cart_item_id+"/"+cart_id+"/"+user_id+"/"+parent_data_type+"/"+parent_id;
 		return get_cloud_url_main(biz9_config.APP_ID,biz9_config.URL,action_url,params);
 	};
-	static cart_update = (biz9_config,user_id,data_type,id,params) => {
-		let action_url="order/cart-update/"+user_id+"/"+data_type+"/"+id;
+	static cart_get = (biz9_config,cart_id,params) => {
+		let action_url="order/cart-get/"+cart_id;
 		return get_cloud_url_main(biz9_config.APP_ID,biz9_config.URL,action_url,params);
 	};
-	static cart_get = (biz9_config,user_id,data_type,id,params) => {
-		let action_url="order/cart-get/"+user_id+"/"+data_type+"/"+id;
+	static cart_delete = (biz9_config,id,params) => {
+		let action_url="order/cart-delete/"+id;
 		return get_cloud_url_main(biz9_config.APP_ID,biz9_config.URL,action_url,params);
 	};
-	static cart_search = (biz9_config,order_id,params) => {
-		let action_url="order/cart-search/"+order_id;
+	static cart_search = (biz9_config,params) => {
+		let action_url="order/cart-search/";
 		return get_cloud_url_main(biz9_config.APP_ID,biz9_config.URL,action_url,params);
 	};
 }
@@ -1789,7 +1777,7 @@ class User_Logic {
 	}
 	static get_user(req){
 		if(!req || !req.session.user){
-			let user=DataItem.get_new(DataType.USER,0,{is_guest:true,customer_id:Number.get_id(99999)});
+			let user=DataItem.get_new(DataType.USER,0,{is_guest:true});
 			req.session.user=user;
 		}
 		return req.session.user;

package/package.json

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

package/test.js

@@ -209,9 +209,14 @@ describe("connect", () => {
 
                 console.log('PRODUCT-CART-START');
                 let user = User_Logic.get_test({generate_id:true});
-                let cart_id = Order_Logic.get_order_id();
-                Log.w('cccc',cart_id);
-                //let product_cart = Product_Logic.get_test_cart(cart_id,user.id,{get_cart_item:true,cart_item_count:1, get_cart_sub_item:true,cart_sub_item_count:1 });
+                let product = Product_Logic.get_test("Product "+Number.get_id(),{get_value:false,get_item:false})
+                //cart_item_id,cart_id,user_id,parent_data_type,parent_id
+                let cart_item = Order_Logic.get_test_cart_item(0,Order_Logic.get_cart_id(),user.id,product.data_type,product.id);
+                Log.w('user',user);
+                Log.w('product',product);
+                Log.w('cart_item',cart_item);
+                //let cart_id = Order_Logic.get_order_id();
+                let product_cart = Product_Logic.get_test_cart(cart_id,user.id,{get_cart_item:true,cart_item_count:1, get_cart_sub_item:true,cart_sub_item_count:1 });
                 //let product_cart = Product_Logic.get_test_cart(user.id,{get_cart_item:true,order_item_count:1,get_order_sub_item:true,order_sub_item_count:2 });
                 //Log.w('product_cart',product_cart);
                 //Log.w('product_cart_item_list',product_order.order_item_list.length);