← All changes | app/Models/GeneralList.php +64 -62 2.0.2 → 2.0.0 View file →

		@@ -73,10 +73,10 @@
73	73	'top-right' => esc_html__( 'Top Right', 'shopbuilder' ),
74	74	'bottom-right' => esc_html__( 'Bottom Right', 'shopbuilder' ),
75	75	'bottom-left' => esc_html__( 'Bottom Left', 'shopbuilder' ),
76	76	'top-left' => esc_html__( 'Top Left', 'shopbuilder' ),
77		- //'top-full-width' => esc_html__( 'Top Full Width', 'shopbuilder' ),
78		- //'bottom-full-width' => esc_html__( 'Bottom Full Width', 'shopbuilder' ),
	77	+ 'top-full-width' => esc_html__( 'Top Full Width', 'shopbuilder' ),
	78	+ 'bottom-full-width' => esc_html__( 'Bottom Full Width', 'shopbuilder' ),
79	79	'top-center' => esc_html__( 'Top center', 'shopbuilder' ),
80	80	'bottom-center' => esc_html__( 'Bottom center', 'shopbuilder' ),
81	81	],
82	82	],
		@@ -376,9 +376,8 @@
376	376	'label' => esc_html__( 'Country', 'shopbuilder' ),
377	377	'type' => 'checkbox',
378	378	'orientation' => 'vertical',
379	379	'value' => [ 'show', 'required' ],
380		- // 'help' => esc_html__( 'If the Shipping Form is enabled, the Country field is mandatory.', 'shopbuilder' ),
381	380	'options' => [
382	381	[
383	382	'value' => 'show',
384	383	'label' => 'Show Country?',
		@@ -636,9 +635,8 @@
636	635	'id' => 'billing_state_label',
637	636	'label' => esc_html__( 'State label', 'shopbuilder' ),
638	637	'type' => 'text',
639	638	'help' => esc_html__( 'Leave empty to set default.', 'shopbuilder' ),
640		- //'help' => esc_html__( 'Leave empty to set default. If the Shipping Form is enabled, the State field is mandatory.', 'shopbuilder' ),
641	639	// 'tab' => 'state',
642	640	'dependency' => [
643	641	'rules' => [
644	642	[
		@@ -1125,9 +1123,9 @@
1125	1123	'id' => 'shipping_address_2',
1126	1124	'label' => esc_html__( 'Address 2', 'shopbuilder' ),
1127	1125	'type' => 'checkbox',
1128	1126	'orientation' => 'vertical',
1129		- 'value' => [ 'show' ],
	1127	+ 'value' => [ 'show', 'required' ],
1130	1128	'options' => [
1131	1129	[
1132	1130	'value' => 'show',
1133	1131	'label' => 'Show Address field?',
		@@ -1246,9 +1244,9 @@
1246	1244	],
1247	1245	'shipping_state_heading' => [
1248	1246	'id' => 'shipping_state_heading',
1249	1247	'type' => 'title',
1250		- 'label' => esc_html__( 'Others', 'shopbuilder' ),
	1248	+ 'label' => esc_html__( 'State', 'shopbuilder' ),
1251	1249	// 'tab' => 'name',
1252	1250	],
1253	1251	'shipping_state' => [
1254	1252	'id' => 'shipping_state',
		@@ -1267,31 +1265,31 @@
1267	1265	],
1268	1266	],
1269	1267	// 'tab' => 'country',
1270	1268	],
1271		- //
1272		- // 'shipping_state_label' => [
1273		- // 'id' => 'shipping_state_label',
1274		- // 'label' => esc_html__( 'State label', 'shopbuilder' ),
1275		- // 'type' => 'text',
1276		- // 'help' => esc_html__( 'Leave empty to set default.', 'shopbuilder' ),
1277		- // // 'tab' => 'country',
1278		- // 'dependency' => [
1279		- // 'rules' => [
1280		- // [
1281		- // 'item' => 'general.shipping_form.shipping_state',
1282		- // 'value' => 'show',
1283		- // 'operator' => '==', // 'operator' => 'any','in', !in' only valid for multiple value //
1284		- // ],
1285		- // ],
1286		- // ],
1287		- // ],
1288		- //'shipping_postcode_heading' => [
1289		- // 'id' => 'shipping_postcode_heading',
1290		- // 'type' => 'title',
1291		- // 'label' => esc_html__( 'Postcode / ZIP', 'shopbuilder' ),
1292		- // // 'tab' => 'name',
1293		- //],
	1269	+
	1270	+ 'shipping_state_label' => [
	1271	+ 'id' => 'shipping_state_label',
	1272	+ 'label' => esc_html__( 'State label', 'shopbuilder' ),
	1273	+ 'type' => 'text',
	1274	+ 'help' => esc_html__( 'Leave empty to set default.', 'shopbuilder' ),
	1275	+ // 'tab' => 'country',
	1276	+ 'dependency' => [
	1277	+ 'rules' => [
	1278	+ [
	1279	+ 'item' => 'general.shipping_form.shipping_state',
	1280	+ 'value' => 'show',
	1281	+ 'operator' => '==', // 'operator' => 'any','in', !in' only valid for multiple value //
	1282	+ ],
	1283	+ ],
	1284	+ ],
	1285	+ ],
	1286	+ 'shipping_postcode_heading' => [
	1287	+ 'id' => 'shipping_postcode_heading',
	1288	+ 'type' => 'title',
	1289	+ 'label' => esc_html__( 'Postcode / ZIP', 'shopbuilder' ),
	1290	+ // 'tab' => 'name',
	1291	+ ],
1294	1292	'shipping_postcode' => [
1295	1293	'id' => 'shipping_postcode',
1296	1294	'label' => esc_html__( 'Postcode / ZIP', 'shopbuilder' ),
1297	1295	'type' => 'checkbox',
		@@ -1300,44 +1298,48 @@
1300	1298	'options' => [
1301	1299	[
1302	1300	'value' => 'show',
1303	1301	'label' => 'Show Postcode / ZIP?',
1304		- ]
	1302	+ ],
	1303	+ [
	1304	+ 'value' => 'required',
	1305	+ 'label' => 'Required Field',
	1306	+ ],
1305	1307	],
1306	1308	// 'tab' => 'country',
1307	1309	],
1308		- // 'shipping_postcode_label' => [
1309		- // 'id' => 'shipping_postcode_label',
1310		- // 'label' => esc_html__( 'Postcode / ZIP label', 'shopbuilder' ),
1311		- // 'type' => 'text',
1312		- // 'help' => esc_html__( 'Leave empty to set default. ', 'shopbuilder' ),
1313		- // // 'tab' => 'country',
1314		- // 'dependency' => [
1315		- // 'rules' => [
1316		- // [
1317		- // 'item' => 'general.shipping_form.shipping_postcode',
1318		- // 'value' => 'show',
1319		- // 'operator' => '==', // 'operator' => 'any','in', !in' only valid for multiple value //
1320		- // ],
1321		- // ],
1322		- // ],
1323		- // ],
1324		- // 'shipping_postcode_placeholder' => [
1325		- // 'id' => 'shipping_postcode_placeholder',
1326		- // 'label' => esc_html__( 'Postcode / ZIP placeholder', 'shopbuilder' ),
1327		- // 'type' => 'text',
1328		- // 'help' => esc_html__( 'Leave empty to set default.', 'shopbuilder' ),
1329		- // // 'tab' => 'country',
1330		- // 'dependency' => [
1331		- // 'rules' => [
1332		- // [
1333		- // 'item' => 'general.shipping_form.shipping_postcode',
1334		- // 'value' => 'show',
1335		- // 'operator' => '==', // 'operator' => 'any','in', !in' only valid for multiple value //
1336		- // ],
1337		- // ],
1338		- // ],
1339		- // ],
	1310	+ 'shipping_postcode_label' => [
	1311	+ 'id' => 'shipping_postcode_label',
	1312	+ 'label' => esc_html__( 'Postcode / ZIP label', 'shopbuilder' ),
	1313	+ 'type' => 'text',
	1314	+ 'help' => esc_html__( 'Leave empty to set default.', 'shopbuilder' ),
	1315	+ // 'tab' => 'country',
	1316	+ 'dependency' => [
	1317	+ 'rules' => [
	1318	+ [
	1319	+ 'item' => 'general.shipping_form.shipping_postcode',
	1320	+ 'value' => 'show',
	1321	+ 'operator' => '==', // 'operator' => 'any','in', !in' only valid for multiple value //
	1322	+ ],
	1323	+ ],
	1324	+ ],
	1325	+ ],
	1326	+ 'shipping_postcode_placeholder' => [
	1327	+ 'id' => 'shipping_postcode_placeholder',
	1328	+ 'label' => esc_html__( 'Postcode / ZIP placeholder', 'shopbuilder' ),
	1329	+ 'type' => 'text',
	1330	+ 'help' => esc_html__( 'Leave empty to set default.', 'shopbuilder' ),
	1331	+ // 'tab' => 'country',
	1332	+ 'dependency' => [
	1333	+ 'rules' => [
	1334	+ [
	1335	+ 'item' => 'general.shipping_form.shipping_postcode',
	1336	+ 'value' => 'show',
	1337	+ 'operator' => '==', // 'operator' => 'any','in', !in' only valid for multiple value //
	1338	+ ],
	1339	+ ],
	1340	+ ],
	1341	+ ],
1340	1342
1341	1343	],
1342	1344	]
1343	1345	),