updated to V1.3.3

CHANGELOG for v1.3.x.md

@@ -1,7 +1,11 @@
-# CHANGELOG for v1.3.2
+# CHANGELOG for v1.3.x
 
 #### This changelog consists the bug & security fixes and new features being included in the releases listed below.
 
+## **v1.3.3(31th of Nov, 2021)** - *Release*
+
+* [feature] Compatible With bagisto v1.3.3
+
 ## **v1.3.2(31th of March, 2021)** - *Release*
 
 * [feature] functionality to edit home page layout from admin panel.

README.md

@@ -27,7 +27,7 @@ It packs with lots of demanding features that allows your business to scale in n
 
 ### 2. Requirements:
 
-* **Bagisto**: v1.3.2.
+* **Bagisto**: v1.3.3.
 
 
 ### 3. Installation:

package.json

@@ -18,19 +18,19 @@
     "vue": "^2.1.10"
   },
   "dependencies": {
-    "ajv": "^6.9.1",
-    "firebase": "^6.3.0",
-    "flatpickr": "^4.6.6",
-    "imagemin": "^5.0.0",
+    "ajv": "^8.8.2",
+    "firebase": "^9.5.0",
+    "flatpickr": "^4.6.9",
+    "imagemin": "^8.0.1",
     "vee-validate": "2.0.0-rc.26",
     "vue-carousel": "^0.18.0",
-    "vue-currency-filter": "^3.4.2",
-    "vue-i18n": "^8.11.2",
-    "vue-moment": "^4.0.0",
-    "vue-router": "^3.0.2",
-    "vue-slider-component": "^3.0.16",
-    "vue-toasted": "^1.1.27",
-    "vuex": "^3.6.0"
+    "vue-currency-filter": "^5.2.0",
+    "vue-i18n": "^8.26.7",
+    "vue-moment": "^4.1.0",
+    "vue-router": "^3.5.3",
+    "vue-slider-component": "^3.2.15",
+    "vue-toasted": "^1.1.28",
+    "vuex": "^3.6.2"
   },
   "name": "pwa",
   "version": "1.0.0",

publishable/assets/mix-manifest.json

@@ -1,5 +1,5 @@
 {
-    "/js/app.js": "/js/app.js?id=35d444ff4d960ad3fe8c",
+    "/js/app.js": "/js/app.js?id=7dd864ed138acaf03ef3",
     "/css/pwa-admin.css": "/css/pwa-admin.css?id=7073d876ccd90f556cb1",
     "/css/pwa.css": "/css/pwa.css?id=c4298c8f5bceee667d50"
 }

publishable/pwa/dist/service-worker.dev.js

@@ -156,17 +156,17 @@ function formFilter(response) {
 importScripts('https://www.gstatic.com/firebasejs/4.8.1/firebase-app.js');
 importScripts('https://www.gstatic.com/firebasejs/4.8.1/firebase-messaging.js');
 var firebaseConfig = {
-  apiKey: "AIzaSyC-HKvgBpSVK27IZdxv5U7s-WDTzODswO8",
-  authDomain: "laravel-pwa-5c45c.firebaseapp.com",
-  databaseURL: "https://laravel-pwa-5c45c.firebaseio.com",
-  projectId: "laravel-pwa-5c45c",
+  apiKey: "{{core()->getConfigData('pwa.settings.push-notification.web-api-key')}}",
+  authDomain: "{{core()->getConfigData('pwa.settings.push-notification.auth-domain')}}",
+  databaseURL: "{{core()->getConfigData('pwa.settings.push-notification.database-url')}}",
+  projectId: "{{core()->getConfigData('pwa.settings.push-notification.project-id')}}",
   storageBucket: "",
-  messagingSenderId: "444825614301",
-  appId: "1:444825614301:web:ee31ac20d8c7de3e"
+  messagingSenderId: "{{core()->getConfigData('pwa.settings.push-notification.messaging-id')}}",
+  appId: "{{core()->getConfigData('pwa.settings.push-notification.app-id')}}"
 }; // Initialize the Firebase app in the service worker by passing in themessagingSenderId.
 
 firebase.initializeApp({
-  'messagingSenderId': '444825614301'
+  'messagingSenderId': "{{core()->getConfigData('pwa.settings.push-notification.messaging-id')}}"
 }); // Retrieve an instance of Firebase Messaging so that it can handle background messages
 
 var messaging = firebase.messaging(); // Add the public key generated from the console here.
@@ -191,4 +191,4 @@ var messaging = firebase.messaging(); // Add the public key generated from the c
 //   };
 //   return self.registration.showNotification(notificationTitle,
 //     notificationOptions);
-// });
+// });

publishable/pwa/firebase-messaging-sw.js

@@ -1,7 +1,7 @@
 importScripts('https://www.gstatic.com/firebasejs/4.8.1/firebase-app.js');
 importScripts('https://www.gstatic.com/firebasejs/4.8.1/firebase-messaging.js');
 
-firebase.initializeApp({messagingSenderId: "{{core()->getConfigData('pwa.settings.push-notification.messaging-id')}}"});
+firebase.initializeApp({messagingSenderId: "{{core()->getConfigData('pwa.settings.push-notification.messaging-id')}}"}");
 
 const messaging = firebase.messaging();
 
@@ -28,4 +28,4 @@ messaging.setBackgroundMessageHandler(function(payload)
 	event.waitUntil(
 		clients.openWindow(action_click)
 	);
-  });
+  });

publishable/pwa/manifest.json

@@ -25,5 +25,5 @@
             "type": "image/png"
         }
     ],
-    "gcm_sender_id": "103953800507"
+    "gcm_sender_id": "709349998192"
 }

publishable/pwa/service-worker.js

@@ -210,7 +210,6 @@ const firebaseConfig = {
 firebase.initializeApp({
   'messagingSenderId': "{{core()->getConfigData('pwa.settings.push-notification.messaging-id')}}"
 });
-
 // Retrieve an instance of Firebase Messaging so that it can handle background messages
 const messaging = firebase.messaging();
 
@@ -240,4 +239,4 @@ const messaging = firebase.messaging();
 
 //   return self.registration.showNotification(notificationTitle,
 //     notificationOptions);
-// });
+// });

src/Http/Controllers/Admin/PushNotificationController.php

@@ -170,7 +170,7 @@ public function pushtofirebase($id) // send push notification to multiple device
 
             $headers = array(
                 'Content-Type:application/json',
-                'Authorization:key=' . $server_key,
+                'Authorization:key='.$server_key,
             );
 
             // Open connection
@@ -189,15 +189,14 @@ public function pushtofirebase($id) // send push notification to multiple device
             curl_setopt( $ch, CURLOPT_POSTFIELDS, json_encode( $fields ) );
             // Execute post
             $result = curl_exec( $ch );
-
-            if ( $result === false ) {
-                session()->flash('error', 'Curl failed: ' . curl_error($ch));
+            curl_close( $ch );
+            $resp = json_decode($result);
+            if ( empty($resp->message_id) ) {
+                session()->flash('error', 'Invalid Credentials');
             } else {
                 session()->flash('success', trans('pwa::app.admin.push-notification.success-notification'));
             }
 
-            curl_close( $ch );
-
             // Close connection
             return redirect()->back();
         } else {