diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index 4b045221..b2c715ad 100644
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -128,8 +128,15 @@ class Crm::CustomersController < BaseCrmController
                   end
                     # format.json { render :index, status: :created, location: @crm_customers }
               else
-                  customer = Customer.find(@crm_customers.customer_id)
-                  status   = customer.update_attributes(membership_type:member_group_id )
+                  customer = Customer.find(@crm_customers.customer_id)                  
+
+                  # Check membership id and bind to user
+                  if response["membership_id"] != nil
+                    status   = customer.update_attributes(membership_id: response["membership_id"],membership_type:member_group_id )
+                  else
+                    status   = customer.update_attributes(membership_type:member_group_id)
+                  end
+
                   if params[:sale_id]
                       format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created.' + response["message"]}
                   else
@@ -208,16 +215,18 @@ end
             end
 
             if response["status"] == true
-
               customer = Customer.find(@crm_customer.customer_id)
               status   = customer.update_attributes(membership_id: response["customer_datas"]["id"],membership_type:member_group_id )
 
               format.html { redirect_to crm_customers_path, notice: 'Customer was successfully updated'}
-
             else
-
               customer = Customer.find(@crm_customer.customer_id)
-              status   = customer.update_attributes(membership_type:member_group_id )
+              # Check membership id and bind to user
+              if response["membership_id"] != nil
+                status   = customer.update_attributes(membership_id: response["membership_id"],membership_type:member_group_id )
+              else
+                status   = customer.update_attributes(membership_type:member_group_id)
+              end
 
               format.html { redirect_to crm_customers_path, notice: response["error"] }
             end
@@ -255,6 +264,12 @@ end
               format.html { redirect_to crm_customers_path, notice: 'Customer was successfully updated.' }
               format.json { render :show, status: :ok, location: @crm_customer }
             else
+              # Check membership id and bind to user
+              if response["membership_id"] != nil
+                status   = customer.update_attributes(membership_id: response["membership_id"],membership_type:member_group_id )
+              else
+                status   = customer.update_attributes(membership_type:member_group_id)
+              end
               format.html { redirect_to crm_customers_path, notice: response["message"] }
             end
 
diff --git a/app/models/customer.rb b/app/models/customer.rb
index ef777c2d..06f7f1d1 100644
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -10,7 +10,7 @@ class Customer < ApplicationRecord
   validates :contact_no, uniqueness: true
   validates :email, uniqueness: true
   validates :card_no, uniqueness: true
-  # validates :paypar_account_no
+  validates :paypar_account_no, uniqueness: true
 
   paginates_per 50
 
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 26fa24cd..197c7106 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -249,7 +249,7 @@ class Sale < ApplicationRecord
       if item.remark != 'void'
         #compute each item and added to total
         subtotal_price = subtotal_price + item.price
-        total_taxable = total_taxable + item.taxable_price
+        total_taxable = total_taxable + item.price
       end
     end
 
diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb
index 3c09d20f..b99c25a3 100644
--- a/app/views/crm/customers/_new_form.html.erb
+++ b/app/views/crm/customers/_new_form.html.erb
@@ -128,10 +128,9 @@
 <script type="text/javascript">
   $(function() {
     // Read Card Reader
-    $("#paypar_account_no").on('focus', function(e){ 
-      var cardNo = "";
-      $("#sxModal").show();   
+    $("#paypar_account_no").on('focus', function(e){               
       if($(this).val() == ''){
+        $("#sxModal").show();
         setTimeout(function(){
           getCardNo();
           $("#sxModal").hide();
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index b11488b4..f882ad29 100644
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -216,12 +216,14 @@
     $('.datepicker').css('cursor','pointer');
 
     // Read Card Reader
-    $("#paypar_account_no").on('focus', function(e){   
-      $("#sxModal").show();   
-      setTimeout(function(){
-        getCardNo();
-        $("#sxModal").hide();
-      },100);     
+    $("#paypar_account_no").on('focus', function(e){         
+      if($(this).val() == ''){  
+        $("#sxModal").show();
+        setTimeout(function(){
+          getCardNo();
+          $("#sxModal").hide();
+        },100);  
+      }   
     });
 
     // Read Card Reader
diff --git a/db/seeds.rb b/db/seeds.rb
index 14f070eb..43d1fbdf 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -103,7 +103,8 @@ customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contac
 # room = Room.create({name:"Table 2", zone: zone2, status:"available", seater: 4 , order_by:1, created_by:"SYSTEM DEFAULT"})
 
 #Tax Profile
-tax_profiles = TaxProfile.create({id:1, name: "Commercial Tax", rate:5.0, order_by:1, created_by:"SYSTEM DEFAULT"})
+tax_profiles = TaxProfile.create({id:1, name: "Commercial Tax", rate:5.0, order_by:2, created_by:"SYSTEM DEFAULT"})
+service_charges = TaxProfile.create({id:2, name: "Service Charges", rate:10.0, order_by:1, created_by:"SYSTEM DEFAULT"})
 
 #Account for Menu Item Type (eg: Food, Beverage)
 # food = Account.create({title: "Food", account_type: "0"})
@@ -163,26 +164,6 @@ close_cashier_printer=PrintSetting.create({name: "Close Cashier", unique_code: "
 crm_order_printer=PrintSetting.create({name: "CRM Order", unique_code: "CrmOrderPdf", printer_name: "Cashier", precision: "0", delimiter: "0", heading_space: "5"})
 queue_no_printer=PrintSetting.create({name: "Queue No", unique_code: "QueueNoPdf", printer_name: "Cashier", precision: "0", delimiter: "0", heading_space: "5"})
 
-member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"})
-
-member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
-  {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
-  {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
-  {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
-  {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
-  {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
-  {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
-  {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
-  {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
-  {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
-  ])
-
-payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http://192.168.1.47:3006"})
-payment_methods = PaymentMethodSetting.create({payment_method:"VISA",gateway_url: "http://192.168.1.47:3006"})
-payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http://192.168.1.47:3006"})
-payment_methods = PaymentMethodSetting.create({payment_method:"Master",gateway_url: "http://192.168.1.47:3006"})
-payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"})
-
 cashier_terminal = CashierTerminal.create({name:"Terminal 1"})
 cashier_terminal2 = CashierTerminal.create({name:"Terminal 2"})
 cashier_terminal3 = CashierTerminal.create({name:"Terminal 3"})
diff --git a/dump.rdb b/dump.rdb
index 0e8d606f..7ef23891 100644
Binary files a/dump.rdb and b/dump.rdb differ
diff --git a/lib/tasks/menu_import.rake b/lib/tasks/menu_import.rake
index e0e0be3a..cdf175bf 100644
--- a/lib/tasks/menu_import.rake
+++ b/lib/tasks/menu_import.rake
@@ -636,6 +636,26 @@ zone3 = Zone.create({id:3, name: "H3", is_active:true, created_by: "SYSTEM DEFAU
   table = Table.create({name:"77", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
   table = Table.create({name:"78", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
 
+member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://membership.paypar.ws",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"})
+
+member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
+  {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
+  {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
+  {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
+  {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
+  {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
+  {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
+  {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
+  {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
+  {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:6},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"code2lab"},
+])
+
+payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http://membership.paypar.ws"})
+payment_methods = PaymentMethodSetting.create({payment_method:"VISA",gateway_url: "http://membership.paypar.ws"})
+payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http://membership.paypar.ws"})
+payment_methods = PaymentMethodSetting.create({payment_method:"Master",gateway_url: "http://membership.paypar.ws"})
+payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://membership.paypar.ws",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"})
+
 #Default Order Queue stations
 order_queue_station1 = OrderQueueStation.create({station_name: "K1", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['01001','01002','01003','01004']), print_copy:true, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"})
 order_queue_station2 = OrderQueueStation.create({station_name: "K2", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['02005','02006','02007','02008']), print_copy:true, cut_per_item: true, use_alternate_name: true, created_by: "SYSTEM DEFAULT"})
diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake
index 9241166b..515abe53 100644
--- a/lib/tasks/menu_osaka.rake
+++ b/lib/tasks/menu_osaka.rake
@@ -896,6 +896,26 @@ zone3 = Zone.create({id:3, name: "H3", is_active:true, created_by: "SYSTEM DEFAU
   table = Table.create({zone: zone3, name:"34", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
   table = Table.create({zone: zone3, name:"35", status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
 
+member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http://staging.membership.paypar.ws",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv"})
+
+member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
+  {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
+  {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
+  {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
+  {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
+  {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
+  {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
+  {membership_type:"get_member_transactions",gateway_url:"/api/generic_customer/get_membership_transactions",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
+  {membership_type:"member_discount",gateway_url:"/api/membership_campaigns/discount",additional_parameter:{campaign_type_id:6},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
+  {membership_type:"get_member_campaign",gateway_url:"/api/membership_campaigns/get_member_campaign",additional_parameter:{campaign_type_id:6},merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv",auth_token:"code2lab"},
+])
+
+payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http://staging.membership.paypar.ws"})
+payment_methods = PaymentMethodSetting.create({payment_method:"VISA",gateway_url: "http://staging.membership.paypar.ws"})
+payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http://staging.membership.paypar.ws"})
+payment_methods = PaymentMethodSetting.create({payment_method:"Master",gateway_url: "http://staging.membership.paypar.ws"})
+payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://staging.membership.paypar.ws",merchant_account_id:"RxzaYyAGzm7VqAZ4hKnv"})
+
 #Default Order Queue stations
 order_queue_station1 = OrderQueueStation.create({station_name: "K1", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['I0001','I0002','I0003','I0004']), print_copy:false, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"})
 order_queue_station2 = OrderQueueStation.create({station_name: "K2", is_active: true,printer_name: "Cashier", processing_items: JSON.generate(['I0005','I0006','I0007','I0008']), print_copy:false, cut_per_item: false, use_alternate_name: false, created_by: "SYSTEM DEFAULT"})