sidtri

become active record migration expert (Rails 4.0.2)

workflow:

create model

$ rails g model NameOfModel
    invoke  active_record
    create    db/migrate/YYYYMMDDHHMMSS_create_name_of_models.rb

sidtri

diff --git a/app/models/concerns/business_default.rb b/app/models/concerns/business_default.rb
index f201925..03719ba 100644
--- a/app/models/concerns/business_default.rb
+++ b/app/models/concerns/business_default.rb
@@ -28,45 +28,26 @@ module BusinessDefault
     self.create_text_in_setting(TextInSetting.default_messages)
   end
 
-  # Seed data
   def create_default_alert_settings

sidtri

diff --git a/app/assets/javascripts/dashboard_map.js b/app/assets/javascripts/dashboard_map.js
index b420c18..39c9bee 100644
--- a/app/assets/javascripts/dashboard_map.js
+++ b/app/assets/javascripts/dashboard_map.js
@@ -94,7 +94,7 @@ $(document).ready(function(){
       });
 
       DashboardMap.markers[order.id].addListener('click', function() {
-        window.location.href = "/orders/"+order.number;
+        Turbolinks.visit("/orders/"+order.number);

sidtri

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 8ad93b9..23c1431 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,6 +12,7 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require datepicker
 //= require_tree .

sidtri

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 221e9ad..8d1d490 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -102,7 +102,7 @@ function appendOrders(data) {
 // Common functions 
 function insertParam(key, value)
 {
-    if(typeof(window.search_params) === "undefined") { window.search_params = "" }
+    if(typeof(window.search_params) === "undefined") { d = new Date($("#date").val());window.search_params = "?date=" + d.getFullYear() + "-" + d.getMonth() + "-" + d.getDate(); }

sidtri

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index d86c2c6..221e9ad 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -93,5 +93,36 @@ function appendOrders(data) {
     data = $('#temp_data_for_parsing').html();
     $('#temp_data_for_parsing').html('');
     $('#orders_list').append(data);
+  }else{
+    $("#orders_list").append(data)

sidtri

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 3ea97b9..d86c2c6 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -27,7 +27,6 @@
 //= require confirm.js.coffee
 //= require moment
 //= require star-rating.min
-//= require google_map_with_turbolinks
 

sidtri

diff --git a/app/assets/javascripts/reports/return_item.js b/app/assets/javascripts/reports/return_item.js
index e69de29..998f681 100644
--- a/app/assets/javascripts/reports/return_item.js
+++ b/app/assets/javascripts/reports/return_item.js
@@ -0,0 +1,33 @@
+$('.reports.return_item').ready(function(){
+    $("#from_date").daterangepicker({
+      format: "MM/DD/YYYY",
+      singleDatePicker: true,
+      showDropdowns: true

sidtri

diff --git a/app/assets/javascripts/reports/return_item.js b/app/assets/javascripts/reports/return_item.js
index e69de29..998f681 100644
--- a/app/assets/javascripts/reports/return_item.js
+++ b/app/assets/javascripts/reports/return_item.js
@@ -0,0 +1,33 @@
+$('.reports.return_item').ready(function(){
+    $("#from_date").daterangepicker({
+      format: "MM/DD/YYYY",
+      singleDatePicker: true,
+      showDropdowns: true

sidtri

diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index 88f0232..9584038 100644
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -186,7 +186,7 @@ class ReportsController < ApplicationController
       .joins("LEFT JOIN stores ON stores.id = orders.store_id")
       .select("orders.number AS order_number, stores.name AS location_name, order_items.*")
       .by_store(params[:store_id])
-      # .where("delivered = ? AND orders.schedule_date = ? AND orders.business_id = ?", false, @date, current_business.id)
+      .where("delivered = ? AND orders.schedule_date = ? AND orders.business_id = ?", false, @date, current_business.id)