raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-06 22:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,063 Commits 18 Branches 453 Tags
ae799eb2b61b7f7bd98b49cca7f11dca751a830e
Commit Graph

11063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugo Daniel
ae799eb2b6 Use Spree routes 2019-02-04 18:56:28 +00: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
Maikel
f3ff7ca2fe Merge pull request #3366 from coopdevs/fix-orders-controller-spec 
Fix orders controller spec
 2019-01-30 10:27:17 +11:00
luisramos0
729feb16f1 Merge branch 'master' into 2-0-stable-jan-29th 2019-01-29 12:38:34 +00:00
Pau Pérez Fabregat
2b3ffd8c82 Merge pull request #2833 from kristinalim/fix-variant_override_permissions 
Add tests for permissions for variant overrides
 2019-01-29 09:51:41 +01:00
Pau Pérez Fabregat
a5ed17f0f5 Merge pull request #3390 from openfoodfoundation/dependabot/bundler/oj-3.7.8 
Bump oj from 3.7.4 to 3.7.8
 2019-01-29 09:50:25 +01: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 Perez
0b62b4621f Make expectation easier to reason about 2019-01-29 09:40:54 +01:00
Pau Perez
9d1d8513e7 Make controller req. params a bit more obvious 2019-01-29 09:40:54 +01:00
Pau Perez
f589d4125d Restore distributor in test that relies on it 2019-01-29 09:40:54 +01:00
Pau Perez
1bceb0748a Do not modify config's state in test 2019-01-29 09:40:53 +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
dependabot[bot]
33ee46b224 Bump oj from 3.7.4 to 3.7.8 
Bumps [oj](https://github.com/ohler55/oj) from 3.7.4 to 3.7.8.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.4...v3.7.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-24 19:16:56 +00:00
Maikel
4cc6a8c966 Merge pull request #3350 from openfoodfoundation/dependabot/bundler/delayed_job_active_record-4.1.3 
Bump delayed_job_active_record from 4.1.2 to 4.1.3
 2019-01-24 11:58:32 +11:00
Maikel
66cb0e6a91 Merge pull request #3352 from openfoodfoundation/dependabot/bundler/foundation-rails-5.5.2.1 
Bump foundation-rails from 5.5.0.0 to 5.5.2.1
 2019-01-24 10:29:17 +11: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
Kristina Lim
cf7f8b887f Add tests for permissions for variant overrides 2019-01-24 07:08:54 +11:00
Pau Pérez Fabregat
7881f96cac Merge pull request #3341 from openfoodfoundation/dependabot/bundler/daemons-1.3.1 
Bump daemons from 1.2.2 to 1.3.1
 2019-01-23 16:09:28 +01: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
77fd0b228e Merge pull request #3360 from brases/wording_order_cofirmation 
Fix wording in email template for orders confirmation
 2019-01-23 13:35:00 +01:00
Maikel
2064ffe548 Merge pull request #3354 from luisramos0/knapsack 
New Knapsack report
 2019-01-22 10:58:13 +11:00
Maikel
06af79d1b0 Merge pull request #3339 from Matt-Yorkley/headless4 
[Headless Chrome] Fix embedded_shopfront_spec unhandled alert
 2019-01-22 10:46:42 +11: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
d8710d283a Merge pull request #3320 from luisramos0/2-0-subs-mailer 
[Spree Upgrade] Phase 2 - Subscriptions - Specify :mailer type in SubscriptionMailer spec
 2019-01-21 15:09:56 +01:00
Pau Pérez Fabregat
8b1c1881f7 Merge pull request #3351 from openfoodfoundation/dependabot/bundler/diffy-3.3.0 
Bump diffy from 3.1.0 to 3.3.0
 2019-01-21 15:08:24 +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
Pau Pérez Fabregat
659c47340e Merge pull request #3353 from luisramos0/2-0-stable-jan-17th 
[Spree Upgrade] Merging master into 2-0-stable (third run in Jan2019)
 2019-01-21 11:06:57 +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
luisramos0
d155bb142c Make proxy order spec a bit more resilient by allowing two secs diff in timestamps 2019-01-19 15:53:05 +00:00
luisramos0
6f7a351ffa Update knapsack report to get build jobs more balanced 2019-01-18 23:46:09 +00:00
Matt-Yorkley
3929689d48 Ensure login via modal is completed 2019-01-18 19:06:42 +00:00
dependabot[bot]
49e3aa5070 Bump daemons from 1.2.2 to 1.3.1 
Bumps [daemons](https://github.com/thuehlinger/daemons) from 1.2.2 to 1.3.1.
- [Release notes](https://github.com/thuehlinger/daemons/releases)
- [Changelog](https://github.com/thuehlinger/daemons/blob/master/Releases)
- [Commits](https://github.com/thuehlinger/daemons/compare/v1.2.2...v1.3.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-18 16:52:13 +00:00
dependabot[bot]
1e01cf81ec Bump diffy from 3.1.0 to 3.3.0 
Bumps [diffy](https://github.com/samg/diffy) from 3.1.0 to 3.3.0.
- [Release notes](https://github.com/samg/diffy/releases)
- [Changelog](https://github.com/samg/diffy/blob/master/CHANGELOG)
- [Commits](https://github.com/samg/diffy/compare/3.1.0...3.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-18 16:51:42 +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 Pérez Fabregat
ee28cc5a29 Merge pull request #3323 from openfoodfoundation/dependabot/bundler/paper_trail-5.2.3 
Bump paper_trail from 3.0.9 to 5.2.3
 2019-01-18 17:48:56 +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
01f0671f6d Add missing accept alert in products_spec when deleting product properties 2019-01-18 12:45:29 +00:00
luisramos0
6da94fc960 Adapt cart_controller_spec to new variant_stock where variant count_on_hand can only be set after saving the variant 2019-01-18 12:45:29 +00:00
luisramos0
eac365182f Adapt variants_stock_levels_spec to new variant_stock where variant count_on_hand can only be set after saving the variant 2019-01-18 12:45:25 +00:00
luisramos0
13d65a4a39 Fix Gemfile.lock by running bundle install 2019-01-18 11:43:58 +00: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