RazorPay checkout added, Option to use shipping address, Config update, Pubspec.yaml change, Option to use different billing or shipping address, Bug fixes

Author: WooSignal

LabelStoreMax/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [2.0.5] - 2020-05-16
+
+* RazorPay checkout added
+* Option to use shipping address
+* Config update
+* Pubspec.yaml change
+* Option to use different billing or shipping address
+* Bug fixes
+
 ## [2.0.4] - 2020-05-13
 
 * Added Flexible widget for checkout details

LabelStoreMax/assets/images/razorpay.png

@@ -272,6 +272,8 @@
 				"${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",
@@ -287,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/ios/Runner.xcodeproj/project.pbxproj

@@ -127,6 +127,7 @@
   "Done": "Done",
   "Billing Details": "Billing Details",
   "Shipping Details": "Shipping Details",
+  "Shipping Address": "Shipping Address",
   "State": "State",
   "Country": "Country",
   "UPDATE DETAILS": "UPDATE DETAILS",
@@ -145,5 +146,9 @@
   "Welcome back": "Welcome back",
   "Quantity": "Quantity",
   "Select a state": "Select a state",
-  "Select state": "Select state"
+  "Select state": "Select state",
+  "Ship to a different address?": "Ship to a different address?",
+  "USE DETAILS": "USE DETAILS",
+  "Not supported, try a card payment": "Not supported, try a card payment",
+  "Invalid shipping address, please check your shipping details": "Invalid shipping address, please check your shipping details"
 }

LabelStoreMax/lang/en.json

@@ -11,6 +11,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/razor_pay.dart';
 import 'package:label_storemax/providers/stripe_pay.dart';
 
 // Payment methods available for uses in the app
@@ -36,15 +37,25 @@ List<PaymentType> arrPaymentMethods = [
     ),
   ),
 
+  addPayment(
+    PaymentType(
+      id: 3,
+      name: "RazorPay",
+      desc: "Debit or Credit Card",
+      assetImage: "razorpay.png",
+      pay: razorPay,
+    ),
+  ),
+
   // e.g. add more here
 
 //  addPayment(
 //    PaymentType(
-//      id: 3,
+//      id: 4,
 //      name: "MyNewPaymentMethod",
 //      desc: "Debit or Credit Card",
 //      assetImage: "add icon image to assets/images/myimage.png",
-//      pay: stripePay
+//      pay: myCustomPaymentFunction
 //    ),
 //  ),
 ];

LabelStoreMax/lib/app_payment_methods.dart

@@ -66,6 +66,9 @@ Future<OrderWC> buildOrderWC({TaxRate taxRate, bool markPaid = true}) async {
   billing.postcode = billingDetails.billingAddress.postalCode;
   billing.country = billingDetails.billingAddress.country;
   billing.email = billingDetails.billingAddress.emailAddress;
+  if (billingDetails.billingAddress.country == "United States") {
+    billing.state = billingDetails.billingAddress.state;
+  }
 
   orderWC.billing = billing;
 
@@ -75,6 +78,9 @@ Future<OrderWC> buildOrderWC({TaxRate taxRate, bool markPaid = true}) async {
   shipping.address1 = billingDetails.shippingAddress.addressLine;
   shipping.city = billingDetails.shippingAddress.city;
   shipping.postcode = billingDetails.shippingAddress.postalCode;
+  if (billingDetails.shippingAddress.country == "United States") {
+    shipping.state = billingDetails.shippingAddress.state;
+  }
   shipping.country = billingDetails.shippingAddress.country;
 
   orderWC.shipping = shipping;

LabelStoreMax/lib/helpers/data/order_wc.dart

@@ -16,15 +16,16 @@ import 'dart:ui';
  Developer Notes
 
  SUPPORT EMAIL - [email protected]
- VERSION - 2.0.4
+ VERSION - 2.0.5
  https://woosignal.com
  */
 
 /*<! ------ CONFIG ------!>*/
 
 const app_name = "MyApp";
 
-const app_key = "Your app key from WooSignal";
+const app_key =
+    "app_b2538b4325a4a6b0f3b919f4c91cea8087ba80977f4a7c1feda669127aca";
 
 // Your App key from WooSignal
 // link: https://woosignal.com/dashboard/apps
@@ -47,7 +48,7 @@ const app_locales_supported = [
 
 /*<! ------ PAYMENT GATEWAYS ------!>*/
 
-// Available: "Stripe", "CashOnDelivery",
+// Available: "Stripe", "CashOnDelivery", "RazorPay"
 // Add the method to the array below e.g. ["Stripe", "CashOnDelivery"]
 
 const app_payment_methods = ["Stripe"];
@@ -78,6 +79,11 @@ const app_forgot_password_url =
     "https://mysite.com/my-account/lost-password"; // change to your forgot password url
 const app_wp_api_path = "/wp-json"; // By default "/wp-json" should work
 
+/*<! ------ Razor Pay (OPTIONAL) ------!>*/
+// https://razorpay.com/
+
+const app_razor_id = "Your Razor ID from RazorPay";
+
 /*<! ------ DEBUGGER ENABLED ------!>*/
 
 const app_debug = true;

LabelStoreMax/lib/labelconfig.dart

@@ -21,7 +21,10 @@ import 'package:woosignal/models/response/tax_rate.dart';
 import '../helpers/tools.dart';
 
 class CheckoutSession {
-  String sfKeyCheckout = "CS_BILLING_DETAILS";
+  String sfKeyBillingCheckout = "CS_BILLING_DETAILS";
+  String sfKeyShippingCheckout = "CS_SHIPPING_DETAILS";
+  bool shipToDifferentAddress = false;
+
   CheckoutSession._privateConstructor();
   static final CheckoutSession getInstance =
       CheckoutSession._privateConstructor();
@@ -35,19 +38,25 @@ class CheckoutSession {
     shippingType = null;
   }
 
+  void clear() {
+    billingDetails = null;
+    shippingType = null;
+    paymentType = null;
+  }
+
   void saveBillingAddress() {
     SharedPref sharedPref = SharedPref();
     CustomerAddress customerAddress =
         CheckoutSession.getInstance.billingDetails.billingAddress;
 
     String billingAddress = jsonEncode(customerAddress.toJson());
-    sharedPref.save(sfKeyCheckout, billingAddress);
+    sharedPref.save(sfKeyBillingCheckout, billingAddress);
   }
 
   Future<CustomerAddress> getBillingAddress() async {
     SharedPref sharedPref = SharedPref();
 
-    String strCheckoutDetails = await sharedPref.read(sfKeyCheckout);
+    String strCheckoutDetails = await sharedPref.read(sfKeyBillingCheckout);
 
     if (strCheckoutDetails != null && strCheckoutDetails != "") {
       return CustomerAddress.fromJson(jsonDecode(strCheckoutDetails));
@@ -57,7 +66,30 @@ class CheckoutSession {
 
   void clearBillingAddress() {
     SharedPref sharedPref = SharedPref();
-    sharedPref.remove(sfKeyCheckout);
+    sharedPref.remove(sfKeyBillingCheckout);
+  }
+
+  void saveShippingAddress() {
+    SharedPref sharedPref = SharedPref();
+    CustomerAddress customerAddress =
+        CheckoutSession.getInstance.billingDetails.shippingAddress;
+
+    String shippingAddress = jsonEncode(customerAddress.toJson());
+    sharedPref.save(sfKeyShippingCheckout, shippingAddress);
+  }
+
+  Future<CustomerAddress> getShippingAddress() async {
+    SharedPref sharedPref = SharedPref();
+    String strCheckoutDetails = await sharedPref.read(sfKeyShippingCheckout);
+    if (strCheckoutDetails != null && strCheckoutDetails != "") {
+      return CustomerAddress.fromJson(jsonDecode(strCheckoutDetails));
+    }
+    return null;
+  }
+
+  void clearShippingAddress() {
+    SharedPref sharedPref = SharedPref();
+    sharedPref.remove(sfKeyShippingCheckout);
   }
 
   Future<String> total({bool withFormat, TaxRate taxRate}) async {

LabelStoreMax/lib/models/checkout_session.dart

@@ -291,14 +291,14 @@ class CheckoutConfirmationPageState extends State<CheckoutConfirmationPage> {
                                       .getTotal(withFormatting: true)),
                       (_taxRate != null
                           ? wsCheckoutTaxAmountWidgetFB(taxRate: _taxRate)
-                          : Container()),
+                          : null),
                       wsCheckoutTotalWidgetFB(
                           title: trans(context, "Total"), taxRate: _taxRate),
                       Divider(
                         color: Colors.black12,
                         thickness: 1,
                       ),
-                    ],
+                    ].where((e) => e != null).toList(),
                   ),
                   wsPrimaryButton(
                     context,