raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-07 22:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removing number column from orders panel, adding edit action

Browse Source
This commit is contained in:
Rob Harrington
2016-12-14 08:52:36 +11:00
parent e4f30cea57
commit a32fb752dd
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/views/admin/standing_orders/_orders_panel.html.haml
View File

@@ -3,27 +3,24 @@
.row.standing-order-orders
.fourteen.columns.offset-by-one
%table
%col{ style: 'width: 25%' }
%col{ style: 'width: 30%' }
%col{ style: 'width: 30%' }
%col{ style: 'width: 20%' }
%col{ style: 'width: 15%' }
%col{ style: 'width: 10%' }
%col{ style: 'width: 20%' }
%thead
%th= t('admin.standing_orders.orders.number')
%th= t('admin.order_cycle')
%th= t('admin.status_state')
%th= t('total')
%th.actions
%tbody
%tr.proxy_order{ :id => "o_{{order.id}}", ng: { repeat: 'order in standingOrder.not_closed_proxy_orders' } }
%tr.proxy_order{ :id => "po_{{proxyOrder.id}}", ng: { repeat: 'proxyOrder in standingOrder.not_closed_proxy_orders' } }
%td
%a{ ng: { href: "{{::order.edit_path}}", bind: '::order.number' }, target: '_blank' }
%td
%div{ ng: { bind: "::orderCycleName(order.order_cycle_id)" } }
%div{ ng: { bind: "::orderCycleCloses(order.order_cycle_id)" } }
%div{ ng: { bind: "::orderCycleName(proxyOrder.order_cycle_id)" } }
%div{ ng: { bind: "::orderCycleCloses(proxyOrder.order_cycle_id)" } }
%td.text-center
%span.state{ ng: { class: "order.state", bind: 'stateText(order.state)' } }
%td.text-center{ ng: { bind: 'order.total' } }
%span.state{ ng: { class: "proxyOrder.state", bind: 'stateText(proxyOrder.state)' } }
%td.text-center{ ng: { bind: 'proxyOrder.total | currency' } }
%td.actions
%a.cancel-order.icon-remove.no-text{ href: 'javascript:void(0)', ng: { hide: "order.state == 'canceled'", click: "cancelOrder(order)" }, 'ofn-with-tip' => t(:cancel_order) }
%a.resume-order.icon-resume.no-text{ href: 'javascript:void(0)', ng: { show: "order.state == 'canceled'", click: "resumeOrder(order)" }, 'ofn-with-tip' => t(:resume_order) }
%a.edit-order.icon-edit.no-text{ href: '{{::proxyOrder.edit_path}}', 'ofn-with-tip' => t(:edit_order) }
%a.cancel-order.icon-remove.no-text{ href: 'javascript:void(0)', ng: { hide: "proxyOrder.state == 'canceled'", click: "cancelOrder(proxyOrder)" }, 'ofn-with-tip' => t(:cancel_order) }
%a.resume-order.icon-resume.no-text{ href: 'javascript:void(0)', ng: { show: "proxyOrder.state == 'canceled'", click: "resumeOrder(proxyOrder)" }, 'ofn-with-tip' => t(:resume_order) }

5
spec/features/admin/standing_orders_spec.rb
View File

@@ -66,14 +66,11 @@ feature 'Standing Orders' do
page.find("td.orders.panel-toggle").trigger('click')
end
# save_screenshot '/Users/rob/Desktop/ss1.png'
# expect(page).to have_selector ".standing-order-orders"
within ".standing-order-orders" do
expect(page).to have_selector "tr.proxy_order", count: 1
proxy_order = standing_order.proxy_orders.first
within "tr#o_#{proxy_order.id}" do
within "tr#po_#{proxy_order.id}" do
expect(page).to_not have_content 'CANCELLED'
accept_alert 'Are you sure?' do
find("a.cancel-order").trigger('click')