rightnow_oms 0.1.4 → 0.1.6

data/config/locales/validates_timeliness.en.yml

@@ -0,0 +1,16 @@
+en:
+  errors:
+    messages:
+      invalid_date: "is not a valid date"
+      invalid_time: "is not a valid time"
+      invalid_datetime: "is not a valid datetime"
+      is_at: "must be at %{restriction}"
+      before: "must be before %{restriction}"
+      on_or_before: "must be on or before %{restriction}"
+      after: "must be after %{restriction}"
+      on_or_after: "must be on or after %{restriction}"
+  validates_timeliness:
+    error_value_formats:
+      date: '%Y-%m-%d'
+      time: '%H:%M:%S'
+      datetime: '%Y-%m-%d %H:%M:%S'

data/config/locales/validates_timeliness.zh-CN.yml

@@ -0,0 +1,16 @@
+'zh-CN':
+  errors:
+    messages:
+      invalid_date: "不是有效的日期"
+      invalid_time: "不是有效的时间"
+      invalid_datetime: "不是有效的日期时间"
+      is_at: "必须正好在%{restriction}"
+      before: "必须在%{restriction}之前"
+      on_or_before: "必须正好或在%{restriction}之前"
+      after: "必须在%{restriction}之后"
+      on_or_after: "必须正好或在%{restriction}之后"
+  validates_timeliness:
+    error_value_formats:
+      date: '%Y-%m-%d'
+      time: '%H:%M:%S'
+      datetime: '%Y-%m-%d %H:%M:%S'

data/db/migrate/20120224051751_add_required_arrival_time_to_rightnow_oms_orders.rb

@@ -0,0 +1,6 @@
+class AddRequiredArrivalTimeToRightnowOmsOrders < ActiveRecord::Migration
+  def change
+    add_column :rightnow_oms_orders, :required_arrival_time, :timestamp
+
+  end
+end

data/db/migrate/20120302085200_add_tastes_to_rightnow_oms_order_items.rb

@@ -0,0 +1,6 @@
+class AddTastesToRightnowOmsOrderItems < ActiveRecord::Migration
+  def change
+    add_column :rightnow_oms_order_items, :tastes, :string
+
+  end
+end

data/lib/rightnow_oms.rb

@@ -1,9 +1,11 @@
 require 'acts_as_api'
 require 'confstruct'
+require 'validates_timeliness'
 
 require 'rightnow_oms/engine'
 require 'rightnow_oms/cartable_validator'
 require 'rightnow_oms/acts_as_cartable'
+require 'rightnow_oms/controller_extension'
 require 'rightnow_oms/controller_helpers'
 require 'rightnow_oms/order_no_generator'
 
@@ -20,4 +22,6 @@ module RightnowOms
 end
 
 ActiveRecord::Base.extend(RightnowOms::ActsAsCartable)
-ActionController::Base.send(:include, RightnowOms::ControllerHelpers)
+ActionController::Base.send(:include, RightnowOms::ControllerExtension)
+ActionController::Base.send(:helper, RightnowOms::ControllerHelpers)
+ActionController::Base.send(:helper, RightnowOms::Engine.helpers)

data/lib/rightnow_oms/controller_extension.rb

@@ -0,0 +1,33 @@
+module RightnowOms
+  module ControllerExtension
+    extend ActiveSupport::Concern
+
+    def has_cart?
+      !@cart.nil?
+    end
+
+    def remove_null_params(data = params)
+      data.each do |k, v|
+        remove_null_params(v) if v.is_a? Hash
+        data.delete(k) if v == 'null'
+      end
+    end
+
+    def load_cart(key = nil)
+      key ||= :current_cart_id
+      @cart = RightnowOms::Cart.find_by_id(session[key])
+    end
+
+    def load_or_create_cart(name = nil)
+      key = name ? "#{name}_cart_id".to_sym : :current_cart_id
+      load_cart key
+
+      unless has_cart?
+        @cart = RightnowOms::Cart.create
+      end
+
+      session[:current_cart_id] = session[key] = @cart.id
+    end
+
+  end
+end

data/lib/rightnow_oms/controller_helpers.rb

@@ -1,28 +1,11 @@
 module RightnowOms
   module ControllerHelpers
-    extend ActiveSupport::Concern
-
-    def has_cart?
-      !@cart.nil?
-    end
-
-    def load_or_create_cart
-      load_cart
-
-      unless has_cart?
-        @cart = RightnowOms::Cart.create! and session[:cart_id] = @cart.id
-      end
-    end
-
-    def load_cart
-      @cart = RightnowOms::Cart.find_by_id(session[:cart_id])
+    def current_cart
+      @cart
     end
 
-    def remove_null_params(data = params)
-      data.each do |k, v|
-        remove_null_params(v) if v.is_a? Hash
-        data.delete(k) if v == 'null'
-      end
+    def list_items(items)
+      render partial: "rightnow_oms/cart_items/list", locals: { items: items }
     end
   end
 end

data/lib/rightnow_oms/version.rb

@@ -1,3 +1,3 @@
 module RightnowOms
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rightnow_oms
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,96 +9,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000 Z
+date: 2012-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &17779620 !ruby/object:Gem::Requirement
+  requirement: &6485080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *17779620
+  version_requirements: *6485080
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &15954100 !ruby/object:Gem::Requirement
+  requirement: &6524660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.19
   type: :runtime
   prerelease: false
-  version_requirements: *15954100
+  version_requirements: *6524660
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &15834820 !ruby/object:Gem::Requirement
+  requirement: &6534900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *15834820
+  version_requirements: *6534900
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &15833020 !ruby/object:Gem::Requirement
+  requirement: &6532120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *15833020
+  version_requirements: *6532120
+- !ruby/object:Gem::Dependency
+  name: validates_timeliness
+  requirement: &6530220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *6530220
 - !ruby/object:Gem::Dependency
   name: acts_as_api
-  requirement: &15848500 !ruby/object:Gem::Requirement
+  requirement: &6528740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *15848500
+  version_requirements: *6528740
 - !ruby/object:Gem::Dependency
   name: ember-rails
-  requirement: &15847660 !ruby/object:Gem::Requirement
+  requirement: &6550780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *15847660
+  version_requirements: *6550780
 - !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &15846940 !ruby/object:Gem::Requirement
+  requirement: &6546980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *15846940
+  version_requirements: *6546980
 - !ruby/object:Gem::Dependency
   name: confstruct
-  requirement: &15845720 !ruby/object:Gem::Requirement
+  requirement: &6544440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *6544440
+- !ruby/object:Gem::Dependency
+  name: ransack
+  requirement: &6543620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *15845720
+  version_requirements: *6543620
 description: A common mountable engine can be used to manage the orders.
 email:
 - towerhe@gmail.com
@@ -118,20 +140,22 @@ files:
 - app/assets/stylesheets/rightnow_oms/carts.css.scss
 - app/assets/stylesheets/rightnow_oms/orders.css.scss
 - app/assets/images/rightnow_oms/cart.png
-- app/assets/javascripts/rightnow_oms/application.js
 - app/assets/javascripts/rightnow_oms/vendor/ember-data.min.js
 - app/assets/javascripts/rightnow_oms/vendor/ember-data.js
-- app/assets/javascripts/rightnow_oms/vendor/ember-0.9.5.js
+- app/assets/javascripts/rightnow_oms/vendor/ember.js
+- app/assets/javascripts/rightnow_oms/vendor/ember-i18n.js
+- app/assets/javascripts/rightnow_oms/vendor/cldr.js
 - app/assets/javascripts/rightnow_oms/vendor/ember.min.js
 - app/assets/javascripts/rightnow_oms/lib/utils.js.coffee
 - app/assets/javascripts/rightnow_oms/lib/ember/data/types.js.coffee
 - app/assets/javascripts/rightnow_oms/lib/ember/data/extensions.js
 - app/assets/javascripts/rightnow_oms/lib/ember/data/my_rest_adapter.js.coffee
-- app/assets/javascripts/rightnow_oms/app/templates/cart_items/show.hjs
-- app/assets/javascripts/rightnow_oms/app/templates/cart_items/show_in_detail.hjs
-- app/assets/javascripts/rightnow_oms/app/templates/carts/show.hjs
-- app/assets/javascripts/rightnow_oms/app/templates/carts/show_cartable_count.hjs
-- app/assets/javascripts/rightnow_oms/app/templates/carts/show_in_detail.hjs
+- app/assets/javascripts/rightnow_oms/application.js.coffee
+- app/assets/javascripts/rightnow_oms/app/templates/cart_items/show.handlebars
+- app/assets/javascripts/rightnow_oms/app/templates/cart_items/show_in_detail.handlebars
+- app/assets/javascripts/rightnow_oms/app/templates/carts/show_cartable_count.handlebars
+- app/assets/javascripts/rightnow_oms/app/templates/carts/show.handlebars
+- app/assets/javascripts/rightnow_oms/app/templates/carts/show_in_detail.handlebars
 - app/assets/javascripts/rightnow_oms/app/app.js.coffee
 - app/assets/javascripts/rightnow_oms/app/controllers/cart.js.coffee
 - app/assets/javascripts/rightnow_oms/app/models/cart.js.coffee
@@ -141,9 +165,19 @@ files:
 - app/assets/javascripts/rightnow_oms/app/views/carts/show_in_detail.js.coffee
 - app/assets/javascripts/rightnow_oms/app/views/carts/show.js.coffee
 - app/assets/javascripts/rightnow_oms/app/views/carts/show_cartable_count.js.coffee
+- app/assets/javascripts/rightnow_oms/cart_items.js
+- app/assets/javascripts/rightnow_oms/config/app.js.coffee
+- app/assets/javascripts/rightnow_oms/config/locales/zh_CN.js.coffee
+- app/assets/javascripts/rightnow_oms/config/locales/en.js.coffee
 - app/views/rightnow_oms/orders/show.html.haml
+- app/views/rightnow_oms/cart_items/_list.html.haml
 - app/views/rightnow_oms/carts/show.html.haml
+- config/locales/validates_timeliness.zh-CN.yml
+- config/locales/validates_timeliness.en.yml
+- config/initializers/rightnow_oms.rb
+- config/initializers/validates_timeliness.rb
 - config/routes.rb
+- db/migrate/20120224051751_add_required_arrival_time_to_rightnow_oms_orders.rb
 - db/migrate/20120202104431_create_rightnow_oms_carts.rb
 - db/migrate/20120207085551_add_group_to_rightnow_oms_cart_items.rb
 - db/migrate/20120207095146_add_parent_id_to_rightnow_oms_cart_items.rb
@@ -151,11 +185,13 @@ files:
 - db/migrate/20120203045059_create_rightnow_oms_cart_items.rb
 - db/migrate/20120217081138_add_base_quantity_to_rightnow_oms_cart_items.rb
 - db/migrate/20120214074943_create_rightnow_oms_orders.rb
+- db/migrate/20120302085200_add_tastes_to_rightnow_oms_order_items.rb
 - db/migrate/20120214081113_create_rightnow_oms_order_items.rb
 - lib/rightnow_oms.rb
 - lib/rightnow_oms/controller_helpers.rb
 - lib/rightnow_oms/acts_as_cartable.rb
 - lib/rightnow_oms/order_no_generator.rb
+- lib/rightnow_oms/controller_extension.rb
 - lib/rightnow_oms/engine.rb
 - lib/rightnow_oms/version.rb
 - lib/rightnow_oms/cartable_validator.rb
@@ -177,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1275997018015637822
+      hash: 1453687471519212132
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -186,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1275997018015637822
+      hash: 1453687471519212132
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10

data/app/assets/javascripts/rightnow_oms/app/templates/cart_items/show.hjs

@@ -1,23 +0,0 @@
-{{#unless cartItem.hasParent }}
-  <dt>
-    <ul>
-      <li class="name" {{ action "toggleChildren" }}>{{ cartItem.name }}</li>
-      <li class="price r-money">￥{{ cartItem.priceString }}x{{ cartItem.quantity }}</li>
-      <li class="delete">
-        <a href="#" {{ action "deleteRecord" }}>删除</a>
-      </li>
-    <ul>
-  </dt>
-  {{#if isChildrenHidden}}
-    {{#if cartItem.hasChildren}}
-      <dd>
-        {{#each cartItem.children }}
-          <ul class='child'>
-            <li class="name">{{ name }}</li>
-            <li class="price r-money">￥{{ priceString }}x{{ quantity }}</li>
-          </ul>
-        {{/each}}
-      </dd>
-    {{/if}}
-  {{/if}}
-{{/unless}}

data/app/assets/javascripts/rightnow_oms/app/templates/carts/show_cartable_count.hjs

@@ -1 +0,0 @@
-<a href="/rightnow_oms/cart">购物车 {{ cartableCount }} 件</a>

data/app/assets/javascripts/rightnow_oms/app/templates/carts/show_in_detail.hjs

@@ -1,27 +0,0 @@
-<h2>我的购物车</h2>
-<div class="r-cart-items">
-  <ul class='title'>
-    <li class="name">名称</li>
-    <li class="others">
-      <div class="price">价格</div>
-      <div class="quantity">数量</div>
-      <div class="subtotal">小计</div>
-      <div class="delete"></div>
-    </li>
-  </ul>
-  <div class='r-clear'></div>
-  {{#each cart.cartItems}}
-    {{ view RightnowOms.ShowCartItemInDetailView cartItemBinding="this" }}
-  {{/each}}
-  <div class='r-clear'></div>
-</div>
-<div class="r-bottom-bar">
-  <div class="left-conner">
-    <span class="r-cleanup-cart"><a href="#" {{ action cleanUp }}>清空购物车</a></span>
-  </div>
-  <div class="right-conner">
-    <span>总价：<span class="r-money">￥{{ cart.total }}</span></span>
-    <span class="r-continue-to-shop"><a href="/"><< 继续购物</a></span>
-    <span class="r-checkout"><a {{ bindAttr href="newOrderUrl" }}>去结算 >></a></span>
-  </div>
-</div>

data/app/assets/javascripts/rightnow_oms/application.js

@@ -1,8 +0,0 @@
-//= require_tree ./lib
-//
-//= require ./app/app
-//= require ./app/models/cart_item
-//= require ./app/models/cart
-//= require_tree ./app/controllers
-//= require_tree ./app/views
-//= require_tree ./app/templates