luisramos0
c1d14686a6
Merge branch 'master' into 2-0-stable-Mar22
2019-03-22 10:55:17 +00:00
luisramos0
7c39c45f79
Stop using inexistent en.order_state translations keys and use existing en.spree.order_state in haml code and new js.admin.orders.order_state in JS code
2019-03-12 19:42:08 +00:00
Maikel Linke
0c6a5d730b
Add spaces around HAML brackets
2019-03-12 09:12:10 +11:00
Maikel Linke
2d7498b77b
Hide elements before Angular is loaded
...
The "Loading orders" spinner is still visible from the beginning so that
it can be used as indicator for when the page is loaded.
Before, the "No orders found" message was visible between page load and
Angular initilisation.
2019-03-08 14:23:18 +11:00
Pau Pérez Fabregat
8a855edbda
Merge pull request #3527 from luisramos0/2-0-fix-admin-edit-order-page
...
[Spree Upgrade] Fix edit ship method and tracking number in backoffice order page
2019-02-25 12:20:46 +01:00
luisramos0
b73ca88811
Fix edit ship method and tracking number in backoffice order page
...
The data-hook is necessary to make spree js code work, in this case, activate click events on edit and save buttons
2019-02-20 23:57:57 +00:00
luisramos0
5d51ad71b0
Merge branch 'master' into 2-0-stable-Feb20
2019-02-20 14:32:36 +00:00
Maikel
d4589cc2f4
Merge pull request #3444 from mkllnk/3437-supplier-name-on-invoice
...
3437 supplier name on invoice
2019-02-15 16:31:29 +11:00
Pau Pérez Fabregat
fce92090db
Merge pull request #3479 from luisramos0/2-0-stable-Feb12
...
[Spree Upgrade] Merging master into 2-0-stable (2nd run in Feb2019)
2019-02-14 09:40:28 +01:00
luisramos0
c652cfe4d5
Merge branch 'master' into 2-0-stable-Feb12
2019-02-12 16:03:33 +00:00
luisramos0
0f44beb477
Delete all Spree::Admin::LineItemsController customizations as they are no longer used
2019-02-12 10:09:00 +00:00
luisramos0
3ed6aea9ab
Add line items adjustments (order.price_adjustments) to the order edit page so that user is aware of adjustments included in the price like for example tax rates
...
This change happens in spree v2.2 together with other changes (like adding the, not yet available in v2.0, shipment_adjustments this way). See commit for more details: 636d87dd77
2019-02-07 11:14:45 +00:00
Kristina Lim
0030428647
Do not show table until first time dereferencing is done
2019-02-07 04:39:45 +08:00
Kristina Lim
35ecbe1584
Compile row ID with higher priority
2019-02-07 04:39:44 +08:00
Kristina Lim
ed5856afa4
Compile edit link with higher priority
2019-02-07 04:39:44 +08:00
Maikel Linke
4a3e5f1d0a
Print supplier name on invoice
2019-02-06 15:07:05 +11:00
Hugo Daniel
c823f942b4
Fix failing specs due to Spree 2's new order admin page
...
Add missing form tag and OC and shops injectors on order form to make the OC field, the distributor field and the update button work
2019-02-04 18:57:51 +00:00
Hugo Daniel
fa1525bdd3
Upgrade views to Spree 2 and apply overrides
2019-01-31 12:59:05 +01:00
luisramos0
729feb16f1
Merge branch 'master' into 2-0-stable-jan-29th
2019-01-29 12:38:34 +00:00
Matt-Yorkley
003014daf8
Extract invoice methods from ordersCtrl
2019-01-10 09:57:06 +00:00
Matt-Yorkley
638dc6eada
Add polling and show action
2019-01-10 09:57:06 +00:00
Matt-Yorkley
4a88fb0626
Use simpler array for selected ids
2019-01-10 09:57:06 +00:00
Matt-Yorkley
f3585befff
Fix customer missing from some order records - guest checkout?
2019-01-10 09:57:06 +00:00
Matt-Yorkley
24207053e4
Reset selected orders on filter change
2019-01-10 09:57:06 +00:00
Matt-Yorkley
5cc8bad42b
Improve UI layout for select all option
2019-01-10 09:57:06 +00:00
Matt-Yorkley
42cf96e635
Disable button unless orders selected
2019-01-10 09:57:06 +00:00
Matt-Yorkley
4ec0f0ff73
Add bulk invoices printing
2019-01-10 09:57:06 +00:00
Matt-Yorkley
f263ef7dc0
Add selectable checkboxes
2019-01-10 09:57:06 +00:00
luisramos0
bdefc0ebd1
Fix admin orders spec by adapting the spec to the recently de-defaced page
2019-01-07 12:16:28 +00:00
luisramos0
3776b891ce
Merge branch 'master' into 2-0-stable-dec-3rd
2018-12-03 15:30:16 +00:00
Hugo Daniel
65dd3eb5b9
Change line items controller HTML response spec to look for form order_edit class
2018-11-28 10:31:47 +01:00
Hugo Daniel
60214b9a90
Fix failing specs
2018-11-28 10:31:47 +01:00
Hugo Daniel
422a68630f
Remove data-hook tags
2018-11-28 10:31:47 +01:00
Hugo Daniel
c233ea38cf
Import Spree views for orders#edit in our codebase and integrate deface modifications
2018-11-28 10:31:47 +01:00
luisramos0
e153510a71
Merge branch 'master' into 2-0-stable-nov-24th
2018-11-24 15:19:38 +00:00
Pau Perez
23bda74ecb
Match name of filter and db column for consistency
2018-11-15 19:09:17 +01:00
Pau Perez
52e58a1c31
Remove unused @show_only_completed from view
...
Now there's no difference in behavior. In both cases we sort by
completed_at in the second column of the orders page.
2018-11-15 15:40:13 +01:00
Pau Perez
b7a3255dbe
Replace completed_at in orders table w/ created_at
2018-11-15 15:40:13 +01:00
luisramos0
fcdb5cd7af
Merge branch 'master' into 2-0-stable-nov-8th
2018-11-08 11:18:54 +00:00
Matt-Yorkley
d0b7b57017
Remove OrderSerializer#show_path and adjust to use #edit over #show
2018-11-06 11:07:14 +00:00
Matt-Yorkley
77251848ee
Refactor Spree::Admin::OrdersController
2018-10-26 21:38:57 +01:00
Pau Pérez Fabregat
9a06c1ef98
Merge pull request #2899 from luisramos0/2898-2-0-fix-orders-admin
...
[Spree Upgrade] Fix orders admin page by removing a filter that is gone in spree 2
2018-10-23 18:59:01 +02:00
luisramos0
d0d9038308
Removed order.shipments_path from order serializer. In order list page the shipment state is now a label, not a link. The shipmeents page is gone in spree 2
2018-10-22 11:24:01 +01:00
luisramos0
653c67971f
Remove order admin page filter 'show only unfulfilled orders' as done on spree 2
2018-10-20 15:11:47 +01:00
Matt-Yorkley
fcff835922
Update results on dropdown select
2018-10-12 17:06:42 +01:00
Matt-Yorkley
dafcd0ddc2
Add per_page controls to admin orders index
2018-10-10 18:32:12 +01:00
Matt-Yorkley
37a7cceead
Fix bindings on angular orders data
2018-10-08 15:42:46 +01:00
Matt-Yorkley
55d7d5d1e4
Rename #capture_path to #payment_capture_path
2018-10-02 11:10:51 +01:00
Matt-Yorkley
6f2760cf92
Move translations into their namespace and use '.key' format
2018-09-24 15:54:05 +01:00
Matt-Yorkley
9f57b43a13
Move sortble header elements to a partial
2018-09-23 22:14:12 +01:00
