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 ce5b5c0..daab2c8 100644 | |
| --- a/app/assets/javascripts/dashboard_map.js | |
| +++ b/app/assets/javascripts/dashboard_map.js | |
| @@ -181,5 +181,38 @@ $(document).ready(function(){ | |
| }); | |
| }; | |
| + | |
| + DashboardMap.showpercent = function(sp, d, c) { |
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 ce5b5c0..daab2c8 100644 | |
| --- a/app/assets/javascripts/dashboard_map.js | |
| +++ b/app/assets/javascripts/dashboard_map.js | |
| @@ -181,5 +181,38 @@ $(document).ready(function(){ | |
| }); | |
| }; | |
| + | |
| + DashboardMap.showpercent = function(sp, d, c) { |
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/application.js b/app/assets/javascripts/application.js | |
| index 909d48e..36ef9fb 100644 | |
| --- a/app/assets/javascripts/application.js | |
| +++ b/app/assets/javascripts/application.js | |
| @@ -94,3 +94,30 @@ function appendOrders(data) { | |
| $('#orders_list').append(data); | |
| } | |
| } | |
| + | |
| + |
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/application.js b/app/assets/javascripts/application.js | |
| index 909d48e..e6545b6 100644 | |
| --- a/app/assets/javascripts/application.js | |
| +++ b/app/assets/javascripts/application.js | |
| @@ -94,3 +94,29 @@ function appendOrders(data) { | |
| $('#orders_list').append(data); | |
| } | |
| } | |
| + | |
| + |
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 1fde651..0ee10b9 100644 | |
| --- a/app/assets/javascripts/dashboard_map.js | |
| +++ b/app/assets/javascripts/dashboard_map.js | |
| @@ -2,6 +2,7 @@ $(document).ready(function(){ | |
| var DashboardMap = {} | |
| DashboardMap.markers = {}; | |
| DashboardMap.bounds = new google.maps.LatLngBounds(); | |
| + DashboardMap.bounds_for_store = new google.maps.LatLngBounds(); | |
| window.DashboardMap = DashboardMap; |
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 1fde651..e266415 100644 | |
| --- a/app/assets/javascripts/dashboard_map.js | |
| +++ b/app/assets/javascripts/dashboard_map.js | |
| @@ -2,6 +2,7 @@ $(document).ready(function(){ | |
| var DashboardMap = {} | |
| DashboardMap.markers = {}; | |
| DashboardMap.bounds = new google.maps.LatLngBounds(); | |
| + DashboardMap.bounds_for_store = new google.maps.LatLngBounds(); | |
| window.DashboardMap = DashboardMap; |
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 7641279..842e614 100644 | |
| --- a/app/controllers/home_controller.rb | |
| +++ b/app/controllers/home_controller.rb | |
| @@ -35,7 +35,7 @@ class HomeController < ApplicationController | |
| @grouped_orders = @orders_data.collect do |order| | |
| - { group: order, orders: Order.fetch_orders(order.ids) } | |
| + { group: order, orders: Order.include(SurveyQueries).fetch_orders(order.ids) } |
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.rb b/app/models/order.rb | |
| index ffcb3a9..16d5b0a 100644 | |
| --- a/app/models/order.rb | |
| +++ b/app/models/order.rb | |
| @@ -107,10 +107,7 @@ class Order < ActiveRecord::Base | |
| scope :payment_pending,-> { where(status: "Payment Pending") } | |
| scope :ordered_but_not_processed,->{ where("orders.payment_made_at <= ?", 2.days.ago) } | |
| # Example fetch_orders('1,2,3,4,5') -> Fetches orders with ids | |
| - scope :join_attachments, -> { joins("LEFT JOIN `attachments` ON attachments.order_id = orders.id") } | |
| - scope :join_order_exceptions, -> { joins("LEFT JOIN `order_exceptions` ON order_exceptions.order_id = orders.id") } |
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'){ |
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'){ |