This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/app/assets/javascripts/dashboard_map.js b/app/assets/javascripts/dashboard_map.js | |
| index e4e1c04..8271a81 100644 | |
| --- a/app/assets/javascripts/dashboard_map.js | |
| +++ b/app/assets/javascripts/dashboard_map.js | |
| @@ -36,7 +36,7 @@ $(document).ready(function(){ | |
| if(order.has_exception){ | |
| image = order_red_icon_path; | |
| } | |
| - else if(order.status == 'Scheduled for Delivery'){ | |
| + else if(order.status == 'Scheduled'){ |
sidtri
/ DTV#81 Locations list ordered alphabetically.diff
Created
July 27, 2016 10:14
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/app/controllers/admin/stores_controller.rb b/app/controllers/admin/stores_controller.rb | |
| index 084ba1d..89fc10f 100644 | |
| --- a/app/controllers/admin/stores_controller.rb | |
| +++ b/app/controllers/admin/stores_controller.rb | |
| @@ -51,7 +51,7 @@ class Admin::StoresController < ApplicationController | |
| def widget | |
| end | |
| - | |
| + |
sidtri
/ DTV#82 - Loader for Delivery reports data and default values.diff
Created
July 27, 2016 09:41
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/README.rdoc b/README.rdoc | |
| index dd4e97e..ebd62e3 100644 | |
| --- a/README.rdoc | |
| +++ b/README.rdoc | |
| @@ -24,5 +24,14 @@ Things you may want to cover: | |
| * ... | |
| +* System dependencies | |
| +[TODO] - While setting up docker dont forget to add below configuration. |
sidtri
/ DTV#82 - Loader for Delivery reports data and default values.diff
Created
July 27, 2016 09:08
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/README.rdoc b/README.rdoc | |
| index dd4e97e..ebd62e3 100644 | |
| --- a/README.rdoc | |
| +++ b/README.rdoc | |
| @@ -24,5 +24,14 @@ Things you may want to cover: | |
| * ... | |
| +* System dependencies | |
| +[TODO] - While setting up docker dont forget to add below configuration. |
sidtri
/ DTV#83 - order items status logic rake task.diff
Created
July 26, 2016 13:33
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/app/models/business.rb b/app/models/business.rb | |
| index 68cac67..df6acf2 100644 | |
| --- a/app/models/business.rb | |
| +++ b/app/models/business.rb | |
| @@ -1,7 +1,7 @@ | |
| class Business < ActiveRecord::Base | |
| include RailsSettings::Extend | |
| include BusinessDefault | |
| - | |
| + |
sidtri
/ DTV#83 - order items status logic rake task.diff
Created
July 26, 2016 13:32
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/app/models/business.rb b/app/models/business.rb | |
| index 68cac67..df6acf2 100644 | |
| --- a/app/models/business.rb | |
| +++ b/app/models/business.rb | |
| @@ -1,7 +1,7 @@ | |
| class Business < ActiveRecord::Base | |
| include RailsSettings::Extend | |
| include BusinessDefault | |
| - | |
| + |
sidtri
/ DTV#83 - order items status logic rake task.diff
Created
July 26, 2016 12:22
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/app/models/order_item.rb b/app/models/order_item.rb | |
| index 952a76a..14995b7 100644 | |
| --- a/app/models/order_item.rb | |
| +++ b/app/models/order_item.rb | |
| @@ -40,13 +40,6 @@ class OrderItem < ActiveRecord::Base | |
| self[:updated_at].strftime("%B %d,%Y %I:%M %p") | |
| end | |
| - def status | |
| - return "Exception" if (super == "Refused") || (delivered_quantity != quantity) |
sidtri
/ DTV#85 List should be displayed in alphabetic order.diff
Created
July 26, 2016 09:17
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb | |
| index 5660249..e6153eb 100644 | |
| --- a/app/controllers/home_controller.rb | |
| +++ b/app/controllers/home_controller.rb | |
| @@ -29,12 +29,21 @@ class HomeController < ApplicationController | |
| [date = Date.parse(params[:date]), "Orders for - #{parse_date date}"]) | |
| @stores = current_user.stores.active | |
| - @orders = current_business.orders.includes(:store) | |
| + #take care of orders now |
sidtri
/ DTV#74 - Filters getting reset problem with huge data.diff
Created
July 25, 2016 12:03
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb | |
| index b9cb52d..615fa14 100644 | |
| --- a/app/controllers/orders_controller.rb | |
| +++ b/app/controllers/orders_controller.rb | |
| @@ -9,6 +9,10 @@ class OrdersController < ApplicationController | |
| def index | |
| @orders = OrderSearch.new(current_business, @page, @per_page, params).process | |
| + if @orders.total_pages < (params[:page].to_i || 1) | |
| + params[:page] = "1" |
sidtri
/ DTV##77 Should not be able to subscribe to alerts if the alerts in Admin is not enabled.diff
Created
July 25, 2016 11:05
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/app/controllers/admin/alerts_controller.rb b/app/controllers/admin/alerts_controller.rb | |
| index 6801063..e617a8d 100644 | |
| --- a/app/controllers/admin/alerts_controller.rb | |
| +++ b/app/controllers/admin/alerts_controller.rb | |
| @@ -7,12 +7,13 @@ class Admin::AlertsController < ApplicationController | |
| end | |
| def subscribe | |
| - alert = UserAlert.new(alert_setting_id: params[:alert_id], user_id: current_user.id) | |
| + alert = UserAlert.new(alert_setting_id: params[:alert_id], user_id: current_user.id) |