fixed conflict

app/assets/javascripts/origami.js

@@ -236,12 +236,12 @@ function control_button(order_status){
 	if(order_status=="billed"){
 		$("#request_bills").prop('disabled', true);
 		$("#discount").prop('disabled', false);
-		$("#pay").prop('disabled', false);
+		$("#pay-bill").prop('disabled', false);
 	}
 	else if(order_status=="new") {
 		$("#request_bills").prop('disabled', false);
 		$("#discount").prop('disabled', true);
-		$("#pay").prop('disabled', true);
+		$("#pay-bill").prop('disabled', true);
 	}
 }
 
@@ -261,6 +261,3 @@ function update_balance(){
 	$('#order-discount').text(discount_amount);
 	$('#order-grand-total').text(total);
 }
-
-
-

app/assets/javascripts/origami/redeem_payments.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

app/assets/stylesheets/origami.scss

@@ -7,17 +7,36 @@
 //   min-height: 75rem;
 //   padding-top: 4.5rem;
 // }
+.others-payment{
+	line-height:100px;
+	text-align:center;
+	color:white;
+	width:300px;
+	height:100px;
+	font-size:18px;
+}
 
 .cashier_number{
-	height:76px;
+	width: 30%;
-	line-height:80px;
+	height:71px;
+	line-height:71px;
+
 	text-align:center;
 	background:#54A5AF;
-	float:left;
+	// float:left;
-	margin:2px;
+	// margin:2px;
+	font-size:20px;
+	color:white;
+	// cursor:pointer;
+}
+
+.pay{
+	width: 98%;
+  height:210px;
+	line-height:210px;
+	text-align:center;
 	font-size:20px;
 	color:white;
-	cursor:pointer;
 }
 
 .cashier_number:hover{
@@ -25,7 +44,7 @@
 }
 
 .long{
-	width:100%
+	width:49%
 }
 
 .sold {
@@ -70,7 +89,13 @@
 	background-color: #009900
 }
 
+.left{
+	margin-left:1px;
+}
 
+.bottom{
+	margin-bottom: 1px;
+}
 /*----- Reset -----*/
 
 select.form-control {

app/assets/stylesheets/origami/redeem_payments.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the origami/redeem_payments controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/api/bill_controller.rb

@@ -9,11 +9,11 @@ class Api::BillController < Api::ApiController
     #create Bill by Booking ID
     if (params[:booking_id])
       @sale = Sale.new
-      @status = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee.name)
+      @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee.name)
 
     elsif (params[:order_id])
       @sale = Sale.new
-      @status = @sale.generate_invoice_from_order(params[:order_id], current_login_employee.name)
+      @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee.name)
 
     end
   end

app/controllers/crm/customers_controller.rb

@@ -58,8 +58,9 @@ class Crm::CustomersController < BaseCrmController
         membership_id   = params[:membership_id]
 
         membership      = MembershipSetting.find_by_membership_type("paypar_url")
+        memberaction    = MembershipAction.find_by_membership_type("create_membership_customer")
         app_token       = membership.auth_token.to_s
-        url             = membership.gateway_url.to_s + "/api/create_membership_customer".to_s
+        url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
 
         response        = HTTParty.post(url, :body => { name: name,phone: phone,email: email,
                                                         date_of_birth: date_of_birth,
@@ -79,9 +80,6 @@ class Crm::CustomersController < BaseCrmController
                 
                 format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer', notice: 'Customer was successfully created.' }
                               
-              else
-                 format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' } 
-              end
               # format.json { render :index, status: :created, location: @crm_customers }
           else
               
@@ -125,8 +123,9 @@ class Crm::CustomersController < BaseCrmController
         id              = customer_params[:membership_id]
 
         membership      = MembershipSetting.find_by_membership_type("paypar_url")
+        memberaction    = MembershipAction.find_by_membership_type("update_membership_customer")
         app_token       = membership.auth_token.to_s
-        url             = membership.gateway_url.to_s + "/api/update_membership_customer".to_s
+        url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
 
         response        = HTTParty.post(url, :body => { name: name,phone: phone,email: email,
                                                         date_of_birth: date_of_birth,
@@ -162,6 +161,20 @@ class Crm::CustomersController < BaseCrmController
  # DELETE /crm/customers/1
   # DELETE /crm/customers/1.json
 
+  # def get_sale_id
+
+  #   @sale_id        = params[:sale_id]
+  #   @crm_customers  = Customer.all
+  #   @crm_customer   = Customer.new
+  #   @membership     = Customer.get_member_group
+  #   if @membership["status"] == true
+  #     @member_group = @membership["data"]
+  #   end
+  #   respond_to do |format|
+  #     format.html { render action: "index"}
+  #     format.json { render json: @crm_customers }
+  #   end
+  # end
 
   private
     # Use callbacks to share common setup or constraints between actions.
@@ -175,5 +188,3 @@ class Crm::CustomersController < BaseCrmController
       params.require(:customer).permit(:name, :company, :contact_no, :email, :date_of_birth)
     end
 end
-
-

app/controllers/origami/mpu_controller.rb

@@ -0,0 +1,17 @@
+class Origami::MpuController < BaseOrigamiController
+
+  def index
+    @sale_id = params[:sale_id]
+  end
+
+  def create
+    cash = params[:amount]
+    sale_id = params[:sale_id]
+    if(Sale.exists?(sale_id))
+      saleObj = Sale.find(sale_id)
+      sale_payment = SalePayment.new
+      @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "mpu")
+    end
+  end
+
+end

app/controllers/origami/others_payments_controller.rb

@@ -5,6 +5,7 @@ class Origami::OthersPaymentsController < BaseOrigamiController
   	@membership_rebate_balance = 0
   	@sale_id = params[:sale_id]
   	@payment_method_setting = PaymentMethodSetting.all
+
   	# @sale_id = params[:sale_id]
   	# sale_data = Sale.find_by_sale_id(@sale_id)
 

app/controllers/origami/payments_controller.rb

@@ -17,7 +17,17 @@ class Origami::PaymentsController < BaseOrigamiController
   def show
     sale_id = params[:sale_id]
     if Sale.exists?(sale_id)
+      @cash = 0.0
+      @other = 0.0
       @sale_data = Sale.find_by_sale_id(sale_id)
+        @sale_data.sale_payments.each do |spay|
+         if spay.payment_method == "cash"
+           @cash = spay.payment_amount
+         end
+         if spay.payment_method == "mpu"
+           @other = spay.payment_amount
+         end
+      end
     end
   end
 

app/controllers/origami/paypar_payments_controller.rb

@@ -8,7 +8,6 @@ class Origami::PayparPaymentsController < BaseOrigamiController
 			saleObj = Sale.find(sale_id)
       		sale_payment = SalePayment.new
       		status,msg =sale_payment.process_payment(saleObj, @user, redeem_amount,payment_method)
-   
       		if status == true
       			@out = true, "Success!"
       		else

app/controllers/origami/redeem_payments_controller.rb

@@ -0,0 +1,46 @@
+class Origami::RedeemPaymentsController < BaseOrigamiController
+ 	def index
+ 		@sale_id = params[:sale_id]
+ 		payment_method = params[:payment_method]
+ 		@membership_rebate_balance=0
+ 		sale_data = Sale.find_by_sale_id(@sale_id)
+ 		if sale_data
+ 			if sale_data.customer_id
+ 				customer_data= Customer.find_by_customer_id(sale_data.customer_id)
+ 				if customer_data
+ 					@membership_id = customer_data.membership_id
+ 					if !@membership_id.nil?
+ 						membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
+ 						if membership_setting.gateway_url
+ 							member_actions =MembershipAction.find_by_membership_type("get_account_balance")
+ 							if member_actions.gateway_url
+ 								@campaign_type_id = member_actions.additional_parameter["campaign_type_id"]
+ 								url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s
+		 						membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id)
+		 						if membership_data["status"]==true
+		 							@membership_rebate_balance=membership_data["balance"]
+		 							@out = true, @membership_rebate_balance,@membership_id
+		 						end
+		 					else
+		 						@out =false,0
+ 							end
+ 						else
+ 							@out = false,0
+ 						end
+	                    
+	                    
+ 					else
+ 						@out = false, 0
+ 					end
+ 				else
+ 					@out = false, 0
+ 				end
+ 			else
+ 				@out = false, 0
+ 			end
+ 		else
+ 			@out = false, 0
+ 		end
+ 		@out = false, 0
+ 	end
+end

app/controllers/settings/membership_actions_controller.rb

@@ -4,44 +4,7 @@ class Settings::MembershipActionsController < ApplicationController
   # GET /settings/membership_actions
   # GET /settings/membership_actions.json
   def index
-    type = params[:type]
+        @settings_membership_actions = MembershipAction.all
-    @sale_id = params[:sale_id]
-    if type.nil?
-        @settings_membership_actions = Settings::MembershipAction.all
-    else
-        membership_actions_data=Settings::MembershipAction.find_by_membership_type(type)
-
-        if !membership_actions_data.nil?
-            url = params[:gateway_url].to_s + membership_actions_data.gateway_url.to_s
-            puts url.to_json
-            sale_data = Sale.find_by_sale_id(@sale_id) 
-            if sale_data.customer_id
-              customer_data= Customer.find_by_customer_id(sale_data.customer_id)
-               @membership_id = customer_data.membership_id
-               @campaign_type_id =1
-                if !@membership_id.nil?
-                    membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
-                    membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id)
-                    if membership_data["status"]==true
-                        @membership_rebate_balance=membership_data["balance"]
-                        @out = true, @membership_rebate_balance
-                    else
-                        @out = false, 0
-                    end
-                else
-                  @out = false, 0
-                end
-              else
-                @out =false, 0
-            end
-            # campaign_type_id=1
-            # get_account_data = MembershipAction.get_account_data(url)
-        else
-          @out = false, 0
-        end
-      render :json => @out.to_json
-    end
-    
   end
 
   # GET /settings/membership_actions/1
@@ -51,7 +14,7 @@ class Settings::MembershipActionsController < ApplicationController
 
   # GET /settings/membership_actions/new
   def new
-    @settings_membership_action = Settings::MembershipAction.new
+    @settings_membership_action = MembershipAction.new
   end
 
   # GET /settings/membership_actions/1/edit
@@ -61,11 +24,11 @@ class Settings::MembershipActionsController < ApplicationController
   # POST /settings/membership_actions
   # POST /settings/membership_actions.json
   def create
-    @settings_membership_action = Settings::MembershipAction.new(settings_membership_action_params)
+    @settings_membership_action = MembershipAction.new(settings_membership_action_params)
 
     respond_to do |format|
       if @settings_membership_action.save
-        format.html { redirect_to @settings_membership_action, notice: 'Membership action was successfully created.' }
+        format.html { redirect_to settings_membership_actions_path, notice: 'Membership action was successfully created.' }
         format.json { render :show, status: :created, location: @settings_membership_action }
       else
         format.html { render :new }
@@ -79,7 +42,7 @@ class Settings::MembershipActionsController < ApplicationController
   def update
     respond_to do |format|
       if @settings_membership_action.update(settings_membership_action_params)
-        format.html { redirect_to @settings_membership_action, notice: 'Membership action was successfully updated.' }
+        format.html { redirect_to settings_membership_action_path, notice: 'Membership action was successfully updated.' }
         format.json { render :show, status: :ok, location: @settings_membership_action }
       else
         format.html { render :edit }
@@ -101,11 +64,11 @@ class Settings::MembershipActionsController < ApplicationController
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_settings_membership_action
-      @settings_membership_action = Settings::MembershipAction.find(params[:id])
+      @settings_membership_action = MembershipAction.find(params[:id])
     end
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_membership_action_params
-      params.require(:settings_membership_action).permit(:membership_type, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :created_by, :additional_parameter)
+      params.require(:membership_action).permit(:membership_type, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :created_by, :additional_parameter)
     end
 end

app/helpers/origami/redeem_payments_helper.rb

@@ -0,0 +1,2 @@
+module Origami::RedeemPaymentsHelper
+end

app/models/customer.rb

@@ -15,9 +15,10 @@ class Customer < ApplicationRecord
   def self.get_member_group
 
     membership  = MembershipSetting.find_by_membership_type("paypar_url")
+    memberaction = MembershipAction.find_by_membership_type("get_all_member_group")
     app_token   = membership.auth_token.to_s
 
-    url         = membership.gateway_url.to_s + "/api/get_all_member_group".to_s
+    url         = membership.gateway_url.to_s + memberaction.gateway_url.to_s
     response    = HTTParty.get(url,
                     :body => { app_token: app_token}.to_json,
                     :headers => {

app/models/membership_action.rb

@@ -0,0 +1,2 @@
+class MembershipAction < ApplicationRecord
+end

app/models/sale.rb

@@ -3,7 +3,6 @@ class Sale < ApplicationRecord
 
   #primary key - need to be unique generated for multiple shops
   before_create :generate_custom_id
-
   #before_create :generate_receipt_no
   belongs_to :cashier, :optional => true
   belongs_to :customer, :optional => true
@@ -17,7 +16,6 @@ class Sale < ApplicationRecord
   scope :open_invoices, -> { where("sale_status = 'new' and receipt_date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") }
 
   def generate_invoice_from_booking(booking_id, requested_by)
-    puts "get invoice from booking"
     booking = Booking.find(booking_id)
     status = false
     Rails.logger.debug "Booking -> " + booking.id.to_s
@@ -33,7 +31,6 @@ class Sale < ApplicationRecord
         booking.sale_id = sale_id
       end
         order = booking.booking_orders.take.order
-        puts "add sale order"
         link_order_sale(order.id)
       return status, sale_id
     end
@@ -233,7 +230,8 @@ class Sale < ApplicationRecord
     saleOrder = SaleOrder.where("sale_id=? and order_id=?", self.id, order_id).take
 
     if saleOrder.nil?
-      SaleOrder.create(:sale_id => self.id, :order_id => order_id)
+      sale_order = SaleOrder.new
+      sale_order.create_sale_order(self.id, order_id)
     end
     # if (SaleOrder.where("sale_id = #{self.id} and order_id=#{order_id}").nil?)
     #   SaleOrder.create(:sale_id => self.id, :order_id => order_id)
@@ -261,6 +259,7 @@ class Sale < ApplicationRecord
   end
 
   private
+
   def generate_custom_id
     self.sale_id = SeedGenerator.generate_id(self.class.name, "SAL")
   end

app/models/sale_order.rb

@@ -2,13 +2,22 @@ class SaleOrder < ApplicationRecord
   self.primary_key = "sale_order_id"
 
   #primary key - need to be unique generated for multiple shops
-  before_create :generate_custom_id
+  before_create :generate_sale_order_id
 
   belongs_to :sale
   belongs_to :order
 
+  def create_sale_order(sale, order)
+    self.sale_id = sale
+    self.order_id = order
+    self.save
+
+  end
+
   private
-  def generate_custom_id
+  def generate_sale_order_id
-    self.sale_order_id = SeedGenerator.generate_id(self.class.name, "SOI")
+    self.class.name
+    saleOrderId = SeedGenerator.generate_id(self.class.name, "SOI")
+    self.sale_order_id = saleOrderId
   end
 end

app/models/sale_payment.rb

@@ -78,11 +78,11 @@ class SalePayment < ApplicationRecord
 
   end
 
-  def self.redeem(paypar_url,token,membership_id,received_amount,sale_id,campaign_type_id)
+  def self.redeem(paypar_url,token,membership_id,received_amount,sale_id)
-      membership_actions_data = Settings::MembershipAction.find_by_membership_type("redeem_url");
+      membership_actions_data = MembershipAction.find_by_membership_type("redeem");
       if !membership_actions_data.nil?
         url = paypar_url.to_s + membership_actions_data.gateway_url.to_s
-        campaign_type_id = 1
+       campaign_type_id = membership_actions_data.additional_parameter["campaign_type_id"]
         response = HTTParty.post(url,
                 :body => { generic_customer_id:membership_id,total_amount:received_amount,receipet_no:sale_id,campaign_type_id:campaign_type_id,account_no:""}.to_json,
                 :headers => {
@@ -93,7 +93,7 @@ class SalePayment < ApplicationRecord
       else
         response =false;
       end
-
+      puts response.to_json
       return response;
 
   end
@@ -106,7 +106,6 @@ class SalePayment < ApplicationRecord
     self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
     self.payment_status = "paid"
     payment_method = self.save!
-
     sale_update_payment_status(self.received_amount)
 
     return payment_status
@@ -134,7 +133,7 @@ class SalePayment < ApplicationRecord
     self.payment_method = method
     self.payment_amount = self.received_amount
     self.payment_reference  = self.card_payment_reference
-    self.outstanding_amount = self.sale.grand_total- self.received_amount
+    self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
     self.payment_status = "paid"
     payment_method = self.save!
 
@@ -188,10 +187,9 @@ class SalePayment < ApplicationRecord
     self.payment_status = "pending"
     payment_method = self.save!
 
-    campaign_type_id =1;
     customer_data = Customer.find_by_customer_id(self.sale.customer_id)
     membership_setting = MembershipSetting.find_by_membership_type("paypar_url")
-    membership_data = SalePayment.redeem(membership_setting.gateway_url,membership_setting.auth_token,customer_data.membership_id,self.received_amount,self.sale.sale_id,campaign_type_id)
+    membership_data = SalePayment.redeem(membership_setting.gateway_url,membership_setting.auth_token,customer_data.membership_id,self.received_amount,self.sale.sale_id)
     if membership_data["status"]==true
       SalePayment.where(:sale_payment_id => self.sale_payment_id).update_all(:payment_status => 'paid')
       sale_update_payment_status(self.received_amount.to_f)
@@ -207,15 +205,26 @@ class SalePayment < ApplicationRecord
   def sale_update_payment_status(paid_amount)
     #update amount_outstanding
     self.sale.amount_received =   self.sale.amount_received.to_f + paid_amount.to_f
-    self.sale.amount_changed = paid_amount.to_f - self.sale.amount_received
+    self.sale.amount_changed = paid_amount.to_f - self.sale.amount_received.to_f
-    if (self.sale.grand_total <=   self.sale.amount_received.to_f && self.sale.amount_changed.to_f > 0)
+    all_received_amount = 0.0
+    sObj = Sale.find(self.sale_id)
+    sObj.sale_payments.each do |spay|
+        all_received_amount += spay.payment_amount.to_f
+    end
+
+    if (self.sale.grand_total <= all_received_amount)
       self.sale.payment_status = "paid"
       self.sale.sale_status = "completed"
       self.sale.save!
+      rebat()
     end
 
   end
 
+  def rebat
+    
+  end
+
   private
   def generate_custom_id
     self.sale_payment_id = SeedGenerator.generate_id(self.class.name, "SPI")

app/models/seed_generator.rb

@@ -1,7 +1,9 @@
 class SeedGenerator < ApplicationRecord
+
   def self.generate_id(model, prefix)
     seed = SeedGenerator.find_by_model(model)
     new_receipt_no = 0
+
     if (seed.nil?)
       seed = SeedGenerator.new()
       seed.model = model
@@ -16,8 +18,8 @@ class SeedGenerator < ApplicationRecord
     end
 
     padding_len = 15 - prefix.length
-
+    saleOrderId = prefix +"-"+ seed.current.to_s.to_s.rjust((14-prefix.length)+1,'0')
-    return prefix +"-"+ seed.current.to_s.to_s.rjust((14-prefix.length)+1,'0')
+    return saleOrderId
 
   end
 

app/models/settings/membership_action.rb

@@ -1,2 +0,0 @@
-class Settings::MembershipAction < ApplicationRecord
-end

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

@@ -39,6 +39,7 @@
               <p class="hidden orders-id"><%= unique_id  %></p>   
               <p class="hidden customer-id"><%= bko.customer_id  %></p>   
               <h4 class="card-title orders-table"><%= bko.table_name %></h4>                                 
+
               <p class="card-text">
                 Receipt No :
                 <span class="orders-receipt-no">
@@ -227,13 +228,18 @@
     <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Edit</button>
     <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Move</button>
 
+<<<<<<< HEAD
     <button type="button" id="customer"class="btn btn-primary btn-lg btn-block" disabled>Customer</button>
     <button type="button" id="request_bills" class="btn btn-primary btn-lg btn-block">Req.Bill</button>
+=======
+    <button type="button" class="btn btn-primary btn-lg btn-block" disabled id="customer" disabled>Customer</button>
+    <button type="button" id="request_bills" class="btn btn-primary btn-lg btn-block" disabled>Req.Bill</button>
+>>>>>>> 6d4ef8e2adaa39c710a9b30dcb35737b6be2410e
     <!-- Cashier Buttons -->
-    <button type="button" id="discount" class="btn btn-primary btn-lg btn-block">Discount</button>
+    <button type="button" id="discount" class="btn btn-primary btn-lg btn-block" disabled>Discount</button>
     <!-- <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Tax</button> -->
 
-    <button type="button" id="pay-bill" class="btn btn-primary btn-lg btn-block" >Pay</button>
+    <button type="button" id="pay-bill" class="btn btn-primary btn-lg btn-block" disabled>Pay</button>
     <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Re.Print</button>
   </div>
 </div>

app/views/origami/mpu/create.json.jbuilder

@@ -0,0 +1,5 @@
+if(@status)
+  json.status @status
+else
+  json.status false
+end

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

@@ -0,0 +1,26 @@
+<h2> MPU </h2>
+
+
+Amount :
+
+<input type="text" name="amount" id="amount" value=""/>
+
+<button type="submit" id="mpu_pay" > PAY </button>
+
+<script>
+  $('#mpu_pay').on('click',function(){
+    var amount = $('#amount').val();
+    var sale_id = "<%= @sale_id %>";
+
+    $.ajax({type: "POST",
+      url: "<%= origami_create_mpu_payment_path  %>",
+      data: "amount="+ amount + "&sale_id="+ sale_id,
+      success:function(result){
+        if(result){
+          alert("Payment success")
+          window.location.href = '/origami/sale/'+ sale_id  + "/payment";
+       }
+      }
+    });
+  })
+</script>

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

@@ -1,177 +1,19 @@
 <div class="row">
 
-	<div class="col-lg-5 col-md-5 col-sm-3">
+	<div >
-			<div class="card">
+			<div >
 				<% @payment_method_setting.each do |payment_method|%>
-					<div class="col-md-5">
+					<div class="purple others-payment bottom left" data-type="<%= payment_method.payment_method %>" id="<%= payment_method.payment_method %>" data-url="<%=payment_method.gateway_url%>" data-sale-id="<%= @sale_id%>"><%= payment_method.payment_method %></div>
-		            	<div class="col-md-12 long purple " id="<%= payment_method.payment_method%>" data-url="<%=payment_method.gateway_url%>" data-sale-id="<%= @sale_id%>"><%= payment_method.payment_method %></div>
-		         	</div>
 				<% end %>
 			</div>
 	</div>
-	
-    <div class="col-lg-7 col-md-7 col-sm-7">
-    	<div class="rebate-form" hidden="true">
-    		<div class="row">
-	    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-	      			<label class="col-lg-4 col-md-4 col-sm-4">Valid Amount</label>
-				      	<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="">
-	    		</div>
-	    		<hr>
-	    	</div>	
-	    	<div class="row">
-	    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
-	      			<label class="col-lg-4 col-md-4 col-sm-4">Used Amount</label>
-	      			<div id="used_amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
-	    		</div>
-	    		<hr>
-	    	</div>	
-    	</div>
-    	<div class="row">
-	      <div class="col-md-12">
-	         <div class="row">
-	           <div class="col-md-7">
-	              <div class="row">
-	                 <div class="col-md-3 cashier_number" data-value="1" data-type="num">1</div>
-	                 <div class="col-md-3 cashier_number" data-value="2" data-type="num">2</div>
-	                 <div class="col-md-3 cashier_number" data-value="3" data-type="num">3</div>
-	              </div>
-	            </div>
-	           <div class="col-md-5">
-	              <div class="col-md-12 cashier_number long" data-value="1000" data-type="add">1000</div>
-	           </div>
-	         </div>
-	         <div class="row">
-	           <div class="col-md-7">
-	             <div class="row">
-	                <div class="col-md-3 cashier_number" data-value="4" data-type="num">4</div>
-	                <div class="col-md-3 cashier_number" data-value="5" data-type="num">5</div>
-	                <div class="col-md-3 cashier_number" data-value="6" data-type="num">6</div>
-	             </div>
-	           </div>
-	           <div class="col-md-5">
-	             <div class="col-md-12 cashier_number long" data-value="5000" data-type="add">5000</div>
-	           </div>
-	         </div>
-	         <div class="row">
-	            <div class="col-md-7">
-	              <div class="row">
-	                 <div class="col-md-3 cashier_number" data-value="7" data-type="num">7</div>
-	                 <div class="col-md-3 cashier_number" data-value="8" data-type="num">8</div>
-	                 <div class="col-md-3 cashier_number" data-value="9" data-type="num">9</div>
-	              </div>
-	            </div>
-	            <div class="col-md-5">
-	                <div class="col-md-12 cashier_number long" data-value="10000" data-type="add">10000</div>
-	            </div>
-	          </div>
-	          <div class="row">
-	             <div class="col-md-7">
-	               <div class="row">
-	                  <div class="col-md-3 cashier_number" data-value="0" data-type="num">0</div>
-	                  <div class="col-md-3 cashier_number" data-value="." data-type="num">.</div>
-	                  <div class="col-md-3 cashier_number" data-value="00" data-type="num">00</div>
-	               </div>
-	             </div>
-	             <div class="col-md-5">
-	                <div class="col-md-12 cashier_number long" data-value="50000" data-type="add">50000</div>
-	             </div>
-	          </div>
-	          <div class="row">
-	             <div class="col-md-7">
-	               <div class="row">
-	                 <div class="col-md-3 cashier_number"></div>
-	                 <div class="col-md-3 cashier_number">DEL</div>
-	                 <div class="col-md-3 cashier_number">CLR</div>
-	               </div>
-	             </div>
-	             <div class="col-md-5">
-	                <div class="col-md-12 cashier_number long purple" id="redeem" data-value="<%=@sale_id %>" data-member-value = "<%= @membership_id %>">PAY</div>
-	             </div>
-	           </div>
-	      </div>
 </div>
 
-    </div>
-</div>
-<div class="row">
-	
-</div>
 <script type="text/javascript">
-$(document).on('click', '.cashier_number', function(event){
-        // event.stopPropagation();
-        // event.preventDefault();
-        // if(event.handled !== true) {
-            var original_value;
-            original_value = $('#used_amount').text();
-
-            var input_value = $(this).attr("data-value");
 
+$('.others-payment').on('click',function(){
 	var input_type = $(this).attr("data-type");
-            	switch (input_type) {
+	var sale_id = $(this).attr("data-sale-id");
-              		case 'num':
+	window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment/" + input_type;
-		              	if (original_value == "0.0"){
-			                $('#used_amount').text(input_value);
-			            }else{
-			                $('#used_amount').append(input_value);
-			            }
-              		break;
-
-              		case 'add':
-	                	var input_value = $(this).attr("data-value");
-	                	amount = parseInt(input_value) + parseInt(original_value);
-	                	$('#used_amount').html(amount);
-                
-             		break;
-             		case 'clr':
-             			$('#used_amount').html("0.0");
-             		break;
-
-          		}
-          	// event.handled = true;
-        // } else {
-        //     return false;
-        // }
-});
-	  
-$("#REDIMREBATE").click(function(){
-		$('.rebate-form').removeAttr("hidden");
-		gateway_url = $(this).attr("data-url");
-		sale_id = $(this).attr("data-sale-id");
-		$.ajax({
-			type: "GET",
-			url:  "../../../../settings/membership_actions",
-			data: {type:"get_account_balance_url",gateway_url:gateway_url,sale_id:sale_id},
-			success: function(result){
-				$("#valid_amount").val(result[1]);
-			}
 })
-
-
-});
-
-$("#redeem").click(function(){
-	valid_amount = $("#valid_amount").val();
-	sale_id = $("#REDIMREBATE").attr("data-sale-id");
-	membership_id = $(this).attr("data-member-value");
-	redeem_amount = parseInt($("#used_amount").text());
-	if(redeem_amount<=0){
-		alert(" Insufficient Amount!")
-	}else if(valid_amount< redeem_amount){
-		alert("Please type valid amount");
-	}else{
-		$.ajax({
-			type: "POST",
-			url:  "<%=origami_paypar_payment_process_path%>",
-			data: {redeem_amount:redeem_amount,membership_id:membership_id,sale_id:sale_id},
-			success: function(result){
-				if(result.status == true){
-					window.location.href = '/origami/sale/'+ sale_id  + "/payment"
-				}else{
-					alert(result.message);
-				}
-			}
-		})
-	}
-});
 </script>

app/views/origami/payments/create.json.jbuilder

@@ -0,0 +1 @@
+json.status true

app/views/origami/payments/show.html.erb

@@ -1,25 +1,35 @@
 
 <div class="row">
-<div class="col-lg-5 col-md-5 col-sm-3">
+<div class="col-lg-6 col-md-6 col-sm-3">
     <div class="card"  >
       <div class="card-header">
         <div id="order-title">
-        	<span><strong>Receipt No : <%=@sale_data.receipt_no rescue ' '%></strong></span>
+          <table>
-          <span style="margin-left: 24%"><strong>Receipt Date : <%=@sale_data.receipt_date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></strong></span>
+            <tr>
-        	<span><strong>Table No</strong> <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %></span>
+              <td style="width:60%;"><strong>Receipt No : <%=@sale_data.receipt_no rescue ' '%></strong></td>
-          <span style="margin-left: 27%"><strong>Sale Id</strong> </span><span id="sale_id"><% if @sale_data %><%=@sale_data.sale_id %><% end %></span>
+              <td style="width:40%;"><strong>Receipt Date : <%=@sale_data.receipt_date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></strong></td>
+            </tr>
+            <tr>
+              <td><strong>Table No</strong> <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %></td>
+              <td><strong>Sale Id</strong> </span><span id="sale_id"><% if @sale_data %><%=@sale_data.sale_id %><% end %></td>
+            </tr>
+            <tr>
+              <td><strong>Customer :</strong> Default Customer</td>
+              <td><strong>Points :</strong>  1234 </td>
+            </tr>
+          </table>
         </div>
       </div>
       <div class="card-block">
         <div class="card-title">
-          <table class="table">
+          <table >
-            <thead>
+            <!-- <thead> -->
               <tr>
-                <th style="width:60%; text-align:left">Items</th>
+                <th style="width:80%;">Items</th>
-                <th style="width:20%; text-align:right">QTY</td>
+                <th style="width:20%;">QTY</td>
-                <th style="width:20%; text-align:right">Price</td>
+                <th style="width:20%;">Price</td>
               </tr>
-            </thead>
+            <!-- </thead> -->
           </table>
         </div>
         <div id="table-details" class="card-text" style="min-height:400px; max-height:400px; overflow-x:scroll">
@@ -71,99 +81,87 @@
     </div>
   </div>
   <div class="col-lg-5 col-md-5 col-sm-3">
-    <div class="row">
+    <div class="row" style="margin-top:10px;">
-      <div class="col-md-8"><strong>AMOUNT DUE</strong></div>
+      <div class="col-md-8"><strong style="font-size:18px;">Amount Due</strong></div>
-      <div class="col-md-4"><strong><span id="amount_due"><%= @sale_data.grand_total %></span></strong></div>
+      <div class="col-md-4"><strong><span id="amount_due" style="font-size:18px;"><%= @sale_data.grand_total %></span></strong></div>
     </div>
     <hr>
     <div class="row">
-      <div class="col-md-8">CASH</div>
+      <div class="col-md-8">Cash</div>
-      <div class="col-md-4" id="cash" >0.0</div>
+      <div class="col-md-4" id="cash" ><%= @cash %></div>
     </div>
     <hr>
     <div class="row" id="credit_payment">
-      <div class="col-md-8">CREDIT</div>
+      <div class="col-md-8">Credit</div>
-      <div class="col-md-4">0.0</div>
+      <div class="col-md-4" id="credit">0.0</div>
     </div>
       <hr>
     <div class="row" id="card_payment">
-      <div class="col-md-8">OTHERS PAYMENT</div>
+      <div class="col-md-8">Others Payment</div>
-      <div class="col-md-4">0.0</div>
+      <div class="col-md-4" id="others"><%= @other %></div>
     </div>
       <hr>
     <div class="row">
-      <div class="col-md-8">BALANCE</div>
+      <div class="col-md-8">Balance</div>
       <div class="col-md-4"><span id='balance'><%= @sale_data.grand_total %></span></div>
     </div>
       <hr>
+
       <div class="row">
-      <div class="col-md-12">
+         <div class="col-lg-6 col-md-1 col-sm-1">
-         <div class="row">
+           <div class="row bottom">
-           <div class="col-md-7">
+             <div class=" cashier_number " data-value="1" data-type="num">1</div>
-              <div class="row">
+             <div class=" cashier_number left" data-value="2" data-type="num">2</div>
-                 <div class="col-md-3 cashier_number" data-value="1" data-type="num">1</div>
+             <div class=" cashier_number left" data-value="3" data-type="num">3</div>
-                 <div class="col-md-3 cashier_number" data-value="2" data-type="num">2</div>
+           </div>
-                 <div class="col-md-3 cashier_number" data-value="3" data-type="num">3</div>
+           <div class="row bottom">
+             <div class=" cashier_number " data-value="4" data-type="num">4</div>
+             <div class=" cashier_number left" data-value="5" data-type="num">5</div>
+             <div class=" cashier_number left" data-value="6" data-type="num">6</div>
+           </div>
+           <div class="row bottom">
+             <div class=" cashier_number " data-value="7" data-type="num">7</div>
+             <div class=" cashier_number left" data-value="8" data-type="num">8</div>
+             <div class=" cashier_number left" data-value="9" data-type="num">9</div>
+           </div>
+           <div class="row bottom">
+             <div class=" cashier_number " data-value="0" data-type="num">0</div>
+             <div class=" cashier_number left" data-value="." data-type="num">.</div>
+             <div class=" cashier_number left" data-value="00" data-type="num">00</div>
+           </div>
+           <div class="row bottom">
+             <div class=" cashier_number"></div>
+             <div class=" cashier_number red left" data-type="del">Del</div>
+             <div class=" cashier_number green left" data-type="clr">Clr</div>
            </div>
          </div>
-           <div class="col-md-5">
+         <div class="col-lg-6 col-md-1 col-sm-1">
-              <div class="col-md-12 cashier_number long" data-value="1000" data-type="add">1000</div>
+           <div class="row bottom">
-           </div>
+             <div class="cashier_number long" data-value="1000" data-type="add">1000</div>
-         </div>
+             <div class="cashier_number long left" data-value="3000" data-type="add">3000</div>
-         <div class="row">
-           <div class="col-md-7">
-             <div class="row">
-                <div class="col-md-3 cashier_number" data-value="4" data-type="num">4</div>
-                <div class="col-md-3 cashier_number" data-value="5" data-type="num">5</div>
-                <div class="col-md-3 cashier_number" data-value="6" data-type="num">6</div>
-             </div>
-           </div>
-           <div class="col-md-5">
-             <div class="col-md-12 cashier_number long" data-value="5000" data-type="add">5000</div>
-           </div>
-         </div>
-         <div class="row">
-            <div class="col-md-7">
-              <div class="row">
-                 <div class="col-md-3 cashier_number" data-value="7" data-type="num">7</div>
-                 <div class="col-md-3 cashier_number" data-value="8" data-type="num">8</div>
-                 <div class="col-md-3 cashier_number" data-value="9" data-type="num">9</div>
-              </div>
-            </div>
-            <div class="col-md-5">
-                <div class="col-md-12 cashier_number long" data-value="10000" data-type="add">10000</div>
-            </div>
-          </div>
-          <div class="row">
-             <div class="col-md-7">
-               <div class="row">
-                  <div class="col-md-3 cashier_number" data-value="0" data-type="num">0</div>
-                  <div class="col-md-3 cashier_number" data-value="." data-type="num">.</div>
-                  <div class="col-md-3 cashier_number" data-value="00" data-type="num">00</div>
-               </div>
-             </div>
-             <div class="col-md-5">
-                <div class="col-md-12 cashier_number long" data-value="50000" data-type="add">50000</div>
-             </div>
-          </div>
-          <div class="row">
-             <div class="col-md-7">
-               <div class="row">
-                 <div class="col-md-3 cashier_number"></div>
-                 <div class="col-md-3 cashier_number red" data-type="del">DEL</div>
-                 <div class="col-md-3 cashier_number green" data-type="clr">CLR</div>
-               </div>
-             </div>
-             <div class="col-md-5">
-                <div class="col-md-12 cashier_number long purple " id="pay">PAY</div>
-             </div>
            </div>
+           <div class="row bottom">
+             <div class="cashier_number long" data-value="5000" data-type="add">5000</div>
+             <div class="cashier_number long left" data-value="10000" data-type="add">10000</div>
            </div>
+           <div class="row bottom">
+             <div class="pay purple" id="pay">Pay</div>
            </div>
          </div>
       </div>
 
+  </div>
+  <div class="col-lg-1 col-md-1 col-sm-1">
+    <!-- Waiter Buttons -->
+    <button type="button" class="btn btn-primary btn-lg btn-block"> Foc </button>
+    <button type="button" class="btn btn-primary btn-lg btn-block"> Void </button>
+  </div>
+  </div>
+
 <script>
+$(document).ready(function(){
+  update_balance();
+})
 $(document).on('click', '.cashier_number', function(event){
   if(event.handled !== true) {
       var original_value;
@@ -231,7 +229,8 @@ $( document ).ready(function() {
         url: "<%= origami_payment_process_path %>",
         data: "cash="+ cash + "&sale_id=" + sale_id,
         success:function(result){
-          alert("THANK YOU")
+          alert("Thank you")
+          window.location.href = '/origami';
         }
       });
    }
@@ -242,9 +241,9 @@ $( document ).ready(function() {
 function update_balance(){
   var cash = $('#cash').text();
   var credit = $('#credit').text();
-  var card = $('#card').text();
+  var card = $('#others').text();
   var amount_due = $('#amount_due').text();
-  var total = cash + credit + card
+  var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card)
   var result = amount_due - total
   $('#balance').text(result);
 }

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

@@ -0,0 +1,161 @@
+<div class="row">
+
+	<div class="col-lg-5 col-md-5 col-sm-3">
+			<div class="card">
+				<div class="rebate-form">
+		    		<div class="row">
+			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
+			      			<label class="col-lg-4 col-md-4 col-sm-4">Valid Amount</label>
+						      	<input type="text" name="valid_amount" id="valid_amount" class="form-control col-lg-7 col-md-7 col-sm-7" readonly="" value="<%=@membership_rebate_balance%>" data-value="<%=@sale_id %>" data-member-value="<%= @membership_id %>">
+			    		</div>
+			    		<hr>
+			    	</div>
+			    	<div class="row">
+			    		<div class="form-group col-lg-12 col-md-12 col-sm-12">
+			      			<label class="col-lg-4 col-md-4 col-sm-4">Used Amount</label>
+			      			<div id="used_amount" class="form-control col-lg-7 col-md-7 col-sm-7">0.0</div>
+			    		</div>
+			    		<hr>
+			    	</div>
+		    	</div>
+			</div>
+	</div>
+
+    <div class="col-lg-7 col-md-7 col-sm-7">
+    	
+    	<div class="row">
+	      <div class="col-md-12">
+	         <div class="row">
+	           <div class="col-md-7">
+	              <div class="row">
+	                 <div class="col-md-3 cashier_number" data-value="1" data-type="num">1</div>
+	                 <div class="col-md-3 cashier_number" data-value="2" data-type="num">2</div>
+	                 <div class="col-md-3 cashier_number" data-value="3" data-type="num">3</div>
+	              </div>
+	            </div>
+	           <div class="col-md-5">
+	              <div class="col-md-12 cashier_number long" data-value="1000" data-type="add">1000</div>
+	           </div>
+	         </div>
+	         <div class="row">
+	           <div class="col-md-7">
+	             <div class="row">
+	                <div class="col-md-3 cashier_number" data-value="4" data-type="num">4</div>
+	                <div class="col-md-3 cashier_number" data-value="5" data-type="num">5</div>
+	                <div class="col-md-3 cashier_number" data-value="6" data-type="num">6</div>
+	             </div>
+	           </div>
+	           <div class="col-md-5">
+	             <div class="col-md-12 cashier_number long" data-value="5000" data-type="add">5000</div>
+	           </div>
+	         </div>
+	         <div class="row">
+	            <div class="col-md-7">
+	              <div class="row">
+	                 <div class="col-md-3 cashier_number" data-value="7" data-type="num">7</div>
+	                 <div class="col-md-3 cashier_number" data-value="8" data-type="num">8</div>
+	                 <div class="col-md-3 cashier_number" data-value="9" data-type="num">9</div>
+	              </div>
+	            </div>
+	            <div class="col-md-5">
+	                <div class="col-md-12 cashier_number long" data-value="10000" data-type="add">10000</div>
+	            </div>
+	          </div>
+	          <div class="row">
+	             <div class="col-md-7">
+	               <div class="row">
+	                  <div class="col-md-3 cashier_number" data-value="0" data-type="num">0</div>
+	                  <div class="col-md-3 cashier_number" data-value="." data-type="num">.</div>
+	                  <div class="col-md-3 cashier_number" data-value="00" data-type="num">00</div>
+	               </div>
+	             </div>
+	             <div class="col-md-5">
+	                <div class="col-md-12 cashier_number long" data-value="50000" data-type="add">50000</div>
+	             </div>
+	          </div>
+	          <div class="row">
+	             <div class="col-md-7">
+	               <div class="row">
+	                 <div class="col-md-3 cashier_number"></div>
+	                 <div class="col-md-3 cashier_number red" data-type="del">DEL</div>
+	                 <div class="col-md-3 cashier_number green" data-type="clr">CLR</div>
+	               </div>
+	             </div>
+	             <div class="col-md-5">
+	                <div class="col-md-12 cashier_number long purple" id="redeem" >PAY</div>
+	             </div>
+	           </div>
+	      </div>
+    </div>
+
+    </div>
+</div>
+<div class="row">
+
+</div>
+<script type="text/javascript">
+$(document).on('click', '.cashier_number', function(event){
+        event.stopPropagation();
+        event.preventDefault();
+        if(event.handled !== true) {
+            var original_value;
+            original_value = $('#used_amount').text();
+
+            var input_value = $(this).attr("data-value");
+
+            var input_type = $(this).attr("data-type");
+            	switch (input_type) {
+              		case 'num':
+		              	if (original_value == "0.0"){
+			                $('#used_amount').text(input_value);
+			            }else{
+			                $('#used_amount').append(input_value);
+			            }
+              		break;
+
+              		case 'add':
+	                	var input_value = $(this).attr("data-value");
+	                	amount = parseInt(input_value) + parseInt(original_value);
+	                	$('#used_amount').html(amount);
+
+             		break;
+             		case 'clr':
+             			$('#used_amount').html("0.0");
+             		break;
+             		case 'del' :
+			          var cash=$('#used_amount').text();
+			          $('#used_amount').text(cash.substr(0,cash.length-1));
+			        break;
+
+          		}
+          	event.handled = true;
+        } else {
+            return false;
+        }
+});
+
+$("#redeem").click(function(){
+	valid_amount = $("#valid_amount").val();
+	sale_id = $("#valid_amount").attr('data-value');
+	membership_id = $("#valid_amount").attr('data-member-value');
+	redeem_amount = parseInt($("#used_amount").text());
+	if(redeem_amount<=0 ){
+		alert(" Insufficient Amount!")
+	}else if(valid_amount< redeem_amount || redeem_amount == ""){
+		alert("Please type valid amount");
+	}else{
+		$.ajax({
+			type: "POST",
+			url:  "<%=origami_paypar_payment_process_path%>",
+			data: {redeem_amount:redeem_amount,membership_id:membership_id,sale_id:sale_id},
+			success: function(result){
+				if(result.status == true){
+					window.location.href = '/origami/sale/'+ sale_id  + "/payment"
+				}else{
+					alert(result.message);
+				}
+			}
+		})
+	}
+});
+</script>

app/views/settings/membership_actions/_form.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for(@settings_membership_action) do |f| %>
+<%= simple_form_for([:settings,@settings_membership_action]) do |f| %>
   <%= f.error_notification %>
 
   <div class="form-inputs">

app/views/settings/membership_actions/edit.html.erb

@@ -2,5 +2,5 @@
 
 <%= render 'form', settings_membership_action: @settings_membership_action %>
 
-<%= link_to 'Show', @settings_membership_action %> |
+<%= link_to 'Show', settings_membership_action_path(@settings_membership_action) %> |
 <%= link_to 'Back', settings_membership_actions_path %>

app/views/settings/membership_actions/index.html.erb

@@ -28,9 +28,9 @@
         <td><%= settings_membership_action.merchant_account_id %></td>
         <td><%= settings_membership_action.created_by %></td>
         <td><%= settings_membership_action.additional_parameter %></td>
-        <td><%= link_to 'Show', settings_membership_action %></td>
+        <td><%= link_to 'Show', settings_membership_action_path(settings_membership_action) %></td>
         <td><%= link_to 'Edit', edit_settings_membership_action_path(settings_membership_action) %></td>
-        <td><%= link_to 'Destroy', settings_membership_action, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td><%= link_to 'Destroy', settings_membership_action_path(settings_membership_action), method: :delete, data: { confirm: 'Are you sure?' } %></td>
       </tr>
     <% end %>
   </tbody>

config/routes.rb

@@ -94,6 +94,10 @@ Rails.application.routes.draw do
     get '/:customer_id/get_customer' => 'home#get_customer'
     post '/:sale_id/update_sale' , to: "home#update_sale_by_customer"#update customer id in sale table
 
+    # get 'sale/:sale_id/payment/others_payment/:payment_method' => "redeem_payments#index"
+    get 'sale/:sale_id/payment/others_payment/MPU' => "mpu#index"
+    post 'create_mpu_payment' => "mpu#create"
+    get 'sale/:sale_id/payment/others_payment/REDEEMREBATE' => "redeem_payments#index"
   end
 
   #--------- Waiter/Ordering Station ------------#

db/migrate/20170403140820_create_order_items.rb

@@ -13,6 +13,7 @@ class CreateOrderItems < ActiveRecord::Migration[5.1]
       t.string :options
       t.json :set_menu_items #this parameter is require to route the items correctly
       t.boolean :taxable, :null => false, :default => true
+      t.string :completed_by
       t.timestamps
     end
   end

db/migrate/20170403153001_create_payment_method_settings.rb

@@ -7,7 +7,7 @@ class CreatePaymentMethodSettings < ActiveRecord::Migration[5.1]
       t.string :gateway_url
       t.string :auth_token
       t.string :merchant_account_id
-
+      t.string :additional_parameters
       t.timestamps
     end
   end

db/migrate/20170403174029_create_sale_orders.rb

@@ -1,8 +1,8 @@
 class CreateSaleOrders < ActiveRecord::Migration[5.1]
   def change
     create_table :sale_orders, :id => false do |t|
-      t.primary_key :sale_order_id #custom primary key - to ensure consistence for cloud syncing
       
+      t.string :sale_order_id, :limit => 16, :primary_key => true
       t.string :sale_id, foreign_key: true,:limit => 16
       t.string :order_id, foreign_key: true, :limit => 16
 

db/migrate/20170421171849_add_company_address_email.rb

@@ -1,5 +0,0 @@
-class AddCompanyAddressEmail < ActiveRecord::Migration[5.1]
-  def change
-  		add_column :order_items, :completed_by, :string
-  end
-end

db/migrate/20170608111602_additionparametertopaymentsettings.rb

@@ -1,5 +0,0 @@
-class Additionparametertopaymentsettings < ActiveRecord::Migration[5.1]
-  def change
-  		add_column :payment_method_settings, :additional_parameters, :string
-  end
-end

db/migrate/20170611084537_create_membership_actions.rb

@@ -1,6 +1,6 @@
-class CreateSettingsMembershipActions < ActiveRecord::Migration[5.1]
+class CreateMembershipActions < ActiveRecord::Migration[5.1]
   def change
-    create_table :settings_membership_actions do |t|
+    create_table :membership_actions do |t|
     	t.string :membership_type
       t.boolean :is_active
       t.string :gateway_communication_type
@@ -8,7 +8,7 @@ class CreateSettingsMembershipActions < ActiveRecord::Migration[5.1]
       t.string :auth_token
       t.string :merchant_account_id
       t.string :created_by
-      t.string :additional_parameter
+      t.jsonb :additional_parameter
 
       t.timestamps
     end

db/seeds.rb

@@ -144,6 +144,17 @@ order_station1=PrintSetting.create({name: "OrderItemPdf", unique_code: "OrderIte
 order_station2=PrintSetting.create({name: "Order Summary", unique_code: "OrderSummaryPdf", printer_name: "EPSON-TM-T82-S-A"})
 request_bill_printer=PrintSetting.create({name: "Receipt Bill", unique_code: "ReceiptBillPdf", printer_name: "EPSON-TM-T82-S-A"})
 
+member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "192.168.1."})
+
+member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1}},
+  {membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1}},
+  {membership_type:"create_membership_customer",gateway_url:"/api/generic_customer/create_membership_customer"},
+  {membership_type:"update_membership_customer",gateway_url:"/api/generic_customer/update_membership_customer"},
+  {membership_type:"get_all_member_group",gateway_url:"/api/member_group/get_all_member_group"},
+  {membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1}},
+  {membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data"}
+  ])
+
 # shop = Shop.create(
 #   {name: "Beauty In The Pot", address: "address", township: "Yangon", city: "Yangon", state: "Yangon", 
 #     country: "Myanmar", phone_no: "09123456789", reservation_no: "bip000001", license: "license", 

lib/tasks/clear_data.rake

@@ -0,0 +1,16 @@
+namespace :clear do
+  desc "Clear Data"
+  task :data => :environment do
+    BookingOrder.delete_all
+    Booking.delete_all
+    OrderItem.delete_all
+    AssignedOrderItem.delete_all
+    Order.delete_all
+    SaleOrder.delete_all
+    SaleItem.delete_all
+    Sale.delete_all
+    SaleAudit.delete_all
+    SalePayment.delete_all
+    puts "Clear Data Done."
+  end
+end

spec/controllers/origami/redeem_payments_controller_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Origami::RedeemPaymentsController, type: :controller do
+
+end

spec/helpers/origami/redeem_payments_helper_spec.rb

@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the Origami::RedeemPaymentsHelper. For example:
+#
+# describe Origami::RedeemPaymentsHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+RSpec.describe Origami::RedeemPaymentsHelper, type: :helper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end