fixed conflict

2019-11-15 16:23:33 +06:30
parent acbca8b5b6 af2d69c0b5
commit 3253518aae
57 changed files with 1526 additions and 1361 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -117,6 +117,14 @@ scope "(:locale)", locale: /en|mm/ do

    #API for sync cloud
    post 'sync_data' => 'sync#sync_data'
+
+    namespace :loader_service do
+      post "get_sale_data" => "load_data#get_sale_data_rage"
+      post "get_detail_sale_data" => "load_data#get_detail_sale_data"
+      post "get_tender_sale_data" => "load_data#get_tender_sale_data"
+      post "get_daily_sale_data" => "load_data#get_daily_sale_data"
+      post "get_check_sale_data" => "load_data#get_check_sale_data"
+    end
  end

  #--------- Cashier ------------#