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
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
Pau Pérez Fabregat
30bbc5ee6f
Merge pull request #3472 from pacodelaluna/fix-datetime-picker
...
Fix datetime picker on Order Cycle form
2019-03-05 14:50:34 +01:00
Luis Ramos
72e9c1d002
Merge pull request #3321 from luisramos0/2-0-delete-acct-invoices
...
[Spree Upgrade] Delete Accounts and Billing dead feature code until we decide we want to start using it again
2019-03-04 15:54:09 +00:00
luisramos0
a36722cebf
Merge branch '2-0-stable' into 2-0-remove-variant-count-on-hand
2019-02-26 12:47:11 +00:00
luisramos0
37685c8107
Move the code that hides the split order button from js to css
2019-02-26 12:34:07 +00:00
luisramos0
15456577a3
Remove the button that enables user to split an order between stock locations
...
There's only one stock location in OFN so this feature is not useful at this point
2019-02-25 23:39:21 +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
François Turbelin
68fd6de39b
Update Jquery datetimepicker lib to v1.6.3
2019-02-25 22:22:27 +01:00
luisramos0
0501db1782
Remove changes related to enterprise trials as they dont make sense without business models and account invoices
2019-02-25 14:37:16 +00:00
luisramos0
36e2786a1e
Delete Accounts and Billing dead feature code
2019-02-25 14:37:16 +00:00
luisramos0
ee8fe4b6b4
Move registration process translations to lazy lookups to better organize the en.yml file
2019-02-22 14:37:45 +00:00
luisramos0
5d51ad71b0
Merge branch 'master' into 2-0-stable-Feb20
2019-02-20 14:32:36 +00:00
luisramos0
8ee14ccb4b
Make variants_stock_levels return variants on_demand values
2019-02-19 11:56:02 +00:00
luisramos0
f0842fcbe5
Convert all calls to variant.count_on_hand to variant.on_hand
2019-02-18 21:54:07 +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
Pau Pérez Fabregat
433d10c42f
Merge pull request #3386 from leandroalemao/fix-moment-deprecation-warning
...
[ISSUE-3348] LC: Fix moment.js deprecation warning
2019-02-06 21:22:58 +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
Pau Pérez Fabregat
e1fb005e70
Merge pull request #3387 from kristinalim/fix/3384-product_import_timeout
...
3384 [Product Import] Process only one batch of rows at a time
2019-02-01 17:29:04 +01:00
luisramos0
729feb16f1
Merge branch 'master' into 2-0-stable-jan-29th
2019-01-29 12:38:34 +00:00
Pau Pérez Fabregat
c9a8ec84c0
Merge pull request #3359 from kevinchristianson/ready
...
Convert sass files to scss
2019-01-28 20:02:37 +01:00
Kristina Lim
5992bba97b
Import color variables in new page SCSS partials
...
"admin/all.css" which imports these SCSS partials already imports the
color variables in "admin/variables", so actually there should be no
need to import the variables again.
However, "application.css" calls "require_tree", which means asset
precompilation through Sprockets would attempt to compile each of the
SCSS partials individually. When compiled individually, the color
variables are not available to these partials.
This is a quick solution to allow precompilation of "application.css" to
complete.
2019-01-26 03:29:19 +08:00
Kristina Lim
c23002102c
Add warning for unavailable subscription items
2019-01-26 02:03:55 +08: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
leandroalemao
dfa11834e3
[ISSUE-3348] LC: Fix moment.js deprecation warning
2019-01-24 11:16:31 +00:00
Pau Pérez Fabregat
8320dc75e8
Merge pull request #3002 from kevinchristianson/margin-fix
...
Fix bad spacing on account settings error page
2019-01-23 16:09:14 +01:00
Kevin Christianson
6b7273f685
Convert sass files to scss
2019-01-19 22:40:41 -06:00
nozakis
972bfd5e62
Fixed bad margins on the account settings error page.
2019-01-19 16:23:13 -06: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
e624faaacb
Add 'please wait' message to bulk invoice modal
2019-01-10 09:57:06 +00: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
