From 965a4f099b799480f408923e86347b960a01a578 Mon Sep 17 00:00:00 2001
From: Gundo Sifhufhi <sifhufhisg@gmail.com>
Date: Wed, 15 Feb 2023 11:37:17 +0200
Subject: [PATCH] Revert Configs and Some fields.
---
etc/adminhtml/system.xml | 47 ++++++++++++++++++++++++++++------------
etc/config.xml | 3 +--
2 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index f717c83..3553cdc 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -8,14 +8,16 @@
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
<system>
+
<tab id="BobGo" translate="label" sortOrder="20">
<label>Bob Go</label>
</tab>
- <section id="bobgo_CustomShipping" showInDefault="1">
+
+ <section id="bobgo_CustomShipping" showInDefault="1">
<tab>BobGo</tab>
<label>Settings</label>
<resource>Magento_Config::config</resource>
- <group id="general" showInDefault="1">
+ <group id="general" showInDefault="1">
<label>Settings</label>
<field id="version" translate="label" type="label" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Version</label>
@@ -27,7 +29,8 @@
</field>
</group>
</section>
- <!-- General Section(Store Information) -->
+
+<!-- General Section(Store Information) -->
<section id="general" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<group id="store_information" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="suburb" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
@@ -37,34 +40,50 @@
</group>
</section>
<!--- End General Section -->
- <!--- Delivery Methods Section -->
+
+<!--- Delivery Methods Section -->
<section id="carriers" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
<group id="bobgo" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Bob Go</label>
+
<field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
- <label>Show rates at checkout</label>
+ <label>Show rates for checkout</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<comment>When this setting is enabled, your customers will be presented with shipping rates at checkout, as configured on the Bob Go platform under Rates at checkout.</comment>
</field>
- <field id="additional_info" translate="label" type="select" sortOrder="7" showInDefault="1" showInWebsite="1">
- <label>Show additional rate information</label>
- <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
- <comment>Displays the delivery timeframe and additional service level description as configured on Bob Go.</comment>
- </field>
- <field id="unit_of_measure" translate="label" type="select" sortOrder="73" showInDefault="1" showInWebsite="1">
- <label>Weight Unit</label>
- <source_model>bobgo\CustomShipping\Model\Source\Unitofmeasure</source_model>
- </field>
<field id="specificerrmsg" translate="label" type="textarea" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Displayed Error Message</label>
<comment>The message displayed to the customer when no rates were available on Bob Go.</comment>
</field>
+
+ <field id="sallowspecific" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="0">
+ <label>Ship to Applicable Countries</label>
+ <frontend_class>shipping-applicable-country</frontend_class>
+ <source_model>bobgo\CustomShipping\Model\Source\Allspecificcountries</source_model>
+ </field>
<field id="specificcountry" translate="label" type="select" sortOrder="91" showInDefault="1" showInWebsite="1" showInStore="0">
<label>Applicable Countries</label>
<source_model>bobgo\CustomShipping\Model\Source\Country</source_model>
<can_be_empty>1</can_be_empty>
</field>
+
+ <field id="showmethod" translate="label" type="select" sortOrder="92" showInDefault="1" showInWebsite="1" showInStore="0">
+ <label>Show Method if Not Applicable</label>
+ <frontend_class>shipping-skip-hide</frontend_class>
+ <source_model>bobgo\CustomShipping\Model\Source\Showmethod</source_model>
+ </field>
+ <field id="unit_of_measure" translate="label" type="select" sortOrder="73" showInDefault="1" showInWebsite="1" canRestore="1">
+ <label>Weight Unit</label>
+ <source_model>bobgo\CustomShipping\Model\Source\Unitofmeasure</source_model>
+ </field>
+ <field id="additional_info" translate="label" type="select" sortOrder="7" showInDefault="1" showInWebsite="1">
+ <label>Show additional rate information</label>
+ <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+ <comment>Displays the delivery timeframe and additional service level description as configured on Bob Go.</comment>
+ </field>
</group>
</section>
+
+
</system>
</config>
diff --git a/etc/config.xml b/etc/config.xml
index 618624c..58d5366 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -22,8 +22,7 @@
<model>bobgo\CustomShipping\Model\Carrier\CustomShipping</model>
<name>Fixed</name>
<title>Bob Go</title>
- <specificerrmsg>We could not find any shipping rates for your delivery address. Please make sure your address. If you are experiencing problem, please contact us.</specificerrmsg>
- </bobgo>
+ <specificerrmsg>We could not find any shipping rates for your delivery address. Please make sure your address. If you are experiencing problem, please contact us.</specificerrmsg> </bobgo>
</carriers>
</default>
--
GitLab