Pull from master

2018-08-06 17:52:03 +06:30
parent 35ac07b0a6
commit e99e907bc4
33 changed files with 455 additions and 126 deletions
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -53,9 +53,7 @@ Rails.application.config.assets.precompile += %w( sx-sidebar.css )
 Rails.application.config.assets.precompile += %w( inventory_definitions.css )
 Rails.application.config.assets.precompile += %w( inventory.js )

-# --- Customer/ Customer - Crm ----
+# --- Order Reservation/ Order ----
 Rails.application.config.assets.precompile += %w( order_reservation.css )
 Rails.application.config.assets.precompile += %w( order_reservation.js )

-
-