rightnow_oms 0.1.1 → 0.1.2

data/CHANGELOG

@@ -1,3 +1,11 @@
+*Rightnow OMS 0.1.2 (wip)*
+
+* Clean up the cart
+* Load the cart items in cart by group
+* Update cart items
+* Define a float type for Ember.JS
+* Call a callback when a cart item is added successfully
+
 *Rightnow OMS 0.1.1 (Mon 18:35, Feb 13, 2012)*
 
 * Validate that cart items are cartable

data/README.md

@@ -126,11 +126,17 @@ You can add cartables to the cart by:
 
 ```javascript
   RightnowOms.cartController.addCartItem({
-    cartable_id: 1,
-    cartable_type: 'Product'
+    cartable_id: 1,             // required
+    cartable_type: 'Product',   // required
+    price: '10.00',             // required
 
-    // if the item is a child, you need to set the parent id.
-    // parent_id: 2
+    // optional, indicating this is a child node of another one
+    parent_id: 2,
+
+    // optional, grouping cart items
+    group: 'booking'
+  }, function(cartItem) {
+    // Do something after the cart item is created
   })
 ```
 

data/app/assets/javascripts/rightnow_oms/app/controllers/cart.js.coffee

@@ -9,11 +9,32 @@ RightnowOms.cartController = Ember.Object.create
     @set('content', RightnowOms.store.find(RightnowOms.Cart, @get('content').get('id')))
 
   # item: a hash
-  addCartItem: (item) ->
+  addCartItem: (item, callback) ->
     cartItem = @get('content').addCartItem(item)
     @store.commit()
 
-    cartItem
+    return unless callback
+
+    return callback.call(@, cartItem) if cartItem.get('id')
+
+    self = @
+    cartItem.addObserver('isDirty', ->
+      if (!cartItem.get('isDirty')) && (!cartItem.get('isDeleted'))
+        callback.call(self, cartItem)
+    )
+
+  # @id: id of the cart item to be updated
+  # @properties: a hash which is the new properties of the cart item.
+  # 
+  # For example:
+  #
+  # RightnowOms.cartController.updateCartItem(1, {
+  #   'price': 10.00,
+  #   'quantity': 2
+  # })
+  updateCartItem: (id, properties) ->
+    @get('content').updateCartItem(id, properties)
+    @store.commit()
 
   increaseCartItem: (id) ->
     @get('content').increaseCartItem(id)
@@ -35,3 +56,29 @@ RightnowOms.cartController = Ember.Object.create
     if remove
       @get('content').removeCartItem(id)
       @store.commit()
+
+  cleanUp: ->
+    if confirm('您确定要清空您的购物车吗？')
+      @get('content').cleanUp()
+      @store.commit()
+
+  # return: an array of cart items.
+  #
+  # For example:
+  #
+  # RightnowOms.cartController.findCartItemsByGroup('booking');
+  #
+  # =>
+  #   [{
+  #     'id': 1, 'cartable_id': 2, 'cartable_type': 'Product', 'name': 'product-1', 'price': 10.0, 'group': 'booking', 'parent_id': null
+  #   }, {
+  #     'id': 2, 'cartable_id': 3, 'cartable_type': 'Product', 'name': 'product-2', 'price': 20.0, 'group': 'booking', 'parent_id': 2
+  #   }]
+  findCartItemsByGroup: (group) ->
+    found = []
+    cartItems = @get('content').findCartItemsByGroup(group)
+
+    cartItems.forEach (item) ->
+      found.push(item.getProperties('id', 'cartable_id', 'cartable_type', 'name', 'price', 'quantity', 'group', 'parent_id'))
+
+    found

data/app/assets/javascripts/rightnow_oms/app/models/cart.js.coffee

@@ -29,6 +29,20 @@ RightnowOms.Cart = DS.Model.extend
 
     cartItem
 
+  updateCartItem: (id, properties) ->
+    cartItem = RightnowOms.CartItem.findById(id)
+    cartItem.setProperties(properties) if cartItem?
+    
+  cleanUp: ->
+    cartItemIds = @get('cartItems').map (item) ->
+      return item.get('id')
+
+    cartItemIds.forEach (id) ->
+      item = RightnowOms.CartItem.findById(id)
+
+      # INFO Children will be deleted when the parent is deleted
+      item.deleteRecord() if item && !item.get('hasParent')
+
   removeCartItem: (id) ->
     cartItem = RightnowOms.CartItem.findById(id)
     
@@ -48,5 +62,9 @@ RightnowOms.Cart = DS.Model.extend
     cartItem.decrease()
     cartItem
 
+  findCartItemsByGroup: (group) ->
+    @get('cartItems').filter (item) ->
+      return true if item.get('group') == group
+
 RightnowOms.Cart.reopenClass
   isSingleton: true

data/app/assets/javascripts/rightnow_oms/app/models/cart_item.js.coffee

@@ -2,15 +2,23 @@ RightnowOms.CartItem = DS.Model.extend
   cartable_id: DS.attr('integer')
   cartable_type: DS.attr('string')
   name: DS.attr('string')
-  price: DS.attr('string')
+  price: DS.attr('money')
   quantity: DS.attr('integer')
   group: DS.attr('string')
   parent_id: DS.attr('integer')
 
+  priceString: (->
+    round(@get('price'), 2)
+  ).property('price')
+
   subtotal: (->
-    round(round(@get('price'), 2) * @get('quantity'), 2)
+    @get('price') * @get('quantity')
   ).property('price', 'quantity')
 
+  subtotalString: (->
+    round(@get('subtotal'), 2)
+  ).property('subtotal')
+
   children: (->
     RightnowOms.CartItem.all().filterProperty('parent_id', @get('id'))
   ).property()

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

@@ -1,6 +1,6 @@
 {{#with cartItem }}
   <td class="name">{{ name }}</td>
-  <td class="price r-money">￥{{ price }}x{{ quantity }}</td>
+  <td class="price r-money">￥{{ priceString }}x{{ quantity }}</td>
   <td class="delete">
     {{#unless hasParent }}
       <a href="#" {{ action "deleteRecord" }}>删除</a>

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

@@ -1,6 +1,6 @@
 {{#with cartItem}}
   <td class="name">{{ name }}</td>
-  <td class="price">￥{{ price }}</td>
+  <td class="price">￥{{ priceString }}</td>
   <td class="quantity">
     {{#if hasParent }}
       <span class="quantity-only">{{ quantity }}</span>
@@ -10,7 +10,7 @@
       <span class="increase"><a href="#" {{ action "increase" }}>+</a></span>
     {{/if}}
   </td>
-  <td class="subtotal r-money">￥{{ subtotal }}</td>
+  <td class="subtotal r-money">￥{{ subtotalString }}</td>
   <td class="delete">
     {{#unless hasParent }}
       <a href="#" {{ action "deleteRecord" }}>删除</a>

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

@@ -24,7 +24,12 @@
   </table>
 </div>
 <div class="r-bottom-bar">
-  <span>总价：<span class="r-money">￥{{ cart.total }}</span></span>
-  <span><a href="/"><< 继续购物</a></span>
-  <span><a href="#">去结算 >></a></span>
+  <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 href="#">去结算 >></a></span>
+  </div>
 </div>

data/app/assets/javascripts/rightnow_oms/app/views/carts/show_in_detail.js.coffee

@@ -2,3 +2,6 @@ RightnowOms.ShowCartInDetailView = Ember.View.extend
   templateName: 'rightnow_oms/app/templates/carts/show_in_detail'
 
   cartBinding: 'RightnowOms.cartController.content'
+
+  cleanUp: ->
+    RightnowOms.cartController.cleanUp()

data/app/assets/javascripts/rightnow_oms/lib/ember/data/types.js.coffee

@@ -0,0 +1,7 @@
+DS.attr.transforms.money =
+  from: (serialized) ->
+    parseFloat(serialized) unless Em.none(serialized)
+
+  to: (deserialized) ->
+    (Math.round(deserialized * Math.pow(10, 2)) / Math.pow(10, 2)).toFixed(2) unless Em.none(deserialized)
+

data/app/assets/stylesheets/rightnow_oms/carts.css.scss

@@ -35,11 +35,11 @@
     display: none;
     table {
       td {
-        padding: 5px;
+        padding: 5px 8px;
         text-align: right;
       }
       td.name {
-        width: 175px;
+        width: 150px;
         text-align: left;
         overflow: hidden;
       }
@@ -134,11 +134,11 @@
   }
   .r-bottom-bar {
     position: relative;
-    float: right;
+    width: 100%;
     font-size: 20px;
     line-height: 36px;
-    span {
-      padding: 8px;
-    }
+    span { padding: 8px; }
+    .left-conner { float: left; }
+    .right-conner { float: right; }
   }
 }

data/app/models/rightnow_oms/cart.rb

@@ -19,24 +19,20 @@ module RightnowOms
     end
 
     def add_item(cartable, opts = { quantity: 1 })
-      quantity = opts[:quantity]
-      group = opts[:group]
-      parent_id = opts[:parent_id]
-
       cart_item = cart_items.find_by_cartable(cartable)
 
       if cart_item
         cart_item.update_attributes(
-          quantity: cart_item.quantity + quantity.to_i
+          quantity: cart_item.quantity + opts[:quantity].to_i,
         )
       else
         cart_item = cart_items.create(
           cartable: cartable,
           name: cartable.cartable_name,
-          price: cartable.cartable_price,
-          quantity: quantity,
-          group: group,
-          parent_id: parent_id
+          price: opts[:price] || cartable.cartable_price,
+          quantity: opts[:quantity],
+          group: opts[:group],
+          parent_id: opts[:parent_id]
         )
       end
 

data/lib/rightnow_oms/version.rb

@@ -1,3 +1,3 @@
 module RightnowOms
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rightnow_oms
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-13 00:00:00.000000000 Z
+date: 2012-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &10801820 !ruby/object:Gem::Requirement
+  requirement: &8877280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10801820
+  version_requirements: *8877280
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &10800840 !ruby/object:Gem::Requirement
+  requirement: &8904080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10800840
+  version_requirements: *8904080
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &10799660 !ruby/object:Gem::Requirement
+  requirement: &8902620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10799660
+  version_requirements: *8902620
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &10813400 !ruby/object:Gem::Requirement
+  requirement: &8901160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10813400
+  version_requirements: *8901160
 - !ruby/object:Gem::Dependency
   name: acts_as_api
-  requirement: &10811620 !ruby/object:Gem::Requirement
+  requirement: &8898360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10811620
+  version_requirements: *8898360
 - !ruby/object:Gem::Dependency
   name: ember-rails
-  requirement: &10810480 !ruby/object:Gem::Requirement
+  requirement: &8897240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10810480
+  version_requirements: *8897240
 - !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &10809240 !ruby/object:Gem::Requirement
+  requirement: &8911980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10809240
+  version_requirements: *8911980
 description: A common mountable engine can be used to manage the orders.
 email:
 - towerhe@gmail.com
@@ -109,8 +109,9 @@ files:
 - app/assets/javascripts/rightnow_oms/vendor/ember.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/adapters/my_rest_adapter.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
@@ -155,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -375847056207753837
+      hash: 4137530938571715017
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -164,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -375847056207753837
+      hash: 4137530938571715017
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10