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
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
luisramos0
5183c90c89
Add missing spree translations related to insufficient stock
2018-12-12 15:34:48 +00:00
Matt-Yorkley
d48774e3a2
Add comment
2018-12-10 20:48:53 +00:00
Matt-Yorkley
997169b974
Fix checkbox values on orders page
2018-12-10 20:48:53 +00:00
luisramos0
cdee7c0422
Merge branch 'master' into 2-0-stable-dec-10th
2018-12-10 16:41:29 +00:00
Kristina Lim
71db9f5289
Import CSS variables in admin/components/input
2018-12-06 14:08:06 +08:00
luisramos0
c33ca508f7
Add guard clause on variant overrides filter in case hub id is not present in the hubPermissions
2018-12-06 15:35:44 +11:00
Kristina Lim
842a8e3654
Move null option for VO use_producer_settings to JS
2018-12-05 17:40:32 +08:00
Kristina Lim
47d51ca525
Prefer guard clause in updateCountOnHand for VOs
2018-12-05 17:40:31 +08:00
Kristina Lim
34c34b94d1
Describe method countOnHandPlaceholder for VOs
2018-12-05 17:40:30 +08:00
Kristina Lim
cff4eb0005
Improve and simplify VO count on hand suggestions
...
Set variant override count_on_hand in UI to variant count_on_hand value
if on_demand is changed and both specify limited stock.
2018-12-05 17:40:30 +08:00
Kristina Lim
4f2d96d763
Use correct placeholders for VO count_on_hand
2018-12-05 17:40:29 +08:00
Kristina Lim
f5dc03e118
Style disabled text fields in admin pages
2018-12-05 17:40:29 +08:00
