merge with origin master

2017-06-18 12:50:07 +06:30
parent 0e7042f00f e55ab32fad
commit 6d0cfd17ac
12 changed files with 78 additions and 80 deletions
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -17,6 +17,7 @@
 //= require cable

 $(document).ready(function(){
+	
 	// auto refresh every 10 seconds
 	// setTimeout(function(){
 	//    window.location.reload(1);
--- a/app/controllers/api/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -32,15 +32,12 @@ class Api::BillController < Api::ApiController
    # get printer info
    print_settings=PrintSetting.find_by_unique_code(unique_code)

-    # find order id by sale id
-    # sale_order = SaleOrder.find_by_sale_id(@sale_data.sale_id)
-
    # Calculate Food and Beverage Total
+
    food_total, beverage_total = SaleItem.calculate_food_beverage(@sale_items)

    printer = Printer::ReceiptPrinter.new(print_settings)
    printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, food_total, beverage_total)
-    redirect_to origami_path(@sale_data.sale_id)
  end


--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -103,4 +103,3 @@ class Oqs::HomeController < BaseOqsController
    .group("assigned_order_items.assigned_order_item_id")
  end
 end
-
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -20,7 +20,6 @@ class Origami::PaymentsController < BaseOrigamiController

      # get printer info
      print_settings=PrintSetting.find_by_unique_code(unique_code)
-
      # Calculate Food and Beverage Total
      food_total, beverage_total = SaleItem.calculate_food_beverage(saleObj.sale_items)

--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -231,7 +231,7 @@ class Order < ApplicationRecord
                    .joins("left join orders on orders.order_id = booking_orders.order_id")
                    .joins("left join sales on sales.sale_id = bookings.sale_id")
                    .where("(orders.status = 'new' or orders.status = 'billed') and (dining_facilities.type=? and dining_facilities.is_active=?)",DiningFacility::TABLE_TYPE,true)
-                    .group("bookings.booking_id")
+                    .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id")
                    # For PG
                    # booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true
                    # sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id
@@ -262,7 +262,7 @@ class Order < ApplicationRecord
                    .joins("left join orders on orders.order_id = booking_orders.order_id")
                    .joins("left join sales on sales.sale_id = bookings.sale_id")
                    .where("(orders.status = 'new' or orders.status = 'billed') and (dining_facilities.type=? and dining_facilities.is_active=?)",DiningFacility::ROOM_TYPE,true)
-                    .group("bookings.booking_id")
+                    .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_id")
                    # For PG
                    # booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true
                    # sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_id
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -70,6 +70,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
    #Generate PDF
    #Print
    pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, food_total, beverage_total, member_info)
+
    pdf.render_file "tmp/receipt_bill.pdf"
    self.print("tmp/receipt_bill.pdf")
  end
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -11,7 +11,6 @@ class ReceiptBillPdf < Prawn::Document
    self.item_height = 15
    self.item_description_width = (self.page_width-20) / 2
    self.label_width = 100
-
    # @item_width = self.page_width.to_i / 2
    # @qty_width = @item_width.to_i / 3
    # @double = @qty_width * 1.3
@@ -36,7 +35,6 @@ class ReceiptBillPdf < Prawn::Document
    if member_info != nil
        member_info(member_info)
    end
-
    footer
  end

--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -354,6 +354,7 @@
                <td class="charges-name"><strong>Discount:</strong></td>
                <td class="item-attr"><strong id="order-discount">(<%=@selected_item.total_discount rescue 0%>)</strong></td>
              </tr>
+
              <!-- <tr>
                <td class="charges-name"><strong>Tax:</strong></td>
                <td class="item-attr"><strong id="order-Tax"><%=@selected_item.total_tax rescue 0%></strong></td>
@@ -362,9 +363,8 @@
                <td class="charges-name"><strong>Grand Total:</strong></td>
                <td class="item-attr"><strong id="order-grand-total"><%=@selected_item.grand_total rescue 0%></strong></td>
              </tr> -->
-               <tr class="rebate_amount">

-              </tr>
+               <tr class="rebate_amount"></tr>
            </table>
          </div>
        </div>
--- a/app/views/origami/redeem_payments/index.html.erb
+++ b/app/views/origami/redeem_payments/index.html.erb
@@ -21,7 +21,7 @@
 						<% end %>
 		    		<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">Available Redeem Amount</label>
+			      			<label class="col-lg-4 col-md-4 col-sm-4"> Rebat Balance </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>
@@ -66,7 +66,7 @@
             <div class=" cashier_number left" data-value="00" data-type="num">00</div>
           </div>
           <div class="row bottom">
-             <div class=" cashier_number del_cashier_number" data-type="nett" disable>Nett</div>
+             <div class=" cashier_number " data-type="nett">Nett</div>
             <div class=" cashier_number red left" data-type="del">Del</div>
             <div class=" cashier_number green left" data-type="clr">Clr</div>
           </div>
@@ -123,6 +123,9 @@ $(document).on('click', '.cashier_number', function(event){
             		case 'del' :
 			          var cash=$('#used_amount').text();
 			          $('#used_amount').text(cash.substr(0,cash.length-1));
+								case 'nett':
+								alert($('#valid_amount').text())
+								$('#used_amount').text($('#valid_amount').text());
 			        break;

          		}
--- a/app/views/settings/order_queue_stations/_form.html.erb
+++ b/app/views/settings/order_queue_stations/_form.html.erb
@@ -9,7 +9,7 @@ div.form-inputs span{
  <div class="form-inputs">
    <%= f.input :station_name %>
    <%= f.input :is_active %>
-    <%= f.input :auto_print %>
+
    <%= f.input :printer_name %>
    <%= f.input :font_size %>
    <%= f.input :print_copy %>
@@ -18,7 +18,7 @@ div.form-inputs span{
    <%= f.input :cut_per_item %>
    <%= f.input :use_alternate_name %>
    <%= f.input :processing_items, as: :hidden %>
-
+    <%= f.input :auto_print %>
  </div>

  <div class="form-actions">
--- a/lib/tasks/clear_data.rake
+++ b/lib/tasks/clear_data.rake
@@ -11,7 +11,7 @@ namespace :clear do
    Sale.delete_all
    SaleAudit.delete_all
    SalePayment.delete_all
-    
+    DiningFacility.update_all(status:'available') 
    puts "Clear Data Done."
  end
 end