Matt-Yorkley
db3576f469
Merge pull request #6308 from luisramos0/translations
...
Fix some missing translations in orders edit page
2020-11-05 18:33:51 +01:00
Luis Ramos
0ae3bf985a
Fix some missing translations in orders edit page
2020-11-04 21:54:27 +00:00
Tsara Sudrajat
f4c7a0b2a2
Align center order adjustment and order total title
2020-10-30 11:29:38 +07:00
Andy Brett
8585e6c7f0
add available units injection to BOM page
2020-10-29 09:18:19 -07:00
Luis Ramos
1b4e19b32d
Remore preferences not used in OFN
2020-09-23 22:16:56 +01:00
Luis Ramos
ffac38d934
Remove option to enter state_name for countries without states
...
Thisis not supported in OFN
2020-09-01 16:06:49 +01:00
Luis Ramos
41d797489d
Make onchange code simpler
2020-09-01 14:52:18 +01:00
Luis Ramos
46623242f7
Make use_billing checkbox work again, missign js code from spree
2020-09-01 14:28:45 +01:00
Luis Ramos
1a39a55009
Fix problem of converting from erb to haml
2020-09-01 14:09:06 +01:00
Luis Ramos
56fb09c006
Remove unused class
2020-09-01 14:03:20 +01:00
Luis Ramos
e4dee8a2fb
Replace hash rockets
2020-09-01 13:57:57 +01:00
Luis Ramos
04f9c5ec5e
Convert address form from erb to haml
2020-09-01 13:53:19 +01:00
Luis Ramos
8c322c1a0f
Move shared address_form partial to the only place where it is used, order customer_details
2020-09-01 13:49:17 +01:00
Arun Kumar Mohan
bb9ab57699
Remove resend button on the orders edit page
2020-08-29 20:47:28 -05:00
Maikel
819a445547
Merge pull request #5712 from mbudm/issue/5208
...
Add payment details to invoice
2020-08-28 09:46:49 +10:00
Maikel
d81ed36eef
Merge pull request #5892 from arku/fix/price-i18n
...
Fix price translation in Bulk Order Management
2020-08-27 10:31:38 +10:00
Steve Roberts
4243ff293f
Update invoice2 to also use the shared payment partial
2020-08-20 17:16:20 +01:00
Steve Roberts
debbf9b361
Modify payment_list partial to be shared
...
- Partial is used by both the invoice pdf and the order confirmation email
- separate scss file for new payment list table
- extracted outstanding balance logic (also changed in payments view.. admin/orders/RXXX/payments)
- translations in shared.payments_list and lazy loaded
2020-08-20 17:16:20 +01:00
Steve Roberts
8e5cfdeb97
Add more details on payments to invoice.
2020-08-20 17:16:20 +01:00
Arun Kumar Mohan
13bf7497a9
Fix price translation in Bulk Order Management
2020-08-10 18:26:09 -05:00
Eduardo
51f39ee89d
move coffee directive to partial
2020-08-02 20:01:49 -03:00
Eduardo
d43e9b5716
add Actions dropdown to all pages of order details menu
2020-07-20 20:45:50 -03:00
Luis Ramos
cc3361aaac
Merge pull request #5659 from dmarcoux/issue-5555
...
Filter orders on inclusive dates in admin/orders
2020-07-09 20:40:45 +01:00
Dany Marcoux
3dfabdc117
Filter orders on inclusive dates in admin/orders
...
Closes #5555
Co-authored-by: Luis Ramos <luisramos0@gmail.com >
2020-07-05 20:12:16 +02:00
Matt-Yorkley
46c40bdf33
Fix default image display in admin order edit
2020-07-03 22:58:29 +02:00
Matt-Yorkley
d2db9b3a66
Merge pull request #5599 from luisramos0/submit_on_enteer
...
Make Enter submit the form on both products and orders admin
2020-07-03 11:14:57 +02:00
Pau Pérez Fabregat
28376b1056
Merge pull request #5561 from coopdevs/defend-from-invoice-without-bill-address
...
Do not print the bill addr. name when there's none
2020-07-01 17:50:09 +02:00
Pau Perez
8c371fd0d1
Do not print bill addr. in invoice2 either
2020-07-01 11:27:57 +02:00
Pau Perez
23178763b0
Do not print the bill addr. name when there's none
...
The error
```
ActionView::Template::Error: undefined method `full_name' for nil:NilClass
```
happens a few times a day and raises exceptions we don't pay attention to.
They add unnecessary noise that hides other more relevant issues.
This, however, is a symptom of a deeper data integrity problem that needs
solving at some point. This is just a countermeasure.
2020-06-30 08:46:01 +02:00
Matt-Yorkley
add38bf550
Use #image_path helper correctly
...
Paths should be relative. For example an image under `/app/assets/images/home/banner.jpg` should be: `image_path("home/banner.jpg")`
2020-06-16 18:25:13 +02:00
Luis Ramos
e6e4b6f95c
Add keypress events to text input fields on orders search page
2020-06-13 12:15:49 +01:00
Luis Ramos
983bed3c4e
Merge branch 'master' into 3-0-stable-jun-2
2020-06-11 19:50:56 +01:00
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
19da0ba969
Merge branch 'master' into 3-0-stable-may13
2020-05-13 19:50:32 +01: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
839b373b5c
Merge branch 'master' into 3-0-stable-Apr28
2020-04-28 13:40:19 +01: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
Luis Ramos
384ca310a3
Merge branch 'master' into 3-0-stable-apr3
2020-04-03 18:26:26 +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
