Luis Ramos
6f0d155508
Merge pull request #3742 from openfoodfoundation/2-0-stable
...
Merge 2-0-stable to master
2019-05-04 00:06:27 +01:00
Syed Usama Amer
75a7745736
Closes translation bug for enterprise fee settings
2019-05-01 10:43:35 -05:00
luisramos0
ea52600fc5
Fix split button reappearing when editing line item quantity
2019-04-02 21:58:29 +01:00
Maikel
74aea76c4c
Merge pull request #3609 from luisramos0/2-0-delete-acct-invoices-last-bit
...
[Spree Upgrade] Finish up deleting account invoices
2019-03-28 13:42:01 +11:00
luisramos0
c1d14686a6
Merge branch 'master' into 2-0-stable-Mar22
2019-03-22 10:55:17 +00:00
luisramos0
c0c14b16b6
Remove dynamic monthly pricing description that would come from the deleted business model configurations
2019-03-20 11:19:04 +00:00
Maikel Linke
d129665d43
Wait for orders being loaded in bulk order manage
...
The bulk order management page tried to wait for orders being loaded.
But instead of receiving a request object with an a promise to wait for
the page received a simple array without promise. As a result, the page
didn't wait for orders being loaded.
When loading of orders took longer than loading of line items they or at
least not all of them were enriched with distributors and order cycles
and the line items were missing some orders. That lead to random spec
failures.
2019-03-13 10:37:24 +11: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
7270a9e8e8
DRY date calculation in BOM js
...
This also minimises the risk of values changing in the meantime.
2019-03-12 18:59:14 +11:00
Maikel Linke
af9e80e55d
Load data after all callbacks are installed
2019-03-12 09:46:27 +11:00
Maikel Linke
4574a770d3
Synchronise dereferencing and initilising
...
This seems to make the spec 4 times more reliable. Still failing from
time to time.
2019-03-08 17:36:25 +11:00
luisramos0
2470830ec8
Fix jquery ui merge mistake, it should be jquery.ui.all in v2, not jquery-ui
2019-03-06 11:28:50 +00:00
luisramos0
b325cea6cb
Merge branch 'master' into 2-0-stable-Mar6
2019-03-06 09:19:53 +00:00
François Turbelin
e1953c279b
Move jquery-ui-timepicker libs to vendor dir
2019-02-25 22:48:30 +01:00
François Turbelin
ab86332949
Tune up config and style
2019-02-25 22:22:27 +01:00
luisramos0
36e2786a1e
Delete Accounts and Billing dead feature code
2019-02-25 14:37:16 +00:00
luisramos0
5d51ad71b0
Merge branch 'master' into 2-0-stable-Feb20
2019-02-20 14:32:36 +00:00
luisramos0
c652cfe4d5
Merge branch 'master' into 2-0-stable-Feb12
2019-02-12 16:03:33 +00:00
Pau Pérez Fabregat
92dca0cdfa
Merge pull request #3194 from HugsDaniel/3109-fix-orders-new
...
[Spree Upgrade] Fix admin new order page
2019-02-12 09:58:29 +01:00
Matt-Yorkley
5582160e73
Add localizeCurrency filter to admin and inject currencyConfig data
2019-02-07 22:55:08 +00:00
Pau Pérez Fabregat
8f63be9519
Merge pull request #2733 from kristinalim/fix-subscription_should_not_require_future_oc
...
Reduce restrictions for adding a variant to a subscription
2019-02-06 21:24:57 +01:00
luisramos0
1b8445eb99
Merge branch 'master' into 2-0-stable-Feb5
2019-02-05 11:16:23 +00:00
luisramos0
d598831d67
Adapt variants auto complete to spree v2 code with shipments
2019-02-04 18:59:41 +00:00
luisramos0
729feb16f1
Merge branch 'master' into 2-0-stable-jan-29th
2019-01-29 12:38:34 +00:00
Kristina Lim
929290fc77
Reduce restrictions for creating subscriptions
...
Allow the following variants:
* Variants of permitted producers
* Variants of hub
* Variants that are in outgoing exchanges where the hub is receiver
2019-01-26 02:03:54 +08:00
Kristina Lim
b6d8611359
Return early in JS if last batch
2019-01-25 09:06:25 +08:00
Kristina Lim
b67ba89aca
Process batches of the import CSV one after another
...
Start the HTTP request for processing next batches only after the
previous batch has completed.
A con of this approach is that the user needs to keep their browser open
for later parts of the large CSV to be processed, but this is better
than a higher chance of requests timing out.
2019-01-25 00:33:13 +08:00
Kristina Lim
bf084cd8df
Move import batch size outside method
2019-01-25 00:28:56 +08:00
Pau Pérez Fabregat
a95dd98ed6
Merge pull request #2869 from Matt-Yorkley/bi/bulk_invoices
...
[Bulk Invoice Printing] Bulk invoices
2019-01-18 17:49:34 +01:00
luisramos0
0460e7fc6c
Merge branch 'master' into 2-0-stable-jan-17th
2019-01-17 22:51:25 +00:00
Matt-Yorkley
e7e208061f
Assign polling numbers to variables and add comments
2019-01-17 09:37:32 +00:00
Maikel Linke
5a5db3c458
Fix state of RequestMonitor
...
`@loading` was set to false when the request with the last id finished.
But another request started earlier (having a lower id) could take
longer. `@loading` was set to false even though these long requests were
still active.
2019-01-15 15:45:49 +11:00
Maikel Linke
ca9673f562
Fix Dereferencer service
...
It failed when `object[attr]` was `undefined` instead of `null`.
2019-01-15 15:43:00 +11:00
luisramos0
9ab99f13c4
Merge branch 'master' into 2-0-stable-jan-11th
2019-01-11 11:58:24 +00:00
Maikel
fff054efc1
Merge pull request #3169 from luisramos0/hubPermissions
...
Add guard clause on variant overrides filter in case hub id is not present in the hubPermissions
2019-01-11 10:41:57 +11:00
Matt-Yorkley
0e478ff501
Increase polling to 150 seconds maximum before showing error message.
2019-01-10 09:57:06 +00:00
Matt-Yorkley
003014daf8
Extract invoice methods from ordersCtrl
2019-01-10 09:57:06 +00:00
Matt-Yorkley
bb814f91ef
Extract timeout to named function
2019-01-10 09:57:06 +00:00
Matt-Yorkley
6b6a41cfbc
Update CSS
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
b0f75162ac
Add delayed job for create bulk invoice
2019-01-10 09:57:06 +00:00
Matt-Yorkley
7d82020657
Move bulk invoice to new RESTful route
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
24207053e4
Reset selected orders on filter change
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
e28f9a7c84
Merge branch 'master' into 2-0-stable-jan-8th
2019-01-08 14:29:50 +00:00
Maikel
073f88b1c2
Merge pull request #3198 from kristinalim/fix-variant_override_stock_settings_validation
...
Validation and others for keeping variant override "On Demand" and "Count on Hand" compatible
2018-12-20 14:05:20 +11:00
luisramos0
6fc3562a73
Merge branch 'master' into 2-0-stable-dec-18th
2018-12-18 23:32:45 +00:00
