@fleetbase/storefront-engine 0.2.5 → 0.2.6

package/server/src/Support/QPay.php

@@ -6,22 +6,22 @@ use GuzzleHttp\Client;
 
 class QPay
 {
-    private string $host = 'https://merchant.qpay.mn/';
+    private string $host      = 'https://merchant.qpay.mn/';
     private string $namespace = 'v2';
     private ?string $callbackUrl;
     private array $requestOptions = [];
     private Client $client;
 
-    public function __construct(?string $username = null, ?string $password = null, ?string $callbackUrl = null)
+    public function __construct(string $username = null, string $password = null, string $callbackUrl = null)
     {
-        $this->callbackUrl = $callbackUrl;
+        $this->callbackUrl    = $callbackUrl;
         $this->requestOptions = [
             'base_uri' => $this->buildRequestUrl(),
-            'auth' => [$username, $password],
-            'headers' => [
+            'auth'     => [$username, $password],
+            'headers'  => [
                 'Content-Type' => 'application/json',
-                'Accept' => 'application/json'
-            ]
+                'Accept'       => 'application/json',
+            ],
         ];
         $this->client = new Client($this->requestOptions);
     }
@@ -29,7 +29,7 @@ class QPay
     public function updateRequestOption($key, $value)
     {
         $this->requestOptions[$key] = $value;
-        $this->client = new Client($this->requestOptions);
+        $this->client               = new Client($this->requestOptions);
     }
 
     public function getClient()
@@ -48,6 +48,7 @@ class QPay
     private function buildRequestUrl(string $path = ''): string
     {
         $url = trim($this->host . $this->namespace . '/' . $path);
+
         return $url;
     }
 
@@ -59,7 +60,7 @@ class QPay
         return $this;
     }
 
-    public static function instance(?string $username = null, ?string $password = null, ?string $callbackUrl = null): QPay
+    public static function instance(string $username = null, string $password = null, string $callbackUrl = null): QPay
     {
         return new static($username, $password, $callbackUrl);
     }
@@ -74,9 +75,9 @@ class QPay
         $options['http_errors'] = false;
 
         $response = $this->client->request($method, $path, $options);
-        $body = $response->getBody();
+        $body     = $response->getBody();
         $contents = $body->getContents();
-        $json = json_decode($contents);
+        $json     = json_decode($contents);
 
         return $json;
     }
@@ -119,13 +120,13 @@ class QPay
         return $this;
     }
 
-    public function setAuthToken(?string $accessToken = null): QPay
+    public function setAuthToken(string $accessToken = null): QPay
     {
         if ($accessToken) {
             $this->useBearerToken($accessToken);
         } else {
             $response = $this->getAuthToken();
-            $token = $response->access_token;
+            $token    = $response->access_token;
 
             if (isset($token)) {
                 $this->useBearerToken($token);
@@ -135,19 +136,19 @@ class QPay
         return $this;
     }
 
-    public function createSimpleInvoice(int $amount, ?string $invoiceCode = '', ?string $invoiceDescription = '', ?string $invoiceReceiverCode = '', ?string $senderInvoiceNo = '', ?string $callbackUrl = null)
+    public function createSimpleInvoice(int $amount, ?string $invoiceCode = '', ?string $invoiceDescription = '', ?string $invoiceReceiverCode = '', ?string $senderInvoiceNo = '', string $callbackUrl = null)
     {
         if (!$callbackUrl && $this->hasCallbackUrl()) {
             $callbackUrl = $this->callbackUrl;
         }
 
         $params = array_filter([
-            'invoice_code' => $invoiceCode,
-            'amount' => $amount,
-            'callback_url' => $callbackUrl,
-            'invoice_description' => $invoiceDescription,
+            'invoice_code'          => $invoiceCode,
+            'amount'                => $amount,
+            'callback_url'          => $callbackUrl,
+            'invoice_description'   => $invoiceDescription,
             'invoice_receiver_code' => $invoiceReceiverCode,
-            'sender_invoice_no' => $senderInvoiceNo,
+            'sender_invoice_no'     => $senderInvoiceNo,
         ]);
 
         return $this->createQPayInvoice($params);
@@ -166,7 +167,7 @@ class QPay
     {
         $params = [
             'object_type' => 'INVOICE',
-            'object_id' => $invoiceId
+            'object_id'   => $invoiceId,
         ];
 
         return $this->post('payment/check', $params, $options);
@@ -203,6 +204,7 @@ class QPay
     public static function cleanCode(string $code)
     {
         $code = str_replace(' ', '-', $code);
+
         return preg_replace('/[^A-Za-z0-9\-]/', '', $code);
     }
 }

package/server/src/Support/Storefront.php

@@ -2,13 +2,13 @@
 
 namespace Fleetbase\Storefront\Support;
 
+use Fleetbase\FleetOps\Models\Contact;
+use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\Models\User;
 use Fleetbase\Storefront\Models\Gateway;
 use Fleetbase\Storefront\Models\Network;
 use Fleetbase\Storefront\Models\Product;
 use Fleetbase\Storefront\Models\Store;
-use Fleetbase\FleetOps\Models\Contact;
-use Fleetbase\FleetOps\Models\Order;
-use Fleetbase\Models\User;
 use Fleetbase\Storefront\Notifications\StorefrontOrderCreated;
 use Illuminate\Support\Facades\Notification;
 use Illuminate\Support\Facades\Redis;
@@ -22,6 +22,7 @@ class Storefront
      * with bare minimum columns, but can optionally pass in more columns to receive.
      *
      * @param array $columns
+     *
      * @return \Fleetbase\Models\Storefront\Network|\Fleetbase\Models\Storefront\Store
      */
     public static function about($columns = [], $with = [])
@@ -42,7 +43,7 @@ class Storefront
             $about = Network::select($columns)->where('key', $key)->with($with)->first();
         }
 
-        $about->is_store = Str::startsWith($key, 'store');
+        $about->is_store   = Str::startsWith($key, 'store');
         $about->is_network = Str::startsWith($key, 'network');
 
         return $about;
@@ -64,7 +65,7 @@ class Storefront
             return $about;
         }
 
-        $about->is_store = Str::startsWith($id, 'store');
+        $about->is_store   = Str::startsWith($id, 'store');
         $about->is_network = Str::startsWith($id, 'network');
 
         return $about;
@@ -114,7 +115,7 @@ class Storefront
         }
 
         return Gateway::where([
-            'code' => $code,
+            'code'       => $code,
             'owner_uuid' => session('storefront_store') ?? session('storefront_network'),
         ])->first();
     }
@@ -150,21 +151,21 @@ class Storefront
 
     public static function alertNewOrder(Order $order, $sendNow = false)
     {
-        $about = static::about(['alertable']);
+        $about      = static::about(['alertable']);
         $alertables = [];
 
         if ($about->is_network) {
             $store = static::findAbout($order->getMeta('storefront_id'), ['alertable']);
 
             if ($store && $store->public_id !== $about->public_id) {
-                $merge = Utils::get($store, 'alertable.for_new_order', []);
+                $merge      = Utils::get($store, 'alertable.for_new_order', []);
                 $alertables = array_merge($alertables, $merge);
             }
         }
 
-        $merge = Utils::get($about, 'alertable.for_new_order', []);
+        $merge      = Utils::get($about, 'alertable.for_new_order', []);
         $alertables = array_merge($alertables, $merge);
-        $users = collect($alertables)->map(function ($id) {
+        $users      = collect($alertables)->map(function ($id) {
             return User::where('public_id', $id)->first();
         });
 
@@ -183,14 +184,14 @@ class Storefront
     {
         $stripeCustomer = \Stripe\Customer::create([
             'description' => 'Customer created in Fleetbase Storefront',
-            'email' => $customer->email,
-            'name' => $customer->name,
-            'phone' => $customer->phone,
-            'metadata' => [
-                'contact_id' => $customer->public_id,
+            'email'       => $customer->email,
+            'name'        => $customer->name,
+            'phone'       => $customer->phone,
+            'metadata'    => [
+                'contact_id'    => $customer->public_id,
                 'storefront_id' => session('storefront_store') ?? session('storefront_network'),
-                'company_id' => session('company')
-            ]
+                'company_id'    => session('company'),
+            ],
         ]);
 
         // set the stripe customer to customer meta

package/server/src/routes.php

@@ -161,7 +161,7 @@ Route::prefix(config('storefront.api.routing.prefix', 'storefront'))->namespace(
                         $router->group(
                             [],
                             function ($router) {
-                                /** Dashboard Build */
+                                /* Dashboard Build */
                                 $router->get('dashboard', 'MetricsController@dashboard');
 
                                 $router->group(