added new image upload file

app/assets/javascripts/origami/payment.js

@@ -0,0 +1,113 @@
+// $(document).on('touchstart click', '.keypad', function(event){
+//         event.stopPropagation();
+//         event.preventDefault();
+//         if(event.handled !== true) {
+//
+//             // Do your magic here.
+//             var input_value = $(this).attr("data-value");
+//             switch (input_value) {
+//
+//                 case 'delete':
+//                     process_delete_payment();
+//                     break;
+//
+//                 case 'foc':
+//                     remove_input_action();
+//                     $(".foc").attr("data-action","true");
+//                     if(customerName.toString() != " "){ //if already chosen customer
+//                         if($("#foc_reason_lists").attr("foc_reason") == ' '){
+//                             alert("Please! Choose or Add FOC reason");
+//                             foc_additional_form();
+//                         }
+//                         else{
+//                             process_foc_payment();
+//                         }
+//                     }
+//                     else{
+//                         alert("Please! Choose or Save Customer");
+//                         foc_additional_form();
+//                     }
+//                     break;
+//
+//                 case 'nett':
+//                     remove_input_action();
+//                     $(".nett").attr("data-action","true");
+//                     if($(".credit_note_payment").hasClass("payment_selected")){
+//                         if(customerName == " "){
+//                             alert("Please! Choose or Save Customer");
+//                             showCustomer();
+//                         }
+//                         else{
+//                             $("#accept_payment_btn").attr("data-payment","credit");
+//                             process_nett_payment();
+//                         }
+//                     }
+//                     else{
+//                             process_nett_payment();
+//                     }
+//                     break;
+//
+//                 case 'edit':
+//                     process_edit_invoice();
+//                     break;
+//
+//                 case 'cancel':
+//                     remove_input_action();
+//                     var status = $("#label_amountdue").attr("data-status");
+//                     if (status != 'completed' && status != 'void'){
+//                         $(".cancel").attr("data-action","true");
+//                         var message = confirm("Are you sure to void? Please, add reason!");
+//                         if (message == true) {
+//                             $(".additional_form").hide();
+//                             $("#void_sale_additional_form").show();
+//                             process_cancel_payment();
+//                         }
+//                     }
+//                     else{
+//                         $(".cancel").addClass("dim");
+//                     }
+//                     break;
+//
+//                 case 'ent':
+//                     amount_due = parseFloat($("#label_amountdue").attr("data-original"));
+//                     other_amt = parseFloat($("#label_cash_amount").attr("data-value"));
+//                     credit_amount = parseFloat($("#label_credit_note").text());
+//                     if ($(".credit_note_payment").hasClass("payment_selected") && credit_amount > 0){
+//                         if(customerName.toString() != " "){
+//                             if(credit_amount > (amount_due - other_amt)){
+//                                 alert("You shouldn't exceed the amount due.");
+//                             }
+//                             else{
+//                                 $("#accept_payment_btn").attr("data-payment","credit");
+//                                 update_balance_due();
+//                             }
+//                         }
+//                         else{
+//                             alert("Please! Choose or Save Customer");
+//                         }
+//                     }
+//                     else{
+//                         update_balance_due();
+//                     }
+//
+//                     break;
+//                 case 'clear':
+//                     process_clear_payment();
+//                     break;
+//
+//                 default:
+//
+//                     var existing_value = $(".payment_selected span").text();
+//
+//                     if (existing_value == "0" || existing_value == "0.00") { existing_value = ""; }
+//                     existing_value = existing_value + input_value;
+//                     $(".payment_selected span").text(existing_value);
+//
+//             }
+//
+//
+//             event.handled = true;
+//         } else {
+//             return false;
+//         }
+// });

app/assets/stylesheets/orgiami.scss

@@ -7,3 +7,21 @@
 //   min-height: 75rem;
 //   padding-top: 4.5rem;
 // }
+
+.cashier_number{
+	height:76px;
+	line-height:80px;
+	text-align:center;
+	background:#54A5AF;
+	float:left;
+	margin:2px;
+	font-size:20px;
+	color:white;
+	cursor:pointer;
+}
+.cashier_number:hover{
+	background:#A9F5F2;
+}
+.long{
+	width:100%
+}

app/controllers/origami/home_controller.rb

@@ -4,6 +4,7 @@ class Origami::HomeController < BaseOrigamiController
   	@order_rooms = Order.get_order_rooms()
   	@orders = Order.get_orders()
   end
+  
   def show
   	str = []
   	@order_details = OrderItem.get_order_items_details(params[:order_id])

app/controllers/origami/payments_controller.rb

@@ -1,6 +1,14 @@
 class Origami::PaymentsController < BaseOrigamiController
+
+
   def index
+
   end
+
   def create
   end
+
+  def show
+
+  end
 end

app/controllers/origami/request_bills_controller.rb

@@ -1,8 +1,10 @@
 class Origami::RequestBillsController < BaseOrigamiController
-  def show
+
+  def create
     @sale = Sale.new
 
     check_order = Order.find_by_id(params[:id])
+
     if check_order
     	@order_details = OrderItem.get_order_items_details(check_order.id)
   		@order_details = OrderItem.get_order_items_details(check_order.id)
@@ -10,13 +12,22 @@ class Origami::RequestBillsController < BaseOrigamiController
     	@sale_data = Sale.find_by_id(@sale_id)
     	@sale_items = SaleItem.where("sale_id=?",@sale_id)
     end
+
     unique_code="ReceiptBillPdf"
+
     print_settings=PrintSetting.find_by_unique_code(unique_code)
 
     printer = Printer::ReceiptPrinter.new(print_settings)
 
     printer.print_receipt_bill(print_settings,@sale_items,@sale)
 
+  end
 
+
+  def show
+    sale_id = params[:sale_id]
+    if Sale.exists?(sale_id)
+      @sale_data = Sale.find_by_id(sale_id)
+    end
   end
 end

app/models/order.rb

@@ -223,8 +223,7 @@ class Order < ApplicationRecord
         left join dining_facilities on dining_facilities.id = bookings.dining_facility_id
         left join order_items on order_items.order_id = orders.id")
         .where("dining_facilities.type=? and orders.order_type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,"dine_in",true)
-
+        .group("orders.id, order_items.id,dining_facilities.name")
-        .group("orders.id")
 
   end
    #Origami: Cashier : to view order type Room
@@ -248,8 +247,7 @@ class Order < ApplicationRecord
           left join bookings on bookings.id = booking_orders.id
           left join dining_facilities on dining_facilities.id = bookings.dining_facility_id
           left join order_items on order_items.order_id = orders.id")
-
           .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to)
-          .group("orders.id")
+          .group("orders.id,order_items.id,dining_facilities.name")
   end
 end

app/models/sale.rb

@@ -28,7 +28,8 @@ class Sale < ApplicationRecord
         end
         booking.sale_id = sale_id
       end
-
+        order = booking.booking_orders.take.order
+        link_order_sale(order.id)
       return status
     end
   end

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

@@ -143,7 +143,7 @@
     <!-- Cashier Buttons -->
     <button type="button" 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" class="btn btn-primary btn-lg btn-block" disabled>Pay</button>
+    <button type="button" id="pay" class="btn btn-primary btn-lg btn-block" >Pay</button>
     <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Re.Print</button>
   </div>
 </div>
@@ -196,10 +196,18 @@ function callOrderDetails(order_id){
 
 $( document ).ready(function() {
    $('#request_bills').click(function() {
-      window.location.href = '/origami/request_bills/'+table_or_order_id;
+      window.location.href = '/origami/request_bills/'+ table_or_order_id
       return false;
   });
 });
+
+$( document ).ready(function() {
+   $('#pay').click(function() {
+      window.location.href = '/origami/sale/'+ 10 + "/payment"
+      return false;
+  });
+});
+
 </script>
 <style type="text/css">
   .selected_color{

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

@@ -1,3 +1,4 @@
+
 <div class="row">
 <div class="col-lg-5 col-md-5 col-sm-3">
     <div class="card"  >
@@ -23,8 +24,7 @@
           <table class="table" id="append-table">
             <tbody>
             <% sub_total = 0 %>
-            <% if @sale_items %>
+	          <% @sale_data.sale_items.each do |sale_item| %>
-	          <% @sale_items.each do |sale_item| %>
 	          		<% sub_total += sale_item.qty*sale_item.unit_price%>
 	            	<tr>
 	                    <td style="width:60%; text-align:left">
@@ -38,7 +38,6 @@
 	                    </td>
 	                  </tr>
 	            <%end %>
-	          <%end %> 
             </tbody>
           </table>
         </div>
@@ -66,4 +65,111 @@
       </div>
     </div>
   </div>
+  <div class="col-lg-5 col-md-5 col-sm-3">
+    <div class="row">
+      <div class="col-md-8">AMOUNT DUE</div>
+      <div class="col-md-4"><%= @sale_data.grand_total %></div>
     </div>
+    <hr>
+    <div class="row">
+      <div class="col-md-8">CASH</div>
+      <div class="col-md-4">0.0</div>
+    </div>
+    <hr>
+    <div class="row">
+      <div class="col-md-8">CREDIT</div>
+      <div class="col-md-4">0.0</div>
+    </div>
+      <hr>
+    <div class="row">
+      <div class="col-md-8">CARD</div>
+      <div class="col-md-4">0.0</div>
+    </div>
+      <hr>
+    <div class="row">
+      <div class="col-md-8">BALANCE</div>
+      <div class="col-md-4">0.0</div>
+    </div>
+      <hr>
+    <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">1</div>
+                 <div class="col-md-3 cashier_number">2</div>
+                 <div class="col-md-3 cashier_number">3</div>
+              </div>
+            </div>
+           <div class="col-md-5">
+              <div class="col-md-12 cashier_number long">1000</div>
+           </div>
+         </div>
+         <div class="row">
+           <div class="col-md-7">
+             <div class="row">
+                <div class="col-md-3 cashier_number">4</div>
+                <div class="col-md-3 cashier_number">5</div>
+                <div class="col-md-3 cashier_number">6</div>
+             </div>
+           </div>
+           <div class="col-md-5">
+             <div class="col-md-12 cashier_number long">5000</div>
+           </div>
+         </div>
+         <div class="row">
+            <div class="col-md-7">
+              <div class="row">
+                 <div class="col-md-3 cashier_number">7</div>
+                 <div class="col-md-3 cashier_number">8</div>
+                 <div class="col-md-3 cashier_number">9</div>
+              </div>
+            </div>
+            <div class="col-md-5">
+                <div class="col-md-12 cashier_number long">10000</div>
+            </div>
+          </div>
+          <div class="row">
+             <div class="col-md-7">
+               <div class="row">
+                  <div class="col-md-3 cashier_number">0</div>
+                  <div class="col-md-3 cashier_number">.</div>
+                  <div class="col-md-3 cashier_number">00</div>
+               </div>
+             </div>
+             <div class="col-md-5">
+                <div class="col-md-12 cashier_number long">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">ENTER</div>
+             </div>
+           </div>
+      </div>
+    </div>
+  </div>
+  </div>
+
+<script>
+$(document).on('click', '.cashier_number', function(event){
+        event.stopPropagation();
+        event.preventDefault();
+        if(event.handled !== true) {
+            var input_value = $(this).attr("data-value");
+            switch (input_value) {
+
+            }
+            event.handled = true;
+        } else {
+            return false;
+        }
+});
+</script>

config/routes.rb

@@ -73,6 +73,7 @@ Rails.application.routes.draw do
       resources :customers, only: [:index,:new, :create ] #add customer type
     end
     resources :request_bills, only: [:show]
+    get 'sale/:sale_id/payment' => 'request_bills#show'
   end
 
   #--------- Waiter/Ordering Station ------------#

spec/models/print_setting_spec.rb~HEAD

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe PrintSetting, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/models/print_setting_spec.rb~crm

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe PrintSetting, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end