raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-31 21:37:16 +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
Pau Pérez Fabregat
8547d5302c Merge pull request #2978 from Matt-Yorkley/spree-upgrade/orders#show 
[Spree Upgrade] orders#show
 2018-11-06 16:20:47 +00:00
Luis Ramos
0c02e8c15f Merge pull request #2981 from coopdevs/remove-commented-out-code 
Remove old commented out code
 2018-11-06 16:06:59 +00:00
Luis Ramos
1ceb632b83 Merge pull request #2980 from coopdevs/fix-long-line 
Fix long line
 2018-11-06 16:05:22 +00:00
Pau Pérez Fabregat
a4139a14a8 Merge pull request #2977 from luisramos0/2-0-payment-translation 
[Spree Upgrade] Add missing failed authorization translation
 2018-11-06 16:01:00 +00:00
Luis Ramos
86721d6d42 Merge pull request #2974 from luisramos0/2-0-user-balance 
[Spree Upgrade] Fix User Balance Calculator spec
 2018-11-06 16:00:44 +00:00
Pau Perez
71702af3c3 Have a single attributes list in serializer 2018-11-06 15:52:02 +00:00
Pau Perez
51155bb368 Remove old commented out code 
You know, git already keeps old code for us.
 2018-11-06 14:23:15 +00:00
Pau Perez
26d95b7250 Fix long lines 2018-11-06 13:59:51 +00:00
Matt-Yorkley
d0b7b57017 Remove OrderSerializer#show_path and adjust to use #edit over #show 2018-11-06 11:07:14 +00:00
Matt-Yorkley
aaaec4777d Remove admin order #show link from helper 2018-11-06 11:03:06 +00:00
luisramos0
c191a1feb8 Add missing translation related to authorization failure 2018-11-06 10:20:52 +00:00
luisramos0
79fcc7bce0 Fix user balance calculator spec by setting a target_shipment on line item of the order being tested 2018-11-05 19:23:09 +00:00
Pau Pérez Fabregat
4155f086e0 Merge pull request #2968 from openfoodfoundation/transifex 
Transifex
 2018-11-05 19:40:33 +01:00
Pau Pérez Fabregat
6bc14f4bab Merge pull request #2970 from Matt-Yorkley/2939-edit-order-button 
Remove workaround in failing feature spec
 2018-11-05 19:25:00 +01:00
Pau Pérez Fabregat
057412111d Merge pull request #2972 from coopdevs/mark-last-failing-enterprise-spec-pending 
[Spree Upgrade] Mark last failing enterprises spec as pending
 2018-11-05 18:59:47 +01:00
Pau Pérez Fabregat
e76bf81e2a Merge pull request #2973 from coopdevs/deliver-email-in-spec 
[Spree Upgrade] Perform mail delivery in spec to make it pass
 2018-11-05 18:58:37 +01:00
Pau Perez
f7b6867c28 Perform mail delivery in spec to make it pass 
We need to purposefully enable deliveries for the deliveries array to
list this email. Otherwise the delivery logic is not executed and thus
the deliveries array never filled.
 2018-11-05 17:49:08 +00:00
Pau Perez
21d756a1af Mark last failing enterprises spec as pending 
This will get solved once we complete
https://github.com/openfoodfoundation/openfoodnetwork/issues/2971. Until
then, let's not focus on this spec to reach our 100% green test suite.
 2018-11-05 16:45:53 +00:00
Matt-Yorkley
fd47756e2f Remove workaround in failing feature spec 
Removed an old workaround that clicked a button multiple times.
This was no longer working and causing the spec to fail.
 2018-11-05 11:19:57 +00:00
Pau Pérez Fabregat
50a06d1bd9 Merge pull request #2969 from luisramos0/2897-2-0-price-fix 
[Spree Upgrade] Fix specs creating deleted variants
 2018-11-05 11:59:06 +01:00
luisramos0
4f992a18f7 Fix specs creating deleted variants 
Spree checks that each price belongs to a variant
Since we were creating deleted variants, the price models couldnt see those
 2018-11-05 10:43:10 +00:00
Transifex-Openfoodnetwork
98d79ec939 Updating translations for config/locales/fr_BE.yml 2018-11-05 18:46:40 +11:00
Maikel
4930c9bc06 Merge pull request #2934 from mkllnk/manual-rubocop-todo-config 
Add offending files to rubocop config
 2018-11-05 10:37:03 +11:00
Maikel Linke
7ad40074a5 Make Code Climate show our real score ans split rubocop config 
Our rubocop config hides all current violations. It allows us to have a
passing rubocop run on the current code and improve it gradually. It
detects new violations, but doesn't annoy us with all the existing ones.

Code Climate has its own way of remembering all current violations which
is more sophisticated than ours. The new config for Code Climate doesn't
hide any violations so that Code Climate can give us a realistic score
of code quality and warn us about every new violation.

Splitting the configuration into the main three parts gives a quicker
overview and makes maintaining the parts easier.
 2018-11-05 10:19:30 +11:00
Maikel Linke
e798532a2f Add offending files to rubocop config 
The file .rubocop_todo.yml is generated automatically and contains a
configuration to make all files pass. For a lot of cops it just lists
the offending files. But for some cops it sets a different metric.

Since we don't want these lax metrics, we override them in our config
file .rubocop.yml. This leads to a lot of offences again. This patch
lists all offending files for each cop to make rubocop pass. We can
improve the code over time and remove items from the list.
 2018-11-05 10:11:35 +11:00
Pau Pérez Fabregat
fe8303cb19 Merge pull request #2957 from luisramos0/2-0-paypal-spec 
[Spree Upgrade] Fix occurrences of order.shipping_method= by replacing with order.shipments
 2018-11-02 15:50:59 +01:00
Pau Pérez Fabregat
834520491c Merge pull request #2900 from luisramos0/raise_error_if_no_stock_item_available 
[Spree Upgrade] Avoiding variantStock raise by creating variant first and then setting `count_on_hand`
 2018-11-02 15:49:21 +01:00
Pau Pérez Fabregat
e635cfc9c1 Merge pull request #2901 from luisramos0/variants_including_master 
[Spree Upgrade] Adapt product_decorator code to spree 2 with new variants_including_master
 2018-11-02 15:48:19 +01:00
Pau Pérez Fabregat
b1f3fa14e5 Merge pull request #2880 from luisramos0/backorders 
[Spree Upgrade] Replace allow_backorders with variant.on_demand in the cart
 2018-11-02 15:47:02 +01:00
Pau Pérez Fabregat
ad743a03ac Merge pull request #2888 from luisramos0/backorders-line-items 
[Spree Upgrade] Replace allow_backorders with variant.on_demand in the line_item_decorator
 2018-11-02 15:45:25 +01:00
Pau Pérez Fabregat
3b85bbe911 Merge pull request #2923 from mkllnk/2882-extract-email-setup-in-specs 
Extract email setup in specs for easy upgrade
 2018-11-02 15:40:19 +01:00
Pau Pérez Fabregat
a910fc50f5 Merge pull request #2926 from luisramos0/2-0-stable-oct-25 
[Spree Upgrade] Merging master into 2-0-stable (second run in October2018)
 2018-11-02 15:37:34 +01:00
Maikel
3259b3ecf1 Merge pull request #2912 from Matt-Yorkley/admin_orders_refactor 
Admin orders refactor
v1.22.0 		2018-11-02 16:57:28 +11:00
Maikel
cbfe1b535d Merge pull request #2871 from openfoodfoundation/dependabot/bundler/figaro-1.1.1 
Bump figaro from 0.7.0 to 1.1.1
 2018-11-02 12:09:53 +11:00
dependabot[bot]
6416d0e1c3 Bump awesome_print from 1.0.2 to 1.8.0 
Bumps [awesome_print](https://github.com/awesome-print/awesome_print) from 1.0.2 to 1.8.0.
- [Release notes](https://github.com/awesome-print/awesome_print/releases)
- [Changelog](https://github.com/awesome-print/awesome_print/blob/master/CHANGELOG.md)
- [Commits](https://github.com/awesome-print/awesome_print/compare/v1.0.2...v1.8.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-01 19:15:40 +00:00
Maikel
931c1207da Merge pull request #2813 from openfoodfoundation/dependabot/bundler/haml-4.0.7 
Bump haml from 4.0.4 to 4.0.7
 2018-11-01 16:52:07 +11:00
Maikel
7c4370be69 Merge pull request #2963 from luisramos0/2960_migration 
Fix variant_overrides permissions for overrides that belong to the supplier herself
 2018-11-01 11:41:51 +11:00
luisramos0
079d4e0bf5 Fix variant_overrides permissions for overrides that belong to the supplier herself 2018-10-31 11:26:15 +00:00
Pau Pérez Fabregat
1fbeb43c3a Merge pull request #2958 from coopdevs/pull-translations 
Update all locales with the latest Transifex translations
 2018-10-31 10:52:02 +01:00
Pau Pérez Fabregat
fc6a2d4a53 Merge pull request #2959 from coopdevs/fix-name-error-on-migrate 
Move default_url_options set up to an initializer
 2018-10-31 10:51:06 +01:00
Pau Perez
f16897a0b8 Fix DE translations manually 
We don't want 🇩🇪 to have a broken menu.
 2018-10-31 08:39:25 +01:00
Pedro Costa
1ddbc24a8b Fix default time zone config 
Why:

* Starting the environment, even with just `bundle exec rake`, results
  in the following error:
  ```sh
  Value assigned to config.time_zone not recognized.Run "rake -D time"
  for a list of tasks for finding appropriate time zone names.
  ```

This change addresses the issue by:

* Adding the time zone setting to environment specific configurations,
  defaulting to UTC in development, and using Melbourne in tests.
 2018-10-30 23:50:23 +00:00
Pau Perez
2e2c7c56cb Move default_url_options set up to an initializer 
For some reason running `bundle exec rake db:migrate RAILS_ENV=staging`
fails with:

```
rake aborted!
NameError: uninitialized constant Spree::Config
```

Running `bundle exec rails server` for instance, does not. There must be
a difference on the way a rake task and the rails commands load the app.

Moving this configuration to an initializer, at the end of the
initialization process, fixes it. The constant `Spree::Config` is
already loaded.

**This is preventing the release v1.22.0 from being staged and tested**
 2018-10-30 19:45:04 +01:00
luisramos0
3d106d749b Fix rubocop warnings on load_sample_data task 2018-10-30 18:00:52 +00:00
luisramos0
82befd945b Sort Product categories alphabetically by name and fixsample data by fixing taxons taxonomy id 2018-10-30 18:00:48 +00:00
Pau Pérez Fabregat
e4b988c9a2 Merge pull request #2924 from kristinalim/fix-disable_hiding_of_offcanvas_upon_resize 
Disable hiding of hamburger menu upon resize <= 1024px width
 2018-10-30 19:00:14 +01:00
Pau Pérez Fabregat
b35b24d4ae Merge pull request #2914 from luisramos0/checkout-language-bug 
Fix multi lingual issue in cart and checkout: the user language selection was not being used
 2018-10-30 17:46:37 +01:00
Pau Pérez Fabregat
7ffa3a2ca1 Merge pull request #2913 from HugsDaniel/2905_password_reset_missing_translations 
Add password confirmation, token and expired keys
 2018-10-30 17:34:01 +01:00
Pau Pérez Fabregat
3d88199257 Merge pull request #2896 from Matt-Yorkley/email_https_links 
Use https on all links in emails in production
 2018-10-30 17:33:32 +01:00
Pau Pérez Fabregat
8e602d453b Merge pull request #2876 from luisramos0/subs-states-fix 
Fix bug in subscriptions address controller where country states were not correctly returned
 2018-10-30 17:32:34 +01:00