From 81683014b65a2e3ad2607a84c61c2b6b7e88a255 Mon Sep 17 00:00:00 2001
From: BillyGriffiths <billy.griffiths@gmail.com>
Date: Tue, 7 Feb 2023 12:46:49 +0200
Subject: [PATCH] Check all the Bob Go/bobgo naming
---
Block/System/Config/Form/Field/Version.php | 6 +++---
Helper/Data.php | 2 +-
Model/Carrier/CustomShipping.php | 20 +++++++++----------
Model/Carrier/uData.php | 2 +-
Model/Source/Freemethod.php | 2 +-
Model/Source/Generic.php | 2 +-
.../DataProviders/Tracking/ChangeTitle.php | 4 ++--
Plugin/Block/Tracking/PopUpDeliveryDate.php | 4 ++--
Readme.md | 8 ++++----
composer.json | 2 +-
etc/adminhtml/system.xml | 8 ++++----
11 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/Block/System/Config/Form/Field/Version.php b/Block/System/Config/Form/Field/Version.php
index 964f53c..5db3aad 100644
--- a/Block/System/Config/Form/Field/Version.php
+++ b/Block/System/Config/Form/Field/Version.php
@@ -5,14 +5,14 @@ use Magento\Framework\Data\Form\Element\AbstractElement;
/**
* Displays Version number in System Configuration
- * @category BobGroup
+ * @category Bob Go
* @package bobgo_CustomShipping
* @author info@bob.co.za
* @website https://www.bob.co.za
*/
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 \bobgo\CustomShipping\Helper\Data $helper
@@ -39,7 +39,7 @@ class Version extends \Magento\Config\Block\System\Config\Form\Field
protected function _getElementHtml(AbstractElement $element)
{
$extensionVersion = $this->_helper->getExtensionVersion();
- $extensionTitle = 'BobGo';
+ $extensionTitle = 'Bob Go';
$versionLabel = sprintf(
'<a href="%s" title="%s" target="_blank">%s</a>',
self::EXTENSION_URL,
diff --git a/Helper/Data.php b/Helper/Data.php
index f1da9bd..8bfc250 100644
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -9,7 +9,7 @@ use Magento\Store\Model\ScopeInterface;
/**
* @category bobgo
* @package bobgo_CustomShipping
- * @author bobgo
+ * @author Bob Go
* @website https://www.bob.co.za
*/
class Data extends AbstractHelper
diff --git a/Model/Carrier/CustomShipping.php b/Model/Carrier/CustomShipping.php
index d007495..d574860 100644
--- a/Model/Carrier/CustomShipping.php
+++ b/Model/Carrier/CustomShipping.php
@@ -32,7 +32,7 @@ use Magento\Store\Model\StoreManagerInterface;
use Psr\Log\LoggerInterface;
/**
- * bobgo shipping implementation
+ * Bob Go shipping implementation
* @category bob
* @package bobgo_CustomShipping
* @author info@bob.co.za
@@ -182,7 +182,7 @@ class CustomShipping extends AbstractCarrierOnline implements CarrierInterface
/*
* Gets the base url of the store by stripping the http:// or https:// and wwww. from the url
- * leaving just "example.com" since bobgo API uses this format and not the full url as the Identifier
+ * leaving just "example.com" since Bob Go API uses this format and not the full url as the Identifier
* @var \Magento\Store\Model\StoreManagerInterface $this->_storeManager
* @return string
*/
@@ -196,8 +196,8 @@ class CustomShipping extends AbstractCarrierOnline implements CarrierInterface
}
/**
- * Make request to bobgo API to get shipping rates for the cart
- * After all the required data is collected, it makes a request to the bobgo API to get the shipping rates
+ * Make request to Bob Go API to get shipping rates for the cart
+ * After all the required data is collected, it makes a request to the Bob Go API to get the shipping rates
* @param $payload
* @return array
*/
@@ -235,10 +235,10 @@ class CustomShipping extends AbstractCarrierOnline implements CarrierInterface
$destStreet = $request->getDestStreet();
/** Destination Information */
- list($destStreet1, $destStreet2, $destStreet3) = $this->destStreet($destStreet);
+ [$destStreet1, $destStreet2, $destStreet3] = $this->destStreet($destStreet);
/** Origin Information */
- list($originStreet, $originRegion, $originCountry, $originCity, $originStreet1, $originStreet2, $storeName, $baseIdentifier, $originSuburb) = $this->storeInformation();
+ [$originStreet, $originRegion, $originCountry, $originCity, $originStreet1, $originStreet2, $storeName, $baseIdentifier, $originSuburb] = $this->storeInformation();
/** Get all the items in the cart */
$items = $request->getAllItems();
@@ -398,7 +398,7 @@ class CustomShipping extends AbstractCarrierOnline implements CarrierInterface
{
$codes = [
'method' => [
- 'bobGo' => __('Bob Go'),
+ 'bobgo' => __('Bob Go'),
],
'delivery_confirmation_types' => [
'NO_SIGNATURE_REQUIRED' => __('Not Required'),
@@ -720,7 +720,7 @@ class CustomShipping extends AbstractCarrierOnline implements CarrierInterface
*/
private function _requestTracking($trackInfo, array $result): array
{
- $response = $this->trackBobgoShipment($trackInfo);
+ $response = $this->trackBobGoShipment($trackInfo);
$result = $this->prepareActivity($response[0], $result);
@@ -820,11 +820,11 @@ class CustomShipping extends AbstractCarrierOnline implements CarrierInterface
}
/**
- * Curl request to bobgo Shipment Tracking API
+ * Curl request to Bob Go Shipment Tracking API
* @param $trackInfo
* @return mixed
*/
- private function trackBobgoShipment($trackInfo): mixed
+ private function trackBobGoShipment($trackInfo): mixed
{
$this->curl->get(uData::TRACKING . $trackInfo);
diff --git a/Model/Carrier/uData.php b/Model/Carrier/uData.php
index 476e9a1..46e2652 100644
--- a/Model/Carrier/uData.php
+++ b/Model/Carrier/uData.php
@@ -4,7 +4,7 @@ namespace bobgo\CustomShipping\Model\Carrier;
/**
* Class uData
- * bobGo API Resources for Custom Shipping
+ * Bob Go API Resources for Custom Shipping
* @package bobgo\CustomShipping\Model\Carrier
*/
class uData
diff --git a/Model/Source/Freemethod.php b/Model/Source/Freemethod.php
index 2ea09d3..2e0bc6f 100644
--- a/Model/Source/Freemethod.php
+++ b/Model/Source/Freemethod.php
@@ -3,7 +3,7 @@
namespace bobgo\CustomShipping\Model\Source;
/**
- * bobgo Free Method source implementation
+ * Bob Go Free Method source implementation
*/
class Freemethod extends Method
{
diff --git a/Model/Source/Generic.php b/Model/Source/Generic.php
index 214e8eb..8bebd17 100644
--- a/Model/Source/Generic.php
+++ b/Model/Source/Generic.php
@@ -7,7 +7,7 @@ use Magento\Framework\Data\OptionSourceInterface;
use bobgo\CustomShipping\Model\Carrier\CustomShipping;
/**
- * bobgo generic source implementation
+ * Bob Go generic source implementation
*/
class Generic implements OptionSourceInterface
{
diff --git a/Plugin/Block/DataProviders/Tracking/ChangeTitle.php b/Plugin/Block/DataProviders/Tracking/ChangeTitle.php
index 05d108b..285ca5a 100644
--- a/Plugin/Block/DataProviders/Tracking/ChangeTitle.php
+++ b/Plugin/Block/DataProviders/Tracking/ChangeTitle.php
@@ -8,13 +8,13 @@ use Magento\Shipping\Block\DataProviders\Tracking\DeliveryDateTitle as Subject;
/**
- * Plugin to change delivery date title with bobgo customized value
+ * Plugin to change delivery date title with Bob Go customized value
*/
class ChangeTitle
{
/**
- * Title modification in case if bobgo used as carrier
+ * Title modification in case if Bob Go used as carrier
*
* @param Subject $subject
* @param \Magento\Framework\Phrase|string $result
diff --git a/Plugin/Block/Tracking/PopUpDeliveryDate.php b/Plugin/Block/Tracking/PopUpDeliveryDate.php
index 420d39b..e2fa211 100644
--- a/Plugin/Block/Tracking/PopUpDeliveryDate.php
+++ b/Plugin/Block/Tracking/PopUpDeliveryDate.php
@@ -7,12 +7,12 @@ use Magento\Shipping\Model\Tracking\Result\Status;
use Magento\Shiiping\Model\Carrier;
/*
- * Plugin to update delivery date value in case if bobgo is a carrier used
+ * Plugin to update delivery date value in case if Bob Go is a carrier used
*/
class PopupDeliveryDate
{
/**
- * Show only date for expected delivery in case if bobgo is a carrier
+ * Show only date for expected delivery in case if Bob Go is a carrier
*
* @param Popup $subject
* @param string $result
diff --git a/Readme.md b/Readme.md
index c157860..82c6561 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,6 +1,6 @@
-# Magento 2 BobGo Shipping Extension
+# Magento 2 Bob Go Shipping Extension
## Introduction
@@ -75,7 +75,7 @@ Please visit [Bob Go](https://bobgo.co.za) to create an account.
### ✓ Step 2: Login to Magento Admin
-1. Click on **bobgo** > bobGo > Enabled for Checkout > Yes </br>
+1. Click on **Bob Go** > Bob Go > Enabled for Checkout > Yes </br>
2. and go to `Stores > Configuration > Sales > Delivery Methods` to configure the extension.
@@ -83,7 +83,7 @@ Please visit [Bob Go](https://bobgo.co.za) to create an account.
### ✓ Step 3: Configure Bob Go Shipping Extension
-1. Select `Bobgo` as shipping method.
+1. Select `Bob Go` as shipping method.
2. Select `Enable` to enable the extension.
@@ -126,5 +126,5 @@ When the extension is **installed** and **enabled**, a new field will be created
>1. Go to `Sales > Orders` in Magento Admin
>2. Select an order
>3. Click `Ship` button
->4. Select `bobgo` as shipping method
+>4. Select `Bob Go` as shipping method
>5. Click `Submit Shipment` button
diff --git a/composer.json b/composer.json
index d817dec..4544495 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
{
"name": "bobgo/bobgo",
- "description": "Streamline your shipments fulfillment's with bobgo",
+ "description": "Streamline your shipments fulfillment's with Bob Go",
"type": "magento2-module",
"version": "1.0.0",
"authors": [
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 71e49e1..a77b41f 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -9,11 +9,11 @@
<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="200">
- <label>BobGo</label>
+ <tab id="bobgo" translate="label" sortOrder="200">
+ <label>Bob Go</label>
</tab>
<section id="bobgo_CustomShipping" showInDefault="1">
- <tab>BobGo</tab>
+ <tab>Bob Go</tab>
<label>Bob Go</label>
<resource>Magento_Config::config</resource>
<group id="general" showInDefault="1">
@@ -42,7 +42,7 @@
</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>BobGo</label>
+ <label>Bob Go</label>
<field id="version" translate="label" type="label" sortOrder="0" showInDefault="1" showInWebsite="0" showInStore="0">
<label>Version</label>
--
GitLab