rightnow_oms 0.1.4 → 0.1.6

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

@@ -1,46 +1,44 @@
 RightnowOms.CartItem = DS.Model.extend
-  cartable_id: DS.attr('integer')
+  cartable_id: DS.attr('number')
   cartable_type: DS.attr('string')
   name: DS.attr('string')
   original_price: DS.attr('string')
-  base_quantity: DS.attr('integer')
+  base_quantity: DS.attr('number')
   price: DS.attr('money')
-  quantity: DS.attr('integer')
+  quantity: DS.attr('number')
   group: DS.attr('string')
-  parent_id: DS.attr('integer')
   mergable: DS.attr('boolean')
+  parent_id: DS.attr('number')
+  cart: DS.belongsTo('RightnowOms.Cart')
+  parent: DS.belongsTo('RightnowOms.CartItem', { key: 'parent_id' })
+  children: DS.hasMany('RightnowOms.CartItem', { embedded: true })
 
-  priceString: (->
+  priceString: Ember.computed(->
     round(@get('price'), 2)
   ).property('price')
 
-  subtotal: (->
+  subtotal: Ember.computed(->
     @get('price') * @get('quantity')
   ).property('price', 'quantity')
 
-  subtotalString: (->
+  subtotalString: Ember.computed(->
     round(@get('subtotal'), 2)
   ).property('subtotal')
 
-  children: (->
-    RightnowOms.CartItem.findByParentId(@get('id'))
-  ).property().cacheable()
+  hasChildren: Ember.computed(->
+    @get('children')? && @getPath('children.length') > 0
+  ).property('children')
 
-  parent: (->
-    if @get('parent_id')?
-      RightnowOms.CartItem.all().filterProperty('id', @get('parent_id'))
-  ).property('parent_id')
+  hasParent: Ember.computed(->
+    @get('parent')?
+  ).property('parent')
 
-  hasChildren: (->
-    @set('children', RightnowOms.CartItem.findByParentId(@get('id')))
-    @get('children') && @getPath('children.length') > 0
-  ).property()
+  addChild: (child) ->
+    child.parent_id = @get('id')
+    childItem = RightnowOms.CartItem.createRecord(child)
+    @get('children').pushObject(childItem)
 
-  hasParent: (->
-    @get('parent_id')?
-  ).property('parent_id')
-
-  isDecreasable: (->
+  isDecreasable: Ember.computed(->
     @get('quantity') > 1
   ).property('quantity')
 
@@ -61,34 +59,15 @@ RightnowOms.CartItem = DS.Model.extend
     @set('quantity', @get('quantity') - @get('base_quantity'))
 
   deleteRecord: ->
+    # If having children, remove the children from the local store.
+    # No use to delete the children explicitly since it will be remove
+    # automatically on remote.
     if @get('hasChildren')
-      @get('children').forEach((child) ->
-        child.deleteRecord()
-      )
+      @get('children').forEach(@get('children').removeObject, @get('children'))
 
     @_super()
 
   isProcessing: ->
-    @get('isSaving') || @get('children').someProperty('isSaving', true)
-
-RightnowOms.CartItem.reopenClass
-  all: ->
-    RightnowOms.store.findAll(RightnowOms.CartItem)
-
-  findById: (id) ->
-    @all().filterProperty('id', id).get('firstObject')
-
-  findByParentId: (parentId) ->
-    @all().filterProperty('parent_id', parentId)
-
-  findByName: (name) ->
-    @all().filterProperty('name', name).get('firstObject')
-
-  findByCartableAndParentId: (cartableId, cartableType, parentId) ->
-    @all().filter((item) ->
-      if item.get('cartable_id') == cartableId && item.get('cartable_type') == cartableType
-        if parentId?
-          return true if item.get('parent_id') == parentId
-        else
-          return true
-    ).get('firstObject')
+    @get('isSaving') ||
+      @get('children').someProperty('isSaving', true) ||
+      @get('children').someProperty('isDirty', true)

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

@@ -0,0 +1,30 @@
+{{#unless cartItem.hasParent }}
+  <dt>
+    <ul>
+      <li class="name" {{ action "toggleChildren" }}>{{ cartItem.name }}</li>
+      <li class="others">
+        <div class="price r-money">{{t currency.unit}}{{ cartItem.priceString }}x{{ cartItem.quantity }}</div>
+        <div class="delete">
+          <a href="#" {{ action "deleteRecord" }}>{{t buttons.delete}}</a>
+        </li>
+      </li>
+      <div class='r-clear' />
+    </ul>
+  </dt>
+  {{#if isChildrenHidden}}
+    {{#if cartItem.hasChildren}}
+      <dd>
+        {{#each cartItem.children }}
+          <ul class='child'>
+            <li class="name">{{ name }}</li>
+            <li class="others">
+              <div class="price r-money">{{t currency.unit}}{{ priceString }}x{{ quantity }}</div>
+              <div class="delete" />
+            </li>
+            <div class="r-clear" />
+          </ul>
+        {{/each}}
+      </dd>
+    {{/if}}
+  {{/if}}
+{{/unless}}

data/app/assets/javascripts/rightnow_oms/app/templates/cart_items/{show_in_detail.hjs → show_in_detail.handlebars}

@@ -3,7 +3,7 @@
     <ul>
       <li class="name" {{ action "toggleChildren" }}>{{ cartItem.name }}</li>
       <li class="others">
-        <div class='price'>￥{{ cartItem.priceString }}</div>
+        <div class='price'>{{t currency.unit}}{{ cartItem.priceString }}</div>
         <div class="quantity">
           {{#if hasParent }}
             <span class="quantity-only">{{ cartItem.quantity }}</span>
@@ -13,10 +13,10 @@
             <span class="increase"><a href="#" {{ action "increase" }}>+</a></span>
           {{/if}}
         </div>
-        <div class="subtotal r-money">￥{{ cartItem.subtotalString }}</div>
+        <div class="subtotal r-money">{{t currency.unit}}{{ cartItem.subtotalString }}</div>
         <div class="delete">
           {{#unless cartItem.hasParent }}
-            <a href="#" {{ action "deleteRecord" }}>删除</a>
+            <a href="#" {{ action "deleteRecord" }}>{{t buttons.delete}}</a>
           {{/unless}}
         </div>
       </li>

data/app/assets/javascripts/rightnow_oms/app/templates/carts/{show.hjs → show.handlebars}

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

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

@@ -0,0 +1,2 @@
+<a href="/rightnow_oms/cart">{{t
+  cart.cartable.counter}} ({{cartableCount}})</a>

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

@@ -0,0 +1,30 @@
+<h2>{{t titles.cart}}</h2>
+<div class="r-cart-items">
+  <ul class='title'>
+    <li class="name">{{t cart_item.name}}</li>
+    <li class="others">
+      <div class="price">{{t cart_item.price}}</div>
+      <div class="quantity">{{t cart_item.quantity tagName="div"}}</div>
+      <div class="subtotal">{{t cart_item.total}}</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 }}>{{t
+        buttons.clean_cart}}</a></span>
+  </div>
+  <div class="right-conner">
+    <span>{{t cart.total}} <span class="r-money">{{t currency.unit}}{{ cart.total }}</span></span>
+    <span class="r-continue-to-shop"><a href="/"><< {{t
+        buttons.continue_to_shop}}</a></span>
+    <span class="r-checkout"><a {{ bindAttr href="newOrderUrl" }}>{{t
+        buttons.new_order}}>></a></span>
+  </div>
+</div>

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

@@ -9,10 +9,13 @@ RightnowOms.ShowCartItemInDetailView = RightnowOms.ShowCartItemView.extend
     item = @get('cartItem')
     RightnowOms.cartController.decreaseCartItem(item.get('id'))
 
+  deleteRecord: ->
+    item = this.get('cartItem')
+    RightnowOms.cartController.removeCartItem(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/application.js.coffee

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

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

@@ -0,0 +1,10 @@
+//= require jquery
+$(function() {
+  $('.r-cart-items dd').hide();
+  $('dt').click(function(e) {
+    var next = $(this).next();
+    if(next.is('dd')) {
+      next.toggle();
+    }
+  });
+});

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

@@ -0,0 +1,5 @@
+#= require_tree ./locales
+#
+RightnowOms.configure (config) ->
+  config.set 'autoCommit', true
+  config.set 'defaultLocale', 'en'

data/app/assets/javascripts/rightnow_oms/config/locales/en.js.coffee

@@ -0,0 +1,24 @@
+RightnowOms.configure (config)->
+  config.set 'locales.en',
+    'cart.cartable.counter': 'Shopping Cart '
+    'cart.total': 'Total'
+
+    'cart_item.name': 'Name'
+    'cart_item.price': 'Price'
+    'cart_item.quantity': 'Quantity'
+    'cart_item.total': 'Total'
+
+    'currency.unit': '$'
+    
+    'buttons.check_cart': 'Check Cart'
+    'buttons.delete': 'Delete'
+    'buttons.clean_cart': 'Clean Up'
+    'buttons.continue_to_shop': 'Continue To Shop'
+    'buttons.new_order': 'Submit'
+
+    'titles.cart': 'My Shopping Cart'
+
+    'alerts.saving_cart': 'Cart is saving, please wait...'
+
+    'confirmations.delete_cart_item': 'Are you sure to delete this cart items?'
+    'confirmations.clean_up_cart': 'Are you sure to clean up the cart?'

data/app/assets/javascripts/rightnow_oms/config/locales/zh_CN.js.coffee

@@ -0,0 +1,24 @@
+RightnowOms.configure (config)->
+  config.set 'locales.zh_CN',
+    'cart.cartable.counter': '购物车'
+    'cart.total': '总计'
+
+    'cart_item.name': '名称'
+    'cart_item.price': '价格'
+    'cart_item.quantity': '数量'
+    'cart_item.total': '小计'
+
+    'currency.unit': '￥'
+    
+    'buttons.check_cart': '查看我的购物车'
+    'buttons.delete': '删除'
+    'buttons.clean_cart': '清空购物车'
+    'buttons.continue_to_shop': '继续购物'
+    'buttons.new_order': '提交订单'
+
+    'titles.cart': '我的购物车'
+
+    'alerts.saving_cart': '正在保存购物车，请稍后。。。'
+
+    'confirmations.delete_cart_item': '您确定要删除该商品吗？'
+    'confirmations.clean_up_cart': '您确定要清空您的购物车吗？'

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

@@ -1,163 +1,5 @@
-get = Ember.get
-set = Ember.set
-getPath = Ember.getPath
-
 DS.MyRESTAdapter = DS.RESTAdapter.extend
-  createRecord: (store, type, model) ->
-    root = @rootForType(type)
-    url = @buildUrl(type)
-    data = {}
-
-    data[root] = get(model, 'data')
-
-    @ajax(url, "POST", {
-      data: data,
-      success: (json) ->
-        store.didCreateRecord(model, json[root])
-    })
-
-  createRecords: (store, type, models) ->
-    if (get(@, 'bulkCommit') == false)
-      return @_super(store, type, models)
-
-    root = @rootForType(type)
-    plural = @pluralize(root)
-
-    data = {}
-    data[plural] = models.map((model) ->
-      get(model, 'data')
-
-    )
-    @ajax(@buildUrl(type), "POST", {
-      data: data,
-      success: (json) ->
-        store.didCreateRecords(type, models, json[plural])
-    })
-
-  updateRecord: (store, type, model) ->
-    root = @rootForType(type)
-
-    data = {}
-    data[root] = get(model, 'data')
-
-    @ajax(@buildUrl(type, @getPrimaryKeyValue(type, model)), "PUT", {
-      data: data,
-      success: (json) ->
-        store.didUpdateRecord(model)
-    })
-
-  updateRecords: (store, type, models) ->
-    if (get(@, 'bulkCommit') == false)
-      return @_super(store, type, models)
-
-    root = @rootForType(type)
-    plural = @pluralize(root)
-
-    data = {}
-    data[plural] = models.map((model) ->
-      get(model, 'data')
-    )
-
-    @ajax(@buildUrl(type), "POST", {
-      data: data,
-      success: (json) ->
-        store.didUpdateRecords(models, json[plural])
-    })
-
-  deleteRecord: (store, type, model) ->
-    root = @rootForType(type)
-    url = @buildUrl(type, @getPrimaryKeyValue(type, model))
-
-    @ajax(url, "DELETE", {
-      success: (json) ->
-        store.didDeleteRecord(model)
-    })
-
-  deleteRecords: (store, type, models) ->
-    if (get(@, 'bulkCommit') == false)
-      return @_super(store, type, models)
-
-    root = @rootType(type)
-    plural = @pluralize(root)
-    primaryKey = getPath(type, 'proto.primaryKey')
-
-    data = {}
-    data[plural] = models.map((model) ->
-      get(model, primaryKey)
-    )
-
-    @ajax(@buildUrl(type) + "/delete", "POST", {
-      data: data
-      success: (json) ->
-        store.didDeleteRecords(models)
-    })
-    
-  find: (store, type, id) ->
-    url = ''
-    root = @rootForType(type)
-
-    if @isSingleton(type)
-      url = @buildUrl(type)
-    else
-      url = @buildUrl(type, id)
-
-    @ajax(url, "GET", {
-      success: (json) ->
-        store.load(type, json[root])
-    })
-
-  findMany: (store, type, ids) ->
-    root = @rootForType(type)
-    plural = @pluralize(root)
-
-    @ajax(@buildUrl(type), "GET", {
-      data: { ids: ids },
-      success: (json) ->
-        store.loadMany(type, ids, json[plural])
-    })
-    url = "/" + plural
-
-  findAll: (store, type) ->
-    root = @rootForType(type)
-    plural = @pluralize(root)
-
-    @ajax(@buildUrl(type), "GET", {
-      success: (json) ->
-        store.loadMany(type, json[plural])
-    })
-
-  findQuery: (store, type, query, modelArray) ->
-    root = @rootForType(type)
-    plural = @pluralize(root)
-
-    @ajax(@buildUrl(type), "GET", {
-      data: query,
-      success: (json) ->
-        modelArray.load(json[plural])
-    })
-
-  # HELPERS
-
-  plurals: {}
-
-  # define a plurals hash in your subclass to define
-  # special-case pluralization
-  pluralize: (name) ->
-    @plurals[name] || name + "s"
-
-  rootForType: (type) ->
-    if type.url
-      return type.url
-
-    # use the last part of the name as the URL
-    parts = type.toString().split(".")
-    name = parts[parts.length - 1]
-    name.replace(/([A-Z])/g, '_$1').toLowerCase().slice(1)
-
-  getPrimaryKeyValue: (type, model)->
-    primaryKey = getPath(type, 'proto.primaryKey')
-    get(model, primaryKey)
-
+  # @private
   buildUrl: (type, suffix) ->
     url = [""]
     root = @rootForType(type)
@@ -171,13 +13,6 @@ DS.MyRESTAdapter = DS.RESTAdapter.extend
 
     url.join('/')
 
+  # @private
   isSingleton: (type) ->
     if type.isSingleton then type.isSingleton else false
-
-  ajax: (url, type, hash) ->
-    hash.url = url
-    hash.type = type
-    hash.dataType = "json"
-
-    jQuery.ajax(hash)
-