Flutter 1.17.0 support, Sort by feature, Cash on delivery added, Login/register flow change for Apple user guidelines, Bug fixes, Pubspec.yaml update, AndroidManifest.xml bug fix

Author: WooSignal

LabelStoreMax/CHANGELOG.md

@@ -1,5 +1,12 @@
-## [2.0.2] - 2020-05-04
+## [2.0.2] - 2020-05-08
 
+* Flutter 1.17.0 support
+* Sort by feature
+* Cash on delivery added
+* RazorPay added
+* Login/register flow change for Apple user guidelines
+* Bug fixes
+* Pubspec.yaml update
 * AndroidManifest.xml bug fix
 
 ## [2.0.1] - 2020-04-30

LabelStoreMax/assets/images/cart_empty.png

@@ -264,9 +264,6 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/Braintree/Braintree.framework",
-				"${PODS_ROOT}/Braintree/Frameworks/CardinalMobile.framework",
-				"${BUILT_PRODUCTS_DIR}/BraintreeDropIn/BraintreeDropIn.framework",
 				"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
 				"${PODS_ROOT}/../Flutter/Flutter.framework",
 				"${BUILT_PRODUCTS_DIR}/Stripe/Stripe.framework",
@@ -275,16 +272,15 @@
 				"${BUILT_PRODUCTS_DIR}/flutter_web_browser/flutter_web_browser.framework",
 				"${BUILT_PRODUCTS_DIR}/package_info/package_info.framework",
 				"${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework",
+				"${PODS_ROOT}/razorpay-pod/Pod/Razorpay.framework",
+				"${BUILT_PRODUCTS_DIR}/razorpay_flutter/razorpay_flutter.framework",
 				"${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework",
 				"${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework",
 				"${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework",
 				"${BUILT_PRODUCTS_DIR}/woosignal_stripe/woosignal_stripe.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Braintree.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CardinalMobile.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BraintreeDropIn.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Stripe.framework",
@@ -293,6 +289,8 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_web_browser.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/package_info.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Razorpay.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/razorpay_flutter.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework",

LabelStoreMax/assets/images/cash_on_delivery.jpeg

@@ -1,6 +1,5 @@
 import UIKit
 import Flutter
-import Braintree
 
 @UIApplicationMain
 @objc class AppDelegate: FlutterAppDelegate {

LabelStoreMax/ios/Runner.xcodeproj/project.pbxproj

@@ -129,5 +129,18 @@
   "Shipping Details": "Shipping Details",
   "State": "State",
   "Country": "Country",
-  "UPDATE DETAILS": "UPDATE DETAILS"
+  "UPDATE DETAILS": "UPDATE DETAILS",
+  "No more products": "No more products",
+  "release to load more": "release to load more",
+  "Load Failed! Click retry!": "Load Failed! Click retry!",
+  "pull up load": "pull up load",
+  "Sort: Low to high": "Sort: Low to high",
+  "Sort: High to low": "Sort: High to low",
+  "Sort: Name A-Z": "Sort: Name A-Z",
+  "Sort: Name Z-A": "Sort: Name Z-A",
+  "Cancel": "Cancel",
+  "Sort results": "Sort results",
+  "you're now logged in": "You're now logged in",
+  "Hello": "Hello",
+  "Welcome back": "Welcome back"
 }

LabelStoreMax/ios/Runner/AppDelegate.swift

@@ -10,6 +10,7 @@
 
 import 'package:label_storemax/helpers/tools.dart';
 import 'package:label_storemax/models/payment_type.dart';
+import 'package:label_storemax/providers/cash_on_delivery.dart';
 import 'package:label_storemax/providers/stripe_pay.dart';
 
 // Payment methods available for uses in the app
@@ -25,11 +26,21 @@ List<PaymentType> arrPaymentMethods = [
     ),
   ),
 
+  addPayment(
+    PaymentType(
+      id: 2,
+      name: "CashOnDelivery",
+      desc: "Cash on delivery",
+      assetImage: "cash_on_delivery.jpeg",
+      pay: cashOnDeliveryPay,
+    ),
+  ),
+
   // e.g. add more here
 
 //  addPayment(
 //    PaymentType(
-//      id: 2,
+//      id: 3,
 //      name: "MyNewPaymentMethod",
 //      desc: "Debit or Credit Card",
 //      assetImage: "add icon image to assets/images/myimage.png",

LabelStoreMax/lang/en.json

@@ -50,8 +50,10 @@ class _AppLocalizationsDelegate
   const _AppLocalizationsDelegate();
 
   @override
-  bool isSupported(Locale locale) =>
-      app_locales_supported.contains(locale.languageCode);
+  bool isSupported(Locale locale) => app_locales_supported
+      .map((e) => e.languageCode)
+      .toList()
+      .contains(locale.languageCode);
 
   @override
   bool shouldReload(_AppLocalizationsDelegate old) => false;

LabelStoreMax/lib/app_payment_methods.dart

@@ -82,9 +82,9 @@ TextTheme textThemePrimary() {
         fontWeight: FontWeight.w600),
     headline: new TextStyle(color: Colors.black, fontFamily: appFontFamily),
     title: new TextStyle(
-      color: Colors.black,
-      fontFamily: appFontFamily,
-    ),
+        color: Colors.black87,
+        fontFamily: appFontFamily,
+        fontWeight: FontWeight.w600),
     subhead: new TextStyle(
         color: Colors.black,
         fontFamily: appFontFamily,

LabelStoreMax/lib/helpers/app_localizations.dart

@@ -19,7 +19,7 @@ import 'package:label_storemax/models/checkout_session.dart';
 import 'package:woosignal/models/payload/order_wc.dart';
 import 'package:woosignal/models/response/tax_rate.dart';
 
-Future<OrderWC> buildOrderWC({TaxRate taxRate}) async {
+Future<OrderWC> buildOrderWC({TaxRate taxRate, bool markPaid = true}) async {
   OrderWC orderWC = OrderWC();
 
   String paymentMethodName = CheckoutSession.getInstance.paymentType.name ?? "";
@@ -30,7 +30,7 @@ Future<OrderWC> buildOrderWC({TaxRate taxRate}) async {
 
   orderWC.paymentMethodTitle = paymentMethodName.toLowerCase();
 
-  orderWC.setPaid = true;
+  orderWC.setPaid = markPaid;
   orderWC.status = "pending";
   orderWC.currency = app_currency_iso.toUpperCase();
   orderWC.customerId =