biz9-logic 4.8.242 → 4.8.245

package/biz9_config

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

package/index.js

@@ -146,32 +146,6 @@ class Stat_Logic {
 		}
 	}
 }
-class Template_Logic {
-	static get_test = (title,option) =>{
-		if(!Str.check_is_null(title) && Obj.check_is_empty(option)){
-			option = title;
-			title = "Test " + Num.get_id();
-		}
-		option = Field_Logic.get_option(DataType.TEMPLATE,option?option:{});
-		let template = DataItem.get_new(DataType.TEMPLATE,0,Field_Logic.get_test(title,option));
-		if(option.get_item){
-			let title_list = ['Header','Body','Footer','Navigation']
-			//template.items = Sub_Item_Logic.get_test_list(template,template,option);
-			template.items = [];
-			for(let a = 0; a<title_list.length;a++){
-				let item = Sub_Item_Logic.get_test(title_list[a],template,template,option);
-				item.items = Sub_Item_Logic.get_test_section_list(item,template,option);
-				item = Sub_Item_Logic.bind_parent_child_list(item,item.items);
-				template.items.push(item);
-				//template.items.push(Sub_Item_Logic.get_test(title_list[a],template,template,option));
-			}
-			if(option.get_item_bind){
-				template = Sub_Item_Logic.bind_parent_child_list(template,template.items);
-			}
-		}
-		return template;
-	};
-}
 class Page_Logic {
 	static get_test = (title,option) =>{
 		[title,option] = Field_Logic.get_option_title(title,option);
@@ -474,6 +448,14 @@ class Content_Logic {
 		return [category_list,content_list]
 	};
 }
+class Template_Logic {
+	static get_test = (title,option) =>{
+		[title,option] = Field_Logic.get_option_title(title,option);
+		option = Field_Logic.get_option(DataType.TEMPLATE,option?option:{});
+		let template = DataItem.get_new(DataType.TEMPLATE,0,Field_Logic.get_test(title,option));
+		return template;
+	};
+}
 class Blog_Post_Logic {
 	static get_test = (title,option) =>{
 		[title,option] = Field_Logic.get_option_title(title,option);
@@ -515,6 +497,25 @@ class Blog_Post_Logic {
 		return [category_list,blog_post_list]
 	};
 }
+class Gallery_Logic {
+	static get_test = (title,option) =>{
+		[title,option] = Field_Logic.get_option_title(title,option);
+		option = Field_Logic.get_option(DataType.GALLERY,option?option:{});
+		let gallery = DataItem.get_new(DataType.GALLERY,0,Field_Logic.get_test(title,option));
+		if(!option.get_blank){
+			gallery.date = String(String(Num.get_id(2030)) + "-" + String(Num.get_id(13)) + "-" + String(Num.get_id(30))).trim();
+			gallery.time = String(Num.get_id(24)) + ":" + String(Num.get_id(59));
+			gallery.website = "Website "+String(Num.get_id());
+		}else{
+			gallery.website = "";
+		}
+		if(option.get_item){
+			gallery.items = Sub_Item_Logic.get_test_list(gallery,gallery,option);
+		}
+		return gallery;
+	};
+};
+
 class Event_Logic {
 	static get_test = (title,option) =>{
 		[title,option] = Field_Logic.get_option_title(title,option);
@@ -585,12 +586,10 @@ class Field_Logic {
 		if(option.get_blank == true){
 			option.category_title = "";
 			item = {
-				title:"",
-				title_url:"",
-				sub_note:"",
-				note:"",
-				date_create:"",
-				date_save:""
+				title:title,
+				title_url:title,
+				title_url:Str.get_title_url(title),
+				setting_visible:"1",
 			}
 		}else{
 			item = {
@@ -779,7 +778,6 @@ class Field_Logic {
 
 		option.user_count = req.query.user_count ? req.query.user_count : 9;
 		option.get_admin = req.query.get_admin ? req.query.get_admin : false;
-		option.get_business = req.query.get_business ? req.query.get_business : false;
 		option.get_template = req.query.get_template ? req.query.get_template : false;
 		option.get_page = req.query.get_page ? req.query.get_page : false;
 
@@ -827,7 +825,6 @@ class FieldType {
 	/*
 	static KEY_ADMIN="key_admin";
 	static KEY_APP_ID="key_app_id";
-	static KEY_BUSINESS="key_business";
 	static KEY_TEMPLATE="key_template";
 	static KEY_CART="key_cart";
 	static KEY_ORDER="key_order";
@@ -887,33 +884,29 @@ class PageType {
 	static HOME='home';
 	static ABOUT='about';
 	static CONTACT='contact';
+	static FAQ='faq';
+	static SEARCH='search';
 
 	static BLOG_POST='blog_post';
-	static BLOG_POST_BROWSE='blog_post_browse';
 	static BLOG_POST_DETAIL='blog_post_detail';
 
+
 	static CATEGORY='category';
-	static CATEGORY_BROWSE='category_browse';
 	static CATEGORY_DETAIL='category_detail';
 
 	static EVENT='event';
-	static EVENT_BROWSE='event_browse';
 	static EVENT_DETAIL='event_detail';
 
 	static GALLERY='gallery';
-	static GALLERY_BROWSE='gallery_browse';
 	static GALLERY_DETAIL='gallery_detail';
 
 	static SERVICE='service';
-	static SERVICE_BROWSE='service_browse';
 	static SERVICE_DETAIL='service_detail';
 
 	static PRODUCT='product';
-	static PRODUCT_BROWSE='product_browse';
 	static PRODUCT_DETAIL='product_detail';
 
 	static PROJECT='project';
-	static PROJECT_BROWSE='project_browse';
 	static PROJECT_DETAIL='project_detail';
 
 	static SECTION_1='section_1';
@@ -971,7 +964,6 @@ class DataType {
 	static ACTIVITY='activity_biz';
 	static APP='app_biz';
 	static BLANK='blank_biz';
-	static BUSINESS='business_biz';
 	static BLOG_POST='blog_post_biz';
 	static CART_ITEM="cart_item_biz";
 	static CATEGORY='category_biz';
@@ -1055,8 +1047,6 @@ class DataType {
 				return 'content';
 			case DataType.ITEM:
 				return 'item';
-			case DataType.BUSINESS:
-				return 'business';
 			case DataType.CUSTOM_FIELD:
 				return 'custom_field';
 		}
@@ -1271,73 +1261,6 @@ class Admin_Logic {
 		return admin.address_1 + " "+ admin.address_2 + " " + admin.city + " " + admin.state + " " + admin.zip;
 	}
 }
-class Business_Logic {
-	static get_new = (title,option) =>{
-		[title,option] = Field_Logic.get_option_title(title,option);
-		return DataItem.get_new_full_item(
-			DataItem.get_new(DataType.BUSINESS,0),
-			DataItem.get_new(DataType.BUSINESS,0),
-			DataItem.get_new(DataType.BUSINESS,0),{
-				title:title,
-				email:"",
-				phone:"",
-				address_1:"",
-				address_2:"",
-				city:"",
-				state:"",
-				zip:"",
-				website:"",
-				youtube:"",
-				instagram:"",
-				facebook:"",
-				twitter:""
-			});
-	};
-	static get_test = (title,option) =>{
-		[title,option] = Field_Logic.get_option_title(title,option);
-		option = Field_Logic.get_option(DataType.BUSINESS,option?option:{});
-		let item = DataItem.get_new(DataType.BUSINESS,0);
-		let city_list = ["Miami","Atlanta","Chicago","Seattle","New York City"];
-		let state_list = ["Georgia","New York","Illinois","Washington","Flordia"];
-		let business = DataItem.get_new(DataType.BUSINESS,0,Field_Logic.get_test(title,option));
-		if(!option.get_blank){
-			business.email="ceo@business"+Num.get_id()+".com";
-			business.phone=Num.get_id(parseInt(777+100)) + "-" + Num.get_id(parseInt(777+100)) + "-"+Num.get_id(parseInt(7777+1000));
-			business.address_1=Num.get_id(99)+" Main St.";
-			business.address_2="PO "+Num.get_id(99);
-			business.city=city_list[Num.get_id(city_list.length-1)];
-			business.state=state_list[Num.get_id(state_list.length-1)];
-			business.zip=Num.get_id(parseInt(77777+1000));
-			business.website="website_" + Num.get_id(9999);
-			business.youtube="youtube_"+Num.get_id(9999);
-			business.instagram="instagram_"+Num.get_id(9999);
-			business.facebook="facebook_"+Num.get_id(9999);
-			business.twitter="twitter_"+Num.get_id(9999);
-		}else{
-			business.email="";
-			business.phone="";
-			business.address_1="";
-			business.address_2="";
-			business.city="";
-			business.state="";
-			business.zip="";
-			business.website="";
-			business.youtube="";
-			business.instagram="";
-			business.facebook="";
-			business.twitter="";
-		}
-		return business;
-	};
-	static get_full_address(business){
-		business.address_1 = (business.address_1) ? business.address_1 : "";
-		business.address_2 = (business.address_2) ? business.address_2 : "";
-		business.city = (business.city) ? business.city : "";
-		business.state = (business.state) ? business.state : "";
-		business.zip = (business.zip) ? business.zip : "";
-		return business.address_1 + " "+ business.address_2 + " " + business.city + " " + business.state + " " + business.zip;
-	}
-}
 class DataItem {
 	static get_new = (data_type,id,option) => {
 		return get_new_item_main(data_type,id,option?option:{});
@@ -1346,23 +1269,13 @@ class DataItem {
 		return get_new_full_item_main(item,parent_item,top_item,option?option:{});
 	};
 }
-class Business_Url {
-	static get = (app_id,url,params) => {
-		let action_url="item/get_business";
+class Dashboard_Url {
+	static user_home = (app_id,url,params) => {
+		let action_url="dashboard/user_home";
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
-}
-class Blank_Url {
-	static get = (app_id,url,key,params) => {
-		let action_url="blank/get/"+key;
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
-	static browse = (app_id,url,params) => {
-		let action_url="blank/browse";
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
-	static category = (app_id,url,category,params) => {
-		let action_url="blank/category/"+category;
+	static app_home = (app_id,url,params) => {
+		let action_url="dashboard/app_home";
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
 }
@@ -1371,39 +1284,11 @@ class Blog_Post_Url {
 		let action_url="blog_post/get/"+key;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
-	static browse = (app_id,url,params) => {
-		let action_url="blog_post/browse";
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
-	static category = (app_id,url,category,params) => {
-		let action_url="blog_post/category/"+category;
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
 	static search = (app_id,url,params) => {
 		let action_url="blog_post/search";
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
 }
-class Custom_Field_Url {
-	static get = (app_id,url,data_type,key,params) => {
-		let action_url="custom_field/get/"+data_type+"/"+key;
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
-	static browse = (app_id,url,params) => {
-		let action_url="custom_field/browse";
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
-}
-class FAQ_Url {
-	static get = (app_id,url,key,params) => {
-		let action_url="faq/"+key;
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
-	static category = (app_id,url,title_url,params) => {
-		let action_url="faq/category/"+title_url;
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
-}
 class Cart_Url {
 	static post = (app_id,url,parent_data_type,params) => {
 		let action_url="cart/post/"+parent_data_type;
@@ -1437,42 +1322,16 @@ class Product_Url {
 		let action_url="product/get/"+key;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
-	static browse = (app_id,url,params) => {
-		let action_url="product/browse";
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
-	static category = (app_id,url,category,params) => {
-		let action_url="product/category/"+category;
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
 	static search = (app_id,url,params) => {
 		let action_url="product/search";
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
 }
-class Review_Url {
-	static get = (app_id,url,parent_data_type,page_current,page_size,params) => {
-		let action_url="review/get/"+parent_data_type+"/"+page_current+"/"+page_size;
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
-	static post = (app_id,url,parent_data_type,parent_id,params) => {
-		let action_url="review/post/"+parent_data_type+"/"+parent_id;
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
-}
 class Event_Url {
 	static get = (app_id,url,key,params) => {
 		let action_url="event/get/"+key;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
-	static browse = (app_id,url,params) => {
-		let action_url="event/browse";
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
-	static category = (app_id,url,category,params) => {
-		let action_url="event/category/"+category;
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
 	static search = (app_id,url,params) => {
 		let action_url="event/search";
 		return get_cloud_url_main(app_id,url,action_url,params);
@@ -1483,54 +1342,16 @@ class Service_Url {
 		let action_url="service/get/"+key;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
-	static browse = (app_id,url,params) => {
-		let action_url="service/browse";
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
-	static category = (app_id,url,category,params) => {
-		let action_url="service/category/"+category;
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
 	static search = (app_id,url,params) => {
 		let action_url="service/search";
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
 }
-class Content_Url {
-	static portfolio = (app_id,url,params) => {
-		let action_url="content/portfolio";
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
-	static get = (app_id,url,key,params) => {
-		let action_url="content/get/"+key;
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
-	static browse = (app_id,url,params) => {
-		let action_url="content/browse";
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
-	static category = (app_id,url,category,params) => {
-		let action_url="content/category/"+category;
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
-	static search = (app_id,url,params) => {
-		let action_url="content/search";
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
-}
 class Gallery_Url {
 	static get = (app_id,url,key,params) => {
 		let action_url="gallery/get/"+key;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
-	static browse = (app_id,url,params) => {
-		let action_url="gallery/browse";
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
-	static category = (app_id,url,category,params) => {
-		let action_url="gallery/category/"+category;
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
 	static search = (app_id,url,params) => {
 		let action_url="gallery/search";
 		return get_cloud_url_main(app_id,url,action_url,params);
@@ -1554,25 +1375,33 @@ class User_Url {
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
 }
-class Favorite_Url {
-	static get = (app_id,url,parent_data_type,page_current,page_size,params) => {
-		let action_url="favorite/get/"+parent_data_type+"/"+page_current+"/"+page_size;
+class Item_Url {
+	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 post = (app_id,url,parent_data_type,parent_id,params) => {
-		let action_url="favorite/post/"+parent_data_type+"/"+parent_id;
+	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);
 	};
-}
-class Item_Url {
-	static post_cms = (app_id,url,data_type,id,params) => {
-		let action_url = "item/post_cms/"+data_type+"/"+id;
+	static post_review = (app_id,url,parent_data_type,parent_id,params) => {
+		let action_url="item/post_review/"+parent_data_type+"/"+parent_id;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
-}
-class Faq_Url {
-	static get = (app_id,url,key,params) => {
-		let action_url="faq/get/"+key;
+	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 custom_field = (app_id,url,data_type,key,params) => {
+		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,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_id,params) => {
+		let action_url="item/post_favorite"+parent_data_type+"/"+parent_id;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
 }
@@ -1581,10 +1410,6 @@ class Category_Url {
 		let action_url="category/get/"+key;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
-	static browse = (app_id,url,params) => {
-		let action_url="category/browse";
-		return get_cloud_url_main(app_id,url,action_url,params);
-	};
 	static search = (app_id,url,params) => {
 		let action_url="category/search";
 		return get_cloud_url_main(app_id,url,action_url,params);
@@ -1596,7 +1421,19 @@ class Page_Url {
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
 	static home = (app_id,url,params) => {
-		let action_url=PageType.get_title(PageType.HOME);
+		let action_url="page/home";
+		return get_cloud_url_main(app_id,url,action_url,params);
+	};
+	static about = (app_id,url,params) => {
+		let action_url="page/about";
+		return get_cloud_url_main(app_id,url,action_url,params);
+	};
+	static contact = (app_id,url,params) => {
+		let action_url="page/contact";
+		return get_cloud_url_main(app_id,url,action_url,params);
+	};
+	static faq = (app_id,url,key,params) => {
+		let action_url="page/faq/"+key;
 		return get_cloud_url_main(app_id,url,action_url,params);
 	};
 	static post_value_field = (app_id,url,type,page_id,value_id,params) => {
@@ -2149,19 +1986,15 @@ class App_Logic {
 module.exports = {
 	App_Logic,
 	Admin_Logic,
-	Business_Url,
-	Business_Logic,
 	Blank_Logic,
-	Blank_Url,
 	Blog_Post_Logic,
 	Blog_Post_Url,
+	Dashboard_Url,
 	Cart_Logic,
 	Cart_Url,
 	Category_Logic,
 	Category_Url,
-	Content_Url,
 	Content_Logic,
-	Custom_Field_Url,
 	CMS,
 	DataItem,
 	DataType,
@@ -2169,9 +2002,8 @@ module.exports = {
 	Field_Logic,
 	FieldType,
 	Faq_Logic,
-	Faq_Url,
 	Favorite_Logic,
-	Favorite_Url,
+	Gallery_Logic,
 	Gallery_Url,
 	Item_Logic,
 	Item_Url,
@@ -2183,7 +2015,6 @@ module.exports = {
 	PageType,
 	Product_Logic,
 	Review_Logic,
-	Review_Url,
 	Order_Logic,
 	Order_Url,
 	Service_Logic,
@@ -2194,8 +2025,8 @@ module.exports = {
 	Storage,
 	Schedule,
 	Stock,
-	TemplateType,
 	Template_Logic,
+	TemplateType,
 	Url,
 	User_Url,
 	User_Logic,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "biz9-logic",
-  "version": "4.8.242",
+  "version": "4.8.245",
   "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,Field_Logic,Order_Logic,Cart_Logic,Faq_Url,App_Logic,FieldType,Product_Url} = 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,Order_Logic,Cart_Logic,Faq_Url,App_Logic,FieldType,Product_Url,Gallery_Logic} = require('./index');
 const {Log,Num} = require('biz9-utility');
 const {Scriptz}= require('biz9-scriptz');
 
@@ -31,15 +31,18 @@ describe("connect", () => {
         series([
 
             function(call) {
-                //console.log('PAGE-SECTION-START');
-                let page = Page_Logic.get_test();
-                page[Page_Logic.get_page_value_field_title(FieldType.PAGE_VALUE_FIELD_TYPE_TEXT,1)] = 'apple';
+                console.log('ITEM-START');
+                let gallery = Gallery_Logic.get_test('Gallery 1',{get_blank:true});
+                console.log(gallery);
+                console.log('ITEM-END');
+                //let page = Page_Logic.get_test();
+                //page[Page_Logic.get_page_value_field_title(FieldType.PAGE_VALUE_FIELD_TYPE_TEXT,1)] = 'apple';
                 //page[Page_Logic.get_page_value_field_title('list',1,1)] = 'cool';
                 //page[Page_Logic.get_page_value_field_title('list',1,2)] = 'apple';
                 //page[Page_Logic.get_page_value_field_title('list',1,3)] = 'sauce';
-                Log.w('page',page);
-                Log.w('text_1_value',Page_Logic.get_page_value_field_value(FieldType.PAGE_VALUE_FIELD_TYPE_TEXT,page,1));
-                //Log.w('list_1_value',Page_Logic.get_page_value_field_value(FieldType.PAGE_VALUE_TYPE_LIST,1,1));
+                //Log.w('page',page);
+                //Log.w('text_1_value',Page_Logic.get_page_value_field_value(FieldType.PAGE_VALUE_FIELD_TYPE_TEXT,page,1));
+                //Log.w('list_1_value',Page_Logic.get_page_value_field_value(FieldType.PAGE_VALUE_FIELD_TYPE_LIST,page,1));
 
 
                 //console.log(Page_Logic.get_page_value_field_title('text',1));