rightnow_oms 0.1.2 → 0.1.3

data/CHANGELOG

@@ -1,4 +1,11 @@
-*Rightnow OMS 0.1.2 (wip)*
+*Rightnow OMS 0.1.3 (Fri 20:05, Feb 17, 2012)*
+
+* Don't count the children of cart items
+* Group children of cart items
+* Unmerge the same items by setting mergable to false when adding a item
+* Create orders
+
+*Rightnow OMS 0.1.2 (Wed 17:15, Feb 15, 2012)*
 
 * Clean up the cart
 * Load the cart items in cart by group

data/README.md

@@ -13,6 +13,7 @@ Add the following gems to your Gemfile:
   gem 'ember-rails'
   gem 'acts_as_api'
   gem 'haml-rails'
+  gem 'confstruct'
 
   group :assets do
     gem 'uglifier'
@@ -82,6 +83,15 @@ Create a layout for your detailed cart view like:
       = yield
 ```
 
+You need to configure your new order url in RightnowOms:
+
+```ruby
+  # config/initializers/rightnow_oms.rb
+  RightnowOms.configure do
+    new_order_url '/orders/new'
+  end
+```
+
 Add before filters to your controllers which need to use the cart:
 
 ```ruby

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

@@ -6,3 +6,5 @@ window.RightnowOms.store = DS.Store.create
     DS.MyRESTAdapter.create
       bulkCommit: false
       namespace: 'rightnow_oms'
+
+window.RightnowOms.config = Em.Object.create()

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

@@ -70,15 +70,15 @@ RightnowOms.cartController = Ember.Object.create
   #
   # =>
   #   [{
-  #     'id': 1, 'cartable_id': 2, 'cartable_type': 'Product', 'name': 'product-1', 'price': 10.0, 'group': 'booking', 'parent_id': null
+  #     'id': 1, 'cartable_id': 2, 'cartable_type': 'Product', 'name': 'product-1', 'original_price', 10.0, '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
+  #     'id': 2, 'cartable_id': 3, 'cartable_type': 'Product', 'name': 'product-2', 'original_price', 20.0, '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.push(item.getProperties('id', 'cartable_id', 'cartable_type', 'name', 'original_price', 'price', 'quantity', 'group', 'parent_id'))
 
     found

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

@@ -6,7 +6,7 @@ RightnowOms.Cart = DS.Model.extend
   cartableCount: (->
     count = 0
     @get('cartItems').forEach (item) ->
-      count += item.get('quantity')
+      count += item.get('quantity') unless item.get('hasParent')
 
     count
   ).property("cartItems.@each.quantity")
@@ -14,18 +14,28 @@ RightnowOms.Cart = DS.Model.extend
   total: (->
     total = 0
     @get('cartItems').forEach (item) ->
-      total += parseFloat(item.get('price')) * item.get('quantity')
+      total += item.get('price') * item.get('quantity') unless item.get('hasParent')
 
     round(total, 2)
-  ).property("cartableCount")
+  ).property("cartItems.@each.quantity")
 
   addCartItem: (item) ->
+    return @createCartItem(item) if item.mergable == false
+
     cartItem = RightnowOms.CartItem.findByCartableAndParentId(item.cartable_id, item.cartable_type, item.parent_id)
 
     if cartItem?
       cartItem.increase() unless cartItem.get('parent')?
     else
-      cartItem = RightnowOms.store.createRecord(RightnowOms.CartItem, item)
+      cartItem = @createCartItem(item)
+
+    cartItem
+
+  createCartItem: (item)->
+    cartItem = RightnowOms.store.createRecord(RightnowOms.CartItem, item)
+
+    if cartItem.get('hasParent')
+      cartItem.get('parent').set('children', RightnowOms.CartItem.findByParentId(cartItem.get('id')))
 
     cartItem
 

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

@@ -2,10 +2,13 @@ RightnowOms.CartItem = DS.Model.extend
   cartable_id: DS.attr('integer')
   cartable_type: DS.attr('string')
   name: DS.attr('string')
+  original_price: DS.attr('string')
+  base_quantity: DS.attr('integer')
   price: DS.attr('money')
   quantity: DS.attr('integer')
   group: DS.attr('string')
   parent_id: DS.attr('integer')
+  mergable: DS.attr('boolean')
 
   priceString: (->
     round(@get('price'), 2)
@@ -20,16 +23,17 @@ RightnowOms.CartItem = DS.Model.extend
   ).property('subtotal')
 
   children: (->
-    RightnowOms.CartItem.all().filterProperty('parent_id', @get('id'))
-  ).property()
+    RightnowOms.CartItem.findByParentId(@get('id'))
+  ).property().cacheable()
 
   parent: (->
     if @get('parent_id')?
       RightnowOms.CartItem.all().filterProperty('id', @get('parent_id'))
-  ).property()
+  ).property('parent_id')
 
   hasChildren: (->
-    @get('children.length') > 0
+    @set('children', RightnowOms.CartItem.findByParentId(@get('id')))
+    @get('children') && @getPath('children.length') > 0
   ).property()
 
   hasParent: (->
@@ -41,23 +45,26 @@ RightnowOms.CartItem = DS.Model.extend
   ).property('quantity')
 
   increase: ->
-    @get('children').forEach((child) ->
-      child.increase()
-    )
+    if @get('hasChildren')
+      @get('children').forEach((child) ->
+        child.increase()
+      )
 
-    @set('quantity', @get('quantity') + 1)
+    @set('quantity', @get('quantity') + @get('base_quantity'))
 
   decrease: ->
-    @get('children').forEach((child) ->
-      child.decrease()
-    )
+    if @get('hasChildren')
+      @get('children').forEach((child) ->
+        child.decrease()
+      )
 
-    @set('quantity', @get('quantity') - 1)
+    @set('quantity', @get('quantity') - @get('base_quantity'))
 
   deleteRecord: ->
-    @get('children').forEach((child) ->
-      child.deleteRecord()
-    )
+    if @get('hasChildren')
+      @get('children').forEach((child) ->
+        child.deleteRecord()
+      )
 
     @_super()
 
@@ -68,6 +75,9 @@ RightnowOms.CartItem.reopenClass
   findById: (id) ->
     @all().filterProperty('id', id).get('firstObject')
 
+  findByParentId: (parentId) ->
+    @all().filterProperty('parent_id', parentId)
+
   findByName: (name) ->
     @all().filterProperty('name', name).get('firstObject')
 

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

@@ -1,9 +1,23 @@
-{{#with cartItem }}
-  <td class="name">{{ name }}</td>
-  <td class="price r-money">￥{{ priceString }}x{{ quantity }}</td>
-  <td class="delete">
-    {{#unless hasParent }}
-      <a href="#" {{ action "deleteRecord" }}>删除</a>
-    {{/unless}}
-  </td>
-{{/with}}
+{{#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/cart_items/show_in_detail.hjs

@@ -1,19 +1,46 @@
-{{#with cartItem}}
-  <td class="name">{{ name }}</td>
-  <td class="price">￥{{ priceString }}</td>
-  <td class="quantity">
-    {{#if hasParent }}
-      <span class="quantity-only">{{ quantity }}</span>
-    {{else}}
-      <span class="decrease"><a href="#" {{ action "decrease" }}>-</a></span>
-      <span class="quantity"> {{ quantity }} </span>
-      <span class="increase"><a href="#" {{ action "increase" }}>+</a></span>
+{{#unless cartItem.hasParent}}
+  <dt>
+    <ul>
+      <li class="name" {{ action "toggleChildren" }}>{{ cartItem.name }}</li>
+      <li class="others">
+        <div class='price'>￥{{ cartItem.priceString }}</div>
+        <div class="quantity">
+          {{#if hasParent }}
+            <span class="quantity-only">{{ cartItem.quantity }}</span>
+          {{else}}
+            <span class="decrease"><a href="#" {{ action "decrease" }}>-</a></span>
+            <span class="quantity"> {{ cartItem.quantity }} </span>
+            <span class="increase"><a href="#" {{ action "increase" }}>+</a></span>
+          {{/if}}
+        </div>
+        <div class="subtotal r-money">￥{{ cartItem.subtotalString }}</div>
+        <div class="delete">
+          {{#unless cartItem.hasParent }}
+            <a href="#" {{ action "deleteRecord" }}>删除</a>
+          {{/unless}}
+        </div>
+      </li>
+      <div class="r-clear"></div>
+    </ul>
+  </dt>
+  {{#if isChildrenHidden}}
+    {{#if cartItem.hasChildren}}
+      <dd>
+        {{#each cartItem.children}}
+          <ul>
+            <li class="name">{{ name }}</li>
+            <li class="others">
+              <div class="price">￥{{ priceString }}</div>
+              <div class="quantity">
+                <span class="quantity-only">{{ quantity }}</span>
+              </div>
+              <div class="subtotal r-money">￥{{ subtotalString }}</div>
+              <div class="delete"></div>
+            </li>
+            <div class="r-clear"></div>
+          </ul>
+        {{/each}}
+      </dd>
     {{/if}}
-  </td>
-  <td class="subtotal r-money">￥{{ subtotalString }}</td>
-  <td class="delete">
-    {{#unless hasParent }}
-      <a href="#" {{ action "deleteRecord" }}>删除</a>
-    {{/unless}}
-  </td>
-{{/with}}
+  {{/if}}
+{{/unless}}

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

@@ -2,11 +2,9 @@
   {{ view RightnowOms.ShowCartableCountView cartableCountBinding="cart.cartableCount" }}
 </div>
 <div class="r-cart-items">
-  <table>
   {{#each cart.cartItems}}
     {{ view RightnowOms.ShowCartItemView cartItemBinding="this" }}
   {{/each}}
-  </table>
   <div class="r-bottom-bar">
     <span>总计：<span class="r-money">￥{{ cart.total }}</span></span>
     <span><a href="/rightnow_oms/cart">查看我的购物车</a></span>

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

@@ -1,27 +1,19 @@
 <h2>我的购物车</h2>
 <div class="r-cart-items">
-  <table>
-    <thead>
-      <tr>
-        <th>名称</th>
-        <th>价格</th>
-        <th>数量</th>
-        <th>总价</th>
-        <th></th>
-      </tr>
-    </thead>
-    <tbody>
-    {{#each cart.cartItems}}
-      {{ view RightnowOms.ShowCartItemInDetailView cartItemBinding="this" }}
-    {{/each}}
-    </tbody>
-    <tfoot>
-    <tr>
-      <td colspan="4"></td>
-      <td></td>
-    </tr>
-    </tfoot>
-  </table>
+  <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">
@@ -30,6 +22,6 @@
   <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>
+    <span class="r-checkout"><a {{ bindAttr href="newOrderUrl" }}>去结算 >></a></span>
   </div>
 </div>

data/app/assets/javascripts/rightnow_oms/app/views/cart_items/show.js.coffee

@@ -1,7 +1,11 @@
 RightnowOms.ShowCartItemView = Ember.View.extend
-  tagName: 'tr'
+  tagName: 'dl'
   templateName: 'rightnow_oms/app/templates/cart_items/show'
 
+  toggleChildren: ->
+    hidden = @get('isChildrenHidden')
+    @set('isChildrenHidden', !hidden)
+
   deleteRecord: ->
     item = this.get('cartItem')
     RightnowOms.cartController.removeCartItem(item.get('id'), true)

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

@@ -1,11 +1,6 @@
-RightnowOms.ShowCartItemInDetailView = Ember.View.extend
-  tagName: 'tr'
+RightnowOms.ShowCartItemInDetailView = RightnowOms.ShowCartItemView.extend
   templateName: 'rightnow_oms/app/templates/cart_items/show_in_detail'
 
-  deleteRecord: ->
-    item = @get('cartItem')
-    RightnowOms.cartController.removeCartItem(item.get('id'))
-
   increase: ->
     item = @get('cartItem')
     RightnowOms.cartController.increaseCartItem(item.get('id'))
@@ -13,3 +8,11 @@ RightnowOms.ShowCartItemInDetailView = Ember.View.extend
   decrease: ->
     item = @get('cartItem')
     RightnowOms.cartController.decreaseCartItem(item.get('id'))
+
+  mouseEnter: (e) ->
+    $(e.target).parents('.r-cart-items').find('dt').css('background', 'white')
+    $(e.target).parents('dt').css('background','#EEE')
+
+
+  mouseLeave: (e) ->
+    $(e.target).parents('.r-cart-items').find('dt').css('background', 'white')

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

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