update shift

app/controllers/api/orders_controller.rb

@@ -68,8 +68,6 @@ class Api::OrdersController <  Api::ApiController
           if booking.dining_facility_id.to_i == params[:table_id].to_i && booking.booking_status != 'moved'
             if !booking.sale_id.nil?
               sale_status = check_order_with_booking(booking)
-              puts "WWwwWWWWWWww"
-              puts sale_status
               if sale_status
                 return false , @message = "bill requested"
               end
@@ -79,8 +77,6 @@ class Api::OrdersController <  Api::ApiController
             end
           else
               sale_status = check_order_with_table(params[:table_id])
-              puts "OOOOOOOOO"
-              puts sale_status
               if sale_status
                 return false , @message = "bill requested"
               end
@@ -88,14 +84,12 @@ class Api::OrdersController <  Api::ApiController
         end #booking exists
       else
         sale_status = check_order_with_table(params[:table_id])
-        puts "MMMMMMMM"
-        puts sale_status
         if sale_status
           return false , @message = "bill requested"
         end
       end
 
-    @status, @booking = @order.generate
+     @status, @booking = @order.generate
   end
 
   # render json for http status code 202
@@ -103,7 +97,7 @@ class Api::OrdersController <  Api::ApiController
     render status: code, json: {
       message: msg,
       booking_id: booking_id
-    }.to_json    
+    }.to_json
   end
 
   def check_order_with_table(table_id)

app/models/order.rb

@@ -38,6 +38,7 @@ class Order < ApplicationRecord
     booking.save!
     self.default_values
 
+    #  cashier already opened?
     if self.save!
 
       self.adding_line_items

app/models/sale.rb

@@ -437,6 +437,15 @@ end
     return other
   end
 
+  def get_commerical_tax
+    tax = 0.0
+     self.sale_taxes.each do |tax|
+        if tax.tax_name == "Commerical Tax"
+           tax += tax.tax_payable_amount
+        end
+     end
+  end
+
   private
 
   def generate_custom_id

app/models/shift_sale.rb

@@ -40,6 +40,7 @@ class ShiftSale < ApplicationRecord
     cash = saleobj.get_cash_amount
     credit = saleobj.get_credit_amount
     other_sales = saleobj.get_other_amount
+    tax = saleobj.get_commerical_tax
     self.total_revenue = self.total_revenue.to_f + saleobj.total_amount.to_f
     self.total_discounts = self.total_discounts + saleobj.total_discount
     self.total_taxes = self.total_taxes + saleobj.total_tax
@@ -47,8 +48,8 @@ class ShiftSale < ApplicationRecord
     self.cash_sales = self.cash_sales.to_f + cash.to_f
     self.credit_sales = self.credit_sales.to_i + credit.to_f
     self.other_sales = self.other_sales.to_i + other_sales.to_f
-    # self.nett_sales =
-    # self.commercial_taxes =
+    self.nett_sales = self.grand_total.to_i -  self.commercial_taxes
+    self.commercial_taxes = self.commercial_taxes.to_i + tax.to_f
     self.save
 
   end

db/migrate/20170403160742_create_sales.rb

@@ -20,7 +20,7 @@ class CreateSales < ActiveRecord::Migration[5.1]
       t.decimal :rounding_adjustment, :precision => 10, :scale => 2, :null => false, :default => 0.00
       t.decimal :amount_received, :precision => 10, :scale => 2, :null => false, :default => 0.00
       t.decimal :amount_changed, :precision => 10, :scale => 2, :null => false, :default => 0.00
-
+    
       t.timestamps
     end
   end

db/migrate/20170626191519_create_shift_sales.rb

@@ -18,7 +18,9 @@ class CreateShiftSales < ActiveRecord::Migration[5.1]
       t.decimal :commercial_taxes, :precision => 10, :scale => 2, :null => false, :default => 0.00
       t.decimal :cash_in, :precision => 10, :scale => 2, :null => false, :default => 0.00
       t.decimal :cash_out, :precision => 10, :scale => 2, :null => false, :default => 0.00
-
+      t.integer :dining_count, :default => 0
+      t.integer :takeaway_count, :default => 0
+      t.integer :member_count, :default => 0
       t.timestamps
     end
   end

db/seeds.rb

@@ -181,4 +181,6 @@ payment_methods = PaymentMethodSetting.create({payment_method:"Master",gateway_u
 payment_methods = PaymentMethodSetting.create({payment_method:"Redeem",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"})
 
 cashier_terminal = CashierTerminal.create({name:"Terminal 1"})
+cashier_terminal2 = CashierTerminal.create({name:"Terminal 2"})
+cashier_terminal3 = CashierTerminal.create({name:"Terminal 3"})
 puts " Finished System Default Set Up Data "