Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant

app/models/ability.rb

@@ -69,6 +69,8 @@ class Ability
         can :overall_void, :void
 
     elsif user.role == "cashier"
+        
+        # can :overall_void, :void
 
         can :read, Order
         can :update, Order

app/models/customer.rb

@@ -7,8 +7,8 @@ class Customer < ApplicationRecord
   has_many :sales
 
   validates_presence_of :name, :contact_no, :email,:card_no
-  validates :contact_no, uniqueness: true
-  validates :email, uniqueness: true
+  validates :contact_no, uniqueness: true, numericality: true
+  validates :email, uniqueness: true,format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, on: :create }
   validates :card_no, uniqueness: true
   validates :paypar_account_no, uniqueness: true
 

app/models/sale.rb

@@ -91,7 +91,7 @@ class Sale < ApplicationRecord
           add_item(item)
         end
 
-        link_order_sale(order.id)
+        # link_order_sale(order.id)
 
       end
       self.save!
@@ -352,7 +352,7 @@ class Sale < ApplicationRecord
 
     if saleOrder.nil?
       sale_order = SaleOrder.new
-      sale_order.create_sale_order(self.id, order_id)
+      sale = sale_order.create_sale_order(self.id, order_id)
     end
     # if (SaleOrder.where("sale_id = #{self.id} and order_id=#{order_id}").nil?)
     #   SaleOrder.create(:sale_id => self.id, :order_id => order_id)
@@ -642,10 +642,42 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty
       query = query.where("sale_status='completed' and sales.receipt_date between ? and ? #{payment_type} and sale_payments.payment_amount != 0",from,to)
               .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
               .group("sales.sale_id")
-    end 
-                                     
+    end                                
+end
+
+def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to) 
+    query = SalePayment.select("s.receipt_no, sale_payments.*,s.receipt_date as sale_date,
+                                s.cashier_name as cashier_name")
+                      .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+
+    if shift.present?
+      query = query.where("payment_method= 'creditnote' and s.sale_status = 'completed' and s.shift_sale_id in (?)",shift.to_a)
+    elsif shift_sale_range.present?
+      query = query.where("payment_method='creditnote' and s.sale_status = 'completed'  and s.shift_sale_id in (?)",shift_sale_range.to_a)
+    else
+      query = query.where("payment_method='creditnote' and s.sale_status = 'completed' and s.receipt_date between ? and ? ",from,to)
+    end
 end  
 
+ def self.get_void_sale(shift,from,to)
+     sale_arr = Array.new
+    
+     query = Sale.select("sales.receipt_no,sales.receipt_date, sales.payment_status, sales.sale_status,sales.total_amount,sales.grand_total, sales.rounding_adjustment")
+                         # .joins("INNER JOIN shift_sales sh ON sh.id = sales.shift_sale_id")
+                         # .where("sales.sale_status = 'void' and (sh.shift_started_at between ? and ? 
+                         #  OR sh.shift_closed_at between ? and ? )", from ,to, from, to)
+    
+    if shift.present?
+      query = query.where("sales.sale_status = 'void' and sales.shift_sale_id in (?)",shift.to_a)
+    else
+      query = query.where("sales.sale_status = 'void' and sales.receipt_date between ? and ? ",from,to)
+    end
+
+     out = {:items => query}
+     sale_arr.push(out)
+     return sale_arr
+end
+
 def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type)
 
   if payment_type.blank?
@@ -680,18 +712,6 @@ def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type)
            .group("sale_taxes.tax_name")
            .order("sale_taxes.sale_tax_id asc")
   end 
-  
-  # query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name")
-  # .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id")
-  # .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")  
-  # .group("sale_taxes.tax_name")
-  # .order("sale_taxes.sale_tax_id asc")
-  
-  # if shift.present?
-  #   query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed'", shift.to_a)
-  # else
-  #   query = query.where("sales.receipt_date between ? and ? #{payment_type} and sale_status= 'completed' ",from,to)
-  # end 
 end
 
 # def self.get_separate_tax(from,to,payment_method=nil)

app/models/seed_generator.rb

@@ -35,7 +35,7 @@ class SeedGenerator < ApplicationRecord
 
     else
       current_no = seed.next
-      seed.next = seed.next + seed.increase_by
+      seed.next = seed.next
       seed.current = current_no
       seed.save
     end