v6.8.0

woosignal · Jul 3, 2023 · fedd76f · fedd76f
1 parent 456f313
commit fedd76f
Show file tree

Hide file tree

Showing 20 changed files with 375 additions and 340 deletions.
diff --git a/LabelStoreMax/CHANGELOG.md b/LabelStoreMax/CHANGELOG.md
@@ -1,3 +1,11 @@
+## [6.8.0] - 2023-07-03
+
+* UI fixes.
+* Fix price on coupon page error alerts.
+* Fix issue where IOS builds were not using the correct build version.
+* Small refactor to the project.
+* Pubspec.yaml dependency updates.
+
 ## [6.7.0] - 2023-06-20
 
 * Refactor project for Nylo 5.x.

diff --git a/LabelStoreMax/README.md b/LabelStoreMax/README.md
@@ -43,7 +43,7 @@ Full documentation this available [here](https://woosignal.com/docs/app/label-st
 - Browse products, make orders, customer login (via WordPress)
 - Change app name, logo, customize default language, currency + more
 - Light and dark mode
-- Stripe, Cash On Delivery, PayPal
+- Stripe, Cash On Delivery, PayPal, RazorPay
 - Localized for en, es, pt, it, hi, fr, zh, tr, nl, de
 - Orders show as normal in WooCommerce
 

diff --git a/LabelStoreMax/ios/Runner.xcodeproj/project.pbxproj b/LabelStoreMax/ios/Runner.xcodeproj/project.pbxproj
@@ -373,6 +373,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
+				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.flutter.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -511,6 +512,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
+				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.flutter.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -543,6 +545,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
+				MARKETING_VERSION = 1.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.flutter.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

diff --git a/LabelStoreMax/ios/Runner/Info.plist b/LabelStoreMax/ios/Runner/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>MinimumOSVersion</key>

diff --git a/LabelStoreMax/lib/app/models/user.dart b/LabelStoreMax/lib/app/models/user.dart
@@ -19,7 +19,7 @@ class User extends Model {
 
   toJson() => {"token": token, "user_id": userId};
 
-  fromJson(dynamic data) {
+  User.fromJson(dynamic data) {
     token = data['token'];
     userId = data['user_id'];
   }

diff --git a/LabelStoreMax/lib/app/providers/firebase_provider.dart b/LabelStoreMax/lib/app/providers/firebase_provider.dart
@@ -6,13 +6,15 @@ import 'package:woosignal/woosignal.dart';
 
 class FirebaseProvider implements NyProvider {
 
+  @override
   boot(Nylo nylo) async {
 
     return null;
   }
 
+  @override
   afterBoot(Nylo nylo) async {
-    if (getEnv('FCM_ENABLED') != true) return;
+    if (getEnv('FCM_ENABLED', defaultValue: false) != true) return;
 
     await Firebase.initializeApp(
       options: DefaultFirebaseOptions.currentPlatform,

diff --git a/LabelStoreMax/lib/bootstrap/data/order_wc.dart b/LabelStoreMax/lib/bootstrap/data/order_wc.dart
@@ -15,6 +15,7 @@ import 'package:flutter_app/app/models/cart.dart';
 import 'package:flutter_app/app/models/cart_line_item.dart';
 import 'package:flutter_app/app/models/checkout_session.dart';
 import 'package:flutter_app/bootstrap/app_helper.dart';
+import 'package:flutter_app/bootstrap/helpers.dart';
 import 'package:flutter_app/bootstrap/shared_pref/sp_auth.dart';
 import 'package:woosignal/models/payload/order_wc.dart';
 import 'package:woosignal/models/response/tax_rate.dart';
@@ -51,7 +52,7 @@ Future<OrderWC> buildOrderWC({TaxRate? taxRate, bool markPaid = true}) async {
       tmpLineItem.variationId = cartItem.variationId;
     }
 
-    tmpLineItem.subtotal = cartItem.subtotal;
+    tmpLineItem.subtotal = (parseWcPrice(cartItem.subtotal) * parseWcPrice(cartItem.quantity.toString())).toString();
     lineItems.add(tmpLineItem);
   }
 

diff --git a/LabelStoreMax/lib/config/decoders.dart b/LabelStoreMax/lib/config/decoders.dart
@@ -1,3 +1,4 @@
+import 'package:flutter_app/app/models/user.dart';
 import 'package:flutter_app/app/networking/api_service.dart';
 import 'package:flutter_app/app/networking/dio/base_api_service.dart';
 
@@ -12,6 +13,7 @@ import 'package:flutter_app/app/networking/dio/base_api_service.dart';
 
 final Map<Type, dynamic> modelDecoders = {
   // ...
+  User: (data) => User.fromJson(data)
 };
 
 /*

diff --git a/LabelStoreMax/lib/config/events.dart b/LabelStoreMax/lib/config/events.dart
@@ -15,4 +15,5 @@ import 'package:nylo_framework/nylo_framework.dart';
 final Map<Type, NyEvent> events = {
   LoginEvent: LoginEvent(),
   LogoutEvent: LogoutEvent(),
+  AuthUserEvent: AuthUserEvent(),
 };