Admin cart page revamp #1710
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,98 @@ | ||
|
|
||
| Spree.CartLineItemView = Backbone.View.extend | ||
| tagName: 'tr' | ||
| className: 'line-item' | ||
|
|
||
| initialize: (options) -> | ||
| @editing = options.editing || @model.isNew() | ||
| @noCancel = options.noCancel | ||
|
|
||
| events: | ||
| 'click .edit-line-item': 'onEdit' | ||
| 'click .cancel-line-item': 'onCancel' | ||
| 'click .save-line-item': 'onSave' | ||
| 'click .delete-line-item': 'onDelete' | ||
| 'change .js-select-variant': 'onChangeVariant' | ||
|
|
||
| onEdit: (e) -> | ||
| e.preventDefault() | ||
| @editing = true | ||
| @render() | ||
|
|
||
| onCancel: (e) -> | ||
| e.preventDefault() | ||
| @trigger('cancel') | ||
| if @model.isNew() | ||
| @remove() | ||
| else | ||
| @editing = false | ||
| @render() | ||
|
|
||
| validate: () -> | ||
| @$('[name=quantity]').toggleClass 'error', !@$('[name=quantity]').val() | ||
| @$('.select2-container').toggleClass 'error', !@$('[name=variant_id]').val() | ||
|
|
||
| !@$('.select2-container').hasClass('error') && !@$('[name=quantity]').hasClass('error') | ||
|
|
||
| onSave: (e) -> | ||
| e.preventDefault() | ||
| return unless @validate() | ||
| attrs = { | ||
| quantity: parseInt(@$('input.line_item_quantity').val()) | ||
| } | ||
| if @model.isNew() | ||
| attrs['variant_id'] = @$("[name=variant_id]").val() | ||
| @model.save attrs, | ||
| patch: true, | ||
| success: => | ||
| window.Spree.advanceOrder() | ||
| @editing = false | ||
| @render() | ||
|
|
||
| onDelete: (e) -> | ||
| e.preventDefault() | ||
| return unless confirm(Spree.translations.are_you_sure_delete) | ||
| @remove() | ||
| @model.destroy | ||
| success: => | ||
| window.Spree.advanceOrder() | ||
|
|
||
| render: -> | ||
| line_item = @model.attributes | ||
| image = line_item.variant && line_item.variant.images[0] | ||
| html = HandlebarsTemplates['orders/line_item']( | ||
| line_item: line_item, | ||
| image: image, | ||
| editing: @editing, | ||
| isNew: @model.isNew(), | ||
| noCancel: @noCancel | ||
| ) | ||
| el = @$el.html(html) | ||
| @$("[name=variant_id]").variantAutocomplete({ in_stock_only: true }) | ||
|
|
||
| $ -> | ||
| if $("table.line-items").length | ||
| url = Spree.routes.orders_api + "/" + order_number | ||
| lineItemModel = Backbone.Model.extend | ||
|
There was a problem hiding this comment. Can we put this model into its own file and use the Spree.Model namespace discussed in #1715? There was a problem hiding this comment. Can't be done here. At this point the model needs to be defined where we have access to |
||
| urlRoot: Spree.routes.line_items_api(order_number) | ||
|
|
||
| add_button = $('.js-add-line-item') | ||
| add_button.click -> | ||
| add_button.prop("disabled", true) | ||
| view = new Spree.CartLineItemView(model: new lineItemModel()) | ||
| view.render() | ||
| view.on('cancel', (event) -> add_button.prop("disabled", false)) | ||
| $("table.line-items > tbody").append(view.el) | ||
|
|
||
| Spree.ajax(url: url).done (result) -> | ||
| for line_item in result.line_items | ||
| model = new lineItemModel(line_item) | ||
| view = new Spree.CartLineItemView(model: model) | ||
| view.render() | ||
| $("table.line-items > tbody").append(view.el) | ||
|
|
||
| add_button.prop("disabled", !result.line_items.length) | ||
| if !result.line_items.length | ||
| view = new Spree.CartLineItemView(model: new lineItemModel(), noCancel: true) | ||
| view.render() | ||
| $("table.line-items > tbody").append(view.el) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| {{#if isNew}} | ||
| <td class="line-item-select-variant" colspan="2"> | ||
| <input type="hidden" name="variant_id" class="js-select-variant select-variant fullwidth"> | ||
| </td> | ||
| {{else}} | ||
| <td class="line-item-image"> | ||
| <img src="{{ image.mini_url }}"> | ||
| </td> | ||
| <td class="line-item-name"> | ||
| {{ line_item.variant.name }}<br> | ||
| {{#if line_item.variant.options_text }} | ||
| {{ line_item.variant.options_text }}<br/> | ||
| {{/if}} | ||
| <strong>{{ t "sku" }}:</strong> {{ line_item.variant.sku }} | ||
| </td> | ||
| {{/if}} | ||
| <td class="line-item-price align-center"> | ||
| {{ line_item.single_display_amount }} | ||
| </td> | ||
| {{#if editing}} | ||
| <td class="line-item-qty-edit"> | ||
| <input type="number" name="quantity" value="{{ line_item.quantity }}" min="0" class="line_item_quantity" size="5"> | ||
| </td> | ||
| {{else}} | ||
| <td class="line-item-qty-show align-center"> | ||
| {{ line_item.quantity }} | ||
| </td> | ||
| {{/if}} | ||
| <td class="line-item-total align-center"> | ||
| {{ line_item.display_amount }} | ||
| </td> | ||
| <td class="cart-line-item-delete actions" data-hook="cart_line_item_delete"> | ||
| {{#if editing}} | ||
| <a class="save-line-item fa fa-ok no-text with-tip" href="#" title="{{ t "actions.save" }}"></a> | ||
| {{#unless noCancel}} | ||
| <a class="cancel-line-item fa fa-cancel no-text with-tip" href="#" title="{{ t "actions.cancel" }}"></a> | ||
| {{/unless}} | ||
| {{else}} | ||
| <a class="edit-line-item fa fa-edit no-text with-tip" href="#" title="{{ t "actions.edit" }}"></a> | ||
| <a class="delete-line-item fa fa-trash no-text with-tip" href="#" title="{{ t "actions.delete" }}"></a> | ||
| {{/if}} | ||
| </td> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,24 @@ | ||
| <table class="line-items index" data-hook="line-items"> | ||
| <colgroup> | ||
| <col style="width: 10%;" /> | ||
| <col style="width: 45%;" /> | ||
| <col style="width: 10%;" /> | ||
| <col style="width: 10%;" /> | ||
| <col style="width: 10%;" /> | ||
| <col style="width: 15%;" /> | ||
| </colgroup> | ||
|
|
||
| <thead> | ||
| <tr> | ||
| <th colspan="2"><%= Spree::Product.human_attribute_name(:name) %></th> | ||
| <th><%= Spree::LineItem.human_attribute_name(:price) %></th> | ||
| <th><%= Spree::LineItem.human_attribute_name(:quantity) %></th> | ||
| <th><%= Spree::LineItem.human_attribute_name(:total) %></th> | ||
| <th class="orders-actions actions" data-hook="admin_order_form_line_items_header_actions"> </th> | ||
| </tr> | ||
| </thead> | ||
|
|
||
| <tbody> | ||
| <%# Rendered by JS %> | ||
| </tbody> | ||
| </table> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we can also introduce a Spree.Views namespace for views as we discussed for models in #1715?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd rather address this in the #1715, which is a follow up to this. This PR was intended only to be the UI change, with #1715 being a more complete switch to backbone.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure.