diff --git a/app/Views/invoice_form.php b/app/Views/invoice_form.php
index 123db722..3d5a55b1 100755
--- a/app/Views/invoice_form.php
+++ b/app/Views/invoice_form.php
@@ -680,11 +680,13 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
                                             <label for="bcountry" class="col-form-label">Country<span class="text-danger"> *</span></label>
                                             <select class="form-control" id="bcountry" name="bcountry[]"placeholder="Choose Your Country" required>
                                                 <option value="">Choose your Country</option>
-                                                <?php foreach ($country_details as $value) { ?>
+                                                <?php
+                                                if(!empty($country_details)){
+                                                    foreach ($country_details as $value) { ?>                                                 
                                                     <option value="<?php echo $value['country_short_name']; ?>">
                                                         <?php echo $value['country_name']; ?>
                                                     </option>
-                                                <?php } ?>
+                                                    <?php }} ?>
                                             </select>
                                         </div>
                                         <div class="form-group col-md-6">
@@ -729,11 +731,13 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
                                                         <label for="scountry" class="col-form-label">Country<span class="text-danger"> *</span></label>
                                                         <select class="form-control" id="scountry" name="scountry[]"placeholder="Choose Your Country" required>
                                                             <option value="">Choose your Country</option>
-                                                            <?php foreach ($country_details as $value) { ?>
+                                                            <?php 
+                                                            if(!empty($country_details)){
+                                                            foreach ($country_details as $value) { ?>
                                                                 <option value="<?php echo $value['country_short_name']; ?>">
                                                                     <?php echo $value['country_name']; ?>
                                                                 </option>
-                                                            <?php } ?>
+                                                            <?php } } ?>
                                                         </select>
                                                     </div>
                                                     <!-- State -->
@@ -1628,7 +1632,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
                     console.log('Invoice Type is ', invoice_type);
                     if(invoice_type === '2'){
                         $('#membership_id').empty();
-                    $('#membership_id').prop('required',true);
+                   // $('#membership_id').prop('required',true);
                     $('#membership_id').append('<option value = "">Select a Existing Membership ID</option>');
                     for(i=0;i<cm.length;i++){
                         membership_id = cm[i].membership_id;
@@ -2387,7 +2391,6 @@ $('#saveButton').click(function() {
         $('#storeBillingAddress').val("").prop('readonly',false);
         $('#storeShippingAddress').val("").prop('readonly',false);
         var cus_id = $('#customer_name').val() ? $('#customer_name').val() : $('#customerName').val();
-        console.log("Qucik add Addresses - customer id = ",cus_id);
         var last_name = $("#hidden_last_name").val();
         var first_name = $("#hidden_first_name").val();
         var QB_AddressLine = $("#quick_billing_address").val();
@@ -2559,8 +2562,7 @@ $('#saveButton').click(function() {
         $('#balanceAmount').val(parseInt(discountLastValue));
 
 
-        console.log("last Discount value");
-        console.log(discountLastValue);
+        
 
     // var discountedPrice = calculateDiscountedPrice(discountValue);
     // $('#discounted-price').text(discountedPrice);