From 7dce00d6e00a226d65aef2790855bad9c5a6ef75 Mon Sep 17 00:00:00 2001
From: BillyGriffiths <billy.griffiths@gmail.com>
Date: Wed, 15 Feb 2023 10:07:16 +0200
Subject: [PATCH] some settings changes

---
 Plugin/ShippingInformationManagement.php |  2 +-
 etc/adminhtml/system.xml                 | 53 ++++++++----------------
 etc/config.xml                           |  2 +-
 3 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/Plugin/ShippingInformationManagement.php b/Plugin/ShippingInformationManagement.php
index 107f90b..233ed2c 100644
--- a/Plugin/ShippingInformationManagement.php
+++ b/Plugin/ShippingInformationManagement.php
@@ -16,7 +16,7 @@ class ShippingInformationManagement
     public CartRepositoryInterface $cartRepository;
 
     public function __construct(
-        CartRepositoryInterface $cartRepository,
+        CartRepositoryInterface $cartRepository
     )
     {
         $this->cartRepository = $cartRepository;
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index af55345..f717c83 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -8,16 +8,14 @@
 -->
 <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>
@@ -29,8 +27,7 @@
                 </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">
@@ -40,50 +37,34 @@
             </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>Enabled for Checkout</label>
+                    <label>Show rates at checkout</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <comment>Enable this shipping method for your customers</comment>
+                    <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>Displayed if the extension fails to calculate the shipping cost</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>
+                    <comment>The message displayed to the customer when no rates were available on Bob Go.</comment>
                 </field>
                 <field id="specificcountry" translate="label" type="select" sortOrder="91" showInDefault="1" showInWebsite="1" showInStore="0">
-                    <label>Ship to Specific Countries</label>
+                    <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>Display Additional Information</label>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <comment>Display additional information on the checkout page</comment>
-                </field>
             </group>
         </section>
-
-
     </system>
 </config>
diff --git a/etc/config.xml b/etc/config.xml
index 0a72bc6..618624c 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -22,7 +22,7 @@
                 <model>bobgo\CustomShipping\Model\Carrier\CustomShipping</model>
                 <name>Fixed</name>
                 <title>Bob Go</title>
-                <specificerrmsg>This shipping method is not available. To use this shipping method, please contact us.</specificerrmsg>
+                <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>
 
-- 
GitLab