Merge pull request #33 from fleetbase/dev-v0.3.15

added arabic & vietnamese translations + upgraded core dependencies
fleetbase · Oct 2, 2024 · 9f4350d · 9f4350d
2 parents 720a81a + 5d198e3
commit 9f4350d
Show file tree

Hide file tree

Showing 8 changed files with 1,779 additions and 323 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/storefront-api",
-    "version": "0.3.14",
+    "version": "0.3.15",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -22,8 +22,8 @@
     ],
     "require": {
         "php": "^8.0",
-        "fleetbase/core-api": "^1.5.3",
-        "fleetbase/fleetops-api": "^0.5.6",
+        "fleetbase/core-api": "^1.5.9",
+        "fleetbase/fleetops-api": "^0.5.8",
         "geocoder-php/google-maps-places-provider": "^1.4",
         "laravel-notification-channels/apn": "^5.0",
         "laravel-notification-channels/fcm": "^4.1",

diff --git a/config/environment.js b/config/environment.js
@@ -12,6 +12,12 @@ module.exports = function (environment) {
             categoryImage: getenv('DEFAULT_CATEGORY_IMAGE', 'https://flb-assets.s3.ap-southeast-1.amazonaws.com/images/fallback-placeholder-1.png'),
             placeholderImage: getenv('DEFAULT_PLACEHOLDER_IMAGE', 'https://flb-assets.s3.ap-southeast-1.amazonaws.com/images/fallback-placeholder-2.png'),
         },
+
+        'ember-leaflet': {
+            excludeCSS: true,
+            excludeJS: true,
+            excludeImages: true,
+        },
     };
 
     return ENV;

diff --git a/extension.json b/extension.json
@@ -1,6 +1,6 @@
 {
     "name": "Storefront",
-    "version": "0.3.14",
+    "version": "0.3.15",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/storefront",
     "license": "AGPL-3.0-or-later",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/storefront-engine",
-    "version": "0.3.14",
+    "version": "0.3.15",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "fleetbase": {
         "route": "storefront",
@@ -43,14 +43,15 @@
         "publish:github": "npm config set '@fleetbase:registry' https://npm.pkg.github.com/ && npm publish"
     },
     "dependencies": {
-        "@fleetbase/ember-core": "^0.2.17",
-        "@fleetbase/ember-ui": "^0.2.24",
-        "@fleetbase/fleetops-data": "^0.1.17",
+        "@fleetbase/ember-core": "^0.2.19",
+        "@fleetbase/ember-ui": "^0.2.32",
+        "@fleetbase/fleetops-data": "^0.1.18",
         "@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",
+        "ember-auto-import": "^2.7.4",
         "ember-cli-babel": "^8.2.0",
         "ember-cli-htmlbars": "^6.3.0",
         "ember-intl": "6.3.2",
@@ -70,7 +71,6 @@
         "broccoli-funnel": "^3.0.8",
         "broccoli-merge-trees": "^4.2.0",
         "concurrently": "^8.2.2",
-        "ember-auto-import": "^2.7.4",
         "ember-classic-decorator": "^3.0.0",
         "ember-cli": "~5.4.1",
         "ember-cli-clean-css": "^3.0.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/server/config/database.connections.php b/server/config/database.connections.php
@@ -24,6 +24,20 @@
     $mysql_options[PDO::ATTR_EMULATE_PREPARES] = true;
 }
 
+if (extension_loaded('pdo_mysql')) {
+    if (env('MYSQL_ATTR_SSL_CA')) {
+        $mysql_options[PDO::MYSQL_ATTR_SSL_CA] = env('MYSQL_ATTR_SSL_CA');
+    }
+    if (env('MYSQL_ATTR_SSL_CERT')) {
+        $mysql_options[PDO::MYSQL_ATTR_SSL_CERT] = env('MYSQL_ATTR_SSL_CERT');
+    }
+    if (env('MYSQL_ATTR_SSL_KEY')) {
+        $mysql_options[PDO::MYSQL_ATTR_SSL_KEY] = env('MYSQL_ATTR_SSL_KEY');
+    }
+    // Setting default SSL verification behavior based on environment
+    $mysql_options[PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT] = env('MYSQL_ATTR_SSL_VERIFY_SERVER_CERT', env('APP_ENV') === 'production');
+}
+
 /*
     |--------------------------------------------------------------------------
     | Database Connections
@@ -43,7 +57,7 @@
     'storefront' => [
         'driver' => 'mysql',
         'host' => $host,
-        'port' => env('STOREFRONT_DB_PORT', '3306'),
+        'port' => env('STOREFRONT_DB_PORT', env('DB_PORT', '3306')),
         'database' => $database . '_storefront',
         'username' => $username,
         'password' => $password,