git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge with crm

Browse Source
This commit is contained in:
Yan
2017-06-29 13:40:30 +06:30
parent 8045bb31e9 524edfc3b0
commit 8ba2606f6e
54 changed files with 294 additions and 1058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/base_origami_controller.rb
View File

@@ -14,5 +14,4 @@ class BaseOrigamiController < ActionController::Base
@current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token]
end
end

4
app/controllers/oqs/print_controller.rb
View File

@@ -16,7 +16,7 @@ class Oqs::PrintController < ApplicationController
# print when complete click
print_settings = PrintSetting.find_by_unique_code(unique_code)
order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
order_queue_printer.print_order_item(oqs, assigned_item.order_id, assigned_item.item_code, print_status, options )
order_queue_printer.print_order_item(print_settings,oqs, assigned_item.order_id, assigned_item.item_code, print_status, options )
# update print status for completed same order items
assigned_items.each do |ai|
@@ -46,7 +46,7 @@ class Oqs::PrintController < ApplicationController
# print when complete click
print_settings = PrintSetting.find_by_unique_code(unique_code)
order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
order_queue_printer.print_booking_summary(oqs, booking.booking_id, print_status)
order_queue_printer.print_booking_summary(print_settings,oqs, booking.booking_id, print_status)
# update print status for completed same order items
assigned_items.each do |ai|

2
app/controllers/print_settings_controller.rb
View File

@@ -70,6 +70,6 @@ class PrintSettingsController < ApplicationController
# Never trust parameters from the scary internet, only allow the white list through.
def print_setting_params
params.require(:print_setting).permit(:name, :unique_code, :template, :db_name, :db_type, :db_username, :db_password, :printer_name, :api_settings, :page_width, :page_height, :print_copies)
params.require(:print_setting).permit(:name, :unique_code, :template, :db_name, :db_type, :db_username, :db_password, :printer_name, :api_settings, :page_width, :page_height, :print_copies,:precision,:delimiter,:heading_space)
end
end

17
app/controllers/reports/daily_sales_controller.rb
View File

@@ -1,17 +0,0 @@
class Reports::DailySalesController < BaseReportController
# authorize_resource :class => false
def index
from, to ,report_type = get_date_range_from_params
@sale_data = Sale.daily_sales_list(from,to)
@tax = SaleTax.get_tax(from,to)
respond_to do |format|
format.html
format.xls
end
end
def show
end
end

8
app/controllers/reports/daily_salesbk_controller.rb → app/controllers/reports/dailysale_controller.rb
View File

@@ -1,5 +1,6 @@
class Reports::DailySalesController < BaseReportController
authorize_resource :class => false
class Reports::DailysaleController < BaseReportController
authorize_resource :class => false
def index
from, to ,report_type = get_date_range_from_params
@sale_data = Sale.daily_sales_list(from,to)
@@ -13,5 +14,4 @@ class Reports::DailySalesController < BaseReportController
def show
end
end
end

2
app/controllers/reports/receipt_no_controller.rb
View File

@@ -1,5 +1,5 @@
class Reports::ReceiptNoController < BaseReportController
authorize_resource :class => false
def index
from, to = get_date_range_from_params
puts "from..."

19
app/controllers/reports/sale_items_controller.rb
View File

@@ -1,19 +0,0 @@
class Reports::SaleItemsController < BaseReportController
# authorize_resource :class => false
def index
from, to, report_type = get_date_range_from_params
@sale_data = Sale.get_by_range_by_saleitems(from,to,Sale::SALE_STATUS_COMPLETED,report_type)
respond_to do |format|
format.html
format.xls
end
end
def show
end
end

6
app/controllers/reports/bksale_items_controller.rb → app/controllers/reports/saleitem_controller.rb
View File

@@ -1,5 +1,5 @@
class Reports::SaleItemsController < BaseReportController
authorize_resource :class => false
class Reports::SaleitemController < BaseReportController
authorize_resource :class => false
def index
from, to, report_type = get_date_range_from_params
@@ -16,4 +16,4 @@ class Reports::SaleItemsController < BaseReportController
end
end
end