raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-02 21:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,629 Commits 18 Branches 452 Tags
a57504ba1fef7c828c5d286a5fb9797240ea297e
Commit Graph

12629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel Linke
f3d542a3ec Fix style and spelling 2018-05-18 11:27:46 +10:00
Maikel Linke
36b5f0eea7 Render only displayed report options 2018-05-18 11:27:46 +10:00
Maikel Linke
742e9d2a5f Remove more code duplication 2018-05-18 11:27:46 +10:00
Maikel Linke
6a52ca8113 Remove code duplication 2018-05-18 11:27:46 +10:00
Maikel
4df9a0afa2 Merge pull request #2272 from rtrunkhill/620-error-message-tweak 
changed error message in en.yml line 2207
 2018-05-18 11:19:45 +10:00
Maikel
48b9536621 Merge pull request #2268 from stveep/1213-back-empties-cart 
Set response headers to disable cache - to avoid back button emptying…
 2018-05-18 10:54:05 +10:00
stveep
6efc0ab802 Set response headers to disable cache - to avoid back button emptying cart (#1213) 2018-05-18 09:57:32 +10:00
Maikel
b15f4de921 Merge pull request #2270 from mkllnk/2265-update-active-merchant 
Update activemerchant to v1.78 with new root cert
 2018-05-18 09:54:15 +10:00
Rory Trunkhill
5706cecf26 modify enterprise eror name message #620 2018-05-17 18:10:35 +00:00
Pau Pérez Fabregat
e356d712c4 Merge pull request #2288 from frank-west-iii/issue-2182-confirm-first-user 
Confirm first user when seeding database
 2018-05-16 08:51:12 +02:00
Pau Pérez Fabregat
5b89f6a159 Merge pull request #2285 from coopdevs/get-last-spree-fork-changes 
Upgrade spree to point to 1c3dfc7fb
 2018-05-16 08:42:41 +02:00
Maikel Linke
585bba0e23 Update activemerchant to v1.78 with new root cert 
Fixes https://github.com/openfoodfoundation/openfoodnetwork/issues/2265.

Most changes are in gateways we don't use, I believe. There has been a
change in Stripe, but we use another implementation, I guess.
 2018-05-15 16:48:03 +10:00
Pau Pérez Fabregat
a28fa441c5 Merge pull request #2282 from openfoodfoundation/transifex 
Transifex
v1.15.1 		2018-05-15 08:24:39 +02:00
Maikel
1b371e6388 Merge pull request #2249 from mkllnk/upgrade-rubocop-config 
Upgrade Rubocop config to be compatible with 0.55
 2018-05-15 16:19:38 +10:00
Maikel Linke
7c68ac9d0c Wait for dialog to appear before using it 
Travis was failing a few times. This should make the spec more robust.
 2018-05-15 15:00:18 +10:00
Frank West
91351c3f78 Confirm first user when seeding database 
Currently the first user is not confirmed until running the task
`openfoodnetwork:dev:load_sample_data`. This task does not need to be
run on a minimum implementation of a new server or development setup.

We now confirm the first user during seeding. This could be the default
email address or the user entered email address entered during seeding.
 2018-05-14 15:30:04 -07:00
Pau Pérez Fabregat
6033981ad5 Merge pull request #2283 from coopdevs/remove-outdated-specs 
Remove no longer valid tests
 2018-05-14 13:22:00 +02:00
Pau Perez
6f8317b007 Upgrade spree to point to 1c3dfc7fb 
This will fetch latest changes applied in the fork. It also changes the
Github organization we fetch it from. From now on we'll work there and
not in Coopdevs org.
 2018-05-14 13:05:51 +02:00
Pau Perez
5c260dae51 Remove no longer valid tests 
`#available_to_order?` is gone in Spree 2.0 and our customization on top
of it went away with #2256.
 2018-05-14 12:30:11 +02:00
Pau Pérez Fabregat
1991a7f34d Merge pull request #2256 from coopdevs/add-custom-package 
Add custom package
 2018-05-14 10:44:05 +02:00
Buildkite
f2e07419a8 Merge remote-tracking branch 'origin/master' into HEAD 2018-05-11 03:37:13 +00:00
Matt-Yorkley
495f932069 Authentication service class description 2018-05-11 12:05:27 +10:00
Matt-Yorkley
74689afb8a Unregistered user checkout issue 2018-05-11 12:05:27 +10:00
Matt-Yorkley
d3344973b7 checkout_controller clarity 2018-05-11 12:05:27 +10:00
Matt-Yorkley
9841f27f92 Add missing key for devise message 2018-05-11 12:05:27 +10:00
Matt-Yorkley
0741b5fa58 Ensure checkout modal opens at correct height 2018-05-11 12:05:27 +10:00
Maikel Linke
45fc42723c Simplify query for existing email 
It should be easier to read and more efficient now.
 2018-05-11 12:05:27 +10:00
Maikel Linke
fe979b801f Improve readability by grouping depending logic 2018-05-11 12:05:27 +10:00
Matt-Yorkley
358edb4727 Disable guest checkout in model 2018-05-11 12:05:27 +10:00
Matt-Yorkley
6b2c4de20f Tidy up checkout spec 2018-05-11 12:05:27 +10:00
Matt-Yorkley
94b90b4a73 Registered user controller method spec 2018-05-11 12:05:27 +10:00
Matt-Yorkley
598677be3f Disable guest checkout for registered users 2018-05-11 12:05:26 +10:00
Daniel Dominguez
4551fa60c5 Lowercase tag when adding a tag to the array, as they are lowercased after at the database level, 
there is no point to display them with uppercase letters on the view.
 2018-05-11 11:16:58 +10:00
Maikel Linke
7caf166768 Updates pulled from Transifex 2018-05-10 09:42:34 +10:00
Transifex-Openfoodnetwork
48217a54b9 Updating translations for config/locales/es.yml 2018-05-09 22:58:59 +10:00
Maikel Linke
8a3244513f Run Codeclimate with new rubocop 2018-05-08 15:29:04 +10:00
Maikel Linke
fcb9d1411f Exclude file that rubocop fails to parse 2018-05-08 15:19:44 +10:00
Maikel Linke
21b96c63af Update cop naming 2018-05-08 14:52:13 +10:00
Maikel Linke
10d3abeaac Upgrade Rubocop to the latest version 2018-05-08 14:46:57 +10:00
Steven Lawson
fd3e0d885b Closes issue 1926, Changed package screen text from choose your starting point to choose your package 2018-05-07 17:15:55 -06:00
Pau Pérez Fabregat
98985d7211 Merge pull request #2266 from dan1d/upgrade-to-factory-bot 
Switched gem FactoryGirl to FactoryBot as FactoryGirl is deprecated.
v1.15.0 		2018-05-07 15:22:12 +02:00
Daniel Dominguez
9d9a974295 Switched gem FactoryGirl to FactoryBot as FactoryGirl is deprecated. 
- Change FactoryGirl to FactoryBot everywhere on code.
 2018-05-04 11:52:08 -03:00
Pau Pérez Fabregat
501ad8107d Merge pull request #2264 from coopdevs/exclude-js-libs-from-codeclimate 
Exclude shared JS libs from CodeClimate
 2018-05-03 16:53:45 +02:00
Pau Pérez Fabregat
8713bacfab Merge pull request #2260 from coopdevs/improve-report 
Improve order_and_distributor report's readability
 2018-05-03 16:52:16 +02:00
Pau Perez
dd14915209 Exclude shared JS libs from CodeClimate 
CodeClimate is raising issues from code that we don't own and won't
touch thus, causing false negatives.
 2018-05-03 13:56:19 +02:00
Pau Perez
776b5a23f6 Skip methods that distributor can't use in Package 
This ensures that Spree's shipping methods take into account the ones
the order's distributor uses.

This reimplements what `#available_to_order_with_distributor_check?`
used to do and it doesn't work with Spree 2.0.4.
 2018-05-02 13:58:25 +02:00
Pau Perez
5da9b55cdd Improve order_and_distributor report's readability 2018-05-02 12:26:42 +02:00
Pau Pérez Fabregat
21ebb5849c Merge pull request #2258 from mkllnk/2254-invite-manager-flow 
Fix initial password setting
 2018-05-02 08:48:36 +02:00
Pau Pérez Fabregat
b2301190af Merge pull request #2259 from mkllnk/remove-heroku 
Remove Heroku references since nobody is using it
 2018-05-02 08:43:51 +02:00
Maikel Linke
c597b3c377 Speed-up spec 2018-05-01 14:40:05 +10:00