raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-18 04:39:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,190 Commits 15 Branches 457 Tags
ebe7456b666c19450cb4e30ca55f74c8abe470b3
Commit Graph

14190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
VadLusk
f74a6e47d5 Remove css_splitter references, delete all_split2.css. #1361 #2633 2018-09-03 09:20:26 +10:00
luisramos0
512577768c Removed old files that were used with, now unsuported, heroku 2018-09-02 22:13:42 +01:00
apoc64
e62a755ddb Adds comments for setting up timezone in application.yml 2018-09-02 11:08:27 -06: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
Matt-Yorkley
9d05e5c97a Remove duplicate line in spec 2018-09-01 14:09:07 +01:00
Kristina Lim
dc4037474d Test order links in subscription placement emails 2018-09-01 15:40:36 +08:00
Matt-Yorkley
d8bbcdc54b Decrease batch size to reduce chance of timeouts 2018-08-31 22:52:44 +01:00
Matt-Yorkley
4dfbbd60d4 Fix occasional StaleObjectError on variant updates 2018-08-31 19:47:08 +01:00
dependabot[bot]
4557bfbc17 [Security] Bump rubyzip from 1.2.1 to 1.2.2 
Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.1 to 1.2.2. **This update includes security fixes.**
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.1...v1.2.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-08-31 17:49:12 +00:00
Matt-Yorkley
75a9ea5bfa Prefer .flat_map(&foo) over .map(&foo).flatten 2018-08-31 15:38:38 +01:00
Matt-Yorkley
04d50d4555 Fix filter results bug in validation section 2018-08-31 15:00:29 +01:00
Kristina Lim
f5c44ef0e6 Rename "entreprise" in i18n keys to "enterprise" 2018-08-31 15:26:30 +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 Perez
1de13a5049 Favor #public_send over #send using Rubocop's cop 
Devs keep using `#send` although that method does not preserve
private/protected visibility. Watching after this turned out to be quite
time-consuming while doing code review.

Currently, the Style/Send cop doesn't enforce `#public_send` however
(that's what we want). It simply discourages the use of #send. See
https://github.com/rubocop-hq/rubocop/pull/2081#issuecomment-292251650
for details. So a new entry on the Code Conventions doc has been added
to overcome this limitation:
https://github.com/openfoodfoundation/openfoodnetwork/wiki/Code-Conventions#prefer-public_send-over-send
 2018-08-30 18:48:45 +02: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
luisramos0
efcf680094 Fixed bulk_line_items_controller_spec by setting shipment on test line_items and by allowing shipment decorator to allow no adjustments in the shipment 
Fixed 5 out of 7 tests in orders_and_fulfillments_report_spec by providing target_shipment in test line_items
Fixed 12 out of 44 broken tests in bulk_order_management_spec.rb by providing target_shipment in test line_items.” “The remaining 32 failing tests are now failing with the very common: undefined method on_hand= on Spree::Variant
Improved 1 test in reports_spec.rb by providing target_shipment in test line_items. Test now fails with undefined method Spree::Order.shipping_method
Fixed 9 tests in orders_controller_spec by providing target_shipment in test line_items
Fixed 4 tests in packing_report_spec.rb by providing target_shipment in test line_items. Failing tests are now failing with undefined product.on_hand? method
Fixed 8 tests in line_items_controller_spec by providing target_shipment in test line_items
Fixed 1 test in update_billable_periods_spec by providing target_shipment in test line_items
Fixed 4 tests in bulk_coop_report_spec by providing target_shipment in test line_items. The 2 failing tests are now failing with undefined product.on_hand? method
Improved 1 test in line_items_controller_spec by providing target_shipment in test line_items. Test is still failing with an unexpected method call
Fixed 1 test in order_and_distributor_report_spec by providing target_shipment in test line_items
 2018-08-30 00:33:15 +01:00
luisramos0
02b968b312 Cookies policy page table has a single column now. Also made small updates to the page text, migrated translations to ruby translations and extracted repeated partial from cookies policy page view 2018-08-30 00:27:35 +01:00
luisramos0
53e7fcb019 Imcreased cookies banner font size for med/large screens to improve readability 2018-08-30 00:21:00 +01:00