biz9-logic 4.8.101 → 4.8.103

package/biz9_config

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

package/index.js

@@ -207,6 +207,7 @@ class Product_Logic {
 			DataItem.get_new(DataType.PRODUCT,0),
 			DataItem.get_new(DataType.PRODUCT,0),
 			Field_Logic.get_test(title,option));
+		/*
 		if(option.get_blank ==false){
 			product.cost = String(Number.get_id(999)) + "." + String(Number.get_id(99));
 			product.old_cost = String(Number.get_id(999)) + "." + String(Number.get_id(99));
@@ -225,6 +226,7 @@ class Product_Logic {
 		if(option.get_item){
 			product.items = Sub_Item_Logic.get_test_list(product,product,option);
 		}
+		*/
 		return product;
 	};
 	static get_test_list = (option) =>{
@@ -428,7 +430,7 @@ class Field_Logic {
 	static get_test = (title,option) =>{
 		option = !Obj.check_is_empty(option) ? option : {};
 		let sub_note = "Sub Note "+String(Number.get_id());
-		let note = "Note "+String(Number.get_id());
+		let note = "Note "+String(Number.get_id()) + "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.";
 		option.category_title = !Str.check_is_null(option.category_title) ? option.category_title : 'Category '+String(Number.get_id());
 		if(option.get_blank == true){
 			date_create:"";
@@ -458,7 +460,9 @@ class Field_Logic {
 				if(option.get_blank == true){
 					item[field_list[a]] = "";
 				}else{
+					if(!Str.check_is_null(field_list[a])){
 					item[Str.get_title_url(field_list[a])] = Str.get_title(field_list[a]) +"_" + Number.get_id();
+					}
 				}
 			}
 		}
@@ -1506,6 +1510,30 @@ class Storage {
 	}
 }
 class User_Logic {
+	static get_user_country_state_city(item){
+		let country_state_city = "";
+		if(item.country == "United States"){
+            let state = "";
+            if(!Str.check_is_null(item.state)){
+                country_state_city = item.state;
+            }
+			if(!Str.check_is_null(item.city)){
+				if(!Str.check_is_null(item.state)){
+        			country_state_city = item.city + ", " + item.state;
+				}else{
+					country_state_city = item.city;
+				}
+        	}
+		}
+		else{
+			if(!Str.check_is_null(item.city)){
+				country_state_city = item.city + ", " + item.country;
+			}else{
+				country_state_city = item.country;
+			}
+        }
+		return country_state_city;
+	}
 	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)});

package/package.json

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

package/test.js

@@ -1,6 +1,6 @@
 const path = require('path');
 const series = require('async-series');
-const {DataItem,DataType,Url,Obj,BiZ_Url,Cat,Stock,Schedule,Storage,Business,Product,Service,Event,Template,Page,Category,Review,Blog_Post,Faq_Logic,Category_Url,Blank_Url,Blank_Logic,Item_Logic,Service_Logic,Template_Logic,Page_Logic,Product_Logic,Event_Logic,Blog_Post_Logic,Content_Logic,Category_Logic,Team_Logic,Business_Logic,PageType,Sub_Item_Logic,Page_Url,Review_Logic,User_Logic} = require('./index');
+const {DataItem,DataType,Url,Obj,BiZ_Url,Cat,Stock,Schedule,Storage,Business,Product,Service,Event,Template,Page,Category,Review,Blog_Post,Faq_Logic,Category_Url,Blank_Url,Blank_Logic,Item_Logic,Service_Logic,Template_Logic,Page_Logic,Product_Logic,Event_Logic,Blog_Post_Logic,Content_Logic,Category_Logic,Team_Logic,Business_Logic,PageType,Sub_Item_Logic,Page_Url,Review_Logic,User_Logic,Field_Logic} = require('./index');
 const {Log,Number} = require('biz9-utility');
 const {Scriptz}= require('biz9-scriptz');
 
@@ -83,13 +83,26 @@ describe("connect", () => {
                 //Log.w('team_list',team_list);
                 /* --TEAM--END */
 
-                /* --USER--START */
-                //let user = User_Logic.get_test();
+                /* --FIELD-LOGIC--START */
+                let field_logic = Field_Logic.get_test();
+                Log.w('field_logic',field_logic);
+                //let country_state = User_Logic.get_user_country_state_city(user);
+                //Log.w('country_state',country_state);
                 //let user = User_Logic.get_test();
                 //let user_list = User_Logic.get_test_list();
                 //Log.w('user',user);
                 //Log.w('user_list',user_list);
+                /* --FIELD-LOGIC--END */
+
 
+                /* --USER--START */
+                //let user = {country:"United States",state:"",city:"Atlanta"};
+                //let country_state = User_Logic.get_user_country_state_city(user);
+                //Log.w('country_state',country_state);
+                //let user = User_Logic.get_test();
+                //let user_list = User_Logic.get_test_list();
+                //Log.w('user',user);
+                //Log.w('user_list',user_list);
                 /* --USER--END */
 
                /* --SEARCH--START */
@@ -103,7 +116,6 @@ describe("connect", () => {
                 let search_filter_value_2 = 'value2';
                 */
 
-
                 //let query = "?app_id=19&data_type="+data_type+"&sort_by={}&page_current=1&page_size=99&search_filter_key_1="+search_filter_key_1+"&search_filter_value_1="+search_filter_value_1+"&search_filter_key_2="+search_filter_key_2+"&search_filter_value_2="+search_filter_value_2;
 
                 //Log.w('query',query);
@@ -195,6 +207,7 @@ describe("connect", () => {
 
                 /* --PRODUCT--START */
                 //let product = Product_Logic.get_test("Product 1",{get_value:true,get_item:true})
+                //let product = Product_Logic.get_test("Product 1")
                 //let product = Product_Logic.get_test({fields:["date_create"]})
                 //let product = Product_Logic.get_test({fields:["cool_beanj]})
                 //Log.w("product",product);
@@ -272,10 +285,12 @@ describe("connect", () => {
                 /* --CONFIG--END */
 
                 /* --PAGE--START */
+                /*
                 let page = Page_Logic.get_test({item_count:2,page_count:2,get_value:true,get_item:true,value_count:5})
                 let page_row_item = Sub_Item_Logic.get_test_section_list(page,page,{get_value:true,value_count:9,section_count:9});
                 Log.w("Page",page);
                 Log.w("Page_Row_Item",page_row_item);
+                */
                 //let page = Page.get_test({item_count:9,page_count:19,get_item:true,get_value:true})
                 //let page = Page.get_test()
                 //Log.w("Page_section_1",page.section_1);