diff --git a/.idea/magento-uafrica-shipping-extension.iml b/.idea/magento-uafrica-shipping-extension.iml index c956989b29ad0767edc6cf3a202545927c3d1e76..07ba03395dc52591611bcc9d278dda63894a7ecf 100644 --- a/.idea/magento-uafrica-shipping-extension.iml +++ b/.idea/magento-uafrica-shipping-extension.iml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <module type="WEB_MODULE" version="4"> <component name="NewModuleRootManager"> - <content url="file://$MODULE_DIR$" /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/" isTestSource="false" packagePrefix="bobgo\BobGo\" /> + </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> </component> diff --git a/.idea/php.xml b/.idea/php.xml index 0e1f041b9ee90482c568931419b52676b1beb93b..cd2cd2c40e7fce4613bdad795583ced5d335b37b 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -1,5 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> + <component name="MessDetectorOptionsConfiguration"> + <option name="transferred" value="true" /> + </component> + <component name="PHPCSFixerOptionsConfiguration"> + <option name="transferred" value="true" /> + </component> + <component name="PHPCodeSnifferOptionsConfiguration"> + <option name="highlightLevel" value="WARNING" /> + <option name="transferred" value="true" /> + </component> <component name="PhpIncludePathManager"> <include_path> <path value="$PROJECT_DIR$/vendor/composer" /> @@ -8,4 +18,10 @@ <component name="PhpProjectSharedConfiguration" php_language_level="7.4"> <option name="suggestChangeDefaultLanguageLevel" value="false" /> </component> + <component name="PhpStanOptionsConfiguration"> + <option name="transferred" value="true" /> + </component> + <component name="PsalmOptionsConfiguration"> + <option name="transferred" value="true" /> + </component> </project> \ No newline at end of file diff --git a/Block/System/Config/Form/Field/Version.php b/Block/System/Config/Form/Field/Version.php index 5d071801a406da9f220bf1fd0093996f8eeb5b3d..52a54e718795145f99d5722b39118853523f6d8b 100644 --- a/Block/System/Config/Form/Field/Version.php +++ b/Block/System/Config/Form/Field/Version.php @@ -12,7 +12,7 @@ use Magento\Framework\Data\Form\Element\AbstractElement; */ class Version extends \Magento\Config\Block\System\Config\Form\Field { - const EXTENSION_URL = 'https://www.bob.co.za'; + const EXTENSION_URL = 'https://www.bobgo.co.za'; /** * @var \BobGroup\BobGo\Helper\Data $helper diff --git a/Model/Carrier/uData.php b/Model/Carrier/uData.php index 4ccffa28748266b3e0d3e379a3c835055bc58f8b..2ef4d2bb7d05a94634a122a220d41a2f849bc495 100644 --- a/Model/Carrier/uData.php +++ b/Model/Carrier/uData.php @@ -10,12 +10,8 @@ class uData { /** Tracking Endpoint */ - //dev - public const TRACKING = 'https://api.dev.bobgo.co.za/tracking?channel=localhost&tracking_reference='; - - //production - //public const TRACKING = 'https://api.dev.bobgo.co.za/tracking?channel=%s&tracking_reference=%s'; + public const TRACKING = 'https://api.bobgo.co.za/tracking?channel=localhost&tracking_reference='; /*** RATES API Endpoint*/ - public const RATES_ENDPOINT = 'https://api.dev.bobgo.co.za/rates-at-checkout/magento'; + public const RATES_ENDPOINT = 'https://api.bobgo.co.za/rates-at-checkout/magento'; } diff --git a/Readme.md b/Readme.md index 1757dd1c4aee4dbe12ae6d84e0a637e311f49e72..95f824f835a6a2b1c203521425156a1c5dde162a 100644 --- a/Readme.md +++ b/Readme.md @@ -1,29 +1,3 @@ -# Installing Magento locally - -**Note:** For more information, visit https://github.com/markshust/docker-magento - -1. Make sure you have `composer` installed globally and a GitHub personal access token configured using `composer global config github-oauth.github.com <YOUR_PERSONAL_ACCESS_TOKEN>` -2. Create a new folder, ie: `Documents/Magento` -3. `cd` into the folder -4. Run command `curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/onelinesetup | bash -s -- bobgomagento.test 2.4.4-p1 community` -5. When asked for the username and password, provide the Abobe public and private key: - -- Public key: `98b4828a495e7e0e13d80d8bf94f3b1c` -- Private key: `082ced46919bffe1b6db0f96de96d608` - -Once configured, do the following to create an admin user (and make life easier for yourself): - -- Create Admin User: `bin/magento admin:user:create` -- Disable 2FA: `bin/magento module:disable Magento_TwoFactorAuth` -- Disable Admin Captcha: `bin/magento config:set admin/captcha/enable 0` - - -### Adobe account details - -- Email: `tech@uafrica.com` -- Password: `mR3mdr0311@P` - - # Magento 2 Bob Go Shipping Extension ## Introduction @@ -41,7 +15,6 @@ A complete guide to install Magento Bob Go Shipping extension in Magento 2. Run the following command in Magento 2 root folder:</br> - >_Note: You must have composer installed on your server & at this point this option_ #### 1. Execute the following command to install the module: @@ -60,7 +33,6 @@ bin/magento setup:di:compile bin/magento setup:static-content:deploy ``` - ### Option 2: Install via zip file 1. Download the extension zip file from the link below: </br> diff --git a/composer.json b/composer.json index 76742bd4a7f0a11b0de9a1d2606feb1895ef279c..4c8558a26ce7627bd54e246acac078f987086fe3 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "bobgo/bobgo", - "description": "Streamline your shipments fulfillment's with Bob Go", + "description": "Streamline your order fulfillments with Bob Go", "type": "magento2-module", "version": "1.0.0", "authors": [