raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-22 00:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,885 Commits 19 Branches 454 Tags
cd53ec1a4f84948e7d449e26bf19da2e0c7ef737
Commit Graph

9885 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pau Perez
cd53ec1a4f Replace exception with DB uniqueness constraint 
By forbidding more than a row per variant in the spree_stock_items we
can ensure all variants have a single stock_item associated.
 2018-09-06 13:21:22 +02:00
Pau Perez
8848af15ee Raise when a variant has more than a stock item 
This means we violated the business rules of having a single stock
location for the OFN instance and hence a single stock item per variant.

Although it is too late to preserve the data integrity we can know data
needs to be cleaned up.
 2018-09-06 13:20:52 +02:00
Pau Perez
59883f9509 Add deprecation warnings for VariantStock methods 
This will prevent other devs from relying on this methods and will tell
us the exact lines that call this methods, which will come in handy when
removing this module.
 2018-09-06 13:20:52 +02:00
Pau Perez
fc5882686a Add unit tests to VariantStock 
This also replaces the after_save callback to after_update.

We enforce a stock_item exists when modifying the variant and the
stock_item gets created on variant's after_create. This means it's not
possible to use any of the VariantStock's setters before the variant is
persisted so executing the callback on creation is pointless.
 2018-09-06 13:20:52 +02:00
Maikel
417c33a870 Merge pull request #2639 from luisramos0/2-0-stable-sept 
Merging master into 2-0-stable (one month of commits in master)
 2018-09-06 08:50:47 +10:00
luisramos0
89d51d75ae Merge branch 'master' into 2-0-stable-sept 2018-09-04 17:43:20 +01:00
Maikel
0d2fa3dc40 Merge pull request #2611 from luisramos0/cookies_banner_font_size 
[Cookies] Increased cookies banner font size for med/large screens to improve readability
 2018-09-04 11:35:32 +10:00
Maikel
1b6bb72966 Merge pull request #2587 from luisramos0/spree2_order_mailer_decorator_bug 
Spree 2 Upgrade - MailMethod - Fixed bug on order_mailer_decorator (only visible in spree 2)
 2018-09-04 11:29:51 +10:00
Pau Pérez Fabregat
7dbbc3e9d8 Merge pull request #2610 from luisramos0/cookies_banner_bug 
[Cookies] Added new test to cookies spec to cover bug on cookies banner and fix…
 2018-09-03 17:23:17 +02:00
Pau Pérez Fabregat
903d70090e Merge pull request #2636 from luisramos0/heroku_dead_code 
Removed old files that were used with, now unsupported, heroku
 2018-09-03 12:49:19 +02:00
Pau Pérez Fabregat
0f118baa4e Merge pull request #2615 from mkllnk/2575-variant-on-hand-api 
2575 variant on hand api
 2018-09-03 11:16:02 +02:00
luisramos0
8004abbb9f Improved Order mailer and Subscriptions mailer specs by removing dependency to old mail method 2018-09-03 10:03:06 +01:00
luisramos0
921c8dfdf4 Removed unnecessary cancel_email from order_email_decorator (spree one is equivalent after ofn PR#2589). Also refactored remaining order_mailer_decorator methods by extracting duplicated code. 2018-09-03 10:03:02 +01:00
Maikel
129e2c915e Merge pull request #2579 from openfoodfoundation/dependabot/bundler/angular-rails-templates-0.3.0 
Bump angular-rails-templates from 0.2.0 to 0.3.0
 2018-09-03 14:39:21 +10:00
Maikel
1b264403e0 Merge pull request #2624 from kristinalim/fix-no_order_link_in_subscription_emails_unless_user 
Subscription emails for customer should not link to order page if customer has no user account
 2018-09-03 14:38:56 +10:00
Maikel
3fadd06dc7 Merge pull request #2613 from luisramos0/cookies_better_policy_page 
[Cookies] Updated cookies policy page text
 2018-09-03 11:49:14 +10:00
Maikel
42afd426d5 Merge pull request #2620 from openfoodfoundation/dependabot/bundler/foreigner-1.7.4 
Bump foreigner from 1.6.1 to 1.7.4
 2018-09-03 11:48:48 +10:00
Maikel
11ab875b9a Merge pull request #2623 from openfoodfoundation/dependabot/bundler/eventmachine-1.2.7 
Bump eventmachine from 1.2.3 to 1.2.7
 2018-09-03 11:48:34 +10:00
Maikel
c510bbd8d0 Merge pull request #2589 from luisramos0/spree2_base_mailer_dec_update 
Spree 2 Upgrade - MailMethod - Delete outdated base_mailer_decorator.from_address
 2018-09-03 11:05:48 +10:00
luisramos0
512577768c Removed old files that were used with, now unsuported, heroku 2018-09-02 22:13:42 +01:00
luisramos0
59f8dd4458 Improved cookies spec by keeping global config values as they were before the test 2018-09-01 20:35:07 +01:00
Kristina Lim
f844236b9c Remove order link in non-user order cancellation email 2018-09-01 23:46:12 +08:00
Kristina Lim
5f2c3a1955 Remove order link in non-user failed payment email 2018-09-01 23:46:12 +08:00
Kristina Lim
f8244a400a Custom subscription placement email if non-user 
The order link should not be provided if the order does not have an
associated user account.
 2018-09-01 23:46:11 +08:00
Kristina Lim
ad8b120e48 Extract format for order cycle closing in emails 
Using a helper for this, but this can be changed to look up a
translation key.
 2018-09-01 23:46:08 +08:00
Kristina Lim
dc4037474d Test order links in subscription placement emails 2018-09-01 15:40:36 +08:00
Maikel
a9c8c033c7 Merge pull request #2566 from openfoodfoundation/dependabot/bundler/daemons-1.2.6 
Bump daemons from 1.2.2 to 1.2.6
 2018-08-31 14:54:53 +10:00
Maikel
c30e29051a Merge pull request #2594 from openfoodfoundation/dependabot/bundler/compass-rails-3.1.0 
Bump compass-rails from 2.0.4 to 3.1.0
 2018-08-31 13:47:22 +10:00
Maikel
42936be40a Merge pull request #2578 from luisramos0/spree2_fix_test_line_items 
Spree2 fix test line items
 2018-08-31 13:26:25 +10:00
Maikel Linke
13b9ecab21 Fix font issue in mobile menu 2018-08-31 11:23:11 +10:00
luisramos0
1b4e0cd73a Made the menu config default values more user friendly 2018-08-31 11:23:11 +10:00
luisramos0
e573a3fc2b The main menu is now translatable and configurable using Content configuration and translations. Added 7 menu entries to the translations file (each with text and url) and 7 content configuration points to enable/disable these. The mobile menu icons can also be configured. 2018-08-31 11:23:11 +10:00
dependabot[bot]
508643b64e Bump eventmachine from 1.2.3 to 1.2.7 
Bumps [eventmachine](https://github.com/eventmachine/eventmachine) from 1.2.3 to 1.2.7.
- [Release notes](https://github.com/eventmachine/eventmachine/releases)
- [Changelog](https://github.com/eventmachine/eventmachine/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eventmachine/eventmachine/compare/v1.2.3...v1.2.7)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-08-30 19:19:08 +00:00
dependabot[bot]
287b21b0cf Bump foreigner from 1.6.1 to 1.7.4 
Bumps [foreigner](https://github.com/matthuhiggins/foreigner) from 1.6.1 to 1.7.4.
- [Release notes](https://github.com/matthuhiggins/foreigner/releases)
- [Changelog](https://github.com/matthuhiggins/foreigner/blob/master/CHANGELOG.md)
- [Commits](https://github.com/matthuhiggins/foreigner/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-08-30 19:16:41 +00:00
Pau Pérez Fabregat
b4bfa3ff2d Merge pull request #2591 from mkllnk/remove-rack-livereload 
Remove gem rack-livereload
 2018-08-30 13:50:57 +02:00
Maikel
1b88edea1f Merge pull request #2420 from stveep/stripe-admin-2 
Stripe admin 2
 2018-08-30 15:48:49 +10:00
Maikel Linke
d1f7828432 Fix pending spec 
The link from the enterprise page was missing the enterprise id. So the
bulk edit page for fees was showing fees for all enterprises.
 2018-08-30 14:50:41 +10:00
Maikel Linke
429bf132da Test creating a fee, not updating 
The spec for creating an enterprise fee didn't actually create a new
fee. Because all enterprise fees are displayed, it changed an existing
fee.
 2018-08-30 14:50:41 +10:00
Maikel Linke
297ea830dc Further style spec 2018-08-30 14:50:41 +10:00
Maikel Linke
bc1e8bfde6 Convert specs to RSpec 3.7.0 syntax with Transpec 
This conversion is done by Transpec 3.3.0 with the following command:
    transpec spec/features/admin/enterprise_fees_spec.rb

* 27 conversions
    from: obj.should
      to: expect(obj).to

* 8 conversions
    from: == expected
      to: eq(expected)

* 4 conversions
    from: obj.should_not
      to: expect(obj).not_to

For more details: https://github.com/yujinakayama/transpec#supported-conversions
 2018-08-30 14:50:41 +10:00
Maikel Linke
a789aeb30a Speed up enterprise fee spec 2018-08-30 14:50:41 +10:00
Maikel Linke
0174b84254 Remove old deactivated code 2018-08-30 14:50:41 +10:00
Maikel Linke
cebcdea40c Replace obsolete count_on_hand call for variant 
The variant factory supports only `on_hand` now.
 2018-08-30 13:55:12 +10:00
Maikel Linke
e9c1868759 Update factory to fix tests 
In Spree 2, products don't have `on_hand` or `on_demand` any more. But
we always create a standard variant in an after-save hook which accepts
these values due to our backwards compatibility patch.
 2018-08-30 13:55:12 +10:00
Maikel Linke
c7648d67bd Add Variant stock API of Spree 1 2018-08-30 13:55:12 +10:00
Maikel
174bc15ac9 Merge pull request #2607 from openfoodfoundation/dependabot/bundler/pg-0.21.0 
Bump pg from 0.13.2 to 0.21.0
 2018-08-30 13:37:25 +10:00
dependabot[bot]
664db1b0c2 Bump pg from 0.13.2 to 0.21.0 
Bumps [pg](https://bitbucket.org/ged/ruby-pg) from 0.13.2 to 0.21.0.
- [Changelog](https://bitbucket.org/ged/ruby-pg/src/master/History.rdoc)
- [Commits](https://bitbucket.org/ged/ruby-pg/branches/compare/v0.21.0..v0.13.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-08-30 03:19:13 +00:00
Maikel
8a97088bb6 Merge pull request #2606 from openfoodfoundation/dependabot/bundler/poltergeist-1.18.1 
Bump poltergeist from 1.16.0 to 1.18.1
 2018-08-30 13:16:47 +10:00
Maikel
1c61539119 Merge pull request #2585 from greysteil/bump-ams 
Bump active_model_serializer to 0.8.4, and pin it
 2018-08-30 10:00:22 +10:00
Maikel
fac29ebb96 Merge pull request #2595 from openfoodfoundation/dependabot/bundler/immigrant-0.3.6 
Bump immigrant from 0.1.6 to 0.3.6
 2018-08-30 09:56:37 +10:00