diff --git a/app/Controllers/Payment.php b/app/Controllers/Payment.php
index 52fe000d..83eb7c06 100644
--- a/app/Controllers/Payment.php
+++ b/app/Controllers/Payment.php
@@ -167,7 +167,8 @@ public function payment_success() {
     $parts = explode('_', $ORDER_ID);
     $customer_id = (int)$parts[0];
     $past_membership_id = $parts[1];
-    $payment_method = $this->request->getVar('PAYMENTMODE');
+    // $payment_method = $this->request->getVar('PAYMENTMODE');
+    $payment_method = 'paytm';
     //dd($past_membership_id);
     // $parts = explode('_', $ORDER_ID);
     // $customer_id = (int)$parts[0];
diff --git a/app/Views/invoice_form.php b/app/Views/invoice_form.php
index 8d1fc095..e09ac5cd 100755
--- a/app/Views/invoice_form.php
+++ b/app/Views/invoice_form.php
@@ -219,7 +219,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
 
                             <div class="form-group col-md-5">
                                 <label for="loadShippingDropdown">Shipping Address<span class="text-danger"> *</span></label>
-                                <select  class="form-control" id="loadShippingDropdown" name="shipping_address_id" data-toggle="select2" onchange="get_customer_shipping_details(this.value)" >
+                                <select  class="form-control" id="loadShippingDropdown" name="shipping_address_id" data-toggle="select2" onchange="get_customer_shipping_details(this.value)" <?php $invoice_type == 2?'required':'' ?>>
                                     <option value="">Select an address</option>
                                 </select>
                             </div>
@@ -1650,9 +1650,9 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
                     text2 = cm[0].status == 0 ? " - Expried" : "";
                     $(".subscribedetails").show(); // Change this line to use the class selector
                     let messages = "Earlier Membership : <br>"; 
-                        for (let i = 0; i < cm.length; i++) {
+                        for (let i = 0; i < cm.length; i++) {console.log(typeof cm[i].to_subscription);
                             let text1 = cm[i].is_renew > 1 ? " - Renewed" : "";
-                            let text2 = cm[i].invoice_status != 'Approved' ? " - Draft" : "";
+                            let text2 = cm[i].invoice_status == 'Approved' ?  "" :" - Draft";
                             let text3 = cm[i].status == 0  ? ' - Expired ': " - Active";
                             messages += cm[i].title + "<br> ( From: " + cm[i].formatted_from_subscription + " To: " + cm[i].formatted_to_subscription + " )" + text1 + text2 + text3+ " <br>";
                         }