app/views/workarea/admin/orders/attributes.html.haml in workarea-admin-3.4.16 vs app/views/workarea/admin/orders/attributes.html.haml in workarea-admin-3.4.17

- old
+ new

@@ -12,112 +12,120 @@ .view__container = render_cards_for(@order, :attributes) .view__container.view__container--narrow - .grid - .grid__cell.grid__cell--25 - %h2= t('workarea.admin.orders.attributes.checkout.title') - %ul.list-reset - - if @order.user.present? || @order.email.present? - %li - %strong= t('workarea.admin.orders.attributes.checkout.customer') - - if @order.user.present? - = link_to @order.user.name, user_path(@order.user) - - else - = @order.email - - if @order.checkout_by.present? && @order.checkout_by != @order.user + .section + .grid + .grid__cell.grid__cell--25 + %h2= t('workarea.admin.orders.attributes.checkout.title') + %ul.list-reset + - if @order.user.present? || @order.email.present? %li - %strong - = t('workarea.admin.orders.attributes.checkout.placed_by') - = link_to @order.checkout_by.name, user_path(@order.checkout_by) - - if @order.source.present? + %strong= t('workarea.admin.orders.attributes.checkout.customer') + - if @order.user.present? + = link_to @order.user.name, user_path(@order.user) + - else + = @order.email + - if @order.checkout_by.present? && @order.checkout_by != @order.user + %li + %strong + = t('workarea.admin.orders.attributes.checkout.placed_by') + = link_to @order.checkout_by.name, user_path(@order.checkout_by) + - if @order.source.present? + %li + %strong + = t('workarea.admin.orders.attributes.checkout.source') + = @order.source.titleize + - if @order.copied_from.present? + %li + %strong + = t('workarea.admin.fields.copied_from_id') + = link_to @order.copied_from.name, order_path(@order.copied_from) %li - %strong - = t('workarea.admin.orders.attributes.checkout.source') - = @order.source.titleize - - if @order.copied_from.present? + %strong= t('workarea.admin.orders.attributes.checkout.status') + = @order.model.status.to_s.titleize %li - %strong - = t('workarea.admin.fields.copied_from_id') - = link_to @order.copied_from.name, order_path(@order.copied_from) - %li - %strong= t('workarea.admin.orders.attributes.checkout.status') - = @order.model.status.to_s.titleize - %li - %strong= t('workarea.admin.orders.attributes.checkout.promo_codes') - = @order.promo_codes.join(', ').presence || t('workarea.admin.orders.attributes.checkout.none') - %li - %strong= t('workarea.admin.orders.attributes.checkout.placed') - - if @order.placed? - = local_time_ago(@order.placed_at) - %li - %strong= t('workarea.admin.orders.attributes.checkout.ip_address') - = @order.ip_address.presence || t('workarea.admin.orders.attributes.checkout.none') - %li - %strong= t('workarea.admin.orders.attributes.checkout.traffic_referrer') - = @order.traffic_referrer&.medium.presence || t('workarea.admin.orders.attributes.checkout.none') - %li - %strong= t('workarea.admin.orders.attributes.checkout.traffic_referrer_url') - = @order.traffic_referrer&.uri.presence || t('workarea.admin.orders.attributes.checkout.none') - %li - %strong= t('workarea.admin.fields.updated_at') - #{local_time_ago(@order.updated_at)} - %li - %strong= t('workarea.admin.fields.created_at') - #{local_time_ago(@order.created_at)} - = append_partials('admin.order_attributes', order: @order) + %strong= t('workarea.admin.orders.attributes.checkout.promo_codes') + = @order.promo_codes.join(', ').presence || t('workarea.admin.orders.attributes.checkout.none') + %li + %strong= t('workarea.admin.orders.attributes.checkout.placed') + - if @order.placed? + = local_time_ago(@order.placed_at) + %li + %strong= t('workarea.admin.orders.attributes.checkout.ip_address') + = @order.ip_address.presence || t('workarea.admin.orders.attributes.checkout.none') + %li + %strong= t('workarea.admin.orders.attributes.checkout.traffic_referrer') + = @order.traffic_referrer&.medium.presence || t('workarea.admin.orders.attributes.checkout.none') + %li + %strong= t('workarea.admin.orders.attributes.checkout.traffic_referrer_url') + - if @order.traffic_referrer&.uri.present? + = link_to t('workarea.admin.orders.attributes.checkout.view'), '#traffic_referrer_url_tooltip', data: { tooltip: { interactive: true, trigger: 'click' }.to_json } + #traffic_referrer_url_tooltip.tooltip-content + .align-center + %p= text_field_tag nil, @order.traffic_referrer.uri, id: 'traffic_referrer_url', class: 'text-box' + = button_tag t('workarea.admin.orders.attributes.checkout.copy_url'), data: { copy_to_clipboard: '#traffic_referrer_url' }, class: 'button button--small' + - else + = t('workarea.admin.orders.attributes.checkout.none') + %li + %strong= t('workarea.admin.fields.updated_at') + #{local_time_ago(@order.updated_at)} + %li + %strong= t('workarea.admin.fields.created_at') + #{local_time_ago(@order.created_at)} + = append_partials('admin.order_attributes', order: @order) - .grid__cell.grid__cell--75 - %h2= t('workarea.admin.orders.attributes.items.title') - %table - %thead - %tr - %th= t('workarea.admin.orders.attributes.items.product') - %th.align-center= t('workarea.admin.orders.attributes.items.quantity') - %th.align-right= t('workarea.admin.orders.attributes.items.pricing') - %tbody - - @order.items.each do |item| + .grid__cell.grid__cell--75 + %h2= t('workarea.admin.orders.attributes.items.title') + %table + %thead %tr - %td - .grid.grid--auto - .grid__cell - = link_to image_tag(product_image_url(item.image, :small), alt: item.product.name), catalog_product_url(item.product, sku: item.sku) - .grid__cell - %p= link_to item.product.name, catalog_product_path(item.product, sku: item.sku) - %p= item.sku - - if item.customizations.any? - - item.customizations.each do |name, value| - %p #{name.titleize}: #{value} - = append_partials('admin.order_attributes_item_details', item: item) - %td.align-center= item.quantity - %td.align-right - - item.price_adjustments.each do |adjustment| - %p - %strong= price_adjustment_description_for(adjustment) - %span= number_to_currency(adjustment.amount) - - .grid.grid--right - .grid__cell.grid__cell--50 - %table.data-pairs - %tbody + %th= t('workarea.admin.orders.attributes.items.product') + %th.align-center= t('workarea.admin.orders.attributes.items.quantity') + %th.align-right= t('workarea.admin.orders.attributes.items.pricing') + %tbody + - @order.items.each do |item| %tr - %th - %span.data-pairs__name= t('workarea.admin.orders.attributes.totals.subtotal') - %td= number_to_currency @order.subtotal_price - %tr - %th - %span.data-pairs__name= t('workarea.admin.orders.attributes.totals.shipping') - %td= number_to_currency @order.shipping_total - %tr - %th - %span.data-pairs__name= t('workarea.admin.orders.attributes.totals.tax') - %td= number_to_currency @order.tax_total - %tr - %th - %span.data-pairs__name= t('workarea.admin.orders.attributes.totals.total_price') %td - %strong= number_to_currency @order.total_price - %tr - %th - %span.data-pairs__name= t('workarea.admin.orders.attributes.totals.total_value') - %td= number_to_currency @order.total_value + .grid.grid--auto + .grid__cell + = link_to image_tag(product_image_url(item.image, :small), alt: item.product.name), catalog_product_url(item.product, sku: item.sku) + .grid__cell + %p= link_to item.product.name, catalog_product_path(item.product, sku: item.sku) + %p= item.sku + - if item.customizations.any? + - item.customizations.each do |name, value| + %p #{name.titleize}: #{value} + = append_partials('admin.order_attributes_item_details', item: item) + %td.align-center= item.quantity + %td.align-right + - item.price_adjustments.each do |adjustment| + %p + %strong= price_adjustment_description_for(adjustment) + %span= number_to_currency(adjustment.amount) + + .grid.grid--right + .grid__cell.grid__cell--50 + %table.data-pairs + %tbody + %tr + %th + %span.data-pairs__name= t('workarea.admin.orders.attributes.totals.subtotal') + %td= number_to_currency @order.subtotal_price + %tr + %th + %span.data-pairs__name= t('workarea.admin.orders.attributes.totals.shipping') + %td= number_to_currency @order.shipping_total + %tr + %th + %span.data-pairs__name= t('workarea.admin.orders.attributes.totals.tax') + %td= number_to_currency @order.tax_total + %tr + %th + %span.data-pairs__name= t('workarea.admin.orders.attributes.totals.total_price') + %td + %strong= number_to_currency @order.total_price + %tr + %th + %span.data-pairs__name= t('workarea.admin.orders.attributes.totals.total_value') + %td= number_to_currency @order.total_value