For Pull

Gemfile

@@ -13,7 +13,7 @@ gem 'rails', '~> 5.1.0'
 # gem 'mysql2', '>= 0.3.18', '< 0.5'
 
 #Use PosgreSQL
-#gem 'pg'
+gem 'pg'
 
 # redis server for cable
 # gem 'redis', '~> 3.0'

app/controllers/origami/others_payments_controller.rb

@@ -3,7 +3,10 @@ class Origami::OthersPaymentsController < BaseOrigamiController
 
   def index
   	@membership_rebate_balance = 0
-  	@membership_id = 0
+  	@sale_id = params[:sale_id]
+  	sale_data = Sale.find_by_sale_id(@sale_id)
+  	customer_data= Customer.find_by_customer_id(sale_data.customer_id)
+  	@membership_id = customer_data.membership_id
   	if !@membership_id.nil?
   		membership_setting = MembershipSetting.find_by_membership_type("smartpay_url")
 	  	membership_data = SalePayment.get_paypar_account(membership_setting.gateway_url,membership_setting.auth_token,@membership_id)
@@ -19,6 +22,7 @@ class Origami::OthersPaymentsController < BaseOrigamiController
 	  	else
 	  		@membership_rebate_balance = 0
 	  	end
+	end
   end
 
   def create

app/controllers/origami/paypar_controller.rb

@@ -1,3 +1,4 @@
 class Origami::PayparController < ApplicationController
-	
+	def create
+	end
 end

app/models/order.rb

@@ -271,7 +271,6 @@ class Order < ApplicationRecord
           left join sale_orders on sale_orders.order_id = orders.order_id
           left join sales on sales.sale_id = sale_orders.sale_id")
           .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to)
-
           .group("orders.order_id,order_items.order_items_id,dining_facilities.name,sales.receipt_no,bookings.booking_id,sales.sale_id")
 
   end

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

@@ -4,7 +4,7 @@
 			<div class="card">
 				<% if @membership_id!=0 %>
 				<div class="col-md-5">
-		            <div class="col-md-12 long purple " id="redim">Redim Amount</div>
+		            <div class="col-md-12 long purple " id="redeem_account">Redim Amount</div>
 		         </div>
 		         <% end %>
 			</div>
@@ -86,7 +86,7 @@
 	               </div>
 	             </div>
 	             <div class="col-md-5">
-	                <div class="col-md-12 cashier_number long purple " id="pay">PAY</div>
+	                <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>
@@ -123,6 +123,9 @@ $(document).on('click', '.cashier_number', function(event){
 	                	$('#used_amount').html(amount);
                 
              		break;
+             		case 'clr':
+             			$('#used_amount').html("0.0");
+             		break;
 
           		}
           	event.handled = true;
@@ -131,7 +134,23 @@ $(document).on('click', '.cashier_number', function(event){
         }
 });
 	  
-	$("#redim").click(function(){
+$("#redeem_account").click(function(){
 		$('.rebate-form').removeAttr("hidden");
-	})
+});
+
+$("#redeem").click(function(){
+	valid_amount = $("#valid_amount").val();
+	sale_id = $(this).attr("data-value")
+	membership_id = $(this).attr("data-member-value");
+	used_amount = parseInt($("#used_amount").text());
+	if(used_amount<=0){
+		alert(" Insufficient Amount!")
+	}else if(valid_amount< used_amount){
+		alert("Please type valid amount");
+	}else{
+		$.ajax({
+			
+		})
+	}
+});
 </script>

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

@@ -218,21 +218,21 @@ $( document ).ready(function() {
 
  $('#pay').click(function() {
 
-   if($('#balance').text() > 0){
-      alert(" Insufficient Amount!")
-   }else{
+     if($('#balance').text() > 0){
+        alert(" Insufficient Amount!")
+     }else{
     //  payment
-    var cash = $('#cash').text();
-    var credit = $('#credit').text();
-    var card = $('#card').text();
-    var sale_id = $('#sale_id').text();
-    $.ajax({type: "POST",
-      url: "<%= origami_payment_process_path %>",
-      data: "cash="+ cash + "&sale_id=" + sale_id,
-      success:function(result){
-        alert("THANK YOU")
-      }
-    });
+        var cash = $('#cash').text();
+        var credit = $('#credit').text();
+        var card = $('#card').text();
+        var sale_id = $('#sale_id').text();
+        $.ajax({type: "POST",
+          url: "<%= origami_payment_process_path %>",
+          data: "cash="+ cash + "&sale_id=" + sale_id,
+          success:function(result){
+            alert("THANK YOU")
+          }
+        });
 
    }
  });

db/seeds.rb

@@ -141,9 +141,9 @@ admin_employee = Employee.create({name: "Administrator", role: "Administrator",
 food = Account.create({title: "Food", account_type: "0"})
 beverage = Account.create({title: "Beverage", account_type: "1"})
 
-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", 
-    activated_at: "2017-06-06", license_data: "license_data", base_currency: "Ks", id_prefix: "abc"}
-  )
+# 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", 
+#     activated_at: "2017-06-06", license_data: "license_data", base_currency: "Ks", id_prefix: "abc"}
+#   )