@fleetbase/storefront-engine 0.3.28 → 0.3.30

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/storefront-api",
-    "version": "0.3.28",
+    "version": "0.3.30",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Storefront",
-    "version": "0.3.28",
+    "version": "0.3.30",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/storefront",
     "license": "AGPL-3.0-or-later",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/storefront-engine",
-    "version": "0.3.28",
+    "version": "0.3.30",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "fleetbase": {
         "route": "storefront",
@@ -43,14 +43,14 @@
         "publish:github": "npm config set '@fleetbase:registry' https://npm.pkg.github.com/ && npm publish"
     },
     "dependencies": {
+        "@babel/core": "^7.23.2",
         "@fleetbase/ember-core": "latest",
         "@fleetbase/ember-ui": "latest",
         "@fleetbase/fleetops-data": "latest",
-        "@babel/core": "^7.23.2",
         "@fortawesome/ember-fontawesome": "^2.0.0",
         "@fortawesome/fontawesome-svg-core": "6.4.0",
-        "@fortawesome/free-solid-svg-icons": "6.4.0",
         "@fortawesome/free-brands-svg-icons": "6.4.0",
+        "@fortawesome/free-solid-svg-icons": "6.4.0",
         "ember-auto-import": "^2.7.4",
         "ember-cli-babel": "^8.2.0",
         "ember-cli-htmlbars": "^6.3.0",
@@ -59,12 +59,12 @@
         "ember-wormhole": "^0.6.0"
     },
     "devDependencies": {
-        "@fleetbase/intl-lint": "^0.0.1",
         "@babel/eslint-parser": "^7.22.15",
         "@babel/plugin-proposal-decorators": "^7.23.2",
         "@ember/optional-features": "^2.0.0",
         "@ember/test-helpers": "^3.2.0",
         "@embroider/test-setup": "^3.0.2",
+        "@fleetbase/intl-lint": "^0.0.1",
         "@glimmer/component": "^1.1.2",
         "@glimmer/tracking": "^1.1.2",
         "broccoli-asset-rev": "^3.0.0",

package/server/src/Http/Controllers/v1/CustomerController.php

@@ -13,6 +13,7 @@ use Fleetbase\FleetOps\Models\Contact;
 use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Models\Place;
 use Fleetbase\Http\Controllers\Controller;
+use Fleetbase\Models\File;
 use Fleetbase\Models\User;
 use Fleetbase\Models\UserDevice;
 use Fleetbase\Models\VerificationCode;
@@ -210,6 +211,27 @@ class CustomerController extends Controller
             'origin'        => 'storefront',
         ];
 
+        // Handle photo as either file id/ or base64 data string
+        $photo = $request->input('photo');
+        if ($photo) {
+            // Handle photo being a file id
+            if (Utils::isPublicId($photo)) {
+                $file = File::where('public_id', $photo)->first();
+                if ($file) {
+                    $input['photo_uuid'] = $file->uuid;
+                }
+            }
+
+            // Handle the photo being base64 data string
+            if (Utils::isBase64String($photo)) {
+                $path = implode('/', ['uploads', session('company'), 'customers']);
+                $file = File::createFromBase64($photo, null, $path);
+                if ($file) {
+                    $input['photo_uuid'] = $file->uuid;
+                }
+            }
+        }
+
         // create the customer/contact
         try {
             $customer = Contact::create($input);
@@ -269,6 +291,32 @@ class CustomerController extends Controller
             ]);
         }
 
+        // Handle photo as either file id/ or base64 data string
+        $photo = $request->input('photo');
+        if ($photo) {
+            // Handle photo being a file id
+            if (Utils::isPublicId($photo)) {
+                $file = File::where('public_id', $photo)->first();
+                if ($file) {
+                    $input['photo_uuid'] = $file->uuid;
+                }
+            }
+
+            // Handle the photo being base64 data string
+            if (Utils::isBase64String($photo)) {
+                $path = implode('/', ['uploads', session('company'), 'customers']);
+                $file = File::createFromBase64($photo, null, $path);
+                if ($file) {
+                    $input['photo_uuid'] = $file->uuid;
+                }
+            }
+
+            // Handle removal key
+            if ($photo === 'REMOVE') {
+                $input['photo_uuid'] = null;
+            }
+        }
+
         // update the contact
         try {
             $contact->update($input);

package/server/src/Support/PushNotification.php

@@ -6,6 +6,7 @@ use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\Storefront\Models\Network;
 use Fleetbase\Storefront\Models\NotificationChannel;
 use Fleetbase\Storefront\Models\Store;
+use Fleetbase\Support\Utils;
 use Illuminate\Container\Container;
 use Kreait\Laravel\Firebase\FirebaseProjectManager;
 use NotificationChannels\Apn\ApnMessage;
@@ -52,7 +53,7 @@ class PushNotification
         );
 
         return (new FcmMessage(notification: $notification))
-            ->setData(['order' => $order->uuid, 'id' => $order->public_id, 'type' => $status])
+            ->data(['order' => $order->uuid, 'id' => $order->public_id, 'type' => $status])
             ->custom([
                 'android' => [
                     'notification' => [
@@ -117,7 +118,9 @@ class PushNotification
         $notificationChannel = static::getNotificationChannel('apn', $storefront, $order);
         $config              = (array) $notificationChannel->config;
 
-        return new PushOkClient(PuskOkToken::create($config));
+        $isProductionEnv = Utils::castBoolean(data_get($config, 'production', app()->isProduction()));
+
+        return new PushOkClient(PuskOkToken::create($config), $isProductionEnv);
     }
 
     public static function getStorefrontFromOrder(Order $order): Network|Store|null