To add only Other Payment Name beside SX Resturant

app/controllers/origami/jcb_controller.rb

@@ -9,6 +9,7 @@ class Origami::JcbController < BaseOrigamiController
     @jcbcount = 0
     others = 0
 
+    @payment_method_setting_nav = PaymentMethodSetting.all
     @shop        = Shop::ShopDetail 
     if @shop.is_rounding_adj
          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)

app/controllers/origami/master_controller.rb

@@ -9,6 +9,7 @@ class Origami::MasterController < BaseOrigamiController
     @mastercount = 0
     others = 0
     
+    @payment_method_setting_nav = PaymentMethodSetting.all
     @shop        = Shop::ShopDetail 
     if @shop.is_rounding_adj
          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)

app/controllers/origami/mpu_controller.rb

@@ -7,7 +7,8 @@ class Origami::MpuController < BaseOrigamiController
     total     = sale_data.grand_total
     @mpucount = 0
     others    = 0
-
+    
+    @payment_method_setting_nav = PaymentMethodSetting.all
     @shop        = Shop::ShopDetail 
     if @shop.is_rounding_adj
          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)

app/controllers/origami/redeem_payments_controller.rb

@@ -6,6 +6,7 @@ class Origami::RedeemPaymentsController < BaseOrigamiController
  		@membership_rebate_balance=0
  		sale_data = Sale.find_by_sale_id(@sale_id)
 
+        @payment_method_setting_nav = PaymentMethodSetting.all
         @shop        = Shop::ShopDetail 
         # if @shop.is_rounding_adj
         #      new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)

app/controllers/origami/visa_controller.rb

@@ -8,6 +8,7 @@ class Origami::VisaController < BaseOrigamiController
     @visacount = 0
     others = 0
 
+    @payment_method_setting_nav = PaymentMethodSetting.all
     @shop        = Shop::ShopDetail 
     if @shop.is_rounding_adj
          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)

app/pdf/receipt_bill_a5_pdf.rb

@@ -2,7 +2,7 @@ class ReceiptBillA5Pdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
 
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width, :line_move
-  def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data,survey)
+  def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
     self.margin = 15

app/pdf/receipt_bill_pdf.rb

@@ -2,7 +2,7 @@ class ReceiptBillPdf < Prawn::Document
   include ActionView::Helpers::NumberHelper
 
   attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width, :line_move
-  def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data,survey)
+  def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
     self.margin = 0

app/views/layouts/_header.html.erb

@@ -23,6 +23,11 @@
                 <img src="<%= asset_path('SX-Logo-small.png') %>" width="40" height="40" alt="Logo" />
                 <span class="navbar-brand-txt">SX Restaurant</span>
             </a>
+            <% if @payment_method_setting_nav.present? %>
+                <span class="navbar-brand m-0">/ &nbsp;
+                    <span id="otherPayment"></span>&nbsp; Payment
+                </span>
+            <% end %>    
                        
         </div>
         <!-- Start Shop Info -->
@@ -73,4 +78,8 @@
             </a> -->
         </div>
     </div>
-</nav>
+</nav>
+<script type="text/javascript">
+    var otherPayment = location.href.split('/')[location.href.split('/').length -1 ];
+    document.getElementById("otherPayment").innerHTML = otherPayment;
+</script>

app/views/origami/jcb/index.html.erb

@@ -12,7 +12,6 @@
 			</span>
 		</ol>
 	</div> -->
-	<h5>JCB Payment</h5>
 	<div class="row">
 		<div class="col-lg-5 col-md-5 col-sm-3">	
 			<span class="hidden" id="membership_id"><%= @membership_id%></span>

app/views/origami/master/index.html.erb

@@ -12,7 +12,6 @@
       </span>
     </ol>
   </div> -->
-  <h5>Master Payment</h5>
   <div class="row">
    <div class="col-lg-5 col-md-5 col-sm-3">
     <span class="hidden" id="membership_id"><%= @membership_id%></span>

app/views/origami/mpu/index.html.erb

@@ -12,7 +12,6 @@
 			</span>
 		</ol>
 	</div> -->
-	<h5>MPU Payment</h5>
 	<div class="row">
 		<div class="col-lg-5 col-md-5 col-sm-5">
 			<span class="hidden" id="membership_id"><%= @membership_id%></span>

app/views/origami/redeem_payments/index.html.erb

@@ -9,7 +9,6 @@
 			</span>
 		</ol>
 	</div> -->
-	<h5>Reedem Payment</h5>
 	<div class="row">
 		<div class="col-lg-5 col-md-5 col-sm-5">
 			<div class="card  m-l-10 m-t-10" style="padding:0px 20px;">

app/views/origami/visa/index.html.erb

@@ -12,7 +12,6 @@
       </span>
     </ol>
   </div> -->
-  <h5>VISA Payment</h5>
   <div class="row">
    <div class="col-lg-5 col-md-5 col-sm-5">
     <span class="hidden" id="membership_id"><%= @membership_id%></span>

config/initializers/action_controller.rb

@@ -18,13 +18,13 @@ class ActionController::Base
         # redirect_to root_url(:host => request.domain) + "store_error"
          render :json => [{ status: false, message: 'Invalid Access!'}]
       end      
-    else         
+    # else         
-      # check for license file
+    #   # check for license file
-      if check_license
+    #   if check_license
-        current_license(ENV["SX_PROVISION_URL"])
+    #     current_license(ENV["SX_PROVISION_URL"])
-      else
+    #   else
-        redirect_to activate_path
+    #     redirect_to activate_path
-      end      
+    #   end      
     end    
   end