From 8046bc7745cf255a4112e0d4963402765f978869 Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Thu, 29 Jun 2017 18:59:17 +0630
Subject: [PATCH 1/4] shift

---
 .../origami/cash_ins_controller.rb            |  3 ++
 .../origami/cash_outs_controller.rb           |  3 ++
 app/controllers/origami/shifts_controller.rb  |  5 +-
 app/models/payment_journal.rb                 | 21 ++++++++
 app/models/sale.rb                            | 36 +++++++++++--
 app/models/sale_payment.rb                    | 22 ++++----
 app/models/shift_sale.rb                      | 11 ++--
 app/views/origami/shifts/new.html.erb         | 33 ++++++++++++
 app/views/origami/shifts/show.html.erb        | 54 ++-----------------
 9 files changed, 119 insertions(+), 69 deletions(-)

diff --git a/app/controllers/origami/cash_ins_controller.rb b/app/controllers/origami/cash_ins_controller.rb
index dd78bc1b..085f68b8 100644
--- a/app/controllers/origami/cash_ins_controller.rb
+++ b/app/controllers/origami/cash_ins_controller.rb
@@ -11,5 +11,8 @@ class Origami::CashInsController < BaseOrigamiController
     payment_method_reference = params[:payment_method_reference]
     p_jour = PaymentJournal.new
     p_jour.cash_in(reference, remark, amount, payment_method, payment_method_reference, current_user.id)
+    shift = ShiftSale.current_open_shift(current_user.id)
+    shift.cash_in = shift.cash_in + amount.to_i
+    shift.save
   end
 end
diff --git a/app/controllers/origami/cash_outs_controller.rb b/app/controllers/origami/cash_outs_controller.rb
index ac079a39..95ab97a2 100644
--- a/app/controllers/origami/cash_outs_controller.rb
+++ b/app/controllers/origami/cash_outs_controller.rb
@@ -9,5 +9,8 @@ class Origami::CashOutsController < BaseOrigamiController
     amount = params[:amount]
     p_jour = PaymentJournal.new
     p_jour.cash_out(reference, remark, amount, current_user.id)
+    shift = ShiftSale.current_open_shift(current_user.id)
+    shift.cash_out = shift.cash_out + amount.to_i
+    shift.save
   end
 end
diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index 1a7a5289..cd607b42 100644
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -18,9 +18,12 @@ class Origami::ShiftsController < BaseOrigamiController
   end
 
   def update_shift
-    @shift = ShiftSale.current_open_shift(current_user.id)
+    closing_balance = params[:closing_balance]
+    shift_id = params[:shift_id]
+    @shift = ShiftSale.find_by_id(shift_id)
     if @shift
       @shift.shift_closed_at = DateTime.now.utc
+      @shift.closing_balance = closing_balance.to_f
       @shift.save
     end
   end
diff --git a/app/models/payment_journal.rb b/app/models/payment_journal.rb
index 6105a574..0f0c3ce5 100644
--- a/app/models/payment_journal.rb
+++ b/app/models/payment_journal.rb
@@ -19,4 +19,25 @@ class PaymentJournal < ApplicationRecord
     self.created_by = current_user
     self.save
   end
+
+  # def self.today_cash_in(current_user)
+  #   credit = 0.0
+  #   today_date = DateTime.now.strftime("%Y-%m-%d")
+  #   pj_credit = PaymentJournal.where("TO_CHAR(created_at, 'YYYY-MM-DD')=? and created_by=?",today_date, current_user)
+  #   pj_credit.each do |obj|
+  #     credit += obj.credit_amount
+  #   end
+  #   return credit
+  # end
+  #
+  # def self.today_cash_out(current_user)
+  #   debit = 0.0
+  #   today_date = DateTime.now.strftime("%Y-%m-%d")
+  #   pj_debit = PaymentJournal.where("TO_CHAR(created_at, 'YYYY-MM-DD')=? and created_by=?",today_date, current_user)
+  #   pj_debit.each do |obj|
+  #      debit += obj.debit_amount
+  #   end
+  #   return debit
+  # end
+
 end
diff --git a/app/models/sale.rb b/app/models/sale.rb
index bf3bc216..12a88048 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -25,7 +25,7 @@ class Sale < ApplicationRecord
   SALE_STATUS_OUTSTANDING = "outstanding"
   SALE_STATUS_COMPLETED = "completed"
 
-  def generate_invoice_from_booking(booking_id, requested_by, cashier)    
+  def generate_invoice_from_booking(booking_id, requested_by, cashier)
     booking = Booking.find(booking_id)
     status = false
     Rails.logger.debug "Booking -> " + booking.id.to_s
@@ -66,7 +66,7 @@ class Sale < ApplicationRecord
       #Default Tax - Values
       self.tax_type = "exclusive"
 
-      # set cashier      
+      # set cashier
       if cashier != nil
         self.cashier_id = cashier[0].id
         self.cashier_name = cashier[0].name
@@ -270,8 +270,6 @@ class Sale < ApplicationRecord
 
   end
 
-  private
-
   def product_get_unit_price(item_code)
     menu_item_hash =MenuItem.search_by_item_code(item_code)
     if (menu_instance_code)
@@ -409,6 +407,36 @@ def self.get_by_range_by_saleitems(from,to,status,report_type)
 
 end
 
+  def get_cash_amount
+    cash = 0.0
+    self.sale_payments.each do |pay|
+        if pay.payment_method == 'cash'
+          cash = pay.payment_amount
+        end
+    end
+    return cash
+  end
+
+  def get_credit_amount
+    credit = 0.0
+    self.sale_payments.each do |pay|
+        if pay.payment_method == 'creditnote'
+           credit = pay.payment_amount
+        end
+    end
+    return credit
+  end
+
+  def get_other_amount
+    other = 0.0
+    self.sale_payments.each do |pay|
+        if pay.payment_method != 'cash' && pay.payment_method != 'creditnote'
+          other += pay.payment_amount
+        end
+    end
+    return other
+  end
+
   private
 
   def generate_custom_id
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 7a835618..feafd017 100644
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -131,7 +131,6 @@ class SalePayment < ApplicationRecord
     self.payment_status = "paid"
     payment_method = self.save!
     sale_update_payment_status(self.received_amount)
-
     return payment_status
   end
 
@@ -146,7 +145,6 @@ class SalePayment < ApplicationRecord
     payment_method = self.save!
 
     sale_update_payment_status(self.received_amount)
-
     return payment_status
   end
 
@@ -161,7 +159,6 @@ class SalePayment < ApplicationRecord
     payment_method = self.save!
 
     sale_update_payment_status(self.received_amount)
-
     return payment_status
   end
 
@@ -175,7 +172,6 @@ class SalePayment < ApplicationRecord
     self.outstanding_amount = self.sale.grand_total- self.received_amount
     self.payment_status = "paid"
     payment_method = self.save!
-
     sale_update_payment_status(self.received_amount)
 
     return payment_status
@@ -192,7 +188,6 @@ class SalePayment < ApplicationRecord
     self.outstanding_amount = self.sale.grand_total- self.received_amount
     self.payment_status = "paid"
     payment_method = self.save!
-
     sale_update_payment_status(self.received_amount)
 
     return payment_status
@@ -220,7 +215,6 @@ class SalePayment < ApplicationRecord
     else
       sale_update_payment_status(0)
     end
-
     return payment_status
 
   end
@@ -249,16 +243,20 @@ class SalePayment < ApplicationRecord
       self.sale.save!
       table_update_status(sObj)
       rebat(sObj)
-      shift = ShiftSale.current_open_shift(self.sale.cashier_id)
-      puts shift
-      if !shift.nil?
-        puts ">>>> shift >>>>>>"
-        shift.update(self.sale)
+      if paid_amount != "0.0"
+        update_shift
       end
     end
 
   end
 
+  def update_shift
+    shift = ShiftSale.current_open_shift(self.sale.cashier_id)
+    if !shift.nil?
+      shift.update(self.sale)
+    end
+  end
+
   def table_update_status(sale_obj)
     status = true
     booking = Booking.find_by_sale_id(sale_obj.id)
@@ -321,6 +319,8 @@ class SalePayment < ApplicationRecord
       end
   end
 
+
+
   private
   def generate_custom_id
     self.sale_payment_id = SeedGenerator.generate_id(self.class.name, "SPI")
diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb
index ee6885ae..420a700f 100644
--- a/app/models/shift_sale.rb
+++ b/app/models/shift_sale.rb
@@ -37,14 +37,17 @@ class ShiftSale < ApplicationRecord
 
   def update(sale)
     saleobj = Sale.find_by_sale_id(sale)
-    self.total_revenue = self.total_revenue + saleobj.total_amount
+    cash = saleobj.get_cash_amount
+    credit = saleobj.get_credit_amount
+    other_sales = saleobj.get_other_amount
+    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
     self.grand_total = self.grand_total + saleobj.grand_total
+    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.cash_sales =
-    # self.credit_sales =
-    # self.other_sales =
     # self.commercial_taxes =
     self.save
 
diff --git a/app/views/origami/shifts/new.html.erb b/app/views/origami/shifts/new.html.erb
index 16c2aa10..1569eaea 100644
--- a/app/views/origami/shifts/new.html.erb
+++ b/app/views/origami/shifts/new.html.erb
@@ -21,7 +21,40 @@
         </div>
       </div>
   </div>
+    <div class='col-md-8'>
+      <div class="row">
+         <div class="col-lg-6 col-md-1 col-sm-1">
+           <div class="row bottom">
+             <div class=" cashier_number " data-value="1" data-type="num">1</div>
+             <div class=" cashier_number left" data-value="2" data-type="num">2</div>
+             <div class=" cashier_number left" data-value="3" data-type="num">3</div>
+           </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 red" data-type="del" >Del</div>
+             <div class=" cashier_number orange left" data-type="clr">Clr</div>
+             <div class=" cashier_number purple left" data-type="ent">Ent</div>
+           </div>
+         </div>
+
+      </div>
+  </div>
 </div>
+
 <script>
 var total = 0
 $(document).on('focusout', '.float-value', function(event){
diff --git a/app/views/origami/shifts/show.html.erb b/app/views/origami/shifts/show.html.erb
index 9df112b9..9fa8020d 100644
--- a/app/views/origami/shifts/show.html.erb
+++ b/app/views/origami/shifts/show.html.erb
@@ -12,54 +12,7 @@
         <td>Cashier Name</td>
         <td><%= @shift.employee.name rescue ''%></td>
       </tr>
-      <tr>
-        <td>Opening Balance</td>
-        <td><%= @shift.opening_balance rescue ''%></td>
-      </tr>
-      <tr>
-        <td>Total Revenue</td>
-        <td><%= @shift.total_revenue rescue ''%></td>
-      </tr>
-      <tr>
-        <td>Total Discount</td>
-        <td><%= @shift.total_discounts rescue ''%></td>
-      </tr>
-      <tr>
-        <td>Total Tax</td>
-        <td><%= @shift.total_taxes rescue ''%></td>
-      </tr>
-      <tr>
-        <td>Grand Total</td>
-        <td><%= @shift.grand_total rescue ''%></td>
-      </tr>
-      <tr>
-        <td>Nett Sale</td>
-        <td><%= @shift.nett_sales rescue ''%></td>
-      </tr>
-      <tr>
-        <td>Cash Sale</td>
-        <td><%= @shift.cash_sales rescue ''%></td>
-      </tr>
-      <tr>
-        <td>Credit Sale</td>
-        <td><%= @shift.credit_sales rescue ''%></td>
-      </tr>
-      <tr>
-        <td>Other Sale</td>
-        <td><%= @shift.other_sales rescue ''%></td>
-      </tr>
-      <tr>
-        <td>Commercial Tax</td>
-        <td><%= @shift.commercial_taxes rescue ''%></td>
-      </tr>
-      <tr>
-        <td>Cash In</td>
-        <td><%= @shift.cash_in rescue ''%></td>
-      </tr>
-      <tr>
-        <td>Cash Out</td>
-        <td><%= @shift.cash_out rescue ''%></td>
-      </tr>
+
     </table>
     <hr>
     <div class='row'>
@@ -67,7 +20,7 @@
         <span style='font-size:20px;'><b>Closing Balance</b></span>
       </div>
       <div class='col-md-6'>
-        <span style='font-size:20px;padding-left:18px;'><b><%= @shift.closing_balance rescue ''%></b></span>
+        <span style='font-size:20px;'><b><input type='text' id='closing_balance_amount' value=''></b></span>
       </div>
     </div>
   </div>
@@ -78,8 +31,11 @@
 </div>
 <script>
 $('#close_cashier').on('click',function(){
+  var amount = $('#closing_balance_amount').val();
+  var shift_id = "<%= @shift.id %>"
   $.ajax({type: "POST",
     url: "<%= origami_close_shift_path %>",
+    data: "closing_balance="+ amount + "&shift_id="+ shift_id,
     success:function(result){
       console.log(result)
       window.location.href = '/';

From 959102b338e12e3977235c3943aa29606040bc19 Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Fri, 30 Jun 2017 09:49:51 +0630
Subject: [PATCH 2/4] Update

---
 app/controllers/crm/customers_controller.rb  | 56 +++++++++++++-------
 app/controllers/origami/shifts_controller.rb |  1 +
 app/models/customer.rb                       | 12 +++++
 app/models/sale_payment.rb                   | 18 +++++++
 app/models/shift_sale.rb                     |  2 +-
 5 files changed, 69 insertions(+), 20 deletions(-)

diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index f2846c12..f8a80cb8 100644
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -6,12 +6,12 @@ class Crm::CustomersController < BaseCrmController
   # GET /crm/customers.json
   def index
     filter = params[:filter]
-    
+
     if filter.nil?
       @crm_customers = Customer.all
     else
-      @crm_customers = Customer.search(filter) 
-      
+      @crm_customers = Customer.search(filter)
+
     end
     #@crm_customers  = Customer.all
     @crm_customers  = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(50)
@@ -32,7 +32,7 @@ class Crm::CustomersController < BaseCrmController
   def show
     @orders = Order.where("customer_id=?", params[:id])
     @sales  = Sale.where("customer_id=?", params[:id])
-  
+
     if @orders
       @order_items = []
       @orders.each do |order|
@@ -70,7 +70,7 @@ class Crm::CustomersController < BaseCrmController
    def create
 
     @crm_customers = Customer.new(customer_params)
-  
+
     respond_to do |format|
       if @crm_customers.save
           name            = customer_params[:name]
@@ -81,7 +81,7 @@ class Crm::CustomersController < BaseCrmController
           nrc             = customer_params[:nrc_no]
           card_no         = customer_params[:card_no]
           member_group_id = params[:member_group_id]
-          
+
           if !member_group_id.nil?
               membership      = MembershipSetting.find_by_membership_type("paypar_url")
               memberaction    = MembershipAction.find_by_membership_type("create_membership_customer")
@@ -90,7 +90,7 @@ class Crm::CustomersController < BaseCrmController
               url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
 
               begin
-              response        = HTTParty.post(url, 
+              response        = HTTParty.post(url,
                                         :body => {name: name,phone: phone,email: email,
                                                   dob: dob,address: address,nrc:nrc,card_no:card_no,
                                                   member_group_id: member_group_id,
@@ -103,18 +103,24 @@ class Crm::CustomersController < BaseCrmController
                                )
               rescue Net::OpenTimeout
                 response = { status: false }
+
+              rescue OpenURI::HTTPError
+                response = { status: false}
+
+              rescue SocketError
+                response = { status: false}
               end
 
               if response["status"] == true
-                
+
                   customer = Customer.find(@crm_customers.customer_id)
                   status   = customer.update_attributes(membership_id: response["customer_datas"]["id"],membership_type:member_group_id )
-                    
+
                   if params[:sale_id]
                       format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created.' }
                   else
                       format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created'}
-                  end              
+                  end
                     # format.json { render :index, status: :created, location: @crm_customers }
               else
                     # @crm_customers.destroy
@@ -129,7 +135,7 @@ class Crm::CustomersController < BaseCrmController
 
           if params[:sale_id]
             flash[:errors] = @crm_customers.errors
-            format.html { redirect_to '/origami/'+params[:sale_id]+'/customers'} 
+            format.html { redirect_to '/origami/'+params[:sale_id]+'/customers'}
             format.json { render json: @crm_customers.errors, status: :unprocessable_entity }
           else
             flash[:errors] = @crm_customers.errors
@@ -166,7 +172,7 @@ end
             url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
 
             begin
-            response        = HTTParty.post(url, 
+            response        = HTTParty.post(url,
                                       :body => { name: name,phone: phone,email: email,
                                                  dob: dob,address: address,nrc:nrc,
                                                  card_no:card_no,member_group_id: member_group_id,
@@ -176,16 +182,22 @@ end
                                                'Accept'       => 'application/json'
                                                   },
                                       :timeout => 10
-                              )                                                            
+                              )
             rescue Net::OpenTimeout
               response = { status: false }
+
+            rescue OpenURI::HTTPError
+              response = { status: false}
+
+            rescue SocketError
+              response = { status: false}
             end
 
             if response["status"] == true
-          
+
               customer = Customer.find(@crm_customer.customer_id)
               status   = customer.update_attributes(membership_id: response["customer_datas"]["id"],membership_type:member_group_id )
-              
+
               format.html { redirect_to crm_customers_path, notice: 'Customer was successfully updated'}
             else
               format.html { redirect_to crm_customers_path, notice: response["message"] }
@@ -199,7 +211,7 @@ end
             auth_token      = memberaction.auth_token.to_s
             url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
             begin
-            response        = HTTParty.post(url, 
+            response        = HTTParty.post(url,
                                       :body => {name: name,phone: phone,email: email,
                                                 dob: dob,address: address,nrc:nrc,card_no:card_no,
                                                 id: id,member_group_id:member_group_id,merchant_uid:merchant_uid,auth_token:auth_token}.to_json,
@@ -211,6 +223,12 @@ end
                                             )
             rescue Net::OpenTimeout
               response = { status: false }
+              
+            rescue OpenURI::HTTPError
+              response = { status: false}
+
+            rescue SocketError
+              response = { status: false}
             end
 
             if response["status"] == true
@@ -219,8 +237,8 @@ end
             else
               format.html { redirect_to crm_customers_path, notice: response["message"] }
             end
-            
-        end 
+
+        end
 
       else
 
@@ -251,7 +269,7 @@ end
     # Never trust parameters from the scary internet, only allow the white list through.
     def customer_params
 
-      params.require(:customer).permit(:name, :company, :contact_no, :email, 
+      params.require(:customer).permit(:name, :company, :contact_no, :email,
                 :date_of_birth,:salutation,:gender,:nrc_no,:address,:card_no)
     end
 end
diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index cd607b42..079b9e80 100644
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -4,6 +4,7 @@ class Origami::ShiftsController < BaseOrigamiController
   end
 
   def show
+    puts current_user.id
     @shift = ShiftSale.current_open_shift(current_user.id)
   end
 
diff --git a/app/models/customer.rb b/app/models/customer.rb
index e6afca08..a26d857e 100644
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -31,6 +31,12 @@ class Customer < ApplicationRecord
                                         )
     rescue Net::OpenTimeout
       response = { status: false }
+
+    rescue OpenURI::HTTPError
+      response = { status: false}
+
+    rescue SocketError
+      response = { status: false}
     end
 
     return response;
@@ -55,6 +61,12 @@ class Customer < ApplicationRecord
                                         )
     rescue Net::OpenTimeout
       response = { status: false }
+      
+    rescue OpenURI::HTTPError
+      response = { status: false}
+
+    rescue SocketError
+      response = { status: false}
     end
 
     return response;
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index feafd017..c78b6cd8 100644
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -77,6 +77,12 @@ class SalePayment < ApplicationRecord
         )
     rescue Net::OpenTimeout
         response = { status: false }
+
+    rescue OpenURI::HTTPError
+      response = { status: false}
+
+    rescue SocketError
+      response = { status: false}
     end
     return response;
   end
@@ -110,6 +116,12 @@ class SalePayment < ApplicationRecord
             )
           rescue Net::OpenTimeout
             response = false
+
+          rescue OpenURI::HTTPError
+            response = { status: false}
+
+          rescue SocketError
+            response = { status: false}
           end
         else
             response = false;
@@ -312,6 +324,12 @@ class SalePayment < ApplicationRecord
                                               }, :timeout => 10)
         rescue Net::OpenTimeout
           response = { status: false }
+          
+        rescue OpenURI::HTTPError
+          response = { status: false}
+
+        rescue SocketError
+          response = { status: false}
         end
        return response
        # puts response.to_json
diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb
index d12c258b..5372864f 100644
--- a/app/models/shift_sale.rb
+++ b/app/models/shift_sale.rb
@@ -21,7 +21,7 @@ class ShiftSale < ApplicationRecord
       #find open shift where is open today and is not closed and login by current cashier
       today_date = DateTime.now.strftime("%Y-%m-%d")
       puts today_date
-      shift = ShiftSale.where("DATE(shift_started_at)= #{ today_date } and shift_started_at is not null and shift_closed_at is null and employee_id = #{current_user}").take
+      shift = ShiftSale.where("TO_CHAR(shift_started_at, 'YYYY-MM-DD')=? and shift_started_at is not null and shift_closed_at is null and employee_id = #{current_user}", today_date).take
 
       return shift
     #end

From 063d561f3edd3d8bef2d1366f1af56fa5d8d1ffb Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Fri, 30 Jun 2017 10:07:51 +0630
Subject: [PATCH 3/4] closing balance

---
 app/controllers/origami/shifts_controller.rb | 1 +
 app/models/shift_sale.rb                     | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index 079b9e80..8649a0db 100644
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -29,6 +29,7 @@ class Origami::ShiftsController < BaseOrigamiController
     end
   end
 
+  
   def edit
   end
 end
diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb
index 5372864f..aa5265a2 100644
--- a/app/models/shift_sale.rb
+++ b/app/models/shift_sale.rb
@@ -52,4 +52,10 @@ class ShiftSale < ApplicationRecord
     self.save
 
   end
+
+  def get_closing_balance(shift)
+     shiftobj = ShiftSale.find(shift)
+     closing_balance = shiftobj.grand_total + shiftobj.cash_in - shiftobj.cash_out + shiftobj.total_cash
+     return closing_balance
+  end
 end

From 5e3935f176f486f891946f3a28b4a7961f35c150 Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Fri, 30 Jun 2017 13:10:28 +0630
Subject: [PATCH 4/4] update shift

---
 app/controllers/api/orders_controller.rb        | 10 ++--------
 app/models/order.rb                             |  1 +
 app/models/sale.rb                              |  9 +++++++++
 app/models/shift_sale.rb                        |  5 +++--
 db/migrate/20170403160742_create_sales.rb       |  2 +-
 db/migrate/20170626191519_create_shift_sales.rb |  4 +++-
 db/seeds.rb                                     |  2 ++
 7 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index e3184ecc..ecbd6fe4 100644
--- a/app/controllers/api/orders_controller.rb
+++ b/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)
diff --git a/app/models/order.rb b/app/models/order.rb
index 29267965..d3056787 100644
--- a/app/models/order.rb
+++ b/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
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 12a88048..470519c5 100644
--- a/app/models/sale.rb
+++ b/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
diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb
index aa5265a2..a897de2b 100644
--- a/app/models/shift_sale.rb
+++ b/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
diff --git a/db/migrate/20170403160742_create_sales.rb b/db/migrate/20170403160742_create_sales.rb
index 7e4850f1..a3018bbd 100644
--- a/db/migrate/20170403160742_create_sales.rb
+++ b/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
diff --git a/db/migrate/20170626191519_create_shift_sales.rb b/db/migrate/20170626191519_create_shift_sales.rb
index 762b4fc3..18323c9d 100644
--- a/db/migrate/20170626191519_create_shift_sales.rb
+++ b/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
diff --git a/db/seeds.rb b/db/seeds.rb
index 7095d528..2635ab4f 100644
--- a/db/seeds.rb
+++ b/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 "