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
e584fd2155
Make in_stock? work for both variants and overrides by moving it from VariantStock to variant_decorator.
...
Added tests for it in scope_hub_to_variant and improved VO shopping specs
2019-02-01 16:18:09 +00:00
Isaac Haseley
09d3cea830
Lazy-load one more translation
2019-02-01 09:22:26 -06:00
luisramos0
80af7c770b
Remove rescue from products_reset_strategy in product import: if setting count_on_hand fails the import will raise a RuntimeError
2019-02-01 08:32:45 +00:00
luisramos0
4b9be6f1a8
Change product import's product_reset_strategy from depending on the inexistent variant.count_on_hand DB field and instead make individual calls to variant.count_on_hand= defined in VariantStock.
...
Also, added spec to test return value of the reset method: it should return number of updated records.
2019-02-01 08:22:50 +00:00
Isaac Haseley
73a58435a8
Adopt one/other pluralization
2019-01-31 21:45:57 -06:00
Isaac Haseley
a18c98191a
Better accomodate different sentence structures
2019-01-31 21:45:57 -06:00
Isaac Haseley
8543bb7cfb
Add missing 'active products' translation on dashboard
2019-01-31 21:45:57 -06:00
Hugo Daniel
fa1525bdd3
Upgrade views to Spree 2 and apply overrides
2019-01-31 12:59:05 +01:00
Maikel
155b205ac2
Merge pull request #3401 from luisramos0/2-0-stable-jan-29th
...
[Spree Upgrade] Merging master into 2-0-stable (4th run in Jan2019)
2019-01-30 14:44:40 +11:00
luisramos0
6d2765e352
Convert if statement in case statement in product import entry validator
2019-01-29 23:53:37 +00:00
luisramos0
cc4825290b
Fix type conversion problem in product import entry validator
2019-01-29 15:45:22 +00:00
luisramos0
ab2397785b
Adapted product import EntryProcessor and EntryValidator to new VariantStock logic where on_hand is set at variant level (not at product level) and only after saving the variant
2019-01-29 14:55:18 +00:00
luisramos0
2ffc5305d7
Adapted VariantStock to handle on_hand string values (product import is set on_hand with string values)
2019-01-29 14:55:18 +00:00
luisramos0
729feb16f1
Merge branch 'master' into 2-0-stable-jan-29th
2019-01-29 12:38:34 +00:00
Pau Perez
c50fa1224b
Do not restore adjustments that got deleted
...
If something in the block deleted the adjustment update_attribute will
fail.
2019-01-29 09:40:54 +01:00
Pau Perez
59f39b14f4
Do not restore adjustments that aren't in the hash
...
This way we don't modify adjustments that get created as part of the
passed block. We don't know how this might be used in the future.
2019-01-29 09:40:54 +01:00
Pau Perez
f4b790eefa
Restore adjustments state after updating
...
We don't know exactly if all adjustments are closed in all
circumstances, so it's better to be conservative until we figure out.
Chances are that non-completed orders have them open.
2019-01-29 09:40:54 +01:00
Pau Perez
8eab3c5ec1
Extract meaningful methods from controller action
...
This sets the ground for future refactorings while providing some more
readability and context.
2019-01-29 09:40:54 +01:00
Pau Perez
c9429760cd
Trigger the appropriate callbacks from controller
2019-01-29 09:40:54 +01: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
luisramos0
8a86c0473d
Change app config to keep using the same v1 shipping method calculators and not the ones spree v2 introduces, these are copy pasted versions that work with packages
...
See this commit for more details: 18e5b98f5c (diff-b0846898827183f530c113ad7b83b8ea)
2019-01-27 21:03:32 +00: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
9965e95c65
Refactor methods in SubscriptionVariantsService
2019-01-26 02:03:55 +08:00
Kristina Lim
b691d727a7
Move OFN::SubscriptionService to SubscriptionVariantsService
2019-01-26 02:03:55 +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
Maikel
a3cd1dc945
Merge pull request #3344 from mkllnk/3279-moment-upgrade
...
Avoid deprecation warnings of momentjs
2019-01-24 10:28:41 +11:00
Maikel
937aaf67c3
Merge pull request #3250 from coopdevs/open-adjustments-for-update
...
[Spree Upgrade] Open adjustments to enable update
2019-01-24 10:25:16 +11: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
Pau Pérez Fabregat
2b95b5e797
Merge pull request #3347 from luisramos0/2-0-default-on-demand
...
[Spree Upgrade] Sets StockLocation.backorderable_default to false in test factories
2019-01-21 17:34:46 +01:00
Pau Pérez Fabregat
807c45a25c
Merge pull request #3349 from coopdevs/fix-shipment-without-fee
...
Fix shipment without fee
2019-01-21 14:51:10 +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
Brases
3437257515
Fix wording in order confirmation email template
...
Fixes issue #3063 "Repeated translation in Order Confirmation Screen and Email".
Now "Ready for" (collection time) is not repeated in place of "Collection
details" (collection instructions)
2019-01-19 20:37:21 +00: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
Pau Perez
a99a4725c9
Add #shipment to conform to OFN's decision
...
This ensures we can still use Order#shipment although Spree deprecates
it, while fixing a bug at the same time. The problem that was making the
test fail was on `Order#shipment` that Spree defines.
If the shipments association changes, `#shipment` returns stale data.
That is because the order object we might be using is still alive, and
so its @shipment ivar still holds an old shipment object (it's not nil)
and thus `@shipment ||= shipments.last` doesn't evaluate the right-hand
side of the expression.
Note that we need to `prepend` the evaluation of the concern (which it's
been rename) for our methods to take precedence over Spree ones. With
`include`, Spree's `#shipment` would still be picked up making the test
fail.
2019-01-18 16:02:51 +01:00
luisramos0
0460e7fc6c
Merge branch 'master' into 2-0-stable-jan-17th
2019-01-17 22:51:25 +00:00
luisramos0
f896e78e6f
Set StockLocation.backorderable_default to false in DefaultStockLocation and in StockLocation factory.
...
This makes the default value of variant.on_demand false in all environments and in tests.
Additionally, adapt VariantStock.on_demand test and product factory to this change (setting on_hand value in product factory so it's not out of stock by default).
2019-01-17 20:28:05 +00:00
Pau Pérez Fabregat
c178478a4f
Merge pull request #3346 from luisramos0/headless-chrome
...
Merge Headless Chrome to master
2019-01-17 20:04:27 +01:00
Pau Pérez Fabregat
29990f25c1
Merge pull request #3325 from mkllnk/2469-fix-async-js-requests
...
2469 Fix async js requests
2019-01-17 20:03:54 +01:00
Matt-Yorkley
e7e208061f
Assign polling numbers to variables and add comments
2019-01-17 09:37:32 +00:00
Matt-Yorkley
a3b9936f37
Improve matching inventory using 'items' unit type
2019-01-17 09:33:39 +00:00
Maikel Linke
4d3aed8467
Avoid deprecation warnings of momentjs
2019-01-17 14:49:43 +11:00
Rob Harrington
cc55f59b00
Update tag_rules_spec to work with Selenium
2019-01-16 16:21:30 +00:00
Pau Perez
1e03835391
Update order while adjustments are open
...
Spree supports updating line items as the model contains these two
callbacks:
f55722b38d/core/app/models/spree/line_item.rb (L27-L28)f55722b38d/core/app/models/spree/adjustment.rb (L1-L7)f55722b38d/core/app/models/spree/adjustment.rb (L84-L92)
2019-01-16 15:28:54 +01:00
