update fixed conflict

2017-06-28 16:44:31 +06:30
parent 20f89a65f8 d35aa23e34
commit e9e184894d
13 changed files with 175 additions and 25 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -93,6 +93,8 @@ Rails.application.routes.draw do

    get "/:id/discount" => "discounts#index"
    post "/:id/discount" => "discounts#create"
+    get "/:id/remove_all_discount" => "discounts#remove_all_discount"
+    post "/:id/remove_discount_items" => "discounts#remove_discount_items"

    post "/:id/request_bills" => "request_bills#print",:as => "request_bill" ,:defaults => { :format => 'json' }
    get '/:sale_id/reprint' => 'payments#reprint' ,:defaults => { :format => 'json' }