Pau Pérez Fabregat
01a9b33fc9
Merge pull request #5482 from rmklaus12/5094-new-order-translation
...
created partial for order page title to resolve French translation of…
2020-06-11 13:23:28 +02:00
Robin Klaus
d5d6fbc01d
created partial for order page title to resolve French translation of new order
2020-06-05 11:27:51 +10:00
Eduardo
473b4c63c4
add Shipping Method filter to admin/orders page
2020-05-18 18:46:43 -03:00
Luis Ramos
c9b60d0f62
Merge pull request #5341 from mathewdbutton/5173-show-outstanding-order-balance-on-orders-page
...
Show outstanding balance on orders page
2020-05-07 16:03:58 +01:00
Mathew Button
e088b27a13
Always display the outstanding balance if not zero
2020-05-06 16:45:44 +10:00
Mathew Button
fe6c810505
Add brackets in view instead of API response
2020-05-04 19:09:18 +10:00
Luis Ramos
e2b26b2e9c
Replace break with if
...
What we would need would be a continue, not break, so that other units will be processed without halting the cycle through the units
2020-05-03 12:00:23 +01:00
Mathew Button
8087e6b31b
Show outstanding balance on orders page
...
Prior to this change, there was no way of knowing how much was owed (or
in need of refunding) at a glance for each order on the orders index page,
this information was only available by clicking through to an order
payment page
This change adds the outstanding balance for each order
2020-05-01 21:38:20 +10:00
Luis Ramos
8f8dce4bab
Do not render inventory items in the shipment that dont have a line item in the order
2020-04-17 20:23:29 +01:00
Matt-Yorkley
ad42b1b485
Remove pagination limits in BOM
...
We can re-assess this later, but for now it looks like some of the BOM functionality won't work if results are returned across multiple pages.
2020-04-01 13:43:21 +02:00
Matt-Yorkley
a07281910b
Fix dropdown placeholders
2020-03-29 19:54:49 +02:00
Matt-Yorkley
72f9da3ac4
Fix regex validation and HTML "type" settings not allowing decimals for final_weight_volume
...
`final_weight_volume` can be a decimal, and often *is* in production data. Not regarding them as valid was breaking the form submission in various cases
2020-03-29 19:54:49 +02:00
Matt-Yorkley
375b4648dc
Add pagination to Bulk Order Management
2020-03-29 19:54:47 +02:00
Matt-Yorkley
d568b45d4a
Limit spamming the server with lots of requests
...
This uses "debounce" to add a little waiting time whilst the user is part-way through selecting dates (or manually typing in the date filter) so we don't make too many unnecessary requests.
2020-03-28 11:20:23 +01:00
Luis Ramos
26cd0f4a9d
Merge pull request #5023 from mkllnk/5019-invoice-bill-address
...
Display shipping and billing address on invoices
2020-03-21 20:38:00 +00:00
Maikel Linke
25b11f1f4b
Display delivery details in the header
2020-03-20 15:51:49 +11:00
Maikel Linke
22384cb4da
Display shipping and billing address on invoices
2020-03-20 15:14:24 +11:00
Luis Ramos
6b6cdf07fb
Remove inactive confirm
...
The new version of jquery is picking up a confirm in the ship action that was not being triggered in the previous version
The orders_spec was not expecting this confirm to appear so we are removing here to keep the behaviour and the spec green
2020-02-25 11:56:23 +00:00
Luis Ramos
a3a61967a8
Merge pull request #4621 from luisramos0/spree_backend_js
...
OFN without spree_backend 🎉
2020-02-22 10:24:50 +00:00
François Turbelin
3dcb66014e
Factorize column sorter partial
2020-02-13 06:38:13 +01:00
luisramos0
7eba657b2f
Add missing templates from spree_backend
2020-02-05 20:04:15 +00:00
Matt-Yorkley
b86759d7a7
Fix form rendering in admin orders
...
ActionView::Template::Error: Nil location provided. Can't build URI.
0) Account and Billing Settings updating as an admin user loads the page
Failure/Error: = form_tag false, {name: "orders_form", "ng-submit" => "fetchResults()"} do
2020-02-05 16:37:23 +11:00
luisramos0
b8aee4e857
Bring address_states as is from spre_backend
2020-01-28 13:53:04 +00:00
Luis Ramos
3171b60d6f
Merge pull request #4580 from Matt-Yorkley/order_capture
...
Use asynchronous requests for order capture and ship actions
2020-01-13 17:14:40 +00:00
Matt-Yorkley
a3ee6674ea
Use asynchronous requests for order capture and ship actions
2019-12-18 14:15:46 +01:00
Konstantin Shlyk
c5229dd763
billing address in pdf invoice fixed
2019-12-11 23:10:51 +03:00
Kristina Lim
2673a6efee
Fix Angular tracking of row in orders list
...
The tooltip content for the order in index n in page x was being used
for the order in index n in page y.
This was because ng-repeat was tracking the items/rows by index.
As far as ng-repeat is aware, rows with the same index in any page
were the same items/rows, so it didn't bother relinking the ofn-with-tip
directive.
2019-11-30 03:53:20 +08:00
Luis Ramos
688dad2334
Merge pull request #4384 from chaserx/4378_display_customer_name_on_orders_table
...
adds the full_name of the customer ordering beneath email
2019-10-28 15:52:54 +00:00
Chase Southard
61ee0f04a6
adds missing :spree to i18n scopes
2019-10-19 13:55:11 -04:00
Chase Southard
353804a3fa
adds the full_name of the customer ordering beneath email
2019-10-19 12:32:59 -04:00
luisramos0
d038c27f1f
Fix app_wrapper_attr code by making the content_for tag be only the name of the ng-app and ng-ctrller
2019-09-11 10:32:30 +01:00
Hugo Daniel
f88d54b862
Add missing translations for orders
2019-09-05 15:13:10 +02:00
Matt-Yorkley
a72c662b97
Update per_page dropdown UX
2019-09-02 14:35:00 +01:00
Luis Ramos
75c7e0b939
Merge pull request #4089 from luisramos0/undeface-fix
...
Add doctype declaration in layouts/admin view
2019-07-30 19:29:17 +01:00
luisramos0
4867649fc9
Remove dead code related to unused variable in spree: expand_variants
2019-07-29 17:04:57 +01:00
Luis Ramos
55f26f0a3d
Merge pull request #4043 from luisramos0/bring_shipment
...
Bring spree/admin/orders/shipment and shipment_manifest partials from spree_backend and fix an authorization bug
2019-07-24 21:59:47 +01:00
luisramos0
b9b8bc70dd
Remove stock location name from shipment header in the order edit page
2019-07-24 11:50:17 +01:00
luisramos0
5744240f91
Move customer_details/_form defaces to the view
2019-07-16 21:12:09 +01:00
luisramos0
873c56a642
Move customer_details/edit/replace_customer_search deface to view
2019-07-16 21:09:48 +01:00
luisramos0
f53a75660f
Convert spree/admin/orders/customer_details view from erb to haml
2019-07-16 21:05:19 +01:00
luisramos0
50dcbe0b57
Bring spree/admin/order/customer_details from spree_backend
2019-07-16 21:03:35 +01:00
luisramos0
83a306c31b
Convert class attributes to . notation in haml
2019-07-16 14:09:48 +01:00
luisramos0
e8127d81dc
Change how we display variant name in order edit page, use VariantAndLineItemNaming helper method
2019-07-15 18:37:19 +01:00
luisramos0
cd7906a57b
Move translations from Spree.t to root and add them to en.yml
2019-07-15 17:48:10 +01:00
luisramos0
02c573f146
Remove logic that hides item split, because the partial is now in the ofn codebase, we can now simply remove the split-item button
2019-07-15 17:11:41 +01:00
luisramos0
112017a158
Remove variants/split partial from orders/shipments partial
...
In OFN we have one shipment per order so it doesnt make sense to split items between shipments
2019-07-15 17:07:33 +01:00
luisramos0
4a07d67037
Convert spree/admin/orders/_shipment partial from erb to haml
2019-07-15 16:42:45 +01:00
luisramos0
54156dfd32
Convert spree/admin/orders/_shipment_manifest partial from erb to haml
2019-07-15 16:42:19 +01:00
luisramos0
ee20d35487
Fix authorization issue in shipment actions, authorization was being done on a struct (shipment manifest), now it's done on the shipment itself
...
This is similar to https://github.com/spree/spree/pull/5624
2019-07-15 15:38:46 +01:00
luisramos0
be18244abc
Bring views/spree/admin/orders/_shipment and views/spree/admin/orders/_shipment_manifest from spree backend
2019-07-15 15:37:24 +01:00
