update OQS and cashier

2017-11-14 09:43:13 +06:30
parent 8db96beca0
commit f1a28d64e1
31 changed files with 378 additions and 171 deletions
--- a/app/controllers/transactions/credit_notes_controller.rb
+++ b/app/controllers/transactions/credit_notes_controller.rb
@@ -15,12 +15,11 @@ class Transactions::CreditNotesController < ApplicationController

      if filter.nil? && from.nil? && to.nil? && customer.nil?
          @sales = Sale.where('payment_status = ?', Sale::SALE_STATUS_OUTSTANDING)
-          puts "cccccccccccc"
      else
          sale = Sale.search_credit_sales(customer,filter,from,to) 
          if sale.count > 0
             @sales = sale 
-             @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50)
+             @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(20)
           else
             @sales = 0
           end