Pau Pérez Fabregat
24415226bf
Merge pull request #3168 from luisramos0/google-maps-comment-specs
...
Temporarily xit 2 broken specs (shops and producers search by url)
2018-12-04 19:13:40 +01:00
luisramos0
7dc208fb8c
Temporarily move 2 broken specs to pending (shops and producers search by url) due to google maps api changes
2018-12-04 13:20:20 +00:00
Maikel Linke
66585e93a8
Update all locales with the latest Transifex translations
2018-12-04 14:48:03 +11:00
Pau Pérez Fabregat
08297863be
Merge pull request #3047 from mllocs/feature/expand-all-steps-in-checkout-page
...
Expand all steps in the checkout page by default
2018-11-29 16:28:42 +01:00
Pau Pérez Fabregat
9f17acd63c
Merge pull request #3136 from kevinchristianson/dashboard-translation
...
Add missing translation for 'Has Shopfront' in single-enterprise dashboard
2018-11-29 16:27:05 +01:00
Pau Pérez Fabregat
949efd88ce
Merge pull request #3154 from mkllnk/update-db-schema
...
Update schema for latest migration
2018-11-29 11:34:43 +01:00
Maikel Linke
285346fcda
Update schema for latest migration
...
I feel embarrased that this is the second follow up of my last
migration: https://github.com/openfoodfoundation/openfoodnetwork/pull/3126
The last migration didn't change any database structure, but the schema
still needs the latest migration version. Otherwise it will display
pending migrations when setting up the database.
This commit allows to run `bundle exec rake db:reset` in development
without the following message:
Run `rake db:migrate` to update your database then try again.
You have 1 pending migrations:
20181123012635 AssociateCustomersToUsers
The next pull request with a migration would have solved this problem as
well.
2018-11-29 10:29:56 +11:00
Pau Pérez Fabregat
3ea7fac25f
Merge pull request #3095 from luisramos0/admin-users-transl
...
In admin/users, convert Spree.t calls to t calls and use lazy lookup
2018-11-28 17:37:42 +01:00
Pau Pérez Fabregat
8df781887a
Merge pull request #3111 from kevinchristianson/pay-list-translation
...
Add translation for 'Back to Payments List' button in new payment form
2018-11-28 17:03:29 +01:00
Pau Pérez Fabregat
64c12c7a65
Merge pull request #2955 from HugsDaniel/import-spree-views-for-orders#edit
...
Import Spree views for orders#edit in our codebase
2018-11-28 17:02:40 +01:00
Pau Pérez Fabregat
b9dfaea274
Merge pull request #3143 from coopdevs/setup-rack-mini-profiler
...
Enable rack-mini-profiler in development
2018-11-28 13:54:27 +01:00
Pau Pérez Fabregat
438cff6e6d
Merge pull request #3080 from Matt-Yorkley/pi/french_issue
...
Pi/french issue
2018-11-28 13:39:04 +01:00
Hugo Daniel
69e186f482
Define dynamic classes in variables as a turnaround to HAML bug
2018-11-28 10:31:47 +01:00
Hugo Daniel
65dd3eb5b9
Change line items controller HTML response spec to look for form order_edit class
2018-11-28 10:31:47 +01:00
Hugo Daniel
60214b9a90
Fix failing specs
2018-11-28 10:31:47 +01:00
Hugo Daniel
422a68630f
Remove data-hook tags
2018-11-28 10:31:47 +01:00
Hugo Daniel
652191a4c5
Fixing missing variable none
2018-11-28 10:31:47 +01:00
Hugo Daniel
c233ea38cf
Import Spree views for orders#edit in our codebase and integrate deface modifications
2018-11-28 10:31:47 +01:00
Pau Pérez Fabregat
5c8a638320
Merge pull request #3055 from HugsDaniel/3051-products-edit-views
...
[Defacepocalypse] Import products#edit and form partial in our codebase and apply overrides
2018-11-27 17:32:25 +01:00
Pau Pérez Fabregat
869f17256d
Merge pull request #3011 from HugsDaniel/3000-api-endpoint-enterprise-fee
...
Add an API endpoint for EnterpriseFeesController#destroy
2018-11-27 17:28:43 +01:00
Pau Pérez Fabregat
ea6f44e78d
Merge pull request #3144 from mkllnk/2841-fix-migration-encoding
...
Encode records with special chars as well
2018-11-27 17:28:13 +01:00
Pau Pérez Fabregat
04d57f8e6e
Merge pull request #3135 from openfoodfoundation/dependabot/bundler/unicorn-rails-2.2.1
...
Bump unicorn-rails from 1.1.0 to 2.2.1
2018-11-27 17:26:12 +01:00
Pau Pérez Fabregat
d073157424
Merge pull request #3134 from coopdevs/update-skylight
...
Update Skylight from 1.6.1 to 1.7.1
2018-11-27 08:54:39 +01:00
Maikel
2967fdccf7
Merge pull request #3142 from kristinalim/fix-rubocop_block_length_ignore_describe_context
...
Ignore `describe` and `context` in Rubocop BlockLength
2018-11-27 14:54:46 +11:00
Maikel Linke
9efa45663c
Encode records with special chars as well
...
Using Marshal.dump on the French production database raised an error:
Encoding::UndefinedConversionError: "\xC3" from ASCII-8BIT to UTF-8
Replacing Marshal with YAML solves the problem. It is also more reliable
and human readable.
This code was run against the French, Australian and UK production
data successfully.
2018-11-27 14:34:03 +11:00
Pau Perez
b365488653
Enable rack-mini-profiler in development
...
This will run it always in development mode.
2018-11-26 12:10:49 +01:00
Kristina Lim
5c6ec50dea
Ignore describe and context in Rubocop BlockLength
2018-11-26 13:55:55 +08:00
Maikel
c152da8122
Merge pull request #3126 from mkllnk/2841-convert-guest-customer
...
2841 Associate customers with their user records
2018-11-26 13:56:31 +11:00
haseleyi
691de9199f
Add missing translation for 'Has Shopfront' in single-enterprise dashboard
2018-11-23 11:23:28 -08:00
dependabot[bot]
4499c38cfe
Bump unicorn-rails from 1.1.0 to 2.2.1
...
Bumps [unicorn-rails](https://github.com/samuelkadolph/unicorn-rails ) from 1.1.0 to 2.2.1.
- [Release notes](https://github.com/samuelkadolph/unicorn-rails/releases )
- [Commits](https://github.com/samuelkadolph/unicorn-rails/compare/v1.1.0...v2.2.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-23 19:14:51 +00:00
Maxim Colls
4b588cbfb0
Removed unused toggle helpers in spec/support
2018-11-23 16:47:55 +00:00
Pau Perez
2abb316bcc
Update Skylight from 1.6.1 to 1.7.1
...
This doesn't bring too many improvements but it's the latest version can
work on our Rails 3.2 version.
You can read the changelog at
https://github.com/skylightio/skylight-ruby/blob/master/CHANGELOG.md#170-april-24-2018 .
2018-11-23 17:31:53 +01:00
Maikel Linke
f4d5727fb4
Associate customers with their user records
...
When we introduced the Customer model, we didn't associate any existing
customers with users that have the same email address.
Later we decided to create that association when users sign up. But we didn't
update all the existing customers. We do that now for data consistency and to
solve several bugs.
2018-11-23 15:38:35 +11:00
Maikel Linke
95dbfae757
Use expect syntax
2018-11-22 15:42:56 +11:00
Maikel
be7fea9d14
Merge pull request #3003 from kevinchristianson/getting-started-edits
...
Getting Started edits
2018-11-22 12:51:16 +11:00
haseleyi
07e246db39
Remove outdated time zone precaution from Getting Started wiki
2018-11-21 15:56:14 -08:00
haseleyi
364a00074b
Remove Resources header
2018-11-21 15:56:14 -08:00
Kevin Christianson
7dce6e1180
Remove weird red "for" text in Troubleshooting
2018-11-21 15:56:14 -08:00
Kevin Christianson
1216567be9
Add Troubleshooting section with an alternative database setup
2018-11-21 15:56:13 -08:00
Samuel Nozaki
a7032a8822
Clarify that the time zone should be Melbourne
2018-11-21 15:56:13 -08:00
nozakis
6a73ee86f8
Clarify GETTING_STARTED.md in regards to rspec test failures and time zones
2018-11-21 15:56:13 -08:00
haseleyi
d4b49a662f
Add translation for 'Back to Payments List' button in new payment form
2018-11-21 15:33:45 -08:00
Matt-Yorkley
b3a9b502fa
Add missing translation key
2018-11-21 19:16:08 +00:00
Matt-Yorkley
a5407d780c
Include unexpected validation errors
2018-11-21 19:16:07 +00:00
Pau Pérez Fabregat
ac9cfaa8c3
Merge pull request #3093 from mllocs/fix/factories-ignore-warning
...
Fixed Factory warning while running tests
2018-11-21 14:44:03 +01:00
Pau Pérez Fabregat
6a1776b84a
Merge pull request #3053 from HugsDaniel/3050-products-new-views
...
[Defacepocalypse] Import products#new view into our codebase and apply overrides
2018-11-21 14:43:22 +01:00
luisramos0
783e0eed3c
In admin/users, convert Spree.t calls to t calls using lazy lookup and move translations to ofn's en.yml
2018-11-21 11:46:14 +00:00
luisramos0
0189cefd1c
Update all locales with the latest Transifex translations
2018-11-20 22:40:11 +00:00
Maxim Colls
f179bf8c49
Fixed Factory warning while running tests
2018-11-20 18:27:43 +00:00
Pau Pérez Fabregat
398092fa50
Merge pull request #3065 from openfoodfoundation/dependabot/bundler/turbo-sprockets-rails3-0.3.14
...
Bump turbo-sprockets-rails3 from 0.3.6 to 0.3.14
2018-11-20 12:13:23 +01:00
Pau Pérez Fabregat
4c6dec6203
Merge pull request #3082 from coopdevs/remove-travis-leftovers
...
Remove all database.travis.yml
2018-11-20 09:35:12 +01:00
Pau Perez
9301c5e1d5
Remove all database.travis.yml
...
We no longer use this file since we started with Semaphore CI.
2018-11-19 17:16:04 +01:00
Maikel
90e8813ff6
Merge pull request #3054 from coopdevs/fix/incorrect-order-dates
...
Fix/incorrect order dates
2018-11-19 09:17:11 +11:00
Maxim Colls
884d4d0122
Fixed specs
2018-11-17 19:46:09 +01:00
Maxim Colls
3301b5850a
Improved UX in the accordion steps in the checkout page
2018-11-17 18:48:10 +01:00
dependabot[bot]
e655e60b56
Bump turbo-sprockets-rails3 from 0.3.6 to 0.3.14
...
Bumps [turbo-sprockets-rails3](https://github.com/ndbroadbent/turbo-sprockets-rails3 ) from 0.3.6 to 0.3.14.
- [Release notes](https://github.com/ndbroadbent/turbo-sprockets-rails3/releases )
- [Commits](https://github.com/ndbroadbent/turbo-sprockets-rails3/compare/v0.3.6...v0.3.14 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-16 19:16:27 +00:00
Maikel
f593a70000
Merge pull request #2967 from openfoodfoundation/dependabot/bundler/unicorn-5.4.1
...
Bump unicorn from 4.9.0 to 5.4.1
2018-11-16 14:05:47 +11:00
dependabot[bot]
0d93705856
Bump unicorn from 4.9.0 to 5.4.1
...
Bumps [unicorn](https://bogomips.org/unicorn/ ) from 4.9.0 to 5.4.1.
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-11-16 02:00:48 +00:00
Pau Perez
23bda74ecb
Match name of filter and db column for consistency
2018-11-15 19:09:17 +01:00
Pau Perez
a4bbe2b696
Query completed_at filtering orders by date range
2018-11-15 19:09:17 +01:00
Pau Perez
c7a1c4b253
Change order date column translation in BOM
...
This makes it consistent with the order page. In both cases we use the
`completed_at` column underneath.
2018-11-15 19:09:17 +01:00
Hugo Daniel
a50786be34
Remove old do_not_remove_referenced_fees method
2018-11-15 17:59:06 +01:00
Hugo Daniel
0868404e98
Add specs for new Api::EnterpriseFeesController
2018-11-15 17:58:56 +01:00
Hugo Daniel
1309d80f65
Import products#edit and form partial in our codebase and apply overrides
2018-11-15 17:39:36 +01:00
Pau Pérez Fabregat
ee2ace8023
Merge pull request #3022 from HugsDaniel/2756-duplicate-product-with-image
...
Add specs for cloning a product with image
2018-11-15 17:35:28 +01:00
Hugo Daniel
094d88d03a
Import products#new view into our codebase and apply overrides
2018-11-15 16:35:31 +01:00
Hugo Daniel
d060704e86
Change Spree step-6a commit reference in Gemfile
2018-11-15 15:40:44 +01:00
Pau Perez
52e58a1c31
Remove unused @show_only_completed from view
...
Now there's no difference in behavior. In both cases we sort by
completed_at in the second column of the orders page.
2018-11-15 15:40:13 +01:00
Pau Perez
b7a3255dbe
Replace completed_at in orders table w/ created_at
2018-11-15 15:40:13 +01:00
Pau Perez
b1b04b505e
Fetch orders sorted by completion date
2018-11-15 15:40:13 +01:00
Pau Perez
e69d297f86
Wrap long and unreadable lines
2018-11-15 14:26:13 +01:00
Hugo Daniel
a162a2c50b
Move product distributions check as a before_destroy in EnterpriseFee model
2018-11-15 14:05:15 +01:00
Hugo Daniel
7b33712f7a
Add an API endpoint for EnterpriseFeesController#destroy
2018-11-15 14:05:08 +01:00
Hugo Daniel
4e29589be0
Add specs for cloning a product with image
2018-11-15 13:51:40 +01:00
Pau Pérez Fabregat
605f84d30a
Merge pull request #3010 from openfoodfoundation/transifex
...
Transifex
2018-11-14 11:27:01 +01:00
Pau Pérez Fabregat
8ee193dbcf
Merge pull request #2984 from Matt-Yorkley/email_https_links2
...
Specify only email link protocol setting
2018-11-14 11:26:14 +01:00
Pau Pérez Fabregat
e66f406ea6
Merge pull request #2946 from luisramos0/improve_taxons
...
Sort Product categories alphabetically by name
2018-11-14 11:23:59 +01:00
Transifex-Openfoodnetwork
f9fae06a7a
Updating translations for config/locales/en_BE.yml
2018-11-10 07:09:02 +11:00
Maikel
5c208a68c6
Merge pull request #3007 from openfoodfoundation/revert-2859-instagram_pattern
...
Revert "Instagram pattern"
2018-11-09 14:23:44 +11:00
Maikel
d8d20429aa
Revert "Instagram pattern"
2018-11-09 13:33:11 +11:00
Pau Pérez Fabregat
51a94c8194
Merge pull request #2964 from openfoodfoundation/dependabot/bundler/awesome_print-1.8.0
...
Bump awesome_print from 1.0.2 to 1.8.0
2018-11-07 18:48:32 +00:00
Pau Pérez Fabregat
72a9d39ee1
Merge pull request #2932 from luisramos0/2931-weight-calculator
...
2931 Refactor and prepare weight calculator for spree 2
2018-11-07 18:40:38 +00:00
Pau Pérez Fabregat
ecc69c2c58
Merge pull request #2948 from pfac/pfac-config-time-zone
...
Fix default time zone config
2018-11-07 18:39:25 +00:00
Matt-Yorkley
5b16353938
Specify only link protocol setting
2018-11-07 11:22:24 +00:00
luisramos0
b7ffde795a
Add migration to update calculator class name of weight calculators
2018-11-07 09:54:53 +00:00
luisramos0
9490da329a
Move Calculator::Weight from models/open_food_network/calculator to models/calculator
2018-11-07 09:54:30 +00:00
luisramos0
bf55f50a7e
Fix rubocop warnings on weight and weight_spec
2018-11-07 09:54:30 +00:00
luisramos0
275a192270
Convert specs to RSpec 3.7.1 syntax with Transpec
...
This conversion is done by Transpec 3.3.0 with the following command:
transpec spec/models/calculator/weight_spec.rb
* 3 conversions
from: == expected
to: eq(expected)
* 3 conversions
from: obj.should
to: expect(obj).to
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2018-11-07 09:54:30 +00:00
luisramos0
1ef04354fd
Add capacity to weight calculator to calculate based on any object with an order (needed in spree 2 to calculate based on package)
2018-11-07 09:54:30 +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 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
Pau Pérez Fabregat
4155f086e0
Merge pull request #2968 from openfoodfoundation/transifex
...
Transifex
2018-11-05 19:40:33 +01: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
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
Maikel
3259b3ecf1
Merge pull request #2912 from Matt-Yorkley/admin_orders_refactor
...
Admin orders refactor
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
Pau Perez
7f177598f2
Update all locales with the latest Transifex translations
2018-10-30 15:13:57 +01:00
Maikel
d63670d675
Merge pull request #2846 from Matt-Yorkley/pi/rename_enterprise_fields
...
[Product Import] Rename enterprise fields and update template
2018-10-30 15:11:02 +11:00
Maikel
7609496df3
Merge pull request #2859 from albarnaz/instagram_pattern
...
Instagram pattern
2018-10-30 15:10:27 +11:00
Maikel
ee042f51a4
Merge pull request #2949 from pfac/pfac-fix-new-preferences-migration
...
Fix new preferences migration
2018-10-30 15:09:35 +11:00
Pau Pérez Fabregat
5fade045f8
Merge pull request #2928 from luisramos0/line_items_controller_spec
...
Reorganize LineItemsController's destroy line item specs
2018-10-29 16:09:20 +01:00
Pedro Costa
91e4f99c19
Fix new preferences migration
...
Why:
* In a clean environment, running the new preferences migration fails,
due to a missing file from Spree core being manually required. This
file has now been missing since ab707cf .
This change addresses the issue by:
* Copying the missing file from Spree Core 1.3.6.beta into the migration.
This fixes the issue for now, but also means that a migration merge
and/or rewrite might be in order for the future.
2018-10-29 14:53:01 +00:00
Matt-Yorkley
443515dae4
Improve comment in index action
2018-10-29 10:34:05 +00:00
Matt-Yorkley
f3124e5472
Explicitly add :host to actionmailer config
2018-10-26 22:42:47 +01:00
Matt-Yorkley
b826beb0d7
Inline hashes in tests
2018-10-26 21:38:57 +01:00
Matt-Yorkley
29492d61f9
Use #allow syntax
2018-10-26 21:38:57 +01:00
Matt-Yorkley
8c19d1afec
Move tests from spree/admin/orders_controller_spec to api/orders_controller_spec and tidy up
2018-10-26 21:38:57 +01:00
Matt-Yorkley
033ae4f570
Add basic SearchOrders service spec
2018-10-26 21:38:57 +01:00
Matt-Yorkley
1f8f7b0495
Add new Api::OrdersController spec
2018-10-26 21:38:57 +01:00
Matt-Yorkley
46b1317159
Update orders resource js spec
2018-10-26 21:38:57 +01:00
Matt-Yorkley
334eebeab1
Move json to API and strip index action
2018-10-26 21:38:57 +01:00
Matt-Yorkley
0bd67bd06a
Remove unnecessary Spree::Config fallback value
2018-10-26 21:38:57 +01:00
Matt-Yorkley
77251848ee
Refactor Spree::Admin::OrdersController
2018-10-26 21:38:57 +01:00
luisramos0
09f8df6340
Reorganize LineItemsController's destroy line item specs to separate contexts with different test orders (completed_with_total and completed_with_fees)
2018-10-25 18:06:48 +01:00
Pau Pérez Fabregat
8a3f621b42
Merge pull request #2893 from luisramos0/deleted_products_break_inventory
...
Fix bug in inventory management page
2018-10-25 18:20:42 +02:00
Pau Pérez Fabregat
7cac4637fe
Merge pull request #2916 from luisramos0/date-transl-fix
...
Add Portuguese and German to list of momentJS locales
2018-10-25 18:18:53 +02:00
Kristina Lim
2cc594dc98
Proceed to hide off-canvas when resized to >1024px
2018-10-25 20:36:27 +08:00
Kristina Lim
14eaa49204
Disable hiding the off-canvas upon window resize.
...
In some browsers for mobile devices, the address bar is automatically
hidden when scrolling down the page. This is not workable if the height
of the contents of the off-canvas exceeds the height of the screen,
because the latter portion of the contents stays hidden to the user.
https://github.com/openfoodfoundation/angular-foundation/blob/0.9.0-20180826174721/src/offcanvas/offcanvas.js
2018-10-25 19:29:19 +08:00
Maikel
acb8ec772e
Merge pull request #2922 from mkllnk/update-rubocop-todo
...
Update rubocop todo list
2018-10-25 14:48:51 +11:00
Maikel
3cab3d1798
Merge pull request #2921 from openfoodfoundation/transifex
...
Transifex
2018-10-25 14:22:10 +11:00
Maikel Linke
cd5c23993a
Update rubocop todo list
...
Since we activated more cops in 0ac16ce096
we had a lot of files missing in the todo list. They are likely from
other pull requests that have been open at the same time. This is a
quick update so that rubocop gives us some useful feedback again.
2018-10-25 14:08:04 +11:00
Maikel Linke
e6adb8a3b9
Extract email setup in specs for easy upgrade
...
The way we set up email sending completely changes with Spree 2. This
change encapsulates that code in a single method so that it can be
changed easily and doesn't create further merge conflicts while we are
still working on the master branch and the Spree upgrade.
2018-10-25 13:53:22 +11:00
Maikel
51a1787881
Merge pull request #2908 from Matt-Yorkley/bulk_orders_bug
...
Fix pagination conflict with LineItemsCtrl requests
2018-10-25 13:18:11 +11:00
Maikel Linke
dc5302ca08
Speed up database queries and make them scale
...
This commit makes use of three ActiveRecord features:
1. Using `select` instead of `all.map` enables ActiveRecord to nest one
select into the other, resulting in one more efficient query instead of
two.
2. Using `find_each` saves memory by loading records in batches.
https://api.rubyonrails.org/classes/ActiveRecord/Batches.html#method-i-find_each
3. Using `pluck` creates only an array, avoiding loading all the other
columns of the records into objects.
Running this on the current Canadian database, fixes the following
variant overrides:
```
[]
[]
[]
[]
[]
[]
[925, 924, 966, 965]
[]
[]
[]
[]
[462,
863,
464,
822,
949,
947,
944,
939,
942,
946,
945,
943,
438,
937,
938,
941,
940,
467,
952,
875,
453,
953,
454,
951,
487,
460,
457,
528,
527,
486,
459,
458,
461,
529,
530,
950,
642,
384,
380,
643,
385,
381,
644,
386,
382,
960,
959,
379,
640,
377,
375,
532,
639,
376,
374,
646,
390,
389,
637,
406,
408,
647,
391,
393,
633,
396,
400,
398,
645,
388,
387,
648,
394,
392,
536,
632,
399,
397,
395,
634,
403,
401,
635,
404,
402,
636,
407,
405,
535,
534,
638,
410,
409,
948,
533,
537,
531,
877,
880,
894,
893,
672,
671,
673,
674,
703,
714,
715,
716,
717,
862,
864,
879,
876,
865,
881,
878,
463,
954,
866,
823,
957,
958,
955,
956,
899,
897]
[]
[969]
```
2018-10-25 11:33:14 +11:00
Transifex-Openfoodnetwork
c17939631f
Updating translations for config/locales/en_US.yml
2018-10-25 09:31:36 +11:00
Pau Pérez Fabregat
ce93c52dfe
Merge pull request #2850 from Matt-Yorkley/password_change_logout
...
Password change logout
2018-10-24 11:43:09 +02:00
Pau Pérez Fabregat
9ef4852bd4
Merge pull request #2818 from nikobozi/refactor-variant-overrides-query
...
Move query from variant_overrides_controller to its model scope
2018-10-24 11:42:22 +02:00
Pau Pérez Fabregat
7651ee0909
Merge pull request #2798 from as1729/as1729-update-docs-Stripe-publishable_key-for-pr
...
Better docs for Stripe.publishable_key and Stripe.endpoint_secret.
2018-10-24 11:23:21 +02:00
luisramos0
c9784a5eda
Add Portuguese and German to list of moment locales. The main usage is in the order cycle closure time in the shopfront
2018-10-23 17:53:08 +01:00
luisramos0
034d9ef72a
Refactor multilingual spec: extract method with repeated assertion
2018-10-23 14:10:52 +01:00
luisramos0
9d9f5d38d7
Fix multi lingual issue in cart and checkout: the user language selection was not being used
2018-10-23 14:10:48 +01:00
Hugo Daniel
c5f6af95c7
Add password confirmation, token and expired keys
2018-10-23 10:40:20 +02:00
Maikel
6f5289c730
Merge pull request #2894 from openfoodfoundation/transifex
...
Transifex
2018-10-23 16:21:20 +11:00
Matt-Yorkley
42c1584e6f
Fix pagination conflict with LineItemsCtrl requests
2018-10-22 18:13:56 +01:00
Pau Pérez Fabregat
a1bbf5328e
Merge pull request #2872 from mkllnk/2765-fix-geocoding
...
2765 Fix geocoding to display enterprises on map
2018-10-22 16:44:30 +02:00
luisramos0
d375bb8c55
Migration: Revoke variant overrides without permissions
2018-10-20 12:32:55 +01:00
luisramos0
9079437284
Add before_destroy to enterprise_relationship so that variant overrides are revoked when permission is deleted
2018-10-20 12:32:51 +01:00
luisramos0
5ae0ad87a7
Refactor EnterpriseRelationship before save hook: some renames and extract methods
2018-10-20 11:52:11 +01:00
Matt-Yorkley
c3cef699ca
Use https on all links in emails in production
2018-10-19 17:03:51 +01:00
Transifex-Openfoodnetwork
c911462737
Updating translations for config/locales/en_GB.yml
2018-10-20 02:04:33 +11:00
Maikel Linke
9698fd3c5a
Style spec
2018-10-18 11:07:16 +11:00
Maikel Linke
d197c8587f
Test address deletion
2018-10-18 11:06:32 +11:00
Maikel Linke
e96cab957a
Convert specs to RSpec 3.7.1 syntax with Transpec
...
This conversion is done by Transpec 3.3.0 with the following command:
transpec spec/models/spree/addresses_spec.rb
* 13 conversions
from: obj.should
to: expect(obj).to
* 2 conversions
from: it { should ... }
to: it { is_expected.to ... }
* 1 conversion
from: obj.should_not
to: expect(obj).not_to
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2018-10-18 10:52:46 +11:00
luisramos0
fe9f4a1c95
Move countryStates service from ofn.admin to admin.utils to remove bad dependency from admin modules (customers and subscriptions) to main ofn.admin module. Now the dependency admin.utils is used instead
2018-10-17 12:16:33 +01:00
luisramos0
c281927372
Fix subscription address form. It now clears the state selection when a different country is selected
2018-10-16 23:02:26 +01:00
luisramos0
1804bf5a2b
Extract countryStates logic from customer_address modal and re-use new CountryStates service
2018-10-16 22:45:38 +01:00
luisramos0
5c5a2194d6
Extract country states logic out of subscriptions address controller into new service CountryStates
2018-10-16 21:58:27 +01:00
luisramos0
feaf16d878
Fix bug in subscriptions address controller where the country id lookup was not exact and states returned were incorrect. Add unit tests to cover different cases
2018-10-16 20:59:34 +01:00
fabricio.albarnaz
419493f153
Move instagram regex to an method to fix codeclimate
2018-10-16 16:09:15 -03:00
fabricio.albarnaz
8e4adbd23a
Add more test cases
2018-10-16 15:34:46 -03:00
fabricio.albarnaz
93a051bf5a
Regex ajust
2018-10-16 15:33:10 -03:00
Pau Pérez Fabregat
590091c42a
Merge pull request #2842 from Matt-Yorkley/pi/missing_variable
...
Fix missing local variable in EntryProcessor
2018-10-16 13:19:23 +02:00
Maikel Linke
8fb81bb6a7
Configure Geocoder with API key as required by Google
2018-10-16 16:49:52 +11:00
Maikel Linke
61797fff56
Restrict deletion of address explicitely
...
Enterprises have an `address_id` which must point to a valid
`Spree::Address`. As Rubocop suggested, I restricted the deletion of
addresses when they are still associated to an enterprise.
Without declaring `dependent: :restrict`, trying to delete the address
would raise `ActiveRecord::InvalidForeignKey`. Now it is more specific
and raises `ActiveRecord::DeleteRestrictionError`.
I didn't find code rescuing the InvalidForeignKey when deleting addresses. I
actually think that we never delete addresses. So this change should not
have any impact on the execution.
2018-10-16 15:18:44 +11:00
Maikel Linke
a8705ca179
Simplify address methods
2018-10-16 14:49:36 +11:00
Maikel Linke
5021ed9c69
Simplify by using Rails tools
2018-10-16 14:49:35 +11:00
Maikel Linke
34849c441a
Reduce complexity and duplication
2018-10-16 14:48:12 +11:00
Maikel Linke
c4437a6437
Style address decorator
2018-10-16 14:48:12 +11:00
Maikel Linke
b109f6d78c
Remove temporary reporting code
2018-10-16 14:48:12 +11:00
fabricio.albarnaz
02bc134c59
Change befor save check to format validation
2018-10-15 17:51:33 -03:00
dependabot[bot]
dc6c8ec455
Bump figaro from 0.7.0 to 1.1.1
...
Bumps [figaro](https://github.com/laserlemon/figaro ) from 0.7.0 to 1.1.1.
- [Release notes](https://github.com/laserlemon/figaro/releases )
- [Changelog](https://github.com/laserlemon/figaro/blob/master/CHANGELOG.md )
- [Commits](https://github.com/laserlemon/figaro/compare/v0.7.0...v1.1.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-15 19:14:26 +00:00
Pau Pérez Fabregat
f8bccda6ab
Merge pull request #2847 from Matt-Yorkley/emails/validation
...
Emails/validation
2018-10-15 15:54:41 +02:00
Pau Pérez Fabregat
8946fe3ce8
Merge pull request #2829 from Matt-Yorkley/bi/results_per_page
...
Add per_page controls to admin orders index
2018-10-15 12:17:39 +02:00
Pau Pérez Fabregat
0e4a3dbc26
Merge pull request #2845 from coopdevs/fix-invalid-variant-creation
...
Fix invalid variant creation
2018-10-15 12:16:39 +02:00
Pau Pérez Fabregat
fe149967e4
Merge pull request #2521 from luisramos0/cookies_in_engine
...
[OFN Domains] Breaking OFN into domains - POC cookies inside an engine
2018-10-15 10:03:30 +02:00
Matt-Yorkley
fcff835922
Update results on dropdown select
2018-10-12 17:06:42 +01:00
Matt-Yorkley
a2828ea305
Use :for_hubs scope
2018-10-12 17:00:19 +01:00
Matt-Yorkley
123d1963ad
Remove duplicate method
2018-10-12 17:00:19 +01:00
Matt-Yorkley
3cb43121d5
Refactor long lines for new character limit
2018-10-12 17:00:18 +01:00
Matt-Yorkley
8fcaa54de7
Update CSV templates
2018-10-12 16:57:13 +01:00
Matt-Yorkley
bd4f0507ce
Adjustments for new Settings and ResetAbsent classes
2018-10-12 16:57:13 +01:00
Matt-Yorkley
1c85de6f58
Use producer and distributor for field names
2018-10-12 16:57:13 +01:00
Matt-Yorkley
2c9dc8899a
Update fields in specs
2018-10-12 16:57:13 +01:00
Matt-Yorkley
5c2b5377bc
Assign supplier_id when saving new product to products list
2018-10-12 16:57:13 +01:00
Matt-Yorkley
e7a909e828
Rename supplier to enterprise
2018-10-12 16:57:13 +01:00
Matt-Yorkley
8a0a33deec
Merge pull request #2858 from Matt-Yorkley/rubocop_line_limit
...
Increase rubocop line limit to 100
2018-10-12 16:52:37 +01:00
fabricio.albarnaz
6ad32fb66d
Add check for instagram.com
2018-10-11 18:05:18 -03:00
fabricio.albarnaz
e46b3566c3
Remove the check for www.instagram.com
2018-10-11 16:51:43 -03:00
fabricio.albarnaz
48720c835c
Add spec to instagram pattern
2018-10-11 16:30:17 -03:00
fabricio.albarnaz
e87075aed7
Add before save to check the instagram link pattern
2018-10-11 15:27:46 -03:00
Matt-Yorkley
57c6530e46
DRY code and use more flexible I18n
2018-10-11 16:38:14 +01:00
Matt-Yorkley
ebb03906cf
Increase rubocop line limit to 100
2018-10-11 15:37:38 +01:00
Pau Perez
60d05a941c
Fix variants with 'weight' and missing unit_value
...
This adds a data migration to fix those cases. It defaults to showing
1 unit of the specified weight. That is, if the user chose Kg, it'll
display 1 as unit.
Note that migration logs the process in a log/migrate.log file separate
from the regular Rails log/production.log file.
When you run the migration you'll see something like:
Fixing variants missing unit_value...
Processing variant 12...
Succesfully fixed variant 12
Done!
This helps auditing the changes applied and debug any possible failure
scenarios. You can delete it once all is ok.
2018-10-11 15:52:40 +02:00
Pau Perez
5bd375d422
Favor early return over dumb else branch
2018-10-11 15:52:40 +02:00
Pau Perez
c8c16f0e8a
Use Rails 3.2 validates syntax
2018-10-11 15:52:40 +02:00
Pau Perez
cbac916e66
Validate unit value when updating variant_unit
...
Variants whose product's variant_unit is weight or volume require
a unit_value.
2018-10-11 15:52:40 +02:00
Pau Perez
a2228d4131
Make ProductSet parseable by humans
...
Now it's imposible to understand what is really going on. Feels more
like assembler than Ruby.
2018-10-11 15:52:40 +02:00
Pau Perez
575d76e23e
Cover variant creation and update with basic tests
2018-10-11 15:52:40 +02:00
Pau Perez
d43726504b
Make #update_attributes parseable by humans
...
As it is this is impossible to follow.
2018-10-11 15:52:40 +02:00
Pau Perez
f54c69cbba
Add first test case for ProductSet
...
This covers creation and update of a product.
2018-10-11 15:52:40 +02:00
Pau Perez
2d60b3180e
Wrap and improve comment block readability
2018-10-11 15:52:40 +02:00
Matt-Yorkley
4760ebb80c
Use global config
2018-10-11 09:04:37 +01:00
Matt-Yorkley
dafcd0ddc2
Add per_page controls to admin orders index
2018-10-10 18:32:12 +01:00
Pau Pérez Fabregat
1bafa0cb7d
Merge pull request #2853 from mkllnk/remove-parallel-tests
...
Remove parallel tests
2018-10-10 16:01:44 +02:00
Pau Pérez Fabregat
227dd3e399
Merge pull request #2831 from kristinalim/fix-product_import_date_error
...
Fix product import date error when some but not all variants have import date
2018-10-09 16:37:25 +02:00
Pau Pérez Fabregat
85962158b8
Merge pull request #2821 from nikobozi/oc-clear-filter
...
Make 'Clear All' button work on order cycle page
2018-10-09 16:35:57 +02:00
Matt-Yorkley
900c65e0fc
Merge pull request #2855 from openfoodfoundation/transifex
...
Transifex
2018-10-09 14:21:14 +01:00
Matt-Yorkley
edca209f67
Merge pull request #2844 from Matt-Yorkley/bi/angular_orders_changing_page
...
Fix bindings on angular orders data
2018-10-09 14:15:38 +01:00
Transifex-Openfoodnetwork
c2c492cd6b
Updating translations for config/locales/es.yml
2018-10-09 21:57:06 +11:00
Matt-Yorkley
55411af3fa
Improve user account spec
2018-10-09 10:07:41 +01:00
Maikel Linke
245d900b58
Remove unused CI scripts
...
We used to have our own CI server, but now we are using Travis and
Semaphore. We don't need these scripts any more. And since
parallel_tests was removed in the previous commit, they are broken
anyway.
2018-10-09 17:06:59 +11:00
Maikel Linke
4cbc449a51
Remove unused parallel_tests gem
...
Reverts db47c01784
2018-10-09 16:54:08 +11:00
Pau Pérez Fabregat
5606550cd2
Merge pull request #2815 from openfoodfoundation/dependabot/bundler/rspec-retry-0.6.1
...
Bump rspec-retry from 0.5.6 to 0.6.1
2018-10-09 07:30:25 +02:00
Maikel
68c58dcb68
Merge pull request #2770 from openfoodfoundation/transifex
...
Transifex
2018-10-09 15:18:17 +11:00
Matt-Yorkley
3e39f3e749
Disable logout on password change
2018-10-08 23:06:54 +01:00
Matt-Yorkley
8f5fd41c8b
Update email confirmation address
2018-10-08 21:38:47 +01:00
Matt-Yorkley
3ec8c12899
Update account setting spec for updating email address
2018-10-08 20:41:59 +01:00
Pau Pérez Fabregat
ea6e522775
Merge pull request #2826 from 73VW/master
...
[README] Updated build status badge
2018-10-08 17:47:52 +02:00
Pau Pérez Fabregat
f5573f419b
Merge pull request #2778 from coopdevs/refactor-entry-processor
...
Refactor entry processor
2018-10-08 17:11:23 +02:00
Matt-Yorkley
37a7cceead
Fix bindings on angular orders data
2018-10-08 15:42:46 +01:00
Matt-Yorkley
b78716c283
Fix missing local variable
2018-10-08 14:49:29 +01:00
Transifex-Openfoodnetwork
8b59943256
Updating translations for config/locales/de_DE.yml
2018-10-08 16:58:01 +11:00
luisramos0
574f031020
Fix typo in matomo optout iframe url in cookies_policy_helper
2018-10-05 21:36:03 +01:00
Kristina Lim
da904c908d
Fix product import date when not all variants have it
2018-10-06 03:03:22 +08:00
Pau Pérez Fabregat
58a99a7f89
Merge pull request #2692 from Matt-Yorkley/bi/angular_orders
...
Angularise orders page
2018-10-04 21:10:48 +02:00
73VW
7a1cffb4b5
Updated build status badge
2018-10-04 18:43:30 +02:00
Pau Pérez Fabregat
b139f3839a
Merge pull request #2806 from luisramos0/rep
...
Delete representative_view dependency, not used
2018-10-04 13:02:35 +02:00
niko
f99ed81863
Make 'Clear All' button work on order cycle page
2018-10-04 11:46:38 +02:00
niko
f65d3c2815
fix rubocop issue
2018-10-04 03:30:32 +02:00
niko
3ae38178a3
Move query from variant_overrides_controller to its model scope
2018-10-04 02:43:02 +02:00
dependabot[bot]
8a6da745a3
Bump rspec-retry from 0.5.6 to 0.6.1
...
Bumps [rspec-retry](https://github.com/noredink/rspec-retry ) from 0.5.6 to 0.6.1.
- [Release notes](https://github.com/noredink/rspec-retry/releases )
- [Changelog](https://github.com/NoRedInk/rspec-retry/blob/master/changelog.md )
- [Commits](https://github.com/noredink/rspec-retry/compare/v0.5.6...v0.6.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-02 19:15:12 +00:00
dependabot[bot]
4e1521fd6a
Bump haml from 4.0.4 to 4.0.7
...
Bumps [haml](https://github.com/haml/haml ) from 4.0.4 to 4.0.7.
- [Release notes](https://github.com/haml/haml/releases )
- [Changelog](https://github.com/haml/haml/blob/master/CHANGELOG.md )
- [Commits](https://github.com/haml/haml/compare/4.0.4...4.0.7 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-10-02 19:13:34 +00:00
luisramos0
daafe73d81
Delete representative_view dependency, not used
2018-10-02 15:11:13 +01:00
Pau Pérez Fabregat
aa78b9e54c
Merge pull request #2777 from coopdevs/setup-simplecov
...
Setup simplecov
2018-10-02 14:39:43 +02:00
Pau Pérez Fabregat
6ddcb01b7c
Merge pull request #2736 from openfoodfoundation/dependabot/bundler/oj-3.6.10
...
Bump oj from 2.1.2 to 3.6.10
2018-10-02 14:38:26 +02:00
Matt-Yorkley
55d7d5d1e4
Rename #capture_path to #payment_capture_path
2018-10-02 11:10:51 +01:00
Matt-Yorkley
017e3d14df
Use variable colour assignment
2018-10-02 11:10:21 +01:00
Pau Perez
6a7359a3c5
Pass supplier_ids in strategy #reset instead
...
This removes the need to expose supplier_ids through #<< and makes both
ResetAbsent and its strategies simpler.
This could be made even simpler if the strategies just implemented
`#relation` as public method and ResetAbsent called `#update_all` on
them. The data to be fetched is the only thing that changes but the
update is the same.
2018-10-01 17:37:49 +02:00
Pau Perez
82654cd1ee
Turn delegation to a reader to make it simpler
...
This makes the solution less smart and as a result ResetAbsent improves
it's consistency and returns always an integer.
2018-10-01 16:40:34 +02:00
Pau Perez
148321f7b7
Make strategies class names more explicit
2018-10-01 16:40:34 +02:00
Pau Perez
af93af1a64
Replace strategy with a more explicit name
2018-10-01 16:40:34 +02:00
Pau Perez
8715fce295
Remove @import_settings in favor of Settings
2018-10-01 13:12:06 +02:00
Pau Perez
fd69c7672d
Add specs for ResetAbsent strategies
...
This also fixes the case where there are no overrides to exclude.
2018-10-01 13:12:06 +02:00
Pau Perez
d527f6265a
Remove pointless sum
2018-10-01 13:12:06 +02:00
Pau Perez
5eb10edbfd
Inject #updated_ids to strategy
...
Their values are known beforehand.
2018-10-01 13:12:06 +02:00
Pau Perez
186801a1e2
Remove unused supplier_ids argument
2018-10-01 13:12:06 +02:00
Pau Perez
718f529ede
Use nested module in test to improve readability
2018-10-01 13:12:06 +02:00
Pau Perez
f04fa4ed63
Do not treat ResetAbsent as a decorator anymore
...
This fully encapsulates it's logic and reduces its tight coupling with
EntryProcessor.
2018-10-01 13:12:06 +02:00
Pau Perez
95ae18a1ba
Remove method delegation
2018-10-01 13:12:06 +02:00
Pau Perez
54d6bc5443
Don't use importing_into_inventory? in ResetAbsent
...
This completely decouples ResetAbsent from the particular strategy used.
2018-10-01 13:12:06 +02:00
Pau Perez
a10e58e20a
Inject strategy_factory into ResetAbsent
2018-10-01 13:12:06 +02:00
Pau Perez
a9444b8909
Extract InventoryReset and Products strategies
...
Extract this strategy classes from ResetAbsent and move #reset there.
2018-10-01 13:12:06 +02:00
Pau Perez
8d7a11b0ac
Make all steps of the algorithm have 2 branches
2018-10-01 13:12:06 +02:00
Pau Perez
23471346b6
Do not call ResetAbsent when preconditions not met
2018-10-01 13:12:06 +02:00
Pau Perez
a409353d37
Move import_settings query methods to Settings
2018-10-01 13:12:06 +02:00
Pau Perez
fd84bea463
Test that variants or overrides are actually reset
2018-10-01 13:12:06 +02:00
Pau Perez
b940f06238
Return early if reset_all_absent is not set
...
No need to go through half of the algorithm if the setting is not
enabled. It does not change per enterprise.
This also assumes "Previously we were updating both (products and inventory)
at the same time during one import, but now it's one or the other" in
Matt's words.
2018-10-01 13:12:06 +02:00
Pau Perez
c955e151b7
Pass enterprise ids as strs as current code does
2018-10-01 13:12:06 +02:00
Pau Perez
e04162415a
Move code comment to be the method's doc
2018-10-01 13:12:06 +02:00
Pau Perez
5ac3598550
Inject Settings object in ResetAbsent
2018-10-01 13:12:06 +02:00
Pau Perez
b5766a2dd9
Extract common conditional clauses
...
This also turns local vars into ivars so that the behaviour can be
thoroughly tested. These ivars are meant to be removed once this class
is refactored further. Now there's no other way to ensure its state.
2018-10-01 13:12:06 +02:00
Pau Perez
ed073e9750
Rely on Settings and don't access internal struct.
2018-10-01 13:12:06 +02:00
Aditya Sridhar
372ae8e4aa
updated the spacing to be consistent.
2018-09-30 16:10:57 -04:00
Aditya Sridhar
06b28c1ab4
Better docs for Stripe.publishable_key and Stripe.endpoint_secret.
2018-09-30 15:50:33 -04:00
Pau Perez
663db47433
Move products_reset_count to ResetAbsent
2018-09-29 10:57:23 +02:00
Pau Perez
3150741849
Extract ResetAbsent class from EntryProcessor
2018-09-29 10:57:18 +02:00
luisramos0
3cf10020bf
Fix bug on slow page loads where banner and policy modal were both loaded
...
This solution makes the banner aware of the policy modal: the banner doesnt open if the policy modal is enabled
2018-09-27 17:47:36 +01:00
Pau Perez
16badcd1b5
Setup Simplecov to have code coverage analysis
...
This enables code coverage analysis when running specs in your dev
environment. Simply run them as usual and you'll see a line like the
following at the end of the output:
Coverage report generated for RSpec to /home/pau/dev/openfoodnetwork/coverage
Simply browse to coverage/index.html and the results in a web UI.
This is a useful tool that helps you decide if the tests you added are
enough or not.
2018-09-27 15:57:02 +02:00
Matt-Yorkley
54b17ac701
Use Spree::Order.pending_payments and remove service
2018-09-27 13:04:56 +01:00
Maikel
d488ae3f44
Merge pull request #2725 from mkllnk/2699-email-confirm-jobs
...
2699 email confirm jobs
2018-09-27 14:27:43 +10:00
Maikel Linke
f0021be53c
Style I18n call
2018-09-27 13:33:09 +10:00
Maikel Linke
af1ac333df
Create MailMethod before User when seeding
2018-09-27 13:33:09 +10:00
Maikel Linke
9dcc683dc0
Notify Bugsnag on sign-up errors
...
This may lead to more error reports than we want to see. A not existing
email address may cause Bugsnag to be notified. If this happens, we can
rescue form these specific errors and only report the rest.
2018-09-27 13:33:09 +10:00
Maikel Linke
17d951f99d
Rescue from any sign-up errors
...
The most common failure would happen when sending the confirmation email
triggered by `user.save`. We rescue any errors here and give feedback to
the user.
This allows for immediate feedback when the user types an email address
that is not accepted by our mail server or the email setup is not
configured properly.
2018-09-27 13:33:08 +10:00
Maikel Linke
3ae073dce5
Convert specs to RSpec 3.7.1 syntax with Transpec
...
This conversion is done by Transpec 3.3.0 with the following command:
transpec spec/controllers/user_registrations_controller_spec.rb
* 10 conversions
from: obj.should
to: expect(obj).to
* 7 conversions
from: == expected
to: eq(expected)
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2018-09-27 13:33:08 +10:00
Maikel Linke
600c8fcd4c
Send confirmation emails immediately
...
Using deferred methods on the user model breaks delayed jobs when the
user is deleted while the job still exists. We could create a proper job
referencing a user id for sending these emails instead. But since the
user has to wait for the confirmation email anyway, we can send it
within the current request. This should be revised if performance
becomes an issue.
Sending the email directly also has the advantage that we can tell the
user if emailing failed. See the following commits.
This change impacts a bunch of specs as we now need a working email
setup to create unconfirmed users. This commit introduces a custom
matcher to unify testing for confirmation emails.
2018-09-27 13:33:08 +10:00
luisramos0
921105301c
Move angular-templates route and controller into Web engine
...
The route and controller were in the main app and the views in the engine, with this commit they stay all inside the engine
This is done to keep it simple and remove the unnecessary dependency between main app and engine
If we use this mechanism in the future for other things in the main app or other engines, we can find a way to extract/abstract this
2018-09-26 12:39:51 +01:00
luisramos0
b1c7e6c091
Fix assets precompilation by including web/all.js and web/all.css in the assets precompilation list in application.rb
2018-09-26 12:30:45 +01:00
luisramos0
a23b1b980d
Make Web engine an isolated namespace engine mounted on / (without /web prefix)
...
This approach is better to separate concerns, see “Isolated Engine” here: https://api.rubyonrails.org/v3.2/classes/Rails/Engine.html
2018-09-26 12:30:06 +01:00
Matt-Yorkley
2dcc8ea4bb
Add spec for pending payments service
2018-09-25 10:05:32 +01:00
Matt-Yorkley
e93d46e75a
Use .find instead of .select().first
2018-09-25 09:35:05 +01:00
Maikel
51f9a0afa1
Merge pull request #2562 from Matt-Yorkley/pi/product_attributes
...
[Product Import] Product attributes
2018-09-25 11:36:03 +10:00
Maikel
bf1f2b93c6
Merge pull request #2768 from coopdevs/fire-unused-users-task
...
Remove no longer used rake task
2018-09-25 11:30:04 +10:00
Transifex-Openfoodnetwork
97775c0bc1
Updating translations for config/locales/fr_CA.yml
2018-09-25 06:12:48 +10:00
Matt-Yorkley
1d9243af19
DRY and clarify serializer and service
2018-09-24 16:58:43 +01:00
Pau Perez
4a7ee9b91e
Remove no longer used rake task
2018-09-24 17:17:10 +02:00
Matt-Yorkley
6f2760cf92
Move translations into their namespace and use '.key' format
2018-09-24 15:54:05 +01:00
Pau Perez
f743b5f02f
Extract Settings from Product Import processor
...
This encapsulates the data structure used by the entry processor to
check various settings. It still requires a lot of work to move more
logic to this new class.
2018-09-24 13:55:33 +02:00
Pau Pérez Fabregat
b8417058b4
Merge pull request #2741 from coopdevs/refactor-checkout-process-bits
...
Refactor checkout process bits
2018-09-24 12:08:19 +02:00
Maikel
9d48ea7b62
Merge pull request #2759 from luisramos0/del_old_spec_helper
...
Removed deprecated spec helper have_select2_option and fixed its last usage
2018-09-24 11:25:51 +10:00
Matt-Yorkley
9f57b43a13
Move sortble header elements to a partial
2018-09-23 22:14:12 +01:00
Maikel
f0bb927020
Merge pull request #2734 from coopdevs/make-rubocop-useful
...
Get useful feedback from Rubocop Metrics cops
2018-09-23 19:48:05 +10:00
Maikel
89be54f79e
Merge pull request #2750 from openfoodfoundation/transifex
...
Transifex
2018-09-22 16:05:04 +10:00
Transifex-Openfoodnetwork
7175434910
Updating translations for config/locales/en_US.yml
2018-09-22 01:25:48 +10:00
Maikel
e2fd5a36d8
Merge pull request #2757 from luisramos0/delete_dead_specs
...
Deleted sample specs and one pending spec
2018-09-21 15:41:49 +10:00
luisramos0
33d2b65d65
Removed deprecated spec helper have_select2_option and fixed its last usage
2018-09-20 23:01:23 +01:00
luisramos0
2a68184c01
Deleted unused test helper for rabl views
2018-09-20 20:09:14 +01:00
Pau Pérez Fabregat
20077c99b5
Merge pull request #2618 from coopdevs/enable-style-send-cop
...
Favor #public_send over #send using Rubocop's cop
2018-09-20 19:03:40 +02:00
Pau Pérez Fabregat
3dd1fcbc72
Merge pull request #2749 from luisramos0/delete-li-ship-method-name
...
Drop unused db column line_items.shipping_method_name
2018-09-20 13:26:26 +02:00
Matt-Yorkley
897e43fe0b
Remove Spree's Deface data-hooks from new view
2018-09-20 11:33:22 +01:00
Maikel Linke
5763bf0518
Update all translations
2018-09-20 10:33:02 +10:00
luisramos0
0e6b0aa248
Deleted sample specs and one pending spec
2018-09-19 23:45:00 +01:00
Matt-Yorkley
fc68e28e4d
Add :description to non-updatable attributes list
2018-09-19 22:30:10 +01:00
Matt-Yorkley
ebb18e9394
Remove unneccesary method
2018-09-19 21:12:30 +01:00
Matt-Yorkley
cc98cc832c
Prefer #public_send over #send
2018-09-19 21:12:30 +01:00
Matt-Yorkley
b57c6cf9ac
Add errors when attempting to update non-updatable fields
2018-09-19 21:12:29 +01:00
Pau Perez
0ac16ce096
Get useful feedback from Rubocop Metrics cops
...
One of the biggest pros of linters like Rubocop is to get valuable feedback to
help write better code. The way we have Rubocop configured now we don't prevent
new code from adhere improved code quality and this is specially important when
touching code that already suffers from complexity.
Without all Rubocop's Metrics cops enabled there's no way to get this insights
and write better code. This enables them while regenerating the
`.rubocop_todo.yml` to hide the current violations.
So, next time we touch existing code that we think could be simpler, we should
go to `.rubocop_todo.yml` and remove any occurrences of the file in question.
This way we could Rubocop's feedback right in the editor. This is tremendously
helpful when refactoring. It shows you where to start.
2018-09-19 19:27:40 +02:00
Pau Pérez Fabregat
62bebdb15e
Merge pull request #2698 from openfoodfoundation/dependabot/bundler/uglifier-4.1.19
...
[Security] Bump uglifier from 2.7.1 to 4.1.19
2018-09-19 18:02:06 +02:00
Pau Perez
a2b3d8372e
Reduce complexity of OrderUpdater decorator
2018-09-19 16:03:33 +02:00
Transifex-Openfoodnetwork
454cd8bfbf
Updating translations for config/locales/nb.yml
2018-09-19 22:30:06 +10:00
HugsDaniel
c4d4b52668
Merge pull request #2742 from openfoodfoundation/transifex
...
Transifex
2018-09-19 14:18:03 +02:00
Matt-Yorkley
3cbb576b4f
Move payment object logic out of order serializer and delete code
2018-09-19 13:00:30 +01:00
Matt-Yorkley
ba254802f8
Move angular_pagination to /views/admin/shared/
2018-09-19 13:00:30 +01:00
Matt-Yorkley
9ce32e3c14
Add new ordersCtrl spec
2018-09-19 13:00:30 +01:00
Matt-Yorkley
64620c2797
Tidy up response formats for easier testing
2018-09-19 13:00:30 +01:00
Matt-Yorkley
6768055b4d
Split orders into 2 angular controllers
2018-09-19 13:00:30 +01:00
Matt-Yorkley
b2551b4e0b
Rewrite existing specs
2018-09-19 13:00:30 +01:00
Matt-Yorkley
68f0c80016
Add loading message and spinner
2018-09-19 13:00:30 +01:00
Matt-Yorkley
9da6a5a9b3
Add column sorting to table
2018-09-19 13:00:30 +01:00
Matt-Yorkley
2112f296e4
Angularise filters
2018-09-19 13:00:30 +01:00
Matt-Yorkley
3b9d9db16b
Add pagination
2018-09-19 13:00:29 +01:00
luisramos0
524f9af148
Drop unused db column line_items.shipping_method_name
2018-09-19 11:38:19 +01:00
Matt-Yorkley
93d273f94a
Convert orders index table to use angular ng-repeat
2018-09-19 09:33:25 +01:00
Transifex-Openfoodnetwork
f0d015be0d
Updating translations for config/locales/de_DE.yml
2018-09-19 08:34:42 +10:00
Transifex-Openfoodnetwork
258347bc63
Updating translations for config/locales/fr.yml
2018-09-19 01:45:12 +10:00
Pau Pérez Fabregat
9f7d24934d
Merge pull request #2671 from kristinalim/translations-any_enterprise_in_oc_filters
...
Translate "Any Enterprise" and "Any Schedule" in OC filters
2018-09-18 11:42:19 +02:00
Pau Perez
2a0e0eed73
Move state_machine's additions inside class_eval
...
And also cover them with tests.
2018-09-18 11:20:32 +02:00
Pau Perez
1fdc578901
Increase readability (a bit) of OrderUpdater
2018-09-18 11:20:32 +02:00
Pau Perez
99cdeca0b1
Remove useless RSpec context block
2018-09-18 11:20:32 +02:00
Pau Perez
13f73b4512
Test :restart_checkout state machine event
2018-09-18 11:20:32 +02:00
Maikel
19df4ff640
Merge pull request #2701 from mkllnk/2700-improve-product-refresh-scheduling
...
2700 improve product refresh scheduling
2018-09-18 12:09:24 +10:00
dependabot[bot]
ccf7d91487
Bump oj from 2.1.2 to 3.6.10
...
Bumps [oj](https://github.com/ohler55/oj ) from 2.1.2 to 3.6.10.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/commits/v3.6.10 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-09-17 19:16:27 +00:00
luisramos0
c22ac0086b
Moved cookies_policy_helper to Web engine and respective spec
2018-09-17 16:05:38 +01:00
luisramos0
95f2f92cf3
Extracted cookies footer links from view to footer links helper
2018-09-17 16:05:38 +01:00
luisramos0
bded530137
Moved web api endpoint from /api to /web/api
2018-09-17 16:05:38 +01:00
luisramos0
dc5eb6448e
Change web/all.css from sprockets to SASS and include web/all.css through darkswarm/all.css
2018-09-17 16:05:38 +01:00
luisramos0
d170a4d489
New domain Web (rails engine) with the following features extracted from the main app:
...
- cookies banner
- cookies policy page
- cookies policy and privacy policy links in the footer
2018-09-17 16:05:32 +01:00
Matt-Yorkley
e577bcb46f
Prepare angular controller and serialized data
2018-09-17 14:18:23 +01:00
Pau Pérez Fabregat
0f627cdf39
Merge pull request #2661 from kristinalim/translations-copy_of_order_cycle
...
Translate "COPY OF" when cloning an OC
2018-09-17 12:38:29 +02:00
Pau Pérez Fabregat
0520f2187c
Merge pull request #2540 from luisramos0/delete_dead_store
...
removed assets related to spree store: dead code
2018-09-17 11:33:56 +02:00
Kristina Lim
798a6ed391
Translate more text in OC filters
2018-09-17 10:09:17 +10:00
Maikel Linke
ac85b90315
Clarify private class method declaration
2018-09-15 10:18:54 +10:00
Maikel
ce7be68fac
Merge pull request #2660 from kristinalim/translations-failed_oc_creation
...
Translate and fix fallback errors when creating or updating OC
2018-09-14 16:58:39 +10:00
dependabot[bot]
05225aaba7
[Security] Bump uglifier from 2.7.1 to 4.1.19
...
Bumps [uglifier](https://github.com/lautis/uglifier ) from 2.7.1 to 4.1.19. **This update includes security fixes.**
- [Release notes](https://github.com/lautis/uglifier/releases )
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md )
- [Commits](https://github.com/lautis/uglifier/compare/v2.7.1...v4.1.19 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-09-14 06:29:22 +00:00
Maikel
c3f461ad6e
Merge pull request #2622 from openfoodfoundation/dependabot/bundler/db2fog-0.9.0
...
Bump db2fog from 0.8.0 to 0.9.0
2018-09-14 16:26:54 +10:00
Maikel
e836ac0234
Merge pull request #2686 from HugsDaniel/2593_customize_user_guide_link
...
Enable setting a customized user guide link in general settings
2018-09-14 15:46:05 +10:00
Maikel
beedd933e9
Merge pull request #2512 from kristinalim/feature-remove_enterprise_images
...
Support removal of enterprise logo and promo image
2018-09-14 15:07:24 +10:00
Maikel
eabb9f4574
Merge pull request #2659 from kristinalim/translations-admin_area_fixes
...
Simple translation fixes for admin area and profile page
2018-09-14 14:38:25 +10:00
Maikel
da2f278060
Merge pull request #2649 from kristinalim/translations-fix_store_link_in_admin_header
...
Fix i18n translation for Store link in admin header for `fr`
2018-09-14 14:24:29 +10:00
Maikel
43a3ecff06
Merge pull request #2612 from openfoodfoundation/dependabot/bundler/jwt-1.5.6
...
Bump jwt from 1.5.4 to 1.5.6
2018-09-14 14:13:02 +10:00
Maikel
514f64c8d0
Merge pull request #2650 from kristinalim/translations-more_admin_header
...
Add "more" translation key
2018-09-14 13:31:13 +10:00
Maikel
6b56def649
Merge pull request #2697 from mkllnk/2655-fix-admin-payments
...
2655 fix admin payments
2018-09-14 11:26:20 +10:00
Maikel
1000bd4d24
Merge pull request #2658 from kristinalim/translations-order_and_shipment_emails
...
Allow fixing and customizing translations for order cancellation and shipment emails
2018-09-14 10:11:56 +10:00
Hugo Daniel
8dd0e01b8e
Use explicit syntax for section objects in preference_sections definition
2018-09-13 12:34:06 +02:00
Maikel Linke
ec953e1db0
Style cache refreshment class
2018-09-13 17:22:01 +10:00
Maikel Linke
2e635f94f6
Make job queuing more robust and efficient
2018-09-13 17:20:11 +10:00
dependabot[bot]
b676bfdcc8
Bump jwt from 1.5.4 to 1.5.6
...
Bumps [jwt](https://github.com/jwt/ruby-jwt ) from 1.5.4 to 1.5.6.
- [Release notes](https://github.com/jwt/ruby-jwt/releases )
- [Changelog](https://github.com/jwt/ruby-jwt/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jwt/ruby-jwt/compare/v1.5.4...v1.5.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-09-13 02:34:11 +00:00
Maikel
065df96872
Merge pull request #2675 from Matt-Yorkley/bi/remake_views
...
Remake orders index view
2018-09-13 12:29:54 +10:00
Maikel
5e722bf57d
Merge pull request #2634 from luisramos0/cookies_matomo_optout
...
[Cookies] Adds matomo optout iframe to cookies policy page
2018-09-13 12:29:09 +10:00
Maikel
f46c1e8414
Merge pull request #2424 from frank-west-iii/issue-2100-mini-racer
...
Replace therubyracer with mini_racer
2018-09-13 12:28:03 +10:00
Maikel Linke
81f60aab46
Make PaymentMethod serialisable with fees
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/2655
2018-09-13 12:01:17 +10:00
Maikel Linke
d7b19750e5
Add spec for GH issue #2655
2018-09-13 12:01:16 +10:00
Maikel Linke
a447fe4f40
Require lib file where needed
...
We can't always rely on other parts of the code been loaded first. We
need to declare dependencies so that they are always present.
I just ran into this problem in my dev environment.
2018-09-13 12:01:16 +10:00
luisramos0
478dd68072
In cookies policy helper, added string interpolation to variable to avoid variable (Spree::Config entry) to break the concatenation. Added unit test to validate the error case
2018-09-12 18:30:24 +01:00
luisramos0
409f084bd4
Added matomo opt out iframe to cookies policy page
2018-09-12 18:30:24 +01:00
Pau Pérez Fabregat
3f5c799166
Merge pull request #2648 from kristinalim/fix-ask_anonymous_users_to_login_for_order_page
...
Fix ask anonymous users to login for order page
2018-09-12 16:17:34 +02:00
Hugo Daniel
cc43d789e2
Refacto edit method for content controller and enable custom user guide link
2018-09-12 14:51:53 +02:00
dependabot[bot]
91c0de3f2a
Bump db2fog from 0.8.0 to 0.9.0
...
Bumps [db2fog](https://github.com/itbeaver/db2fog ) from 0.8.0 to 0.9.0.
- [Release notes](https://github.com/itbeaver/db2fog/releases )
- [Changelog](https://github.com/itbeaver/db2fog/blob/master/CHANGELOG.md )
- [Commits](https://github.com/itbeaver/db2fog/commits/v0.9.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-09-12 11:09:57 +00:00
Pau Pérez Fabregat
e474271698
Merge pull request #2637 from Vadlusk/remove_css_splitter
...
Remove duplicate css_splitter references, delete split css file.
2018-09-12 13:07:15 +02:00
Pau Pérez Fabregat
64e71a1ee7
Merge pull request #2544 from kristinalim/fix-scrolling_in_modals
...
Fix top position, height, and scrolling with modals
2018-09-12 13:05:20 +02:00
Matt-Yorkley
4d9ebf0550
Apply submenu override
2018-09-11 12:17:28 +01:00
Matt-Yorkley
f08d6389d8
Apply capture order override
2018-09-11 12:06:58 +01:00
Matt-Yorkley
507f4d0878
OCD tidy up of visually misaligned filter
2018-09-11 11:53:37 +01:00
Matt-Yorkley
afedaea2b5
Apply special instructions override
2018-09-11 11:49:28 +01:00
Matt-Yorkley
8f174b1308
Apply ship shortcut override
2018-09-11 11:43:38 +01:00
Matt-Yorkley
ba0701457e
Apply distributor td override
2018-09-11 11:42:08 +01:00
Matt-Yorkley
6389c552ca
Apply distributor th override
2018-09-11 11:41:25 +01:00
Matt-Yorkley
1958ac9932
Apply distributor filter inputs override
2018-09-11 11:39:05 +01:00
Matt-Yorkley
c7e2f817ed
Apply colgroup override
2018-09-11 11:34:34 +01:00
Matt-Yorkley
5a2491cb47
Apply ng-app override
2018-09-11 11:30:14 +01:00
Matt-Yorkley
980c46c63f
Convert Spree view to HAML
2018-09-11 11:22:54 +01:00
Kristina Lim
02a909c1b1
Do not use image_tag for enterprise image previews
...
If Rails config.assets.compile is false and config.assets.digest is
true, which is the case for staging and production, image_tag fails when
the image file is not found.
We do not need sprockets to ensure presence of the image file for these
tags, because the correct SRC values are assigned through the JS.
Inserting HTML should be sufficient.
2018-09-08 23:23:49 +08:00
Maikel
5e0997d03e
Merge pull request #2635 from apoc64/timezone_comments
...
Adds comments for setting up timezone in application.yml
2018-09-08 15:55:16 +10:00
Kristina Lim
003e65fbed
Translate error when failing to create order cycle
2018-09-08 02:15:52 +08:00
Kristina Lim
2c2dd62f6a
Translate "COPY OF" when cloning an OC
2018-09-08 02:06:52 +08:00
Kristina Lim
9dcdb67352
Translate inherits_properties label in product form
2018-09-08 01:37:57 +08:00
Kristina Lim
fc79aae17c
Translate authorized shops headers in account page
2018-09-08 00:34:47 +08:00
Kristina Lim
c64acf47ab
Fix translation key for "involving" in OC filters
2018-09-07 21:38:44 +08:00
Kristina Lim
86f4a118dd
Translate placeholder for order cycle name filter
2018-09-07 17:58:34 +08:00
Kristina Lim
40443b19f1
Add translations for headers in enterprise index
...
This is for the view when logged in as enterprise manager.
The translations added are:
* Producer?
* Package
* Status
2018-09-07 17:51:08 +08:00
Kristina Lim
2cf608ffdf
Add translations for shipment emails
2018-09-07 17:08:12 +08:00
Kristina Lim
f1d5088aaa
Add translations for order cancellation emails
2018-09-07 17:01:43 +08:00
Maikel
62f5228f1f
Merge pull request #2643 from luisramos0/transifex_manual
...
Fetched latest translations from transifex with tx pull --force
2018-09-07 16:46:24 +10:00
Maikel
3e0c74494d
Merge pull request #2604 from Matt-Yorkley/pi/updating_variants_bug
...
Pi/updating variants bug
2018-09-07 15:10:18 +10:00
Maikel Linke
d6c2a36451
Blacklist libv8 version that breaks mini_racer
2018-09-07 14:11:33 +10:00
Frank West
b9fe1ced16
Replace therubyracer with mini_racer
...
This is being replaced to increase the reliability and speed of asset
compilation.
2018-09-07 14:11:30 +10:00
Maikel
937da277f7
Merge pull request #2628 from openfoodfoundation/dependabot/bundler/rubyzip-1.2.2
...
[Security] Bump rubyzip from 1.2.1 to 1.2.2
2018-09-07 10:51:41 +10:00
Kristina Lim
d06bccb832
Change i18n key for Store link in admin header
...
spree_i18n translates the "store" key in different ways, sometimes like
"shop" and sometimes like "save". This could be because of a clash in
usage between Spree add-ons.
To be more specific, the "Store" link in the admin section now uses the
"admin.header.store" translation key.
2018-09-06 22:03:39 +08:00
Kristina Lim
6d5f8553ef
Add "more" translation key
...
This is used in places such as the adaptive menu in the admin section.
This is actually included in spree_i18n but not correctly translated for
fr.
2018-09-06 18:10:27 +08:00
Kristina Lim
f9533f8fb8
Refactor redirecting back after requiring login
2018-09-06 19:46:17 +10:00
Kristina Lim
cd41498da9
Ask to login when not authenticated for order page
...
Redirect the user to the login page, instead of responding with HTTP
401.
2018-09-06 16:26:48 +08:00
Kristina Lim
3bf9e95511
Add specs for existing behaviour in order page
2018-09-06 16:26:45 +08:00
Kristina Lim
28d2bb3d47
Wrap controller specs for viewing cart
2018-09-06 15:04:11 +08:00
Kristina Lim
339ea6fa91
Clean up SCSS as suggested by scss-lint
2018-09-06 04:21:35 +10:00
Kristina Lim
9258e8c464
Remove height limit for modals in small screens
2018-09-05 23:58:26 +08:00
Kristina Lim
169aa752d8
Enlarge potential size of modals for large screens
...
Change modals for large screens from 10% position from top and 80% max
height, to 5% position from top and 90% max height.
This is to accommodate the taller cookies policy modal.
It seems that it is not easy to apply a custom position and height to a
specific modal only. This doesn't seem to be supported by the modal
library currently being used.
Before the recent changes, most modals were rendering at 10px top
position (not the originally planned 10%), so changing this to 5%
doesn't seem to be much of a compromise.
2018-09-05 23:58:26 +08:00
Kristina Lim
f4725198e8
Move some CSS to pages/ subdirectory.
2018-09-05 23:58:26 +08:00
Kristina Lim
f03eb02269
Keep height of modal, dialog within screen height
2018-09-05 23:58:25 +08:00
Kristina Lim
a37e9f1b87
Use v0.9.0-20180826174721 in kristinalim fork of angular-foundation
...
There is a bug in the handling of % values for the "top" CSS property of
the modals. See details here:
https://github.com/kristinalim/angular-foundation/pull/1
A PR to the original repository has also been submitted, but the project
doesn't seem to be active anymore:
https://github.com/yalabot/angular-foundation/pull/319
And to another fork of the repository:
https://github.com/cwadrupldijjit/angular-foundation/pull/1
The bug was causing the 10% "top" CSS property for the modal to be
treated as 10px.
2018-09-05 23:58:25 +08:00
Kristina Lim
34adf7cf6c
Lower the start point for sliding of modals
...
Occasionally, the page scrolls up while the modal is being opened. This
was causing the final position of the modal to be at the wrong location
relative to the viewport.
This was happening because of a race condition between the animation
that slides the modal from above the viewport to the middle, and focus()
which the modal does:
https://github.com/yalabot/angular-foundation/blob/0.8.0/src/modal/modal.js#L109
The final vertical position of the modal is at 10%, so the animation
which translates the modal -25% vertically was starting -15% above the
viewport. The focus() was then causing vertical scroll.
This lowers the starting point of the animation, so there will no longer
be scrolling.
Additionally, the animation would only happen on large screens. The CSS
property "top" is 0 for smaller screens.
2018-09-05 23:58:25 +08:00
Kristina Lim
6e55e5b1c7
Use maximum of 80% for modals in large screens
...
When there is enough content in the modal, the height of the modal plus
its top margin could exceed the height of the viewport.
Considering a top position of 10%, a max height of 80% renders a tall
modal vertically centered, with 10% remaining space at the bottom.
2018-09-05 23:58:22 +08:00
luisramos0
138fa41b8d
Fetched latest translations from transifex with tx pull --force
2018-09-05 14:02:51 +01:00
Pau Pérez Fabregat
0a05e6944e
Merge pull request #2625 from kristinalim/translations-rename_entreprise_keys_to_enterprise
...
Rename "entreprise" in i18n keys to "enterprise"
2018-09-05 13:23:02 +02:00
Pau Perez
b23cb55525
Fix current violations of Style/Send cop
2018-09-05 12:05:05 +02: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
Kristina Lim
ce0758d420
Add confirm dialog for enterprise image removal
2018-09-04 02:08:26 +08:00
Kristina Lim
368612cad6
Allow removal of enterprise logo and promo image
2018-09-04 02:08:25 +08:00
Kristina Lim
c9370672c6
Add JS support for removal of enterprise images
2018-09-04 02:08:12 +08:00
Kristina Lim
9c3bb863da
Add endpoints for removing enterprise images
2018-09-04 01:32:39 +08:00
Kristina Lim
01d4b8fb10
Allow custom resource permission for admin controllers
2018-09-04 01:18:48 +08:00
Kristina Lim
f30032eee7
Include image URLs in serialized enterprise for admin
2018-09-04 01:18:45 +08:00
VadLusk
8efbe0e6d2
Delete _split2.css from application.rb assets precompile array.
2018-09-03 11:08:38 -06: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
apoc64
fbce828305
Breaks comment into multiple lines
2018-09-03 08:56:42 -06: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
luisramos0
14d526efc2
removed assets related to spree store: dead code
2018-09-03 09:50:42 +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
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 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
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
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
luisramos0
8dc10ffc6e
Added new test to cookies spec to cover bug on cookies banner and fixed it. See issue #2599 .
...
Also, improved readability on cookies spec with some extracted methods.
2018-08-28 23:48:22 +01:00
dependabot[bot]
3d8c4c69a7
Bump poltergeist from 1.16.0 to 1.18.1
...
Bumps [poltergeist](https://github.com/teampoltergeist/poltergeist ) from 1.16.0 to 1.18.1.
- [Release notes](https://github.com/teampoltergeist/poltergeist/releases )
- [Changelog](https://github.com/teampoltergeist/poltergeist/blob/master/CHANGELOG.md )
- [Commits](https://github.com/teampoltergeist/poltergeist/compare/v1.16.0...v1.18.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-28 19:15:06 +00:00
Matt-Yorkley
8de0355dc7
Add spec for multiple stages during import
2018-08-28 14:05:57 +01:00
Matt-Yorkley
f905284f7a
Add spec for edge case
2018-08-28 12:45:04 +01:00
Maikel
79f50e0b7b
Merge pull request #2353 from luisramos0/customers_admin_country_state
...
fixed UX problem in the state selector in customers admin
2018-08-28 16:46:00 +10:00
Maikel
b4bea59bb0
Merge pull request #2567 from greysteil/better-feater-matchers
...
Switch feature matcher style from `to_not have` to `to have_no`
2018-08-28 16:44:57 +10:00
Matt-Yorkley
6b9b8d8b73
Match multiple product names
2018-08-28 03:26:17 +01:00
Grey Baker
562a7936d9
Bump active_model_serializer to 0.8.4
2018-08-28 01:00:06 +01:00
Maikel
c39ac26f57
Merge pull request #2580 from openfoodfoundation/dependabot/bundler/stripe-3.3.2
...
Bump stripe from 3.3.1 to 3.3.2
2018-08-28 09:42:38 +10:00
Matt-Yorkley
8c2a49a57c
Update PI model spec
2018-08-27 23:08:19 +01:00
Matt-Yorkley
1df1ddcf66
Add spec for saving product and variant simultaneously
2018-08-27 23:06:54 +01:00
dependabot[bot]
61097c3bf9
Bump immigrant from 0.1.6 to 0.3.6
...
Bumps [immigrant](https://github.com/jenseng/immigrant ) from 0.1.6 to 0.3.6.
- [Release notes](https://github.com/jenseng/immigrant/releases )
- [Changelog](https://github.com/jenseng/immigrant/blob/master/CHANGELOG.md )
- [Commits](https://github.com/jenseng/immigrant/compare/v0.1.6...v0.3.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-27 19:18:13 +00:00
dependabot[bot]
67802cd4ee
Bump compass-rails from 2.0.4 to 3.1.0
...
Bumps [compass-rails](https://github.com/Compass/compass-rails ) from 2.0.4 to 3.1.0.
- [Release notes](https://github.com/Compass/compass-rails/releases )
- [Changelog](https://github.com/Compass/compass-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Compass/compass-rails/compare/2.0.4...3.1.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-27 19:17:55 +00:00
Maikel Linke
58cbe492d4
Remove gem rack-livereload
...
I don't think that anybody is using it. I asked on Slack and people
didn't know what it was. I kept guard-livereload which is probably
offering the same, maybe even better.
2018-08-27 16:34:50 +10:00
Maikel
44faa116db
Merge pull request #2583 from mkllnk/seed-mail-connection-type
...
Configure mail TLS or SSL connection when seeding
2018-08-27 09:52:56 +10:00
Kristina Lim
28792fc895
Add tests for adding/updating enterprise images
2018-08-26 03:58:19 +08:00
Maikel
8eee8f96ed
Merge pull request #2557 from Matt-Yorkley/pi/class_descriptions
...
Class descriptions for Product Import
2018-08-24 18:14:12 +10:00
Matt-Yorkley
717f626dfe
Refactor enterprise validation
2018-08-24 15:51:37 +10:00
Matt-Yorkley
2b057a26d5
Add primary_producer to index to reduce queries
2018-08-24 15:51:37 +10:00
Matt-Yorkley
666fbf53bf
Validate enterprise.is_primary_producer?
2018-08-24 15:51:37 +10:00
Maikel
616b42a14d
Merge pull request #2555 from luisramos0/cookie_http_only
...
Added httponly to cookieConsent cookie, this makes this cookie secure…
2018-08-24 15:50:13 +10:00
Maikel
a37931afda
Merge pull request #2542 from luisramos0/add_to_cart
...
Extract OrderController.populate to new CartController and OrderPopulator to new CartService
2018-08-24 14:43:33 +10:00
Maikel
bf55190136
Merge pull request #2546 from Matt-Yorkley/pi/sku_validation
...
Remove empty SKU values if empty
2018-08-24 14:32:00 +10:00
Maikel Linke
b158c92998
Configure mail TLS or SSL connection when seeding
...
This allows to seed the secure connection type of the default mail
method.
2018-08-24 14:03:21 +10:00
Maikel
871e423e12
Merge pull request #2548 from kristinalim/feature-bulk_update_of_order_cycle_name
...
Make OC name editable from the OC index
2018-08-24 11:38:31 +10:00
Maikel
c4c4547338
Merge pull request #2572 from greysteil/bump-webmock
...
Bump webmock
2018-08-24 08:49:11 +10:00
dependabot[bot]
358bb3030a
Bump stripe from 3.3.1 to 3.3.2
...
Bumps [stripe](https://github.com/stripe/stripe-ruby ) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/stripe/stripe-ruby/releases )
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stripe/stripe-ruby/compare/v3.3.1...v3.3.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-23 19:16:15 +00:00
dependabot[bot]
2e4a8d6318
Bump angular-rails-templates from 0.2.0 to 0.3.0
...
Bumps [angular-rails-templates](https://github.com/pitr/angular-rails-templates ) from 0.2.0 to 0.3.0.
- [Release notes](https://github.com/pitr/angular-rails-templates/releases )
- [Changelog](https://github.com/pitr/angular-rails-templates/blob/master/CHANGELOG.md )
- [Commits](https://github.com/pitr/angular-rails-templates/compare/v0.2.0...v0.3.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-23 19:15:48 +00:00
luisramos0
910297572e
Removed unnecessary currency from CartService constructor, using order.currency instead
2018-08-23 12:40:18 +01:00
luisramos0
ec069b1e3e
Converted specs to latest rspec syntax
2018-08-23 12:39:58 +01:00
luisramos0
c7b202f932
Fixed CodeClimate warnings on services/cart_services.rb
2018-08-23 12:39:58 +01:00
luisramos0
05bfc098ff
/controllers/spree/order_populator_decorator (with a class_eval) is now /services/CartService with no dependency to Spree::OrderPopulator.
2018-08-23 12:39:55 +01:00
luisramos0
6caa361354
Moved Spree::OrderController.populate to new CartController.
...
This was done to make order populate independent of Spree::OrdersController
2018-08-23 12:37:52 +01:00
Maikel
0312bf93dd
Merge pull request #2556 from luisramos0/cookies_failing_tests
...
Make cookies tests more stable
2018-08-23 13:29:02 +10:00
Maikel Linke
00b8b0a36c
Sleep to avoid race conditions in cookie spec
...
We tried a lot to avoid these sleep commands, but nothing worked. So
it's better to have reliable specs than fast specs.
2018-08-23 13:13:05 +10:00
Maikel
0c35d1bade
Merge pull request #2570 from openfoodfoundation/dependabot/bundler/atomic-1.1.101
...
Bump atomic from 1.1.99 to 1.1.101
2018-08-23 11:05:46 +10:00
Maikel
5dd0aed1c0
Merge pull request #2569 from openfoodfoundation/dependabot/bundler/rack-livereload-0.3.17
...
Bump rack-livereload from 0.3.16 to 0.3.17
2018-08-23 10:56:00 +10:00
Maikel
bc192dabbc
Merge pull request #2564 from openfoodfoundation/dependabot/bundler/fuubar-2.3.2
...
Bump fuubar from 2.2.0 to 2.3.2
2018-08-23 10:10:07 +10:00
Maikel
7d40e960f4
Merge pull request #2563 from openfoodfoundation/transifex
...
Transifex
2018-08-23 10:06:16 +10:00
Maikel
92e9392bc5
Merge pull request #2561 from mkllnk/2233-enable-embedded-shopping-spec
...
Enable embedded shopping spec
2018-08-23 09:23:12 +10:00
Grey Baker
468c29b8c1
Use new basic auth stub style
2018-08-22 21:35:56 +01:00
dependabot[bot]
b459ed7122
Bump webmock from 1.8.11 to 3.4.2
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 1.8.11 to 3.4.2.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v1.8.11...v3.4.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-22 21:26:05 +01:00
dependabot[bot]
f35e24d5ce
Bump atomic from 1.1.99 to 1.1.101
...
Bumps [atomic](https://github.com/ruby-concurrency/atomic ) from 1.1.99 to 1.1.101.
- [Release notes](https://github.com/ruby-concurrency/atomic/releases )
- [Commits](https://github.com/ruby-concurrency/atomic/compare/1.1.99...1.1.101 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-22 19:18:33 +00:00
dependabot[bot]
c5b426fded
Bump rack-livereload from 0.3.16 to 0.3.17
...
Bumps [rack-livereload](https://github.com/onesupercoder/rack-livereload ) from 0.3.16 to 0.3.17.
- [Release notes](https://github.com/onesupercoder/rack-livereload/releases )
- [Commits](https://github.com/onesupercoder/rack-livereload/commits )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-22 19:17:49 +00:00
Grey Baker
a747561e77
Switch feature matcher style from to_not have to to have_no
2018-08-22 09:29:48 +01:00
dependabot[bot]
8fb5625f1d
Bump daemons from 1.2.2 to 1.2.6
...
Bumps [daemons](https://github.com/thuehlinger/daemons ) from 1.2.2 to 1.2.6.
- [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.2.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-22 07:48:28 +00:00
dependabot[bot]
ade005bb2c
Bump fuubar from 2.2.0 to 2.3.2
...
Bumps [fuubar](https://github.com/thekompanee/fuubar ) from 2.2.0 to 2.3.2.
- [Release notes](https://github.com/thekompanee/fuubar/releases )
- [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md )
- [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.2.0...releases/v2.3.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-22 07:47:04 +00:00
Maikel
4417a8f156
Merge pull request #2539 from luisramos0/delete_dead_cart
...
removed Cart route, controller, model and specs: dead code
2018-08-22 17:35:58 +10:00
Transifex-Openfoodnetwork
1bbc615496
Updating translations for config/locales/fr_CA.yml
2018-08-22 08:37:41 +10:00
Transifex-Openfoodnetwork
39b3a964dd
Updating translations for config/locales/fr.yml
2018-08-22 04:25:59 +10:00
luisramos0
653804d14c
Make cookies test more stable
2018-08-20 21:08:09 +01:00
luisramos0
61f69905f8
fixed UX problem in the state selector in customers admin
2018-08-20 20:51:22 +01:00
stveep
17f2ba47ca
Add label for card field
2018-08-19 12:00:31 +01:00
stveep
8c6b8d5e84
Move injectors outside Stripe partial to satisfy dependencies
2018-08-19 11:50:34 +01:00
stveep
286101c934
PR changes: switch syntax for mapCC, remove ng-init
2018-08-19 10:43:53 +01:00
stveep
c0f41b6833
PR changes - erb to haml, don't update en_GB translations
2018-08-19 10:43:53 +01:00
stveep
b3da7049c6
Should not hide post code on admin side as no billing address otherwise
2018-08-19 10:43:53 +01:00
stveep
ff7dc811e9
Add translations for messages and remove old placeholder translation
2018-08-19 10:43:53 +01:00
stveep
f9a221e2ff
add to manifest, tidy up requirements, hide postcode similar to frontend
2018-08-19 10:43:53 +01:00
stveep
a848b9172e
Change name to AdminStripeElements to avoid confusion; add status bar for StatusMessages
2018-08-19 10:43:53 +01:00
stveep
8272aebe29
Add Stripe form and duplicate Stripe Elements in backend Angular app
2018-08-19 10:43:53 +01:00
Matt-Yorkley
fbbbc93aba
Class descriptions for Product Import
2018-08-18 11:42:02 +01:00
luisramos0
56879377d5
Added httponly to cookieConsent cookie, this makes this cookie secure, cannot be altered by javascript
2018-08-17 22:57:57 +01:00
Maikel
e0d13010bb
Merge pull request #2543 from openfoodfoundation/transifex
...
Transifex
2018-08-17 17:36:22 +10:00
Maikel Linke
7dccbb5213
Enable embedded shopping spec
...
It was disabled in
https://github.com/openfoodfoundation/openfoodnetwork/pull/2232 , because
it was very unreliable. But it seems stable again since
https://github.com/openfoodfoundation/openfoodnetwork/pull/2468 .
2018-08-17 17:00:15 +10:00
Matt-Yorkley
28b1fc076a
Remove empty SKU values if empty
2018-08-16 14:29:50 +01:00
Kristina Lim
c14e7ea8d5
Allow bulk update of order cycle name
2018-08-16 21:18:24 +08:00
luisramos0
91e57cb893
Removed Cart table, its dependency on spree orders table and removed some more dead code related to this
2018-08-15 23:29:28 +01:00
Transifex-Openfoodnetwork
d76112e072
Updating translations for config/locales/de_DE.yml
2018-08-14 17:18:51 +10:00
Maikel Linke
c9862535f8
Import required colour definitions in SCSS
...
This avoids asset compile errors like this one:
Sass::SyntaxError: Undefined variable: "$disabled-light".
2018-08-14 10:01:48 +10:00
luisramos0
8681618490
Fixed CodeClimate scss feedback on cookies banner and policy page css
2018-08-14 10:01:48 +10:00
luisramos0
ccd5147b11
Added angular templates route and controller to serve angular templates from the server, instead of precompiled assets. This was used to fix a problem with the cookies policy page template that was using a Spree configuration
2018-08-14 10:01:48 +10:00
luisramos0
1c20967ca4
Added a button to close the cookies policy page at the bottom of the page to improve UX on mobile
2018-08-14 10:01:48 +10:00
luisramos0
bff5581a42
Added functional tests for cookies related features: cookies policy page, cookies banner and privacy policy link
2018-08-14 10:01:48 +10:00
luisramos0
4b64369ddb
Added GA and Matomo toggle in Legal Settings in the global settings in the BO and added GA and Matomo cookies details to the cookies policy page (according to what is configured in the BO)
2018-08-14 10:01:48 +10:00
luisramos0
ca35c59e52
Moved the footer TOS URL from the content settings to the new section legal settings in the global settings
2018-08-14 10:01:48 +10:00
luisramos0
d920c32376
Added cookies banner toggle and privacy URL to a new section called Legal Settings in the global settings in the BO
2018-08-14 10:01:48 +10:00
luisramos0
92f9cbd00a
Added new cookies banner (with link to cookie policy page and the accept cookies button)
2018-08-14 10:01:48 +10:00
luisramos0
08c5d8f3ab
Added new cookies policy page and added a link to it in the footer (cookies policy link)
2018-08-14 10:01:48 +10:00
luisramos0
362ed8ed08
Changed modals max height from 120% to 100% so that the content in the modal is never outside the viewport
2018-08-14 10:01:48 +10:00
Transifex-Openfoodnetwork
4f751eb3e3
Updating translations for config/locales/nb.yml
2018-08-13 17:08:33 +10:00
Maikel
910c1d437d
Merge pull request #2536 from openfoodfoundation/transifex
...
Transifex
2018-08-13 15:48:11 +10:00
luisramos0
0b9061df28
removed Cart route, controller, model and specs: dead code
2018-08-11 22:17:12 +01:00
Transifex-Openfoodnetwork
6c306aa1dd
Updating translations for config/locales/fr.yml
2018-08-10 21:09:21 +10:00
luisramos0
3b1bd53d3a
Added basic integration with Matomo
...
Added matomo script and added a new matomo settings menu entry under configuration. Improved organization of en.yml by grouping configuration screens.
2018-08-10 16:12:58 +10:00
Kristina Lim
6251c72921
Add divider between admin enterprise index actions
2018-08-10 12:17:31 +10:00
Kristina Lim
17978f58c7
Rename edit link in admin enterprise index
...
Change "Edit Profile" link to "Settings".
2018-08-10 12:17:31 +10:00
Kristina Lim
295604b689
Change heading for edit enterprise page
...
Change the start of the heading from "Editing:" to "Settings:".
2018-08-10 12:17:31 +10:00
Kristina Lim
0b4fcf8a14
Change enterprise "Manage" button to "Settings"
2018-08-10 12:17:30 +10:00
Kristina Lim
b91019ad64
Split translation key for enterprise manage button
...
The ".manage" key is still used by the column header for the "Manage"
buttons.
2018-08-10 12:12:26 +10:00
Maikel Linke
9dcbd9076e
Override in_stock? to prepare for Spree 2.0
2018-08-09 14:22:43 +10:00
Maikel Linke
b84e524f2d
Prepare inventory report for Spree upgrade
...
This change could impact the performance of the report. But therefore it
takes VariantOverrides into consideration. The old code ignored the
distributor for this filter. It also ignored the `on_demand` flag.
2018-08-09 14:22:43 +10:00
Maikel Linke
289d0b937f
Style ScopeVariantToHub
2018-08-09 14:22:43 +10:00
Maikel Linke
27ddb712c1
Remove unused scope Spree::Variant.in_stock
...
Our added scope is not used anywhere and conflicts with the Spree
upgrade.
https://github.com/openfoodfoundation/openfoodnetwork/issues/2014
2018-08-09 14:22:43 +10:00
Maikel
33f6dc21e7
Merge pull request #2516 from kristinalim/cleanup-move_admin_and_spree_from_routes
...
Separate admin and Spree routes from main file
2018-08-09 10:10:49 +10:00
Maikel
f93ed0de85
Merge pull request #2519 from mkllnk/more-efficient-login-in-specs
...
More efficient login in specs
2018-08-09 10:05:54 +10:00
Maikel
03468efa7e
Merge pull request #2346 from oeoeaio/subs-totals
...
Subs: totals in backend are consistent and include fee breakdown
2018-08-07 18:17:13 +10:00
Maikel Linke
9aff9fbce2
Remove empty spec
2018-08-07 16:01:38 +10:00
Maikel Linke
b628ead525
Speed up shipping methods spec
2018-08-07 16:01:38 +10:00
Maikel Linke
54552f2be7
Speed up admin schedules spec
2018-08-07 16:01:37 +10:00
Maikel Linke
819a173167
Speed up reports spec
2018-08-07 16:01:37 +10:00
Maikel Linke
aa677a117b
Speed up admin products spec
2018-08-07 16:01:37 +10:00
Maikel Linke
eb550505ae
Speed up admin payment method spec
2018-08-07 16:01:37 +10:00
Maikel Linke
9023b16395
Speed up admin orders spec
...
From 80s to 74s.
2018-08-07 16:01:37 +10:00
Maikel Linke
71a381e48e
Speed up order cycles spec
...
From 68 to 63 seconds.
2018-08-07 16:01:37 +10:00
Maikel Linke
f4cd5a7e4b
Speed up admin enterprise spec
...
From 40s to 36s.
2018-08-07 16:01:37 +10:00
Maikel Linke
121bc51feb
Speed up admin enterprises spec
...
From 6.5s to 5.3s.
2018-08-07 16:01:37 +10:00
Maikel Linke
f0da823445
Speed up enterprise user spec
...
From 1.9s to 1.7s.
2018-08-07 12:41:07 +10:00
Maikel Linke
e4ebeb8a29
Remove dead spec code
...
The code has been inactive since 2015 and was probably obsolete anyway.
2018-08-07 12:37:49 +10:00
Maikel Linke
0b39054954
Speed up relationships spec
...
From 18s to 12s: 33% speed up
2018-08-07 12:33:26 +10:00
Maikel Linke
126f312c6b
Make spec more robust not relying on order
...
Enterprises can be in different order. Using `with_options` doesn't
care about the order.
2018-08-07 12:30:59 +10:00
Maikel Linke
edb32218b0
Use quick login to speed up product edit spec
...
From 48s to 44s: 8% speed up
2018-08-07 12:11:15 +10:00
Maikel Linke
0edf393c12
Use quick login to speed up spec
...
We don't need to visit the admin dashboard before each spec.
On my machine:
54 seconds before
47 seconds after
speed up by 13%
2018-08-07 10:56:42 +10:00
Maikel Linke
30fad228c5
Remove code duplication in spec helper
2018-08-07 09:24:31 +10:00
Maikel
32846af230
Merge pull request #2517 from kristinalim/cleanup-disable_rubocop_cop_rails_activerecordaliases
...
Disable rubocop cop "Rails/ActiveRecordAliases"
2018-08-07 09:11:00 +10:00
Kristina Lim
d77a94335b
Update .rubocop_todo.yml
2018-08-06 18:45:52 +08:00
Kristina Lim
a494fb274e
Disable rubocop cop Rails/ActiveRecordAliases
...
The methods :update! and :update (to replace :update_attributes! and
:update_attributes) were not added until Rails 4.
See this for more information:
https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Rails/ActiveRecordAliases
2018-08-06 18:12:43 +08:00
Kristina Lim
b67c8cc9f1
Improve requiring of additional routes
...
This is more appropriate, and allows changes the separate route files to
be loaded automatically in the development environment.
2018-08-06 17:04:03 +08:00
Kristina Lim
4d34693c05
Move Spree route customizations from main file
2018-08-06 09:57:29 +08:00
Kristina Lim
72036a4993
Move admin routes from main file
2018-08-06 09:57:24 +08:00
Maikel Linke
f0be8ff290
Style proxy order serializer
2018-08-03 15:07:22 +10:00
Maikel Linke
b736560d63
Inform about inaccurate subscription totals
...
https://github.com/openfoodfoundation/openfoodnetwork/pull/2346#issuecomment-409822038
2018-08-03 14:59:27 +10:00
Matt-Yorkley
c8397024e4
Streamline Product Import UX flow
2018-08-03 14:33:35 +10:00
Maikel Linke
d5fdda1c46
Fix typo translating Enterprises
2018-08-03 12:15:50 +10:00
Maikel Linke
c48889f368
Remove duplicate translation key
2018-08-03 12:15:50 +10:00
Rob Harrington
cead905d05
Use estimated subscription total for proxy orders if order has not been initialized
2018-08-03 12:14:25 +10:00
Rob Harrington
fb93351386
Show fee breakdown in line items panel if present
2018-08-03 12:14:25 +10:00
Maikel
d726b0a851
Merge pull request #2509 from coopdevs/update-spree-fork-version
...
Update Spree's fork revision in Gemfile
2018-07-31 09:26:00 +10:00
Pau Perez
c4b23b62d0
Update Spree's fork revision in Gemfile
2018-07-30 18:11:02 +10:00
Maikel
915531acc4
Add section about documentation updates
...
This should prevent issues like https://github.com/openfoodfoundation/openfoodnetwork/issues/2427 .
Also converted comments into HTML syntax so that you don't have to delete them when creating a PR.
2018-07-30 14:44:07 +10:00
Maikel
8ecc786b99
Include bug severity in issue template
...
And formatted for easier reading and writing.
2018-07-30 14:28:01 +10:00
Rob H
7f26b1494b
Fix syntax error in GETTING_STARTED.md
2018-07-27 12:49:18 +10:00
Rob H
eb89b74022
Fix syntax error in README.md
2018-07-27 12:48:37 +10:00
Maikel
933ff63de2
Merge pull request #2389 from luisramos0/bulk_prod_edit_fix
...
admin page fetcher is now synchronously fetching all pages before reso…
2018-07-26 14:09:21 +10:00
Maikel
3f91850301
Merge pull request #2499 from mkllnk/update-com-links-in-readme
...
Add communications links to README
2018-07-26 11:39:29 +10:00
Rob Harrington
a16058f52a
Fix link syntax errors in REAME.md and GETTING_STARTED.md
2018-07-26 11:38:39 +10:00
Maikel
02331221ef
Merge pull request #2471 from Matt-Yorkley/pi/post_save
...
PI: post-save UI changes
2018-07-26 11:26:51 +10:00
Maikel Linke
2ceb969925
Style recently merged code
...
We enabled more Rubocop checks and code that was merged around the same
time, didn't comply with the new checks.
2018-07-26 10:52:56 +10:00
Maikel Linke
f0f9662957
Update gem i18n-js to pick up locale changes
...
We had some problems recently with changes in en.yml not being picked up
by i18n-js to be included in all.js. There have been some patches for
the current version that have an impact on that:
578555f57e
db3cdf82aa
a88b206644
Trying it out locally, the updated i18n-js gem works while the old
version doesn't update the Javascript translations when new keys are
added. To reproduce the issue, you can add a new key in `en.yml` and
reference it from an Angular template in `app/assets/javascripts/`. The
old version complained about a missing translation until you ran:
```
bundle exec rake tmp:cache:clear
```
We don't need to do that any more.
2018-07-26 10:45:35 +10:00
Pau Pérez Fabregat
97e61dc6f9
Merge pull request #2498 from Matt-Yorkley/embedded_mobile
...
Fix embedded shopfront menu responsiveness
2018-07-25 15:10:46 +02:00
Matt-Yorkley
ae5fd864d1
Fix embedded shopfront menu responsiveness
2018-07-25 17:41:26 +10:00
Maikel Linke
5db5bc65c0
Add communications links to README
...
This was originally proposed by Kirsten in:
https://github.com/openfoodfoundation/openfoodnetwork/pull/2478
2018-07-24 11:18:54 +10:00
Maikel
ffd3d28889
Merge pull request #2474 from Matt-Yorkley/pi/import_options
...
PI: import options UI
2018-07-24 10:34:14 +10:00
Maikel
30be40ebd9
Merge pull request #2441 from kristinalim/fix-scoping_issue_in_sorting_of_tables
...
Fix front-end sorting in "Customers" index and "Bulk Order Management" page
2018-07-24 10:31:13 +10:00
Pau Pérez Fabregat
26d6ca4a54
Merge pull request #2487 from coopdevs/stricter-code-climate
...
Make CodeClimate config more strict
2018-07-23 12:42:06 +02:00
Pau Pérez Fabregat
687d7c5f38
Merge pull request #2483 from coopdevs/fix-setup-script
...
Fix script/setup by making it less clever
2018-07-23 12:31:50 +02:00
Pau Pérez Fabregat
b60bada542
Merge pull request #2495 from mkllnk/remove-newrelic
...
Remove unused gem newrelic-rpm
2018-07-23 11:19:27 +02:00
Pau Perez
14480b920e
Fix script/setup by making it less clever
...
Now we ask the dev to create the "ofn" user as precondition. This is
way easier than developing a script that fits all possible setups.
It also stops requiring a particlar Postgres version. Although in
production we use 9.5 it is very unlikely we will use any
version-specific feature in the near future. This should make it a bit
easier for new devs to set up their environment.
2018-07-23 10:59:32 +02:00
Matt-Yorkley
67767f86eb
Change import and reset logic to work with first page
2018-07-23 02:07:00 +01:00
Matt-Yorkley
bd200c885b
Move options to first page
2018-07-23 01:46:32 +01:00
Kristina Lim
89ac558f37
Fix wrong sort predicates in customer index
2018-07-23 10:33:40 +10:00
Kristina Lim
47608525c6
Reset reverse when clicking another column to sort
2018-07-23 10:33:40 +10:00
Kristina Lim
5179f7fd63
Move logic for toggling by column into SortOptions
2018-07-23 10:33:40 +10:00
Kristina Lim
55d0b1dfc5
Generalize sorting through SortOptions service
2018-07-23 10:33:40 +10:00
Kristina Lim
8b6b694244
Remove unused sorting preferences in ColumnsCtrl
2018-07-23 10:33:40 +10:00
Kristina Lim
2bba72c5a9
Fix frontend sorting in "Bulk Order Management"
2018-07-23 10:33:40 +10:00
Kristina Lim
822b2c929a
Fix frontend sorting in "Customers" index
...
The scope for customersCtrl did not have access to the sorting
preferences stored in the nested ColumnsCtrl scope. To address this,
the page has been changed to use a new set of sorting preferences
declared in the customersCtrl scope itself.
Also, these sorting preferences are now stored in an object. This
enables the parent scope to see changes to the sorting preferences which
are done via the nested ColumnsCtrl scope,
The "Bulk Order Management" page is also affected by the same scoping
issue. Once this page is fixed, we can remove remnants of the sorting
preferences initialized in ColumnsCtrl.
2018-07-23 10:33:39 +10:00
Kristina Lim
9f09861d8b
Change sorting to be done in ascending order first
...
Currently, we always toggle "reverse" when triggering a sort.
If "reverse" is initially set to false, triggering a sort for the first
time then toggles this to true. The effect is that, the first time that
sorting is done, the rows are sorted in reverse order.
This is not intuitive - they should be sorted in ascending order first.
2018-07-23 10:33:39 +10:00
Kristina Lim
745390dcd5
Wrap rows in customer index with TBODY tag
2018-07-23 10:33:39 +10:00
Maikel
12838ba61e
Merge pull request #2468 from mkllnk/improve-testing-embedded-pages
...
Improve testing embedded pages
2018-07-23 08:59:11 +10:00
Maikel
add250b30f
Merge pull request #2473 from Matt-Yorkley/pi/stop_if_invalid
...
PI: Don't allow save if invalid entries are present
2018-07-23 08:54:01 +10:00
Maikel
df29d4d611
Merge pull request #2472 from lilwillifo/logo-sizing-to-css
...
Logo sizing to css
2018-07-23 08:47:45 +10:00
Pau Perez
7d790a7d59
Update .rubocop_todo.yml
2018-07-20 18:58:37 +02:00
Pau Perez
44fe3de732
Make CodeClimate config more strict
...
There's no point of using Code Climate if most of its checks are
disabled. Now it scores our codebase with an A and reports just 2 code
smells, 64 duplications and 14 other issues. That couldn't farther from
reality. If we care about the architecture and maintainability of our
app, this is a must.
To transition towards enabling all default checks, I started with
scss-lint, duplication and method-complexity. This doesn't mean will
have to fix them all straight away as we'll add the current violations
to the `.rubocop_todo.yml` but it'll point us the parts where we should
focus our efforts.
2018-07-20 09:08:03 +02:00
Maikel Linke
5f4115fbd9
Remove unused gem newrelic-rpm
2018-07-20 16:56:12 +10:00
Margaret Williford
512e974672
move width setting for tagline logo image from HTML to CSS
2018-07-20 14:00:06 +10:00
Margaret Williford
d952276e2a
move footer logo sizing from html to css
2018-07-20 14:00:06 +10:00
Maikel
23964b2542
Merge pull request #2422 from luisramos0/1667_email_validation_fix
...
1667 manage validations emails
2018-07-20 12:19:23 +10:00
Maikel
1b571e9835
Merge pull request #2379 from Matt-Yorkley/uk/guest_label
...
Add guest label to admin customers index
2018-07-20 08:53:26 +10:00
Maikel Linke
962c54b606
Remove unnecessary expectation
...
The `iframe` is rendered in pure HTML and should always be there.
2018-07-19 10:45:33 +10:00
Maikel Linke
8a3a617870
DRY specs with new EmbeddedPagesHelper
2018-07-19 10:44:43 +10:00
luisramos0
8246893652
Added notice for unexpected mail in confirmation instructions mail (HugsDaniel)
2018-07-19 09:26:29 +10:00
Maikel
1dbd265b30
Merge pull request #2384 from luisramos0/open_new_tab
...
added directive to make links open in new tab by default in textangul…
2018-07-19 09:17:09 +10:00
Matt-Yorkley
e3162b0a14
Change import method to fix missing variable error on asset precompilation
2018-07-18 23:00:50 +01:00
Matt-Yorkley
456e05d5d2
Include subfolders in scss import
2018-07-18 22:56:10 +01:00
Matt-Yorkley
24ff5555be
Create admin SCSS colour palette
2018-07-18 22:56:10 +01:00
Matt-Yorkley
75e52a7a91
CSS tweaks fo guest flag
2018-07-18 22:56:10 +01:00
Matt-Yorkley
583f16b38d
Add guest label to admin customers index
2018-07-18 22:56:10 +01:00
Pau Pérez Fabregat
4fe1e1fc9f
Merge pull request #2482 from Matt-Yorkley/uk/mail_config
...
Allow preferred_mails_from and preferred_mail_bcc to be set from configs
2018-07-18 19:20:55 +02:00
Pau Pérez Fabregat
4f215da735
Merge pull request #2467 from mkllnk/ci-output-test
...
Use progress formatter on Travis to avoid timeout
2018-07-18 19:19:40 +02:00
Pau Pérez Fabregat
37e2d76a39
Merge pull request #2477 from mkllnk/2465-use-right-subscriptions-translation
...
Reference existing translation: closed order cycle
2018-07-18 16:47:35 +02:00
Pau Pérez Fabregat
fac8e26d8b
Merge pull request #2475 from Matt-Yorkley/pi/landing_page
...
PI: landing page
2018-07-18 16:47:17 +02:00
Matt-Yorkley
23cbcda0c3
Allow preferred_mails_from and preferred_mail_bcc to be set from configs
2018-07-18 15:43:02 +01:00
Matt-Yorkley
5e142205bd
Use relative translation keys
2018-07-18 13:35:23 +01:00
Matt-Yorkley
5737c9803d
Add unit_type field to inventory template
2018-07-18 12:59:52 +01:00
Matt-Yorkley
c7deae4253
Remove category field from inventory specs
2018-07-18 12:59:19 +01:00
Matt-Yorkley
b37bea35fa
Use relative translation keys
2018-07-18 11:43:31 +01:00
Matt-Yorkley
18206c9369
Remove old view file
2018-07-18 11:42:07 +01:00
Pau Pérez Fabregat
8ae5d5f52e
Merge pull request #2415 from oeoeaio/update-readme
...
Update README.md and add GETTING_STARTED.md
2018-07-18 11:19:33 +02:00
Pau Pérez Fabregat
d56698e4a6
Merge branch 'master' into update-readme
2018-07-18 10:59:20 +02:00
Pau Pérez Fabregat
7bf27ec6b3
Merge pull request #2409 from mkllnk/2013-remove-scope-active_distributors
...
2013 Remove dead code for Spree upgrade
2018-07-18 10:38:19 +02:00
Pau Pérez Fabregat
bd05af5a29
Merge pull request #2442 from kristinalim/translations-enterprise_relationships_to_enterprise_permissions
...
Change "Enterprise Relationships" to "Enterprise Permissions"
2018-07-17 14:48:08 +02:00
Kristina Lim
c16f4203f9
Rename enterprise "Relationships" to "Permissions"
...
This only updates en* translations, and does not affect URLs and other
back-end references.
2018-07-17 16:03:48 +10:00
Pau Pérez Fabregat
0fd57ee7bd
Merge pull request #2390 from luisramos0/buk_prod_edit_rounding_issue
...
fixed number rounding issue in product bulk edit
2018-07-16 16:44:59 +02:00
luisramos0
4a44454210
fixed number rounding issue in product bulk edit
2018-07-16 13:13:58 +10:00
Maikel Linke
4d68723fe3
Reference existing translation: closed order cycle
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/2465
Viewing a customers subscription could display a translation missing
error.
2018-07-16 09:24:32 +10:00
Matt-Yorkley
c4af50e95c
Add sidebar to Import index page
2018-07-15 23:12:26 +01:00
Matt-Yorkley
632b991952
Add downloadable templates
2018-07-15 21:25:42 +01:00
Matt-Yorkley
f344b7893d
Remove Product Import guide page
2018-07-15 20:49:55 +01:00
Matt-Yorkley
8aed78b0e6
Don't allow save if invalid entries are present
2018-07-15 10:21:36 +01:00
Matt-Yorkley
a4210a1cab
PI post-save UI changes
2018-07-15 00:27:21 +01:00
Pau Pérez Fabregat
da344adbcd
Merge pull request #2466 from kristinalim/doc-notes_about_i18n_in_contributing
...
Add section about internationalisation to CONTRIBUTING.md
2018-07-13 19:43:52 +02:00
Pau Pérez Fabregat
c2d9b094d3
Merge pull request #2419 from frank-west-iii/issue-2412-duplicate-menu
...
Remove spree product navigation override
2018-07-13 19:43:07 +02:00
Maikel Linke
622517501c
Make spec robust on slow computers
...
This spec just failed in an unrelated pull request.
https://travis-ci.org/openfoodfoundation/openfoodnetwork/jobs/403435522
This change should fix it even on very slow computers.
2018-07-13 19:10:06 +10:00
Frank West
e3b7e050a0
Remove spree product navigation override
...
This was here to override the original spree products navigation link,
but since moving back to the index action this had the side effect of
adding an additional navigation item instead. We can simply remove this
override to get rid of the additional menu item.
2018-07-13 16:58:57 +10:00
Maikel Linke
8e90488117
Use progress formatter on Travis to avoid timeout
...
We had a few Travis builds lately that timed out, because no output was
received. Even though our standard formatter Fuubar should detect Travis
and print the right output, nothing was visible in our builds.
https://github.com/travis-ci/travis-ci/issues/1337
In this patch, I tell Travis to use Rspec's default formatter to print
dots for every passed test.
2018-07-13 16:51:56 +10:00
Maikel Linke
599f1a966b
Use embedded shops example for tests
2018-07-13 16:36:19 +10:00
Kristina Lim
4ebcf4e3c3
Add internationalisation info to CONTRIBUTING.md
2018-07-13 14:26:27 +08:00
Maikel Linke
66980b247a
Fix test of opening shops in new windows
...
The test case had some hard-coded enterprise name that didn't match
anything. It then confirmed that all found links (none) would open a new
window. So it wasn't confirming anything.
2018-07-13 15:37:19 +10:00
Maikel Linke
6f737d8d1e
Unclutter spec setup
2018-07-13 15:37:19 +10:00
Maikel Linke
ed747ec612
Use embedded groups example for tests
2018-07-13 15:37:19 +10:00
Maikel Linke
185cf9a312
Remove code duplication
2018-07-13 15:37:18 +10:00
luisramos0
dfb510debe
admin page fetcher is now receiving a onLastPageComplete function that is used to show "no results" messages only after the last page is fetched
2018-07-13 15:01:43 +10:00
Maikel Linke
d5d1eae715
Improve spec description
2018-07-13 09:04:42 +10:00
Maikel Linke
43883d1ab4
Simplify email confirmation directive
...
Making better use of Angular features.
Adding a spec for this functionality.
2018-07-13 09:04:42 +10:00
Maikel Linke
fbe2f7ab4c
Remove unused variable from mailer
...
The second variable passed by Devise is actually a hash, not a token.
2018-07-13 09:04:41 +10:00
Maikel Linke
a531135804
Remove unused data-hooks
2018-07-13 09:04:41 +10:00
Maikel Linke
e37213f6a5
Remove redundant edit action
2018-07-13 09:04:41 +10:00
Maikel Linke
28c2ad7160
Move override into view
2018-07-13 09:04:41 +10:00
Maikel Linke
a347837044
Move override into view
2018-07-13 09:04:41 +10:00
Maikel Linke
ab9975cb6c
Move override into view
2018-07-13 09:04:41 +10:00
Maikel Linke
339b04a044
Convert spree admin user list to haml
2018-07-13 09:04:41 +10:00
Maikel Linke
9020e7ddd9
Import admin user list from Spree
2018-07-13 09:04:41 +10:00
Maikel Linke
60b66540df
Add resend email button to admin user form
...
Fixes https://github.com/openfoodfoundation/openfoodnetwork/issues/1589
2018-07-13 09:04:41 +10:00
Maikel Linke
6a58deb436
Add message about unconfirmed email to user form
2018-07-13 09:04:41 +10:00
Maikel Linke
8157897f76
Remove unused data hooks
2018-07-13 09:04:41 +10:00
Maikel Linke
9050a52cc2
Move admin user form override into view
2018-07-13 09:04:41 +10:00
Maikel Linke
2032ed6328
Convert admin user edit form to haml
2018-07-13 09:04:41 +10:00
Maikel Linke
cb1dc6e657
Import admin user edit form from spree_auth_devise
2018-07-13 09:04:41 +10:00
Maikel Linke
23dd09a8fa
Convert Spree view from erb to haml
2018-07-13 09:04:41 +10:00
Maikel Linke
652cc6e677
Import admin user edit view from spree_auth_devise
...
We would like to do some customisations and importing the whole file is
simpler and less error prone than using Spree's overrides.
2018-07-13 09:04:40 +10:00
Maikel Linke
97d1b5d7fe
Add spec for creating users
2018-07-13 09:04:40 +10:00
Maikel
b65578fdc5
Merge pull request #2408 from mkllnk/cleanup-route
...
Remove impossible route
2018-07-13 09:01:33 +10:00
Maikel
0bd40f498a
Merge pull request #2447 from mkllnk/update-translation-documentation
...
Move i18n locale doc to wiki and reference that
2018-07-12 10:07:39 +10:00
Maikel Linke
86f2d7a344
Remove impossible route
...
Hash fragments are not part of the http request and not sent to the
server. So the routes will never see a hash fragment which means that
this route is never used.
2018-07-12 10:05:08 +10:00
luisramos0
b302a1d03d
added Enterprise registration exit message and moved step TYPE translations to a new structure on en.yml (test if transifex picks up the existing translations)
2018-07-12 08:53:06 +10:00
Pau Pérez Fabregat
8cec9d5723
Merge pull request #2451 from Matt-Yorkley/pr_categories
...
Add changelog category to PR template
2018-07-11 22:40:52 +02:00
Matt-Yorkley
056df62359
Add changelog category to PR template
2018-07-11 18:03:45 +01:00
Pau Pérez Fabregat
79b86a4885
Merge pull request #2448 from kristinalim/fix-broken_great_pr_link_in_contributing
...
Fix broken "making a great pull request" link in CONTRIBUTING.md
2018-07-11 13:19:17 +02:00
Kristina Lim
5508c6741f
Fix broken "great-pr" link in CONTRIBUTING.md
2018-07-11 14:10:20 +08:00
Maikel Linke
24f77184cf
Move i18n locale doc to wiki and reference that
2018-07-11 11:31:27 +10:00
Pau Pérez Fabregat
deb04c3075
Merge pull request #2444 from openfoodfoundation/transifex
...
Transifex
2018-07-10 12:12:05 +02:00
Maikel Linke
459057a7db
Revert accidental copy and paste
2018-07-10 10:31:51 +10:00
Maikel
26c23887e2
Merge pull request #2276 from oeoeaio/subs-use-default-card
...
Subs: Use Default Card for Subscriptions
2018-07-10 10:22:58 +10:00
Maikel Linke
f9a3338755
Simplify serialiser with delegate
2018-07-10 10:01:18 +10:00
Maikel Linke
b478ef9fd0
Make admin serialiser specs runnable on their own
2018-07-10 09:59:00 +10:00
Transifex-Openfoodnetwork
15db5e1d50
Updating translations for config/locales/en_GB.yml
2018-07-09 20:23:01 +10:00
Rob Harrington
3dacd06b6b
Reload order before sending emails to ensure state is up to date
2018-07-05 19:26:12 +10:00
Rob Harrington
0afa9fae8e
Check authorisation before attempting to charge credit cards on order cycle close
2018-07-05 19:26:12 +10:00
Rob Harrington
4fd333bbaf
Remove obsolete reference to credit_card from subscription serializer
2018-07-05 19:26:12 +10:00
Rob Harrington
a902af42a3
Update attribute that errors are added to from credit_card to payment_method
2018-07-05 19:26:12 +10:00
Rob Harrington
edde929ced
Replace uses of #stub with #allow in Admin::CustomersController
2018-07-05 19:26:12 +10:00
Rob Harrington
4863f2b5b4
Remove unrequired credit_card_id field from subscriptions table
2018-07-05 19:26:12 +10:00
Rob Harrington
21c3f7d21c
Remove unrequired #cards and #addresses actions from Admin::CustomerController
2018-07-05 19:26:12 +10:00
Rob Harrington
e0d46aa105
Add new serializer to allow search for customer addresses
2018-07-05 19:26:12 +10:00
Rob Harrington
c71a5ec0df
Update subscription form to use new card validations for Stripe payment method
2018-07-05 19:26:11 +10:00
Rob Harrington
a03dd1e10c
Serialize default card auth and presence for Customers
2018-07-05 19:26:11 +10:00
Rob Harrington
21c24eb69b
Validate presence and auth of default card for customer
2018-07-05 19:26:11 +10:00
Rob Harrington
cf8ca1f8c1
Add show action to Admin::CustomersController
2018-07-05 19:26:11 +10:00
Rob Harrington
45895e9924
Use the user's default card to pay for subcriptions
2018-07-05 19:26:11 +10:00
Rob Harrington
fc2844a3d5
Add default_card method to user model
2018-07-05 19:26:11 +10:00
Frank West
09534b41e9
Remove taxon when primary taxon is changed
...
We are adding taxons to the product as you change the primary taxon.
However we never remove the previous primary taxon so it forces the user
to update the taxons manually. This can be a big problem if you are bulk
updating products.
We now remove the taxon that matches the previously set primary taxon.
2018-07-04 09:16:50 +10:00
Rob Harrington
82e3016a26
Add comment to StripeGateway wrapper methods indicating that they are named by Spree
2018-07-03 14:21:58 +10:00
Rob Harrington
2da6234362
Add spec for StripeGateway#refund
2018-07-03 14:21:58 +10:00
Rob Harrington
c496d0f14d
Allow credit owed on payments made via stripe to be refunded via the admin section
2018-07-03 14:21:58 +10:00
Rob Harrington
108c4a7abb
Add GETTING_STARTED.md and update README.md
2018-06-28 22:11:33 +10:00
Maikel
687612dba8
Merge pull request #2403 from luisramos0/hide-stripe-postcode
...
Hide postcode - not necessary as passed from billing address and wrec…
2018-06-28 08:55:42 +10:00
Maikel Linke
b7de80dd7f
Remove unused count_on_hand setting from spec
...
This spec doesn't need to set the product's `count_on_hand`. The product
comes with a count of 3, but what matters is the count of variants.
2018-06-27 11:41:55 +10:00
Maikel Linke
306bfa1944
Remove unused method enterprise method
...
`Enterprise.has_supplied_products_on_hand?` is not used anywhere.
2018-06-27 11:25:44 +10:00
Maikel Linke
792701297b
Remove unused scope Enterprise.active_distributors
...
Working on the Spree upgrade, we found that this scope is using the soon
obsolete column `spree_products.count_on_hand`. Trying to measure the
impact of changing this scope, I couldn't find any use of it.
There is a variable called `active_distributors` used when serialising
enterprises, but that variable is initialised with
`Enterprise.distributors_with_active_order_cycles.ready_for_checkout`,
not using the `active_distributors` scope.
See also:
https://github.com/openfoodfoundation/openfoodnetwork/issues/2013
2018-06-27 11:12:54 +10:00
Maikel
eb9064f5be
Merge pull request #2383 from frank-west-iii/issue-2271-prepend-load
...
Fix NoMethodError in order cycles index
2018-06-27 09:12:18 +10:00
Maikel
f5346289c7
Merge pull request #2388 from Matt-Yorkley/uk/pi_available_on
...
Add available_on notes to PI guide
2018-06-26 17:58:39 +10:00
Maikel
3f334855d1
Merge pull request #2360 from oeoeaio/faster-stats
...
Rewrite user stat query for improved performance of homepage
2018-06-26 17:58:23 +10:00
Maikel
e9fad741e6
Merge pull request #2387 from Matt-Yorkley/embedded_referrers
...
Embedded response headers
2018-06-26 17:57:48 +10:00
Rob Harrington
ddb9ae1140
Load all shops that a user is associated with as a customer
...
Regardless of the presence of an order
2018-06-24 16:28:47 +10:00
luisramos0
0d9b03b066
Hide postcode - not necessary as passed from billing address and wrecks mobile UX
2018-06-22 11:42:50 +01:00
Rob Harrington
5e6291bce3
Don't request customers if list is already populated
2018-06-22 15:39:47 +10:00
Rob Harrington
d1d9c5a092
Add help button to saved cards list on account page
...
Describes the purpose of the default card
2018-06-22 15:39:47 +10:00
Rob Harrington
7db7084008
Use help-modal to display help text for authorised shops
...
Also updated the text slightly to make it more clear when the purpose of authorised shops are
2018-06-22 15:39:47 +10:00
Rob Harrington
32622c77bc
Add basic help modal directive
...
Useful for showing help text that is too long for a tool tip
2018-06-22 15:39:47 +10:00
Rob Harrington
6457a17fde
Add basic view allowing customers to authorise shop use of their credit cards
2018-06-22 15:39:47 +10:00
Rob Harrington
ffa8a8c7d6
Create Api::BaseController to allow use of ActiveModelSerializers
...
Also add index action to Api::CustomersController
2018-06-22 15:39:47 +10:00
Rob Harrington
29922d4be9
Add allow_charges field to Customer model
2018-06-22 15:39:46 +10:00
Rob Harrington
6e76fd8164
Add Api::CustomersController with update action
2018-06-22 15:39:46 +10:00
Rob Harrington
e25574790b
Split out float: right css from .help-btn.tiny selector
2018-06-22 15:39:46 +10:00
Keir Osborn
bd7e072938
embedded groups layout changes
2018-06-22 14:03:00 +10:00
Keir Osborn
f626a21c5e
embedded groups initial test
2018-06-22 14:03:00 +10:00
Buildkite
964059f25b
Merge remote-tracking branch 'origin/master' into HEAD
2018-06-22 02:41:15 +00:00
Buildkite
57dbf2e770
Merge remote-tracking branch 'origin/master' into HEAD
2018-06-22 00:59:28 +00:00
Rob Harrington
cf9f8edcce
Allow html requests for OrderCycleController#update
...
This is still used from the Advanced Settings page, to update the order_cycle
2018-06-22 09:46:08 +10:00
Rob Harrington
25525ae30b
Move applicator calls to OrderCycleForm
2018-06-22 09:46:08 +10:00
Rob Harrington
f88f4a5791
Refactor OrderCycleForm to make logic clearer
2018-06-22 09:46:08 +10:00
Rob Harrington
d9830749f1
Extract schedule syncing logic into OrderCycleForm
2018-06-22 09:46:08 +10:00
Rob Harrington
21bd9d2e10
Add basic specs for OrderCyclesController#create
2018-06-22 09:46:08 +10:00
Rob Harrington
ab9c06837b
Add basic OrderCycleForm to handle create/update logic
2018-06-22 09:46:08 +10:00
Rob Harrington
3f5b6be5b6
Remove unnecessary respond_to blocks from OrderCyclesController
2018-06-22 09:46:08 +10:00
Matt-Yorkley
172fa168ea
Change layout attribute to method with question mark
2018-06-21 15:19:40 +01:00
Matt-Yorkley
aaba6da162
Add available_on notes to PI guide
2018-06-21 14:20:59 +10:00
Matt-Yorkley
d9623176fb
Include admin users as managers on new enterprises
2018-06-21 13:21:08 +10:00
Maikel Linke
d510df5236
Remove obsolete goWithoutHashFragments
...
It was introduced, because `Navigation.go` perserved hash fragments. We
actually don't need that behaviour and it has been corrected.
`goWithoutHashFragments` also didn't deal with absolute URLs. And it used
`location.origin` which is not supported by Internet Explorer. That is
fixed by our use of Modernizr though.
2018-06-21 10:29:32 +10:00
Maikel Linke
fb02bdd25a
Simplify Navigation.go, not preserving hash fragments
...
I looked through the history and it looks like this function was a bit
flawed (preserving hash fragments) from the beginning. It has been
patched a few times without addressing the underlying issue that we want
more than just replacing the pathname. We want to go somewhere else.
2018-06-21 10:29:32 +10:00
Pau Pérez Fabregat
6cf09c936b
Merge pull request #2345 from luisramos0/do-not-upcase-state
...
removed uppercase from state on shops and producers lists in the frontoffice
2018-06-20 21:30:10 +02:00
Matt-Yorkley
6e81871459
Specs for new EmbeddedPageService
2018-06-20 15:14:56 +01:00
Maikel
3399eba428
Merge pull request #2367 from frank-west-iii/issue-2297-edit-product-cancel
...
Move product bulk edit to product index route
2018-06-20 17:53:57 +10:00
Rob Harrington
a29a1bd047
Only show change warning for open order cycles
2018-06-20 16:28:36 +10:00
Rob Harrington
7af11da901
Use a SubscriptionsCount query object to provide counts to IndexOrderCycleSerializer
2018-06-20 13:06:06 +10:00
Rob Harrington
d5b1041481
Preload subscription counts for serialization in order cycle collection actions
2018-06-20 13:06:06 +10:00
Rob Harrington
8770122eae
Request the subscription count for change warning each time, don't cache
2018-06-20 13:06:05 +10:00
Rob Harrington
86d7453d26
Ask user to confirm oc date change for open order cycles with subsciptions
2018-06-20 13:06:05 +10:00
Maikel Linke
bbe21b7804
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into issue-2297-edit-product-cancel
2018-06-20 10:31:17 +10:00
Matt-Yorkley
ff0e0d9f3d
Move logic from ApplicationController to service and improve clarity
2018-06-20 01:28:35 +01:00
Matt-Yorkley
e73b378201
Adjust embedded response headers
2018-06-20 01:28:35 +01:00
luisramos0
b8f1571282
added directive to make links open in new tab by default in textangular text areas in enterprise description, enterprise group description and in shopfront open and closed messages
2018-06-19 16:53:21 +01:00
Pau Pérez Fabregat
8da8a5a086
Merge pull request #2392 from openfoodfoundation/transifex
...
Transifex
2018-06-19 13:37:38 +02:00
Pau Pérez Fabregat
20c25cd030
Merge pull request #2368 from Matt-Yorkley/uk/admin_orders
...
Uk/admin orders
2018-06-19 11:00:35 +02:00
Frank West
3821b9e0da
Fix ordering of Gemfile.lock
...
When we run bundle the gems are being reordered to be alphabetical.
Seems to have been committed on 26/05/2018 here:
7a64ad1cc1
2018-06-19 17:51:24 +10:00
Frank West
f7848b025f
Add rack-rewrite to handle redirects
...
We are moving bulk edit to a different route and we want to be able to
handle redirects on this route. Handling this at the rack level before
the rails stack is the most performant way outside of rewrites on the
web server itself.
2018-06-19 17:51:23 +10:00
Frank West
8324b00999
Renames product bulk edit action to index
...
When a user hit cancel while editing a product it took them to the spree
products index page instead of the bulk edit page. The button was part
of a shared view for all resources so changing it's actions were not
readily available.
It was suggested that instead of carrying our own separate controller
action we could just override the index action of the products
controller with the bulk edit functionality instead. This has the
advantage of removing some overrides and allows us to not add
additional overrides in the future.
2018-06-19 17:51:23 +10:00
Pau Pérez Fabregat
3484996dbd
Merge pull request #2335 from luisramos0/issue2334
...
Fixed missing translations on shops filter - delivery option
2018-06-19 09:34:13 +02:00
Pau Pérez Fabregat
236920d28f
Merge pull request #2357 from luisramos0/enterprises_country_state
...
changed the country and state selectors to angular on enterprises admin
2018-06-19 09:30:24 +02:00
Pau Pérez Fabregat
b1bccb07f2
Merge pull request #2369 from coopdevs/product-import-for-superadmins-only
...
Show product import's UI only to superadmins
2018-06-19 09:23:58 +02:00
Transifex-Openfoodnetwork
55e619af8d
Updating translations for config/locales/de_DE.yml
2018-06-19 10:59:37 +10:00
Rob Harrington
dabef16606
Use ofn-select2 directive for country and state selectors on enterprise forms
2018-06-19 10:34:02 +10:00
luisramos0
d1019fcc5e
changed the country and state selectors to angular on enterprises admin (new and edit screens) so that states are dynamically updated when country is changed
2018-06-19 10:34:02 +10:00
Maikel
2bfb635bcc
Merge pull request #2341 from luisramos0/checkout_country_state
...
fixed country_state selectors on checkout
2018-06-19 09:34:21 +10:00
Transifex-Openfoodnetwork
fe39d96e7f
Updating translations for config/locales/fr_CA.yml
2018-06-19 05:48:59 +10:00
Frank West
f2e1caabff
Fix NoMethodError in order cycles index
...
When a user's session has timed out and they try to load new data on the
order cycles page by changing filters, the application throws a
`NoMethodError` because we are prepending the load data method before
checking the user's session.
We can fix this by removing the prepend on this action.
2018-06-18 06:36:55 -07:00
Maikel
f272a7b604
Merge pull request #2361 from mkllnk/2356-report-search-hint
...
2356 report search hint
2018-06-18 14:51:48 +10:00
luisramos0
ea9ea83fee
improved checkout country and state selectors code
2018-06-18 14:50:03 +10:00
luisramos0
3cb0b76d21
fixed checkout tests by replacing state abbr with name in address selector boxes
2018-06-18 14:50:03 +10:00
luisramos0
836a5836d9
fixed country_state selectors on checkout
2018-06-18 14:50:03 +10:00
Maikel Linke
b7770510a7
Use CSS for layout
2018-06-18 11:08:58 +10:00
Maikel Linke
67c2574b0b
Show report search instructions
...
Solves: https://github.com/openfoodfoundation/openfoodnetwork/issues/2356
2018-06-18 11:08:58 +10:00
Maikel Linke
7a2218fe26
Style the reports controller
2018-06-18 11:08:58 +10:00
Maikel Linke
6243640bca
Unify sales tax report rendering with others
2018-06-18 11:08:58 +10:00
Maikel Linke
66567fd9e6
Unify report table rendering
...
There is a lot of code duplication in the report views and we would like
to change that code. So we move it into one file first.
2018-06-18 11:08:58 +10:00
Maikel
86ff24b43c
Merge pull request #2386 from frank-west-iii/fix-ssl-errors-specs
...
Set the SSL protocol for secure connections
2018-06-18 08:45:31 +10:00
Frank West
0d7352813c
Set the SSL protocol for secure connections
...
There are ssl errors when using stripe through phantom js. This allows
other SSL protocols now.
2018-06-15 11:43:26 -07:00
Rob H
61f303ced2
Merge pull request #2373 from oeoeaio/fix-import-date-filter
...
Reimplement import date filter as an actual Filter
2018-06-15 16:53:22 +10:00
Rob Harrington
d0f8e9fba6
Reimplement import date filter as an actual Filter
2018-06-15 11:31:47 +10:00
Maikel
46f5f5061a
Merge pull request #2377 from mkllnk/2376-fix-paypal-redirects
...
Pass on redirect path instead of URL
2018-06-15 10:16:31 +10:00
Maikel Linke
561a73e911
Pass on redirect path instead of URL
...
Fixes https://github.com/openfoodfoundation/openfoodnetwork/issues/2376
The checkout doesn't deal with absolute URLs since
fc2cc09ea5 .
2018-06-14 16:49:52 +10:00
Pau Pérez Fabregat
24c6b940f6
Merge pull request #2370 from openfoodfoundation/transifex
...
Transifex
2018-06-13 12:03:34 +02:00
Rob Harrington
c72a2fda91
Use placed_at state to determine whether to remove orphaned proxy orders
2018-06-13 13:46:11 +10:00
Rob Harrington
d9ddad554e
Prevent proxy_orders for active or complete order cycles from being removed automatically by ProxyOrderSyncer
2018-06-13 13:46:11 +10:00
Rob Harrington
ac309ffaf5
Rename obsolete_proxy_orders to orphaned_proxy_orders
2018-06-13 13:46:11 +10:00
Maikel
51bbf64b10
Merge pull request #2363 from oeoeaio/update-contributors
...
Update contributors list in the README
2018-06-13 11:11:29 +10:00
Matt-Yorkley
ea0d24a5bf
Re-word test names for clarity
2018-06-12 13:20:00 +01:00
Transifex-Openfoodnetwork
644c2e8788
Updating translations for config/locales/nb.yml
2018-06-12 20:33:43 +10:00
Transifex-Openfoodnetwork
03fb5e7ccf
Updating translations for config/locales/fr.yml
2018-06-12 20:03:03 +10:00
Transifex-Openfoodnetwork
6908635822
Updating translations for config/locales/pt.yml
2018-06-12 19:36:28 +10:00
Pau Perez
78e59d059a
Show product import's UI only to superadmins
...
We still need to iterate on its implementation and it's too early to
make it publicly available.
2018-06-11 19:50:53 +02:00
Rob Harrington
56040685a0
Add Matt, Pau and Enrico to the contributors list on the README
2018-06-10 18:26:50 +10:00
Matt-Yorkley
c7f7541e2d
Admin order customer details spec
2018-06-10 02:32:59 +01:00
Matt-Yorkley
d90e362e6f
Remove guest checkout radio buttons from admin order view
2018-06-09 02:43:42 +01:00
Matt-Yorkley
7bef474efd
Admin Order guest checkout status
2018-06-09 02:43:42 +01:00
Pau Pérez Fabregat
4c9dd4e8a1
Merge pull request #2349 from robotscissors/issue-2278-add-missing-image
...
Add image back into server for background
2018-06-08 19:12:01 +02:00
luisramos0
9e0732ceae
removed uppercase from state on shops and producers lists in the frontoffice
2018-06-08 14:11:53 +01:00
Pau Pérez Fabregat
bb3ae976c6
Merge pull request #2364 from coopdevs/update-template
...
Ask devs to tell whether we should test on mobile
2018-06-08 14:37:16 +02:00
Pau Perez
fed60cf961
Ask devs to tell whether we should test on mobile
2018-06-08 10:01:04 +02:00
Pau Pérez Fabregat
b77091f87d
Merge pull request #1969 from coopdevs/feature/do-not-upcase-state-abbr
...
Do not upcase State abbreviation
2018-06-08 08:36:55 +02:00
Rob Harrington
5cbc4cbf30
Use scoped keys for table headers in saved card partial
2018-06-08 15:30:08 +10:00
Rob Harrington
18c211e97c
Ensure that savedCreditCards always exists
2018-06-08 15:30:08 +10:00
Rob Harrington
6a202d9446
Use more descriptive name for after_save callback method: :ensure_single_default_card
2018-06-08 15:30:08 +10:00
Rob Harrington
5dbf98f39b
Use exists? method to avoid unnecesary loading of credit card array
2018-06-08 15:30:07 +10:00
Rob Harrington
05e4d9007e
Update card spec to make the initial roles of cards clearer
2018-06-08 15:30:07 +10:00
Rob Harrington
254f0db97c
Automatically select the customer's default card in the checkout
2018-06-08 15:30:07 +10:00
Rob Harrington
e88e963b4c
Alter cards interface to allow updating of default card
2018-06-08 15:30:07 +10:00
Rob Harrington
1327b9dc2c
Add update method to CreditCardsController
2018-06-08 15:30:07 +10:00
Rob Harrington
d146d3714f
Add callbacks to ensure a user always has a default credit card
...
(if any exist)
2018-06-08 15:30:01 +10:00
robotscissors
5c25e85d92
Create dark background on load
2018-06-07 21:53:17 -07:00
Rob Harrington
3619ec0dc8
Add is_default attribute to Spree::CreditCard model
2018-06-08 12:01:10 +10:00
Pau Pérez Fabregat
d4e0d14fe1
Merge pull request #2342 from openfoodfoundation/transifex
...
Transifex
2018-06-06 09:05:29 +02:00
Rob Harrington
4fa09639cb
Rewrite user stat query for improved performance of homepage
2018-06-06 16:27:23 +10:00
Pau Pérez Fabregat
7ff7fe4891
Merge pull request #2122 from oeoeaio/subs-unplaced-fees
...
Subs: prevent fees from displaying in email when subscription order cannot be fulfilled
2018-06-06 07:57:18 +02:00
Maikel
9d2c1976e0
Merge pull request #2343 from mkllnk/2212-remove-report-default-filters
...
2212 remove report default filters
2018-06-06 12:19:47 +10:00
Maikel
494aeb9a14
Merge pull request #2348 from oeoeaio/fix-tabs
...
Provide specific tab widths for shop tabs when screen width > medium
2018-06-05 15:27:40 +10:00
Pau Pérez Fabregat
3283c5158b
Merge pull request #1492 from Matt-Yorkley/uk/import2
...
Uk/import2
2018-06-04 09:56:36 +02:00
Pau Pérez Fabregat
cf77bb439a
Merge pull request #2337 from Matt-Yorkley/uk/modal_fix
...
Fix guest checkout login modal
2018-06-04 09:56:00 +02:00
Pau Pérez Fabregat
ed116867d4
Merge pull request #2322 from luisramos0/issue1913
...
Fixed issue #1913 with expand/collapse of list of producers of a shop
2018-06-04 09:55:40 +02:00
Rob Harrington
fed0a81159
Add an optional link to Skylight dashboard to footer
2018-06-02 11:55:28 +10:00
Rob Harrington
e3ea60fda5
Process proxy orders even if underlying subscription has been paused or cancelled
2018-06-01 16:57:56 +10:00
robotscissors
65e13c2a2d
add image back into server for background
2018-05-30 20:42:31 -07:00
Rob Harrington
8201da9fab
Prodide specific tab widths for shop tabs when screen width > medium
2018-05-30 17:05:31 +10:00
Rob Harrington
184bf9ce36
Allow super admin users to enable subscriptions for enterprises
2018-05-30 09:42:03 +10:00
Rob Harrington
16211da5f6
Reimplement tabs on shopfront using our custom tab directive
2018-05-30 08:35:21 +10:00
Maikel
cb19643b3a
Merge pull request #2332 from oeoeaio/1938-oc-switch
...
Correct 'Next Order Closing' text in shopfront when switching OCs
2018-05-30 08:28:23 +10:00
Maikel
cee2f76406
Merge pull request #2299 from frank-west-iii/issue-1832-phone-shopfront
...
Add phone number to shopfront contact info
2018-05-30 08:27:07 +10:00
Maikel
32ef507221
Merge pull request #2318 from luisramos0/issue2307
...
Fixed broken translation keys in "new order cycle" screen
2018-05-29 17:38:04 +10:00
Maikel
603c88a93c
Merge pull request #2317 from luisramos0/issue2308
...
Added missing translation key for no results in admin orders page
2018-05-29 17:37:26 +10:00
Maikel
307132d1f7
Merge pull request #2298 from frank-west-iii/issue-953-ent-description-formatting
...
Fix enterprise description display formatting
2018-05-29 17:36:47 +10:00
Maikel Linke
e6ef43c91d
Give a spec some style
2018-05-29 16:55:30 +10:00
Maikel Linke
54bdcf7679
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/lib/open_food_network/xero_invoices_report_spec.rb
* 15 conversions
from: obj.stub(:message)
to: allow(obj).to receive(:message)
* 10 conversions
from: obj.should
to: expect(obj).to
* 4 conversions
from: == expected
to: eq(expected)
* 3 conversions
from: obj.should_not
to: expect(obj).not_to
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2018-05-29 16:53:18 +10:00
Maikel Linke
72ae6f2af6
Add spec helper to make spec run on its own
2018-05-29 16:49:00 +10:00
Maikel Linke
02c4795640
Remove default dates from reports
...
Closes https://github.com/openfoodfoundation/openfoodnetwork/issues/2212
2018-05-29 16:47:23 +10:00
Transifex-Openfoodnetwork
6d450aeae2
Updating translations for config/locales/pt.yml
2018-05-29 14:53:01 +10:00
Transifex-Openfoodnetwork
d1e9d52acd
Updating translations for config/locales/fr.yml
2018-05-29 14:51:07 +10:00
Matt-Yorkley
b440d05205
Tidy up unnecessary PI code
2018-05-26 19:34:20 +01:00
Matt-Yorkley
a4a2bc438a
Import settings spec
2018-05-26 19:34:20 +01:00
Matt-Yorkley
a503b5e2d0
Add not_master scope to Spree::Variant
2018-05-26 19:34:20 +01:00
Matt-Yorkley
91521dc2b0
Improve import_date queries
2018-05-26 19:34:20 +01:00
Matt-Yorkley
6f6db9384f
Tidy up SCSS and coffeescript
2018-05-26 19:34:20 +01:00
Matt-Yorkley
d9c720e89a
Tidy up import_date
2018-05-26 19:34:20 +01:00
Matt-Yorkley
73f7bc3db0
Remove use of before_filter
2018-05-26 19:34:20 +01:00
Matt-Yorkley
e65bdf35fa
Change wording on default import settings text
2018-05-26 19:34:20 +01:00
Matt-Yorkley
c5b7cec19f
Change checkbox confirmation behaviour
2018-05-26 19:34:20 +01:00
Matt-Yorkley
58e9f0266a
User guide check
2018-05-26 19:34:20 +01:00
Matt-Yorkley
b42e3eb2c9
Product Import Guide WIP
2018-05-26 19:34:20 +01:00
Matt-Yorkley
7da97be7d2
Create separate angular module
2018-05-26 19:34:20 +01:00
Matt-Yorkley
c2c42e1d9a
Product Import refactor
2018-05-26 19:34:20 +01:00
Matt-Yorkley
11908f125e
Fix flaky spec
2018-05-26 19:34:20 +01:00
Matt-Yorkley
1ed49d397e
Refactor PI
2018-05-26 19:34:20 +01:00
Matt-Yorkley
1ff39b8df5
Fix altered translation key
2018-05-26 19:34:20 +01:00
Matt-Yorkley
7a64ad1cc1
Fix roo-xls version in Gemfile
2018-05-26 19:34:20 +01:00
Matt-Yorkley
3a6f316ede
Codeclimate refactor
2018-05-26 19:34:20 +01:00
Matt-Yorkley
7c283d90db
Spec adjustments
2018-05-26 19:34:19 +01:00
Matt-Yorkley
1c34ce6162
PI exception handling
2018-05-26 19:34:19 +01:00
Matt-Yorkley
b26bec45d6
Expanding PI specs
...
squash
2018-05-26 19:34:19 +01:00
Matt-Yorkley
6efd167400
PI inventories UX
...
Minor tweaks
2018-05-26 19:34:19 +01:00
Matt-Yorkley
678a2a365d
Fix spec date to string issue
2018-05-26 19:34:19 +01:00
Matt-Yorkley
2ef63efe28
Tax and Shipping adjustments
2018-05-26 19:34:19 +01:00
Matt-Yorkley
fe01e8ede3
PI human-readable unit fields
...
Enhanced unit specs
2018-05-26 19:34:19 +01:00
Matt-Yorkley
02661d5c23
PI unit_value typecasting
2018-05-26 19:34:19 +01:00
Matt-Yorkley
e848957712
Clean up PI controller
...
Remove assignment
Tweak
2018-05-26 19:34:19 +01:00
Matt-Yorkley
b3c906b3a4
Product Import v3 with asynchronous processing
...
Fixed spec
Quick spec tweak
2018-05-26 19:34:19 +01:00
Matt-Yorkley
3a650dd8b3
Add roo-xls gem for Excel support
2018-05-26 19:34:19 +01:00
Matt-Yorkley
684b493fb3
PI translations
2018-05-26 19:34:19 +01:00
Matt-Yorkley
6e2de0d6ac
PI refactoring
2018-05-26 19:34:19 +01:00
Matt-Yorkley
e76a818fde
Update PI spec
2018-05-26 19:34:19 +01:00
Matt-Yorkley
ffbb67d480
PI inventories additions
2018-05-26 19:34:19 +01:00
Matt-Yorkley
4e97445655
PI inventories timestamps
2018-05-26 19:34:19 +01:00
Matt-Yorkley
a2a65a8900
PI inventories and overhaul
2018-05-26 19:34:19 +01:00
Matt-Yorkley
e362c2d867
PI timestamps
2018-05-26 19:34:19 +01:00
Matt-Yorkley
fc2cc09ea5
checkout redirect excludes angular path variables
2018-05-26 18:13:35 +01:00
luisramos0
533ae77234
Fixed missing translations on shops filter - delivery option
2018-05-25 23:46:44 +01:00
Pau Pérez Fabregat
e04141d797
Merge pull request #2291 from coopdevs/remove-producers-tab-from-dashboard
...
Remove producers tab from dashboard
2018-05-25 19:24:29 +02:00
Rob Harrington
17259b3269
Overwrite cached value for current_order_cycle when updating it
...
This ensures that the correct order cycle is rendered in the json response
2018-05-25 17:28:54 +10:00
Pau Pérez Fabregat
9d57beb33f
Merge pull request #2305 from Matt-Yorkley/uk/domain_headers
...
Ensure domain in SSL header matches request with or without www prefix
2018-05-23 20:08:56 +02:00
luisramos0
d821664ee3
Fixed issue #1913 with expand/collapse of list of producers of a shop
2018-05-23 17:32:38 +01:00
luisramos0
a59d9cb670
Fixed broken translation keys in new order cycle screen
2018-05-23 13:12:56 +01:00
Luis Ramos
12232f552c
Added missing translation key for no results in admin orders page
2018-05-22 21:00:03 +01:00
Pau Perez
2a3772dba0
Do not show icons for producer-enterprises
...
Payment and shipping methods don't apply to them.
2018-05-22 16:50:27 +02:00
Pau Perez
208e3bbadd
Ensure non-distributors are listed in dashboard
...
We want to show all enterprises in a single list regardless of their
type.
2018-05-22 10:21:35 +02:00
Pau Perez
bd34f27ace
Inline partials into enterprises view
...
Now there are no tabs in the dashboard so is pointless to refer to them
and to split in multiple partials.
2018-05-22 10:21:35 +02:00
Pau Perez
889199a525
Refactor Overview Controller to make it more clear
...
Assigns meaningful names to the boolean conditions to make it easier
to understand, breaks down the big and nested if/else and converts the
specs to RSpec 3.
Note the check `!spree_current_user.admin?` has been removed because
in admin/base_controller_decorator.rb `#authorize_admin` is already
called.
2018-05-22 10:21:35 +02:00
Pau Perez
51f3542a92
Remove no longer used Angular controller
...
There are no tabs to keep track of now.
2018-05-22 10:21:35 +02:00
Pau Perez
5a182e8e88
Remove enterprises producers tab from dashboard
2018-05-22 10:21:35 +02:00
Matt-Yorkley
c2934d3570
Ensure domain in SSL header matches request with or without www prefix
2018-05-21 17:50:34 +01:00
Frank West
f995a04ebf
Add phone number to shopfront contact info
2018-05-18 14:05:28 -07:00
Frank West
b05b9747b8
Fix enterprise description display formatting
...
Removes `text-small` class from container and change container to `div`
instead of `p` for semantic differentiation.
2018-05-18 07:20:56 -07:00
Maikel Linke
d218a51d96
Test public instead of private method
...
Refactoring and styling the whole thing, possibly causing conflicts with
other pull requests.
2018-05-18 11:27:48 +10:00
Maikel Linke
57dd984512
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/lib/open_food_network/order_and_distributor_report_spec.rb
* 2 conversions
from: == expected
to: eq(expected)
* 2 conversions
from: obj.should
to: expect(obj).to
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2018-05-18 11:27:48 +10:00
Maikel Linke
7f8f935017
Shorten module referencing
2018-05-18 11:27:48 +10:00
Maikel Linke
0fa9ca653e
Move duplicate code into its own module
2018-05-18 11:27:48 +10:00
Maikel Linke
40b0a0bd5a
Determine searching state by params, not request
...
We may want to use GET for searching or POST to display a certain report
type.
2018-05-18 11:27:48 +10:00
Maikel Linke
8a1a540f3d
Clarify creating objects for test context
2018-05-18 11:27:48 +10:00
Maikel Linke
acee5da31b
Remove unnecessary whitespace
2018-05-18 11:27:48 +10:00
Maikel Linke
8a4457e8e4
Give better names
2018-05-18 11:27:48 +10:00
Maikel Linke
63799b2cb1
Remove outdated comment
2018-05-18 11:27:48 +10:00
Maikel Linke
8e2aee71da
Compile Order Cycle Management only on search
2018-05-18 11:27:48 +10:00
Maikel Linke
7a546087b2
Compile Packing report data only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
1e80487afc
Compile Order And Distributors only on search
...
And move most logic into the report class like the others.
2018-05-18 11:27:47 +10:00
Maikel Linke
53436024e2
Compile Orders & Fulfillment report only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
feb33c3ca5
Compile Payments report only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
bf74282e5f
Compile Bulk Co-Op report only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
5f9d239f19
Compile Products & Inventory report only on search
2018-05-18 11:27:47 +10:00
Maikel Linke
d464216027
Don't compile Sales Tax report data before search
2018-05-18 11:27:47 +10:00
Maikel Linke
983e128d90
Half test run time by loading less data
...
On my computer it took 3 seconds to load all four orders with all the
attached order cycles and enterprises.
Runtime before: 56.38 seconds
Runtime after: 25.14 seconds
This really speeds up developing reports.
2018-05-18 11:27:47 +10:00
Maikel Linke
b8ca37e9d2
Don't compile xero report data before search
2018-05-18 11:27:47 +10:00
Maikel Linke
14e7cdd138
Don't compile customers report data before search
...
Distributors, suppliers and order cycles are still loaded for the search
form.
2018-05-18 11:27:47 +10:00
Maikel Linke
8393b1d4c0
Don't compile user-enterprises report before search
2018-05-18 11:27:47 +10:00
Maikel Linke
fcd41c67fa
Add logic for showing empty reports initially
2018-05-18 11:27:47 +10:00
Maikel Linke
031c4d417e
Simplify report rendering
2018-05-18 11:27:47 +10:00
Maikel Linke
41bb5e4e96
Unify report rendering
2018-05-18 11:27:47 +10:00
Maikel Linke
28d66ad3e0
Activate dormant specs
...
It looks like a typo prevented a bunch of specs from being run.
2018-05-18 11:27:47 +10:00
Maikel Linke
5aef7031d2
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/reports_spec.rb
* 40 conversions
from: obj.should
to: expect(obj).to
* 10 conversions
from: == expected
to: eq(expected)
* 3 conversions
from: obj.should_not
to: expect(obj).not_to
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2018-05-18 11:27:46 +10:00
Maikel Linke
682b92e617
Avoid deprication warning for using stub
2018-05-18 11:27:46 +10:00
Maikel Linke
99a6afd9cd
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/controllers/spree/admin/reports_controller_spec.rb
* 20 conversions
from: obj.should
to: expect(obj).to
* 14 conversions
from: obj.should_not
to: expect(obj).not_to
* 5 conversions
from: == expected
to: eq(expected)
* 4 conversions
from: obj.stub(:message)
to: allow(obj).to receive(:message)
* 2 conversions
from: obj.should_receive(:message)
to: expect(obj).to receive(:message)
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2018-05-18 11:27:46 +10:00
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
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
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
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.
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
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
Maikel Linke
7b06abd4c2
Fix initial password setting
2018-05-01 14:18:56 +10:00
Maikel Linke
de5124f90c
Remove Heroku references since nobody is using it
2018-05-01 10:20:21 +10:00
Pau Pérez Fabregat
d238aedb21
Merge pull request #2224 from coopdevs/minor-upgrade-rails
...
Upgrade Rails to 3.2.22.5 to get security fixes
2018-04-27 12:46:26 +02:00
Matt-Yorkley
a08b095547
Extract json render from :user_confirmed? method
2018-04-27 12:37:42 +10:00
Matt-Yorkley
1c57f0f241
Update :return_url value when re-sending email confirmations
2018-04-27 12:37:42 +10:00
Matt-Yorkley
1f23402912
Disable password reset for unconfirmed users
2018-04-27 12:37:42 +10:00
Matt-Yorkley
1782a8c700
manager invite permissions spec
2018-04-27 10:13:54 +10:00
Matt-Yorkley
b431a7417a
Add cancan permissions for Admin::ManagerInvitationsController
2018-04-27 10:13:54 +10:00
Enrico Stano
6ae1780180
Merge pull request #2248 from coopdevs/upgrade-rubyzip
...
Update rubyzip to fix security issue
2018-04-26 14:50:10 +02:00
Pau Pérez Fabregat
1abf56efd5
Merge pull request #2246 from coopdevs/autofix-comment-indentation
...
Autofix comment indentation
2018-04-25 15:39:34 +02:00
Pau Perez
c12ac91371
Update rubyzip to fix security issue
...
Github reported us about CVE-2017-5946 which is a high severity issue.
This gem is used by Roo which already supports the Rubyzip version that
contains the fix (version 1.2.1). Check
872bb3a0b6
for further details.
Rubyzip's changelog for the version 1.2.1 can be found in
https://github.com/rubyzip/rubyzip/blob/master/Changelog.md#121 .
2018-04-24 16:08:34 +02:00
Pau Perez
25ad9b22aa
Update .rubocop_todo.yml
2018-04-23 13:03:05 +02:00
Pau Perez
11081ab1d6
Autocorrect Rubocop's Layout/CommentIndentation cop
2018-04-23 12:51:09 +02:00
Maikel Linke
3fc49d5935
Simplify code
2018-04-23 12:55:49 +10:00
Matt-Yorkley
cd4268d219
Add manager dropdown UX
2018-04-23 12:55:49 +10:00
Rob Harrington
c77a01815c
Copy datepicker directive to utils module
...
Ensures that datepicker is available for subscriptions
2018-04-23 11:05:22 +10:00
Pau Pérez Fabregat
386716088a
Merge pull request #2190 from Matt-Yorkley/uk/bep_images_modal
...
Use angular translation filter on image upload modal
2018-04-20 16:22:53 +02:00
Pau Pérez Fabregat
9a75728b6e
Merge pull request #2231 from coopdevs/add-image-for-wiki
...
Add image to be used in Spree upgrade wiki page
2018-04-20 09:26:17 +02:00
Pau Perez
ef3ef2d4f3
Upgrade Rails to 3.2.22.5 to get security fixes
...
This will fix reported vulnerabilities CVE-2015-7576, CVE-2016-2098
(reported as high severity), CVE-2016-0751 and CVE-2015-7577.
2018-04-17 20:56:51 +02:00
Pau Perez
cd9d13cb2a
Add images to be used in Spree upgrade wiki page
2018-04-17 20:55:42 +02:00
Pau Pérez Fabregat
89bc9380eb
Merge pull request #2232 from coopdevs/skip-feature-spec-until-fixed
...
Disable totally unreliable feature test
2018-04-17 20:54:20 +02:00
Pau Perez
9f06d1f809
Disable totally unreliable feature
...
We need to investigate why it fails so many times fix it and then enable it
back. As it is, it brings cons than pros preventing even PRs that don't
touch code from being merged.
2018-04-17 19:22:03 +02:00
Pau Pérez Fabregat
ac37b0fc7e
Merge pull request #2221 from Matt-Yorkley/uk/bep_images_ux
...
Close modal when image updated successfully
2018-04-17 18:05:20 +02:00
Pau Pérez Fabregat
1abfe2ab8c
Merge pull request #2199 from coopdevs/auto-correct-cops
...
Auto correct cops
2018-04-16 14:58:28 +02:00
Pau Pérez Fabregat
b1fc15f242
Merge pull request #2223 from openfoodfoundation/transifex
...
Transifex
2018-04-16 13:43:40 +02:00
Pau Pérez Fabregat
fc7dd5d081
Merge pull request #2222 from coopdevs/upgrade-skylight
...
Upgrade to latest Skylight from 1.6.0 to 1.6.1
2018-04-16 11:38:23 +02:00
Pau Perez
2aea612f10
Upgrade to latest Skylight from 1.6.0 to 1.6.1
2018-04-16 10:52:15 +02:00
Pau Perez
147a74f005
Fix Rubocop violations reported by Code Climate
2018-04-16 10:27:44 +02:00
Rob Harrington
6a71aafce1
Update totals for empty order before sending email
2018-04-16 17:07:07 +10:00
Rob Harrington
f5e77cdcec
Ensure order total for uplaced subscription orders is zero
2018-04-16 17:07:07 +10:00
Rob Harrington
50ffd7ca01
Clear adjustments on subs orders when no items are able to be fulfilled
...
This prevents shipping and payment fees from being displayed in the notification email
2018-04-16 17:07:07 +10:00
Matt-Yorkley
37ba1e6c83
Close modal when image updated successfully
2018-04-15 20:52:25 +01:00
Matt-Yorkley
5777d04821
Use angular translation filter on image upload modal
2018-04-15 17:08:16 +01:00
Pau Pérez Fabregat
514ad5d898
Merge pull request #2208 from coopdevs/performance-monitoring-badge
...
Add Skylight's performance monitoring badge
2018-04-13 08:45:30 +02:00
Pau Perez
5822e60a66
Add Skylight's performance monitoring badge
...
Adding the badge, which points now to Katuma's performance monitoring
information, is required for Skylight to showcase OFN on their website.
2018-04-12 09:29:40 +02:00
Transifex-Openfoodnetwork
ce2a7a510f
Updating translations for config/locales/en_US.yml
2018-04-11 00:06:55 +10:00
Pau Perez
394fb91dd5
Auto correct Rubocop's Layout/MultilineArrayBraceLayout cop
2018-04-09 18:47:18 +02:00
Pau Perez
1640d5ad0b
Auto correct Rubocop's Layout/IndentHeredoc cop
2018-04-09 18:47:18 +02:00
Pau Perez
76fe1c7ee9
Auto correct Rubocop's Layout/IndentAssignment cop
2018-04-09 18:47:18 +02:00
Pau Perez
33ea2c0b07
Auto correct Rubocop's Layout/FirstParameterIndentation cop
2018-04-09 18:47:18 +02:00
Pau Perez
f5a5d735fd
Auto correct Rubocop's Layout/EmptyLinesAroundModuleBody cop
2018-04-09 18:47:18 +02:00
Pau Perez
6593dea4f6
Auto correct Rubocop's Layout/EmptyLinesAroundMethodBody cop
2018-04-09 18:47:17 +02:00
Pau Perez
3161fa3801
Auto correct Rubocop's Layout/EmptyLinesAroundExceptionHandlingKeywords cop
2018-04-09 18:47:17 +02:00
Pau Perez
746fcd5802
Auto correct Rubocop's Layout/EmptyLinesAroundAccessModifier cop
2018-04-09 18:47:17 +02:00
Pau Perez
9da33b4e82
Auto correct Rubocop's Layout/EmptyLinesAroundAccessModifier cop
...
This also `script/rubocop_autocorrect` to automate the process of fixing
a cop and comitting the changes.
2018-04-09 18:46:11 +02:00
Pau Perez
e876ef7df1
Auto correct Rubocop's Layout/ClosingParenthesisIndentation cop
2018-04-09 17:22:52 +02:00
Pau Perez
e4c86df7b2
Auto correct Rubocop's Layout/CaseIndentation cop
2018-04-09 17:19:47 +02:00
Transifex-Openfoodnetwork
15945fa1e0
Updating translations for config/locales/fr.yml
2018-04-05 04:48:54 +10:00
Transifex-Openfoodnetwork
ad898848f8
Updating translations for config/locales/pt.yml
2018-04-05 04:29:49 +10:00
Rob Harrington
236ba9328d
Order cycles in specs comply with new date validations
2018-04-04 17:18:33 +10:00
Rob Harrington
ce56e667a4
Use union operator instead of concatenate to load order cycle collection
2018-04-04 17:18:33 +10:00
Rob Harrington
b17d8c2fe3
Add validation of open and close dates for order cycles
2018-04-04 17:18:32 +10:00
Rob Harrington
b14f27f956
Return an error if no order_cycle_set params are submitted to #bulk_update action
2018-04-04 17:17:36 +10:00
Rob Harrington
18f7ec992d
Refactor loading of OrderCycleSet in OrderCyclesController
...
This should result in a significant speed bump in saving order cycles in bulk, because only referenced OCs are loaded into the set, rather than OrderCycle.all
2018-04-04 17:17:36 +10:00
stveep
46d2d6cb8a
Include option text in dropdown cart even if the variant and product have the same name
2018-04-04 16:40:18 +10:00
Maikel Linke
a2e4c33922
Remove old and useless sentence from welcome email
...
The sentence made assumptions of the availability of FAQs and support
forums without linking to them. So it didn't really help. It also
promised that someone would monitor the support page in the forum which
nobody seems to do.
2018-04-04 16:21:39 +10:00
Matt-Yorkley
101269a487
Adjust wording on manager invite email
2018-04-04 15:49:04 +10:00
Maikel
61fbdfcefc
Merge pull request #2178 from HugsDaniel/2172_flexi_rate_miscalculated
...
Fixing flexible rate miscalculation
2018-04-04 15:47:33 +10:00
Hugo Daniel
2a942da160
Use rspec context
2018-04-04 14:58:48 +10:00
Hugo Daniel
bd97d08653
Remove stub after test and create two distinct calculators
2018-04-04 14:58:47 +10:00
Hugo Daniel
68ca352510
Use rspec expect syntax
2018-04-04 14:58:47 +10:00
Hugo Daniel
a71b650f89
Added tests
2018-04-04 14:58:47 +10:00
Hugo Daniel
f40bd9cfcb
Fixing wrong incrementation
2018-04-04 14:58:47 +10:00
Hugo Daniel
843bca9ea3
Updated calculation for flexible rate
2018-04-04 14:58:46 +10:00
Maikel Linke
80da0d5330
Set enterprise form dirty on any change
...
Commit 4953c69123 introduced a bug that
the save button is not activated when changing enterprise fields.
https://github.com/openfoodfoundation/openfoodnetwork/issues/2195
This is reverting the change and fixes #2195 .
Sadly, it re-opens
https://github.com/openfoodfoundation/openfoodnetwork/issues/1216 .
But that one is not as severe as the current bug.
2018-04-04 13:36:03 +10:00
Hugo Daniel
5ec89dde42
Update test sentences to fit new PriceSack behavior
2018-04-04 11:25:26 +10:00
Hugo Daniel
213456f4d9
Moved PriceSack tests from per item list to per order
2018-04-04 11:25:26 +10:00
Hugo Daniel
14ea591c7d
Removed redundant self
2018-04-04 11:25:25 +10:00
Hugo Daniel
28009afbea
Calculate price sack fees and tests
2018-04-04 11:25:25 +10:00
Matt-Yorkley
357ff5fb7d
Improve associating customer specs
2018-04-04 10:14:55 +10:00
Matt-Yorkley
5f2e72e3d4
Private shop spec
2018-04-04 10:14:55 +10:00
Em-AK
3b5c3f41a2
Ensure created users are associated with customers
...
When a user is created with the same email as existing customers
Then the user is associated with these customers
So that the user can access the private shops where he has been invited
to before signup
2018-04-04 10:14:55 +10:00
Rob Harrington
a83bdf16c9
Add error message for case when schedule cannot be deleted
2018-04-04 09:21:52 +10:00
Maikel
f9dbf61afc
Merge pull request #2176 from HugsDaniel/2002_calculator_options_not_translated
...
Overwrites spree_i18n translations for calculator's options
2018-04-04 08:17:18 +10:00
Pau Pérez Fabregat
15bd0de971
Merge pull request #2194 from wrycoder/spec-deprecation-fix
...
Replacing deprecated #ignore with #transient
2018-04-03 18:53:04 +02:00
Pau Pérez Fabregat
87329ad729
Merge pull request #2092 from ltrls/fix-tax-admin-order-show
...
Fix incorrect tax on Admin Order Show
2018-04-03 08:36:10 +02:00
Hugo Daniel
6731dd0b64
Overwrites spree_i18n translations for entreprise fees calculator's options
2018-04-03 08:38:00 +10:00
Michael Toulouse
0519269a53
Replacing deprecated #ignore with #transient
2018-04-02 06:40:12 -04:00
Pau Pérez Fabregat
1357c7c3b5
Merge pull request #2185 from coopdevs/remove-in-stock-dead-scope
...
Remove in_stock dead scope
2018-03-28 13:16:02 +02:00
Pau Perez
0cbd967007
Remove in_stock dead scope
...
This makes the upgrade to Spree 2.0 a bit easier.
`spree_variants.count_on_hand` is removed in that version and this
column was used in the `in_stock` scope that we no longer use.
2018-03-28 12:13:34 +02:00
Pau Pérez Fabregat
7fbaff71c7
Merge pull request #2179 from coopdevs/ignore-vendor-bundle
...
Ignore Bundler's vendor/bundle
2018-03-28 11:29:56 +02:00
Pau Pérez Fabregat
9f6b3498bd
Merge pull request #2177 from coopdevs/upgrade-delayed-job
...
Upgrade delayed_job_active_record from 4.0.2 to 4.1.2
2018-03-27 17:45:33 +02:00
Pau Pérez Fabregat
0b9881b9d3
Merge pull request #2168 from openfoodfoundation/transifex
...
Update translations with current Transifex version
2018-03-27 17:16:10 +02:00
Transifex-Openfoodnetwork
348364814d
Updating translations for config/locales/es.yml
2018-03-28 02:11:09 +11:00
Pau Perez
e8d8d5b0e6
Ignore Bundler's vendor/bundle
2018-03-27 16:56:58 +02:00
Pau Pérez Fabregat
dbf647f700
Merge pull request #1981 from Duende13/su_issue_1936
...
Added 'meta_keywords' to search of products
2018-03-27 14:27:40 +02:00
Hugo Daniel
ef2b0b8383
Added tooltips and locale
2018-03-27 15:21:12 +11:00
duende13
f75b865be8
Made changes requested by reviewer, in labels and tests.
2018-03-27 15:21:11 +11:00
duende13
7670d01c6d
Changing SEO tab to 'Search' tab
2018-03-27 15:21:11 +11:00
duende13
61300a62c2
Added 'meta_keywords' to search of products in shop page. Changed labels
...
on SEO tab and SEO form (edit product Screen) and added in en.yml file.
2018-03-27 15:21:11 +11:00
Transifex-Openfoodnetwork
a3fa6db5a9
Updating translations for config/locales/de_DE.yml
2018-03-26 21:38:21 +11:00
Pau Perez
dae883c68d
Upgrade dj_active_record from 4.0.2 to 4.1.2
...
This brings few styling improvements on dlayed_job_active_record but
also upgrades delayed_job from 4.0.4 to 4.1.4, which includes some fixes
and improved error messages.
2018-03-26 12:32:25 +02:00
Pau Pérez Fabregat
808f7b12c7
Merge pull request #2175 from coopdevs/upgrade-skylight
...
Upgrade Skylight from 1.5.1 to 1.6.0
2018-03-26 12:12:46 +02:00
Pau Perez
82c9cdd874
Upgrade Skylight from 1.5.1 to 1.6.0
2018-03-26 11:13:29 +02:00
Transifex-Openfoodnetwork
a257febc79
Updating translations for config/locales/fr.yml
2018-03-26 20:06:24 +11:00
Pau Pérez Fabregat
17b129ff4f
Merge pull request #2079 from mjal/424cart-page-shouldnt-show-admin-handling-if-it-is-zero
...
Cart page shouldnt show admin handling if it is zero
2018-03-23 18:01:09 +01:00
Pau Pérez Fabregat
6ce552727b
Merge pull request #2118 from oeoeaio/payment-summary-for-emails
...
Show payment summary in confirmation email regardless of payment method
2018-03-23 15:30:44 +01:00
Pau Pérez Fabregat
dadc02fb11
Merge pull request #2030 from lin-d-hop/uk/1663variant-order-emails
...
Uk/1663variant order emails
2018-03-23 15:29:05 +01:00
Pau Pérez Fabregat
bbd2427493
Merge pull request #2075 from mjal/2001translations-missing-in-order-management-pages
...
i18n for admin/orders
2018-03-23 15:27:55 +01:00
Pau Pérez Fabregat
82457d2b63
Merge pull request #2138 from Matt-Yorkley/email/manager_invite
...
Email/manager invite
2018-03-23 15:27:14 +01:00
Pau Pérez Fabregat
9e14186431
Merge pull request #2149 from oeoeaio/subs-remove-fields
...
Subs: Remove obsolete subscription fields from order cycles table
2018-03-23 15:12:32 +01:00
Pau Pérez Fabregat
d422283b76
Merge pull request #2128 from mkllnk/2113-i18n-config
...
2113 Display only selected languages in switcher
2018-03-23 15:06:47 +01:00
Pau Pérez Fabregat
13115d4a2d
Merge branch 'master' into email/manager_invite
2018-03-23 12:56:10 +01:00
Pau Pérez Fabregat
1005c299a2
Merge pull request #1464 from Matt-Yorkley/uk/bep_images
...
Uk/bep_images
2018-03-23 12:40:16 +01:00
Pau Pérez Fabregat
3788ec590f
Merge pull request #2166 from coopdevs/configure-mails-from
...
Configure mails_from
2018-03-23 12:19:31 +01:00
Pau Pérez Fabregat
7dd23d20c8
Merge pull request #2160 from coopdevs/fix-enterprise-filter-in-customers
...
Fix enterprise filter in customers
2018-03-23 08:25:21 +01:00
stveep
231dd7b6a2
Add some rubocop spaces
2018-03-23 17:37:50 +11:00
stveep
8a783bbb7d
PR changes: extract SQL in methods to scopes, add case insensitivity to test for sorting
2018-03-23 17:37:50 +11:00
stveep
9375318c4b
Codeclimate: remove empty line
2018-03-23 17:37:50 +11:00
stveep
dc76b3922b
Add sorting to query for producer mailer
2018-03-23 17:37:50 +11:00
stveep
40506685ef
Adding extra sort step for variant name; ignore case in sorting line items by name
2018-03-23 17:37:50 +11:00
Duende13
f5ad950bc3
Change Syntax from :variant => :product to variant: :product
2018-03-23 17:37:50 +11:00
Duende13
ba37db7ccc
Refactoring test to adopt most Rspec syntax (expect instead of should)
2018-03-23 17:37:50 +11:00
Duende13
401052be68
Fix Robcop issues (blank spaces and indentation)
2018-03-23 17:37:50 +11:00
Duende13
330e7d71af
Sort line items by name and unit_value for confirmation email and summary screen
2018-03-23 17:37:50 +11:00
Maikel Linke
94cc8bb980
Update translations with current Transifex version
...
Since our Transifex integration has a few flaws, there are many
translations that are not in the code yet. This imports everything, even
translation files that are not at 100%.
2018-03-23 12:55:29 +11:00
Pau Perez
2c588847df
Pick from_address from MailMethod as in Spree
...
Spree::Config[] picks it up from AppConfiguration rather than MailMethod
and so, gets a value different from the one configured.
2018-03-22 18:36:41 +01:00
Pau Perez
3c36d2d1a6
Remove failing mails_from default
...
As example.com is not a verified domain, Mandrill rejects the email
giving "reject_reason": "unsigned". Also, the mails_from setting is
already defined as a MailMethod preference.
2018-03-22 13:02:57 +01:00
Pau Pérez Fabregat
fa9d61c7fd
Merge pull request #2165 from coopdevs/upgrade-skylight
...
Upgrade Skylight from 1.5.0 to 1.5.1
2018-03-22 09:56:35 +01:00
Pau Pérez Fabregat
92b5f9a313
Merge pull request #2127 from mkllnk/fix-scss
...
Remove typo from SCSS
2018-03-22 09:41:11 +01:00
Maikel Linke
9588138eb0
Remove typo
...
Accidentally introduced in febe66b7b0 .
2018-03-22 14:18:55 +11:00
Pau Perez
d8dd84e64e
Fix enterprise filter in customers page
...
Angular's filter function uses a pattern object to filter specific
properties on objects contained by the array. We want an exact match
instead, which has to be done by means of a function.
2018-03-21 19:16:14 +01:00
Pau Perez
ae1831241b
Upgrade SKylight from 1.5.0 to 1.5.1
2018-03-21 18:41:21 +01:00
Pau Pérez Fabregat
91f30d5427
Merge pull request #2148 from coopdevs/sample-mail-method
...
Setup mail method automatically
2018-03-21 15:10:56 +01:00
Enrico Stano
3ce7bc54e3
Merge pull request #2143 from Matt-Yorkley/email/enterprise_user_ui
...
Fix enterprise user unsaved changes
2018-03-20 16:43:40 +01:00
Pierre de Lacroix
28bb15f4a9
Fix old rspec syntax
2018-03-20 12:21:27 +01:00
Pierre de Lacroix
e0b12b1332
Remove dependency on model method in feature test
2018-03-20 12:18:54 +01:00
Pierre de Lacroix
2ceecc3d6e
Test Order#tax_adjustment_totals with taxed adjustment on order
2018-03-20 12:18:51 +01:00
Pierre de Lacroix
03de6c690c
Fix incorrect tax amount on Admin Order #show
...
by calling Order#tax_adjustment_totals from
Order#price_adjustment_totals
2018-03-20 12:18:09 +01:00
Pau Perez
977c8f6203
Stick to setup+execution+assertion order in tests
2018-03-20 12:07:10 +01:00
Pau Pérez Fabregat
e23d714e83
Merge pull request #2154 from openfoodfoundation/transifex
...
Transifex
2018-03-19 10:29:48 +01:00
Transifex-Openfoodnetwork
ec01e55707
Updating translations for config/locales/es.yml
2018-03-19 19:56:02 +11:00
Pau Pérez Fabregat
c18b996a1b
Merge pull request #2098 from Matt-Yorkley/uk/font-caching
...
Fix browser caching of updated icon font
2018-03-17 11:10:04 +01:00
Matt-Yorkley
1600067383
Redirect to set password page after invite
2018-03-16 17:32:40 +00:00
Matt-Yorkley
3fad51d271
Clearer angular method naming
2018-03-16 17:32:40 +00:00
Matt-Yorkley
5f0075f8b7
Refactor to use new REST resource
2018-03-16 17:32:38 +00:00
Pau Perez
716e952117
Add mail setting's env vars for development
2018-03-16 13:33:55 +01:00
Pau Perez
092122969c
Make mail env vars mandatory
2018-03-16 13:33:21 +01:00
Pau Perez
f27a624687
Create the mail method from db:seed
...
As opposed the to sample users and enterprises that ease testing and
development, the mail method is needed for the app to function in any
environment.
2018-03-16 13:33:21 +01:00
Pau Perez
7afc999689
Differentiate MAIL_DOMAIN from plain DOMAIN
...
This way we can have katuma.org as the mail domain and
staging.katuma.org as web domain.
2018-03-16 13:33:20 +01:00
Pau Perez
4fc66356cb
Create always a mail method from sample_data
...
This sets the email config so that mails can be sent right away.
2018-03-16 13:33:20 +01:00
Pau Perez
a7f1ed660b
Add service to create a mail method
...
This will make loading sample data into staging environments easier.
2018-03-16 13:33:20 +01:00
Rob Harrington
9840467b8a
Remove obsolete subscription fields from order cycles table
2018-03-16 14:55:22 +11:00
Maxime Lalisse
fa68dd0bcc
refactor spec and check price
2018-03-16 01:18:21 +01:00
Rob Harrington
4d757dde78
Show payment summary in confirmation email regardless of payment method
2018-03-16 10:55:56 +11:00
Matt-Yorkley
f3f18d8338
Cleaner routes.rb entry
2018-03-15 18:48:47 +00:00
Matt-Yorkley
128ca3b1ef
Invite manager specs
2018-03-15 18:48:47 +00:00
Matt-Yorkley
b64327fbb3
Invite enterprise manager functionality
2018-03-15 18:48:47 +00:00
Matt-Yorkley
5c6624e1d1
Tidy up setDirty() calls in enterprise_controller.js
2018-03-15 12:58:05 +00:00
Enrico Stano
98ea82462d
Merge pull request #2136 from coopdevs/upgrade-test-dependencies
...
Upgrade test dependencies
2018-03-15 12:21:49 +01:00
Matt-Yorkley
4953c69123
Fix enterprise user unsaved changes
2018-03-14 23:04:54 +00:00
Pau Pérez Fabregat
586a9afaae
Merge pull request #2125 from KeirOsborn/order_order_cycle_list_#1884
...
Order order cycle list #1884
2018-03-14 19:08:28 +01:00
Pau Pérez Fabregat
f116ee156f
Merge pull request #1951 from JF-Lalonde/remove_duplicate_datepicker_1947
...
Remove duplicated directive datepicker from index_utils directory
2018-03-14 19:08:06 +01:00
JF-Lalonde
7a9f341363
Remove duplicated directive datepicker from index_utils directory
2018-03-14 17:01:54 +11:00
Maikel Linke
ada0fa50fc
Replace Rohan's email address by optional config
...
Rohan's email address is hard-coded, but he doesn't want to receive
these emails any more.
2018-03-14 15:30:53 +11:00
HugsDaniel
451c57da40
Changed i18n t() path to get content from locales
2018-03-14 15:01:01 +11:00
Hugo Daniel
82a752de46
Added margin bottom on table#listing_products to display a bit above the save bar
2018-03-14 13:16:31 +11:00
Matt-Yorkley
e2f3feccf0
Add comments to authentication_service.js
2018-03-14 12:13:45 +11:00
Matt-Yorkley
e6bdbccffa
Ensure email links return to proper path on private shops, refactor modal logic
2018-03-14 12:13:45 +11:00
Matt-Yorkley
ea9b0eca48
Adjust wording on validation modal message
2018-03-14 12:13:45 +11:00
Matt-Yorkley
e8bc87e62b
Ensure email validation link returns to /register paths properly
2018-03-14 12:13:45 +11:00
Matt-Yorkley
d7a3c50bd5
Remove underscore from resource
2018-03-14 12:13:45 +11:00
Matt-Yorkley
f5a0862655
Email confirmation modal specs
2018-03-14 12:13:45 +11:00
Matt-Yorkley
595bc5d1a5
Show confirmation message in modal
2018-03-14 12:13:45 +11:00
Matt-Yorkley
bc621a3c43
Return user to same URL from confirmation link
2018-03-14 12:13:45 +11:00
Hugs
7ebf5db1f2
Added img tag when producer.description.length==0 to display logo even when no About Us
2018-03-14 11:44:04 +11:00
Maxime Lalisse
e806f38142
Fix translation keys
2018-03-14 10:13:40 +11:00
Pau Perez
d980809a19
Upgrade shoulda-matchers from 1.1.0 to 2.8.0
2018-03-13 17:46:59 +01:00
Pau Perez
e6f6232607
Upgrade letter_opener from 1.4.1 to 1.6.0
2018-03-13 14:21:54 +01:00
Pau Perez
cce30d5762
Upgrade Knapsack from 1.5.1 to 1.16.0
2018-03-13 14:11:00 +01:00
Pau Perez
47a6ffbf66
Upgrade Capybara from 2.15.4 to 2.18.0
2018-03-13 13:58:06 +01:00
HugsDaniel
7e5eae1b8d
Added testing on statusMessage display for pending changes
2018-03-13 21:03:54 +11:00
HugsDaniel
8c4d0f11d7
Changed status message with i18n t() filter to displau unsaved changes status for customers edition in admin dashboard
2018-03-13 21:03:54 +11:00
Pau Perez
d96c1fc165
Upgrade factory_girl_rails from 3.3.0 to 4.9.0
...
This is the last version before moving to factory_bot_rails.
2018-03-13 10:01:14 +01:00
Pau Perez
6f879cd5d9
Remove unused gem Turn
...
It provides runners for MiniTest and we use RSpec.
2018-03-13 09:54:26 +01:00
Pau Perez
1d75e5a671
Upgrade rspec-retry from 0.4.2 to 0.5.6
2018-03-13 09:53:20 +01:00
Pau Perez
bdd58dccf0
Upgrade Timecop from 0.8.1 to 0.9.1
2018-03-13 09:34:09 +01:00
Pau Perez
aaf5bcbb12
Upgrade rspec-rails from 3.7.1 to 3.7.2
2018-03-13 09:32:12 +01:00
Pau Pérez Fabregat
976bbd8725
Merge pull request #2124 from coopdevs/replace-mail-method-in-base-mailer-decorator
...
Remove deprecated reference to Spree::MailMethod
2018-03-13 08:51:11 +01:00
Enrico Stano
341604be8a
Merge pull request #2094 from openfoodfoundation/transifex
...
Transifex
2018-03-13 08:39:11 +01:00
Maikel Linke
01dc51c84b
Consistent reference of the source locale
2018-03-13 10:25:31 +11:00
Maikel Linke
64063f305b
Describe methods of I18nConfig
2018-03-13 10:24:42 +11:00
Enrico Stano
5ce320f8a2
Merge pull request #2133 from coopdevs/fix-sample-data
...
Fix shipping method creation in sample data
2018-03-12 18:39:34 +01:00
Pau Perez
6598c80f6e
Fix shipping method creation in sample data
2018-03-12 16:52:56 +01:00
Keir Osborn
d4b84e55c2
order order cycle list from most lates close date to earliest on /orders page #1884
2018-03-12 11:04:50 +00:00
Pau Pérez Fabregat
6f5080923f
Merge pull request #2123 from coopdevs/bring-seeds-from-ofn-install
...
Bring seeds from ofn install
2018-03-12 11:43:14 +01:00
Pau Pérez Fabregat
afda5cc04e
Merge pull request #2115 from coopdevs/localize-sample-data
...
Localize sample data
2018-03-09 16:18:18 +01:00
Pau Perez
12e225e7c0
Add sample addresses in the instance's country
...
This ensures the address country and state are valid, meaning the state
belongs to the provided country. We use the instance's to do that.
2018-03-09 13:33:05 +01:00
Pau Perez
c19c22cb17
Apply couple simple tweaks to seeds.rb
2018-03-09 13:20:35 +01:00
Maikel Linke
db61a2bb17
Parse available language string more relaxed
...
Splitting the string with any whitespace makes it more likely the code
knows what the human meant. It also makes `strip` obsolete, since there
can't be any whitespace within the splitted strings.
2018-03-09 19:41:49 +11:00
Maikel Linke
8017921e89
Use I18nConfig in views
2018-03-09 17:45:04 +11:00
Maikel Linke
3743cf1bc3
Use I18nConfig for application defaults
2018-03-09 17:45:03 +11:00
Maikel Linke
7a34c6e3f0
Introduce I18nConfig as single point of truth
...
It will be used in application.rb and views.
See https://github.com/openfoodfoundation/openfoodnetwork/issues/2113
2018-03-09 17:45:03 +11:00
Pau Pérez Fabregat
b5a8df00dd
Merge pull request #2117 from coopdevs/confirm-example-user
...
Automatically confirm the spree@example.com user
2018-03-09 07:24:40 +01:00
Enrico Stano
0aacb91f50
Merge pull request #2116 from coopdevs/clean-sample-data
...
Clean sample data
2018-03-07 20:58:30 +01:00
Pau Perez
1b39d57800
Remove deprecated reference to Spree::MailMethod
...
Said class is removed in https://github.com/spree/spree/pull/2643 in
Spree.
2018-03-07 16:24:39 +01:00
Pau Perez
5eb3dc4beb
Bring states.yml from l10n_au
...
The states.yml present in this repo had a different format which doesn't
work with the current seeds.rb that we brought from ofn-install.
2018-03-07 10:30:12 +01:00
Pau Perez
9849f76c1c
Bring seeds.rb from ofn-install
2018-03-07 10:28:34 +01:00
Pau Perez
ae2eba89ca
Automatically confirm the spree@example.com user
...
This allows you to log in with it after you run `bundle exec
openfoodnetwork:dev:load_sample_data` rake task right away.
2018-03-07 10:10:38 +01:00
Rob H
dadbb7445b
Merge pull request #2110 from oeoeaio/subs-summary-hash
...
Subs: Fix summary emails for shop owners
2018-03-07 16:41:38 +11:00
Rob H
4fd307832e
Merge pull request #2120 from oeoeaio/subs-unpause-messaging
...
Subs: messaging around unpausing a subscription
2018-03-07 16:41:00 +11:00
Rob Harrington
09ca9ac2dd
Alter scope to return both completed and resumed orders
2018-03-07 14:24:59 +11:00
Rob Harrington
b98afc00ba
Show message about resumable orders when unpausing a subscription
2018-03-07 14:24:59 +11:00
Rob Harrington
7332e21013
Make InfoDialog more flexible (can show information as well as errors)
2018-03-07 14:24:58 +11:00
Rob Harrington
5cb0a1c371
Fix position of jQuery dialogs in admin section
2018-03-07 14:24:58 +11:00
Pau Perez
10d6a29503
Move service class to its own file
2018-03-06 15:30:25 +01:00
Pau Perez
e06af77420
Move from hash rocket to symbol syntax
2018-03-06 13:46:32 +01:00
Pau Pérez Fabregat
392d0de6c5
Merge pull request #2055 from HugsDaniel/1766_entreprise_registration_scroll_on_first_step
...
Changed bootstrap grid for medium size and above to have text and but…
2018-03-06 11:39:35 +01:00
Pau Pérez Fabregat
0fdd7dabd4
Merge pull request #2026 from Matt-Yorkley/uk/embedded_headers
...
Only include one host in embedded shopfront headers
2018-03-06 11:07:32 +01:00
Pau Pérez Fabregat
c999627d28
Merge pull request #2114 from ltrls/fix-old-rspec-syntax
...
Fix old rspec syntax
2018-03-06 11:04:21 +01:00
Hugo Daniel
f2eee77a15
fixed modal height and change grid to have button and text side by side
2018-03-06 16:21:35 +11:00
Pierre de Lacroix
040c292a76
Fix some more old rspec syntax
2018-03-06 01:29:54 +01:00
Pierre de Lacroix
12e3b88b71
Fix some old Rspec syntax
2018-03-06 01:24:54 +01:00
Rob Harrington
2bfa923fe1
Use a hash instead of an array :face_palm:
2018-03-02 15:50:10 +11:00
Rob H
d30362b78c
Merge pull request #2108 from oeoeaio/subs-neg-stock
...
Subs: handle negative stock for subscriptions
2018-03-02 15:47:12 +11:00
Rob Harrington
28491ee948
Skip stock check when requested quantity is zero
...
This prevents an error being raised when available stock is negative
2018-03-02 14:53:24 +11:00
Rob Harrington
fe4145d9d5
Use expect syntax
2018-03-02 14:53:24 +11:00
Rob H
3ef29fde2c
Merge pull request #2107 from oeoeaio/subs-missing-close
...
Subs: Add message to indicate OC has no close date
2018-03-02 14:52:54 +11:00
Rob Harrington
05e6c3daa6
Add message to indicate missing orders_close_at date
2018-03-02 13:28:34 +11:00
Rob H
9d8456cbf3
Merge pull request #2090 from oeoeaio/subs-styling
...
Subs: Make checklist more legible
2018-03-02 13:24:05 +11:00
Rob H
1d8f332cc6
Merge pull request #2096 from oeoeaio/subs-estimates
...
Subs: Improve estimates of item prices and fees
2018-03-02 13:22:27 +11:00
Rob Harrington
6f554814ce
Add class documentation for SubscriptionEstimator
2018-03-02 10:11:26 +11:00
Rob Harrington
f1545a4ab6
Show fee estimates in subscription totals in UI
2018-03-02 10:11:26 +11:00
Rob Harrington
31750a7bba
Add logic for calculator of fee estimates to SubscriptionEstimator
2018-03-02 10:11:26 +11:00
Rob Harrington
ad391c73ab
Add migration to add fee estimate fields to subscriptions table
2018-03-02 10:11:26 +11:00
Rob Harrington
014283447d
Use delegate to access subscription shop
2018-03-02 10:11:26 +11:00
Rob Harrington
3b2d4ae2d4
Estimator take variant overrides into account
2018-03-02 10:11:26 +11:00
Rob Harrington
14a03aab35
Fallback to previous saved estimate if calculator not available
2018-03-02 10:11:26 +11:00
Rob Harrington
904a364bf1
Stop unnecessarily passing fee_calculators around
2018-03-02 10:11:26 +11:00
Rob Harrington
30df1d4345
Refector controller to allow price_estimate calculation
2018-03-02 10:11:26 +11:00
Rob Harrington
b85e38010f
Delegate responsibility to estimating prices for subscriptions to dedicated service object
2018-03-02 10:11:26 +11:00
Transifex-Openfoodnetwork
7a411b0452
Updating translations for config/locales/de_DE.yml
2018-03-02 03:48:06 +11:00
Transifex-Openfoodnetwork
ecbd1fe93d
Updating translations for config/locales/pt.yml
2018-03-02 02:15:53 +11:00
Enrico Stano
14caac0212
Merge pull request #2074 from mjal/2057states-are-not-displayed-in-modify-address-pop-in-and-prevent-saving-2
...
Bug fix in customers edit address
2018-03-01 14:59:02 +01:00
Enrico Stano
6e9efe79b7
Merge pull request #2053 from Matt-Yorkley/uk/enterprise_limit
...
Increase default enterprise limit
2018-03-01 14:40:24 +01:00
Maxime Lalisse
cff1d7224d
Bug fix in customers edit address
2018-03-01 22:02:39 +11:00
Matt-Yorkley
86a500bcdf
Fix browser caching of updated icon font
2018-02-23 20:49:42 +00:00
Matt-Yorkley
7bd0de99ac
Adjust brittle referer header check
2018-02-23 16:35:46 +00:00
Matt-Yorkley
9506ea456e
Stub the request object instead of controller method
2018-02-23 15:57:28 +00:00
Matt-Yorkley
e173f823c8
Refactor embedded logic
2018-02-23 15:57:28 +00:00
Matt-Yorkley
4a818c07bb
Only include one host in embedded shopfornt headers
2018-02-23 15:57:28 +00:00
Rob Harrington
1ac9417a20
Add class description for ProxyOrder
2018-02-22 16:23:10 +11:00
Rob Harrington
ae1c8344d1
Ensure price estimates generated for subscriptions take overrides into account
2018-02-22 16:16:49 +11:00
Rob Harrington
add9c83812
Ensure correct price is used by OrderFactory when building line items
2018-02-22 16:16:49 +11:00
Rob Harrington
993f02a989
Add knowledge of variant overrides to OrderFactory
2018-02-22 16:16:49 +11:00
Rob Harrington
d7d40a4a0f
Create new OrderFactory service object for initializing order from attr hash
2018-02-22 16:16:49 +11:00
Rob Harrington
6bf4ed1ac5
Add new review view to subscription wizard
2018-02-22 16:13:29 +11:00
Rob Harrington
6bdbdc06e7
Use select2_search instead of targetted_select2_search
2018-02-22 16:13:29 +11:00
Rob Harrington
2e94654f91
Create factory to hold auxillary functions for subscriptions
...
NOTE: Moved estimatedSubtotal and estimatedTotal functions to the new factory from the subscription line items controller
2018-02-22 16:13:29 +11:00
Rob Harrington
2a731b2db5
Rename SubscriptionPrototype to SubscriptionActions
2018-02-22 16:13:29 +11:00
Rob Harrington
dcfa5fa42d
Use services to access injected data arrays
2018-02-22 16:13:29 +11:00
Rob Harrington
ad62b258ac
Populate 'all' array from Schedules#load
2018-02-22 16:13:29 +11:00
Rob Harrington
95f70409ee
Auto-load customers into service when present
2018-02-22 16:13:29 +11:00
Rob Harrington
3ac57269ed
Use .all convention for shipping and payment methods resource services
2018-02-22 16:13:29 +11:00
Rob Harrington
8951c79f71
Only count future orders in subs index order count
2018-02-22 15:09:33 +11:00
Rob Harrington
b3e7badd37
Fix incorrect translation key
2018-02-22 14:33:25 +11:00
Rob Harrington
cec5fddf6a
Add missing translation
2018-02-22 14:33:25 +11:00
Rob Harrington
c4a81bdc48
Translate subscriptions loading flash
2018-02-22 14:33:25 +11:00
Rob Harrington
9887819c16
Update ref for ofn-qz
2018-02-22 13:56:10 +11:00
Pau Pérez Fabregat
c1b7e9f79e
Merge pull request #2069 from HugsDaniel/1889_bug_in_order_cycles_filter_on_customer_admin_reports
...
Loads all order cycles for current user whether he is producer, distributor or coordinator
2018-02-21 17:11:52 +01:00
Hugo Daniel
3fa5ca7eae
Use accessible_by method instead of involving_managed_distributors method to fetch all order cycles
2018-02-21 17:33:28 +11:00
Hugo Daniel
65fea6291e
CodeClimate requested changes
2018-02-21 17:33:28 +11:00
Hugo Daniel
64c2bdda1c
Added loading of all active or complete order cycles concerned by the current user to the reports form collection
...
User will see all order cycles he is concerned by as producer, distributor or coordinator
2018-02-21 17:33:28 +11:00
Maikel Linke
de8df4b3e9
Manual update from transifex
2018-02-21 14:25:19 +11:00
Maikel Linke
70bb64d58d
Manual update from transifex
2018-02-21 14:24:45 +11:00
Maikel Linke
a529525a63
Manual update from transifex
2018-02-21 14:24:28 +11:00
Transifex-Openfoodnetwork
50c1224139
Updating translations for config/locales/de_DE.yml
2018-02-21 10:59:20 +11:00
Rob Harrington
927ab3a23a
Make subscriptions setup checklist more legible
2018-02-19 11:11:10 +11:00
Pau Pérez Fabregat
183621f90b
Merge pull request #2080 from coopdevs/add-skylight-staging
...
Enable Skylight in staging
2018-02-15 11:26:16 +01:00
Matt-Yorkley
fdc14ab44e
Add controller specs
2018-02-14 15:37:22 +00:00
Pau Perez
a7dcaf15fa
Enable Skylight in staging
...
This is a follow-up of
https://github.com/openfoodfoundation/openfoodnetwork/pull/2070 .
When running the production API key in staging, the `log/skylight.log`
showed:
```
[SKYLIGHT] [1.5.0] You are running in the staging environment but
haven't added it to config.skylight.environments, so no data will be
sent to skylight.io.
```
According to
https://www.skylight.io/support/advanced-setup#setting-up-multiple-environments
it turns out we need to create a new app for staging and use its API
key.
2018-02-14 14:46:10 +01:00
Matt-Yorkley
8a11dc3c33
Decouple image upload from Spree
2018-02-14 13:46:05 +00:00
Matt-Yorkley
23deb37876
Save/Update product image test
2018-02-14 13:46:05 +00:00
Matt-Yorkley
526317c373
BEP Image upload specs
2018-02-14 13:46:05 +00:00
Matt-Yorkley
7d27d1325e
Bulk Edit image upload
...
Image Upload Translations
Squashme
Squashme
Squashme
Code review tweaks
2018-02-14 13:46:05 +00:00
Matt-Yorkley
24dca5e51f
Add image column to product bulk edit
2018-02-14 13:46:05 +00:00
Matt-Yorkley
237854c781
Update enterprise limit error text and use expect sytnax
2018-02-13 14:05:18 +00:00
Matt-Yorkley
3c5b01ece0
Update enterprise limit spec
2018-02-13 14:05:18 +00:00
Matt-Yorkley
d52f9fd43f
Add enterprise limit modal
2018-02-13 14:05:18 +00:00
Pierre de Lacroix
5c046b76f0
Fix failing tests
2018-02-13 14:05:17 +00:00
Pierre de Lacroix
ab1ed16435
Add a migration to change Spree::Users enterprise_limit default value from 1 to 5
2018-02-13 14:05:17 +00:00
jtruong2
689aed7080
Add spec for admin & handling
2018-02-12 15:53:28 +01:00
jtruong2
6c92fdf167
fixes issue if admin and handling == 0 then do not render row
2018-02-12 15:53:19 +01:00
Maxime Lalisse
aef73aef38
Add translation keys
2018-02-09 22:15:02 +01:00
Maxime Lalisse
11eda94949
Add i18n for admin/orders
2018-02-09 17:40:31 +01:00
Pau Pérez Fabregat
23d36e3898
Merge pull request #2058 from coopdevs/improve-order-cycle-notification
...
Improve code style and docs of job
2018-02-09 13:19:32 +01:00
Pau Perez
c79641c77c
Fix typos in documentation
2018-02-09 09:53:40 +01:00
Pau Perez
aa4bd7f397
Improve code style and docs of job
2018-02-09 09:53:39 +01:00
Pau Pérez Fabregat
be07996656
Merge pull request #2070 from chancancode/skylight
...
Add Skylight instrumentation
2018-02-09 08:55:30 +01:00
Rob Harrington
e12207f3de
Use shop contact email and contact name for subscription emails
2018-02-09 14:44:15 +11:00
Rob Harrington
09b800672d
Fix specs to handle non-deterministic ordering
2018-02-09 14:44:15 +11:00
Rob Harrington
c59b172348
Fix typo
2018-02-09 14:44:15 +11:00
Rob Harrington
7017c8540c
Replace references to 'standing line item' with 'subscription line item'
2018-02-09 14:44:15 +11:00
Rob Harrington
ae4420d9ba
Rename standing line item files
2018-02-09 14:44:14 +11:00
Rob Harrington
eb53df8238
Rename 'standing_line_items' table to 'subscription_line_items'
2018-02-09 14:44:14 +11:00
Rob Harrington
71370e0bce
Replace references to 'standing order' with 'subscription' (cleanup)
2018-02-09 14:44:14 +11:00
Rob Harrington
ba66c0e862
Replace references to 'standing order' with 'subscription' (schedule)
2018-02-09 14:44:14 +11:00
Rob Harrington
c605742671
Replace references to 'standing order' with 'subscription' (routes)
2018-02-09 14:44:14 +11:00
Rob Harrington
720628e49e
Replace references to 'standing order' with 'subscription' (translations)
2018-02-09 14:44:14 +11:00
Rob Harrington
501fa4c901
Replace references to 'standing order' with 'subscription' (erb)
2018-02-09 14:44:14 +11:00
Rob Harrington
532f998b24
Replace references to 'standing order' with 'subscription' (js: spec)
2018-02-09 14:44:14 +11:00
Rob Harrington
b7876ebfbf
Replace references to 'standing order' with 'subscription' (spec)
2018-02-09 14:44:14 +11:00
Rob Harrington
04e48989c9
Replace references to 'standing order' with 'subscription' (lib)
2018-02-09 14:44:13 +11:00
Rob Harrington
094c3e70f7
Replace references to 'standing order' with 'subscription' (HAML)
2018-02-09 14:44:13 +11:00
Rob Harrington
b3eaa30f3d
Replace references to 'standing order' with 'subscription' (JS)
2018-02-09 14:44:13 +11:00
Rob Harrington
672f96b85b
Replace references to 'standing order' with 'subscription'
2018-02-09 14:44:13 +11:00
Rob Harrington
902802594f
Renaming standing order files (lib, spec)
2018-02-09 14:44:13 +11:00
Rob Harrington
a9b5fd69d8
Renaming standing order files
2018-02-09 14:44:13 +11:00
Rob Harrington
b258c032cc
Rename 'standing_orders' table to 'subscriptions'
2018-02-09 14:44:12 +11:00
Rob Harrington
fe7b86ff60
Fix broken call to log_order which should have been record_order
2018-02-09 14:44:12 +11:00
Rob Harrington
17950ba498
Lazy load summarizers for standing order jobs outside of initializer
...
The enqueue script seems to causes delayed job to skip initialization of the job class, meaning that the summarizers were missing
2018-02-09 14:44:12 +11:00
Rob Harrington
ccbe33001f
Add missing interpolation for shop name
2018-02-09 14:44:12 +11:00
Rob Harrington
c5f3249172
Fix rubocop issues
2018-02-09 14:44:12 +11:00
Rob Harrington
e7eb02dfe3
Reduce cognitive complexity of VariantsController#search
2018-02-09 14:44:12 +11:00
Rob Harrington
17a0b18e50
Reduce cognitive complexity of StandingLineItemsController#build
2018-02-09 14:44:12 +11:00
Rob Harrington
2012c23956
Reduce cognitive complexity of ProxyOrder#state
2018-02-09 14:44:12 +11:00
Rob Harrington
88a5d4be47
Reduce cognitive complexity of LineItemSyncer#update_item_quantities
2018-02-09 14:44:12 +11:00
Rob Harrington
224249d66b
Reduce cognitive complexity of OrderSyncer
2018-02-09 14:44:11 +11:00
Rob Harrington
ceab1fe16a
Reduce cognitive complexity of StandingOrderPaymentUpdater
2018-02-09 14:44:11 +11:00
Rob Harrington
c1f0a0b514
Reduce congnitive complexity of AddressFinder
2018-02-09 14:44:11 +11:00
Rob Harrington
ce09a8dad6
Reduce cognitive complexity of StandingOrder#state
2018-02-09 14:44:11 +11:00
Rob Harrington
99db6f8e14
Fix translation key for StandingOrderValidator errors
2018-02-09 14:44:11 +11:00
Rob Harrington
d6924d2866
Add comment to OrderUpdateIssues
2018-02-09 14:44:11 +11:00
Rob Harrington
3e68973812
Rename StandingOrderUpdater to OrderSyncer
2018-02-09 14:44:11 +11:00
Rob Harrington
bbc3cad67d
Refactor large StandingOrderUpdater#update! method
...
Note: extracted line items logic into separate class
2018-02-09 14:44:11 +11:00
Rob Harrington
50d3522b2c
Extract logic for recording issues with updating orders to separate class
2018-02-09 14:44:11 +11:00
Rob Harrington
2c5bfab29f
Refactoring price estimation logic for StandingOrderForm
2018-02-09 14:44:11 +11:00
Rob Harrington
844cd79270
Clean-up of standing order form and spec
2018-02-09 14:44:10 +11:00
Rob Harrington
8ae4307a69
Move logic for updating orders to dedicated class
2018-02-09 14:44:09 +11:00
Rob Harrington
2c40252edb
Extract validation logic for standing orders into service object
2018-02-09 14:44:09 +11:00
Rob Harrington
0c302b022a
Move StandingOrderForm to app/services folder
2018-02-09 14:44:09 +11:00
Rob Harrington
7581779a0d
Remove weird escape characters
2018-02-09 14:44:09 +11:00
Rob Harrington
f9727de206
Comment out interface for turning standing orders ON for an enterprise
2018-02-09 14:44:09 +11:00
Rob Harrington
76daa183d5
Add orders sub-menu to standing-order index page
2018-02-09 14:44:09 +11:00
Rob Harrington
981b874263
Remove unused method active? for order cycles
2018-02-09 14:44:09 +11:00
Rob Harrington
4362ef2cea
Properly translate all error messages for StandingOrderForm
2018-02-09 14:44:09 +11:00
Rob Harrington
7ca60e1990
Use activerecord error translations properly
2018-02-09 14:44:09 +11:00
Rob Harrington
1bf2f7ad03
Fix a couple of offences pickup up by rubocop
2018-02-09 14:44:09 +11:00
Rob Harrington
8ba1a909ca
Use summarizer for standing order confirm job
2018-02-09 14:44:08 +11:00
Rob Harrington
c86207212f
Add confirmation summary email
2018-02-09 14:44:08 +11:00
Rob Harrington
86cddb1cc4
Capitalise translated strings
2018-02-09 14:44:08 +11:00
Rob Harrington
b49c44f7ce
Generalise record_failure method to record_and_log_error
2018-02-09 14:44:08 +11:00
Rob Harrington
818af47613
Move rescue clause to process method
...
This prevents a placement email from being sent unless the order is processed successfully
2018-02-09 14:44:08 +11:00
Rob Harrington
ef6c9ec0f0
Integrate standing order summarizer into placement job
2018-02-09 14:44:08 +11:00
Rob Harrington
13d01df4d8
Add mail method and template for sending placement summary emails to shop owners
2018-02-09 14:44:08 +11:00
Rob Harrington
cf30b7c883
Add service objects for summarizing outcomes of standing order processing jobs
2018-02-09 14:44:08 +11:00
Rob Harrington
0c0e12e165
Show edit link in placement email if changes are allowed by shop
2018-02-09 14:44:08 +11:00
Rob Harrington
f9af8edf27
Ignore Metrics/BlockLength for specs and Rails/HasAndBelongsToMany
2018-02-09 14:44:08 +11:00
Rob Harrington
8bf460c93a
Manually fix remaining rubocop offences
2018-02-09 14:44:08 +11:00
Rob Harrington
f902b8cef0
Fix rubocop Style/ClassAndModuleChildren offences
2018-02-09 14:44:07 +11:00
Rob Harrington
84ad996ef8
Use guard clauses
2018-02-09 14:44:07 +11:00
Rob Harrington
fb28940952
Use Time.zone.now instead of Time.now
2018-02-09 14:44:07 +11:00
Rob Harrington
03f1980b1b
Auto-correct rubocop offences for standing-orders
2018-02-09 14:44:07 +11:00
Rob Harrington
26a325e6e0
Handle payment processing errors for standing orders
2018-02-09 14:44:07 +11:00
Rob Harrington
2576d10e49
Create a new payment when none is present
2018-02-09 14:44:07 +11:00
Rob Harrington
67e05cea9c
Add failed payment email to StandingOrderMailer
2018-02-09 14:44:07 +11:00
Rob Harrington
0ccb0ce0e4
Make standing order header partial more generic
2018-02-09 14:44:07 +11:00
Rob Harrington
8c96a19e3e
Specify minimum postgresql version for travis
2018-02-09 14:44:07 +11:00
Rob Harrington
6e83c6dc86
Move standing order emails to a dedicated StandingOrderMailer
2018-02-09 14:44:07 +11:00
Rob Harrington
d6a9d63de5
Replace StandingOrderSyncJob with ProxyOrderSyncer service object
2018-02-09 14:44:06 +11:00
Rob Harrington
6ea343f26e
Clean up proxy order performance specs
2018-02-09 14:44:06 +11:00
Rob Harrington
43c2aca208
Use delete_all instead of destroy_all for increased speed
2018-02-09 14:44:06 +11:00
Rob Harrington
8a498391ca
Add performance spec for removal of proxy orders
2018-02-09 14:44:06 +11:00
Rob Harrington
146348a4fe
Refactor proxy order syncer using direct sql query for increased speed
2018-02-09 14:44:06 +11:00
Rob Harrington
48b39f4712
Add performance spec for proxy order syncer
2018-02-09 14:44:06 +11:00
Rob Harrington
3aee0b5e70
Allow proxy order syncer to accept both ActiveRecord::Relation or StandingOrder
2018-02-09 14:44:06 +11:00
Rob Harrington
6d5c920a95
Split proxy order sync logic out into dedicated service object
2018-02-09 14:44:06 +11:00
Rob Harrington
cdf04323a9
Serialize standing order credit_card_id to enable selection in edit form
2018-02-09 14:44:06 +11:00
Rob Harrington
bdac68900f
Move address and card loading logic down into DetailsController
...
Also switch to using CreditCardResource to load the card
2018-02-09 14:44:05 +11:00
Rob Harrington
a5ae4c801c
Initialize ofn-select2 with empty array when data is a promise
2018-02-09 14:44:05 +11:00
Rob Harrington
404913dcfa
Move form-saving logic into dedicated StandingOrderForm service
2018-02-09 14:44:05 +11:00
Rob Harrington
c94badbf36
Stub or provide mailer as appropriate
2018-02-09 14:44:04 +11:00
Rob Harrington
ca1485f121
Add missing translations for proxy order controller error messages
2018-02-09 14:44:04 +11:00
Rob Harrington
dfe874cf3f
Attempt to add a credit card before processing payment
2018-02-09 14:44:04 +11:00
Rob Harrington
c20c9e2e78
Use the rails logger instead of Bugsnag
2018-02-09 14:44:04 +11:00
Rob Harrington
f4f6fb6a7a
Update and process standing order payments prior to confirmation
2018-02-09 14:44:04 +11:00
Rob Harrington
ac8e09bc11
Add credit card validation to StandingOrderForm
2018-02-09 14:44:04 +11:00
Rob Harrington
183ad87d07
Fix mislabeled StandingOrderForm specs
2018-02-09 14:44:04 +11:00
Rob Harrington
f95d1ef058
Show message when no credit cards available for a customer
2018-02-09 14:44:04 +11:00
Rob Harrington
61b64a7516
Add credit card selection element to standing orders form
2018-02-09 14:44:04 +11:00
Rob Harrington
494f2f4821
Add cards lookup action to CustomersController
2018-02-09 14:44:04 +11:00
Rob Harrington
d3937e5c80
Move customer address lookup action to CustomersController
2018-02-09 14:44:03 +11:00
Rob Harrington
3ac2ac34ed
Add credit_card_id to StandingOrder model
2018-02-09 14:44:03 +11:00
Rob Harrington
25907d8969
Prevent standing order form from accepting non cash/stripe payment methods
2018-02-09 14:44:03 +11:00
Rob Harrington
26b85052e1
Load only Cash and Stripe payment methods into standing order form actions
2018-02-09 14:44:03 +11:00
Rob Harrington
07a7993109
Require a Cash or Stripe payment method in standing order setup process
2018-02-09 14:44:03 +11:00
Rob Harrington
7798b12086
Replace translation key for yes_i_am_sure
2018-02-09 14:44:03 +11:00
Rob Harrington
be11a1a2f9
Fix memoization issue with line item unit specs
2018-02-09 14:44:03 +11:00
Rob Harrington
86d8133f82
Stop setting host for url helpers in specs
...
All configuration is now happening in test.rb or spec_helper.rb
2018-02-09 14:44:03 +11:00
Rob Harrington
6081db382c
Updating addresses on standing order updates addresses on any initialised orders
2018-02-09 14:44:03 +11:00
Rob Harrington
b89ab2c407
Adding link to view/edit the order from Standing Order placement and confirmation emails
2018-02-09 14:44:02 +11:00
Rob Harrington
fce2d743e5
Adding proxy-order state to specs
2018-02-09 14:44:02 +11:00
Rob Harrington
2a3fc8cfec
Automatically copy shipping address from billing if none present
2018-02-09 14:44:02 +11:00
Rob Harrington
7d1fc8cbe1
Make sure correct intro message is used for empty standing order notification
2018-02-09 14:44:02 +11:00
Rob Harrington
f969caa2d1
Do not place standing order when no items are available
...
Send notification to customer informing them that an order was not placed...
2018-02-09 14:44:02 +11:00
Rob Harrington
0fd86a6cc7
Adding UI to require action from user when pausing/cancelling standing order with open orders
2018-02-09 14:44:02 +11:00
Rob Harrington
ab5dc7ddd5
Require action from user when pausing/cancelling standing order with open orders
2018-02-09 14:44:02 +11:00
Rob Harrington
3ce8a1abba
Tweaking proxy order state logic
...
Inherits 'paused' state from standing order if present
2018-02-09 14:44:02 +11:00
Rob Harrington
834e5b702e
Using standing_order_form.$submitted for show/hide logic for angularjs form errors
2018-02-09 14:44:02 +11:00
Rob Harrington
001f329393
Refactoring StandingOrderPrototype
...
Allow handling of create/update responses from downstream controllers using promise chaining
2018-02-09 14:44:01 +11:00
Rob Harrington
72549697a3
Redirecting to standing orders index on successful standing order save
2018-02-09 14:44:01 +11:00
Rob Harrington
1e0356a74b
StatusMessages can be shown on StandingOrder index
2018-02-09 14:44:01 +11:00
Rob Harrington
42266397aa
Improving performance of available variant lookup for standing orders
...
Only search the DB for available variants once
2018-02-09 14:44:01 +11:00
Rob Harrington
846cccf373
Showing StandingOrder error messages in status bar when save fails
2018-02-09 14:44:01 +11:00
Rob Harrington
ad2506fe75
Require StandingOrders to have at least one product (StandingLineItem)
2018-02-09 14:44:01 +11:00
Rob Harrington
7dcd39986f
Refactoring StandingOrder validations and errors
...
Moving validations to StandingOrderForm
2018-02-09 14:44:01 +11:00
Rob Harrington
b28f2908a6
Fix 'postcode' typo in standing order form
2018-02-09 14:44:01 +11:00
Rob Harrington
7d9d510c0f
Adding a comma after each schedule listed on OC index
2018-02-09 14:44:01 +11:00
Rob Harrington
c64f3590ad
Using placeholder attribute to show prompt text for schedule dropdown
2018-02-09 14:44:01 +11:00
Rob Harrington
f0f478dfa0
Adding placeholder field with default to ofn-select2 component
2018-02-09 14:44:00 +11:00
Rob Harrington
ceaae89dee
Prevent order cycles that are linked to schedules from being destroyed
2018-02-09 14:44:00 +11:00
Rob Harrington
77a50eac42
Show confirmation message when creating/updating/deleting Schedules
2018-02-09 14:44:00 +11:00
Rob Harrington
877a5f27d1
ProxyOrder state is 'pending' until OC opens, then 'cart' until OC closes
2018-02-09 14:44:00 +11:00
Rob Harrington
2c0928ca20
Automatically show 'Schedules' column on OC index when Standing Orders are enabled
2018-02-09 14:44:00 +11:00
Rob Harrington
4e686ecfcc
Debouncing admin variant search requests by 300ms
2018-02-09 14:44:00 +11:00
Rob Harrington
35e42b28fe
Using customer selection to search for addresses on standing order creation
...
Can also copy copy address from billing to shipping
2018-02-09 14:44:00 +11:00
Rob Harrington
9137f68a57
Adding logic to SearchController#customer_addresses for case when customer is not found
2018-02-09 14:44:00 +11:00
Rob Harrington
6ac49a7694
Adding route and controller action for searching for customer addresses using AddressFinder
2018-02-09 14:44:00 +11:00
Rob Harrington
c5066bb613
Making AddressFinder a little more secure
...
Only allow search by email when a customer or user with matching email is also provided
2018-02-09 14:43:59 +11:00
Rob Harrington
4a0dab3608
Renaming LastUsedAddress as AddressFinder
2018-02-09 14:43:59 +11:00
Rob Harrington
1b72b7258d
Refactoring LastUsedAddress to take customers or users
2018-02-09 14:43:58 +11:00
Rob Harrington
58070a8b3e
Adding loading flash and no-results messaging to standing orders index
2018-02-09 14:43:58 +11:00
Rob Harrington
57653cb911
Displaying setup instructions on Standing Orders index
2018-02-09 14:43:58 +11:00
Rob Harrington
ae209f72b9
Removing unrequired OrderCycleOpenCloseJob
2018-02-09 14:43:58 +11:00
Rob Harrington
2859075e43
WIP: StandingOrderConfirmJob no longer scoped to an order cycle
2018-02-09 14:43:58 +11:00
Rob Harrington
0e50009875
WIP: StandingOrderPlacementJob no longer scoped to an order cycle
2018-02-09 14:43:58 +11:00
Rob Harrington
514a462f7b
WIP: Refactor, of standing order placement and confirmation jobs
...
ie. Transfering responsibility for tracking standing order placement and confirmation to proxy orders
2018-02-09 14:43:58 +11:00
Rob Harrington
01cbd7ae9d
WIP: Adding flags for standing order placement and confirmation to proxy_orders table
2018-02-09 14:43:58 +11:00
Rob Harrington
f92b824f52
User is warned about initialising standing order orders
2018-02-09 14:43:58 +11:00
Rob Harrington
3adfb0db3f
Issues with updating orders are reported when saving standing orders
2018-02-09 14:43:58 +11:00
Rob Harrington
fd07830c02
Adding order_update_issues to serialized proxy orders
2018-02-09 14:43:57 +11:00
Rob Harrington
9e986f25f1
Orders are not marked as problematic if the changed value matches the new value
2018-02-09 14:43:57 +11:00
Rob Harrington
e357a7b401
StandingOrderForm: Storing problematic orders for reporting to user
2018-02-09 14:43:57 +11:00
Rob Harrington
9f50253537
StandingOrderForm: Rescuing from RecordInvalid when saving
2018-02-09 14:43:57 +11:00
Rob Harrington
1e8767e8b5
StandingOrderForm: Small refactor, update initialised orders one-by-one
2018-02-09 14:43:57 +11:00
Rob Harrington
a6add2eff6
Limiting shops loaded onto standing orders index to those with standing orders enabled
2018-02-09 14:43:57 +11:00
Rob Harrington
25639a822a
Implementing standing order feature toggle on back-end interface
2018-02-09 14:43:57 +11:00
Rob Harrington
e1f8af6d5b
Adding standing orders feature toggle to enterprise form
2018-02-09 14:43:57 +11:00
Rob Harrington
e7b8648792
Adding standing orders feature toggle column to enterprises table
2018-02-09 14:43:57 +11:00
Rob Harrington
c819197d07
BasicOrderCycleSerializer serialises open and closes dates with time and zone
2018-02-09 14:43:57 +11:00
Rob Harrington
15fb493d9a
StandingOrderPlacementJob: cap quantity at 0 for items not available through OC
2018-02-09 14:43:56 +11:00
Rob Harrington
cd6394987d
StandingOrderPlacementJob: Moving logic for processing an order to completion to separate method
2018-02-09 14:43:56 +11:00
Rob Harrington
0cf7d1a63d
Link standing order orders to user on initialisation if customer user exists
2018-02-09 14:43:56 +11:00
Rob Harrington
439c81d836
Format of hours in standing order placement email without leading zero
2018-02-09 14:43:56 +11:00
Rob Harrington
1e0d43e975
Changing explain text on confirm email
...
Removing mention of making changes
2018-02-09 14:43:56 +11:00
Rob Harrington
994baf12c4
Adding specs to ensure placement emails are sent
2018-02-09 14:43:56 +11:00
Rob Harrington
d12a1371c2
Assigning a priority to OrderCycleOpenCloseJob
2018-02-09 14:43:56 +11:00
Rob Harrington
f9e40ba586
Fixing typos in standing order placement job
2018-02-09 14:43:56 +11:00
Rob Harrington
a32fb752dd
Removing number column from orders panel, adding edit action
2018-02-09 14:43:56 +11:00
Rob Harrington
e4f30cea57
Fixing styling for table rows within index panels
2018-02-09 14:43:56 +11:00
Rob Harrington
d0f4cc2ee2
PlacementJob loads ProxyOrders based on order cycle close date
2018-02-09 14:43:55 +11:00
Rob Harrington
c4c9c92d7e
Refactoring StandingOrderPlacementJob, loading ProxyOrders and initialsing where necessary
2018-02-09 14:43:55 +11:00
Rob Harrington
e6fbdb17e8
Only initialise a proxy order once
2018-02-09 14:43:55 +11:00
Rob Harrington
02f474e16a
Fixing up spec data for orders spec
2018-02-09 14:43:55 +11:00
Rob Harrington
0861a4391e
Removing ui-sortable library (no longer required)
2018-02-09 14:43:55 +11:00
Rob Harrington
1731d4daa7
Rejigging schedule dialog, limit options to coordinated order cycles, with same coordinator as selected OCs
2018-02-09 14:43:55 +11:00
Rob Harrington
875557dc9d
WIP: ProxyOrders don't require an order, fixing remainder of specs
2018-02-09 14:43:55 +11:00
Rob Harrington
be8fa1f4e4
WIP: ProxyOrders don't require an order, calculating total for serialized proxy orders from standing order where order does not exist
2018-02-09 14:43:55 +11:00
Rob Harrington
3d3013a592
WIP: ProxyOrders don't require an order, adding an edit path for proxy orders
...
initialises an order if one does not exist and redirects to its edit path
2018-02-09 14:43:55 +11:00
Rob Harrington
4b440c83a4
WIP: ProxyOrders don't require an order, StandingOrderForm changes
2018-02-09 14:43:55 +11:00
Rob Harrington
f57cae9124
Removing null: false contraint on order_id for ProxyOrder
2018-02-09 14:43:55 +11:00
Rob Harrington
2231d4c6cf
Using factories to build spec data rather than StandingOrderForm
2018-02-09 14:43:54 +11:00
Rob Harrington
e29a4f9a8a
Moving order initialisation logic from StandingOrderForm to ProxyOrder model
2018-02-09 14:43:54 +11:00
Rob Harrington
64206bc35b
ProxyOrders belong to order cycles
2018-02-09 14:43:54 +11:00
Rob Harrington
e351c3e355
Renaming StandingOrderOrder to ProxyOrder
2018-02-09 14:43:54 +11:00
Rob Harrington
fc845a36f1
Fix weird spec failure cause by a Rails.cache.clear call resetting the currency to USD on CI only
2018-02-09 14:43:54 +11:00
Rob Harrington
9bf3767093
Preventing line item stock level checks when updating standing orders
2018-02-09 14:43:54 +11:00
Rob Harrington
8e0f2fcb35
Adding optional manual override of line item stock level check
2018-02-09 14:43:54 +11:00
Rob Harrington
00ee5a63df
Removing incorrect namespacing from StandingOrderForm spec
2018-02-09 14:43:54 +11:00
Rob Harrington
e068c4831b
Adding job to send confirm emails for standing orders on order cycle close
2018-02-09 14:43:54 +11:00
Rob Harrington
2a03477597
Adding standing_orders_confirmed_at flag to order_cycles
2018-02-09 14:43:54 +11:00
Rob Harrington
deebc31c34
DRYing out standing order email template
2018-02-09 14:43:53 +11:00
Rob Harrington
9f1ff1fd01
Adding OrderCycleOpenCloseJob to the whenever schedule
2018-02-09 14:43:53 +11:00
Rob Harrington
f7229ab229
Uninitialised but recently updated order_cycles also trigger StandingOrderPlacementJob
2018-02-09 14:43:53 +11:00
Rob Harrington
c2b68ed6b5
Running StandingOrderSyncJob when order cycles added to a schedule via OrderCyclesController
2018-02-09 14:43:53 +11:00
Rob Harrington
0a74bb8373
Running StandingOrderSyncJob when order cycles added to a schedule via SchedulesController
2018-02-09 14:43:53 +11:00
Rob Harrington
ef5ff3a663
Adding job to re-sync standing orders when order cycles are added to or removed from schedules
2018-02-09 14:43:53 +11:00
Rob Harrington
d6e5c0b346
Adding extra scopes to StandingOrder model
2018-02-09 14:43:53 +11:00
Rob Harrington
107474fc74
Fixing standing_order_with_items factory
2018-02-09 14:43:53 +11:00
Rob Harrington
9a984963a7
Ensuring that only active standing orders are processed when order cycle opens
2018-02-09 14:43:53 +11:00
Rob Harrington
805baa18a9
Adding cancel/close button to standing order form
2018-02-09 14:43:53 +11:00
Rob Harrington
533b05384c
Refactoring save bar on standing order create/edit form
2018-02-09 14:43:52 +11:00
Rob Harrington
9c2e67e953
Cancelling a standing order just changes the state, does not remove it from the page
2018-02-09 14:43:52 +11:00
Rob Harrington
522e646b36
Adding tooltips to standing order index actions
2018-02-09 14:43:52 +11:00
Rob Harrington
3d8dceb76a
Displaying state of standing orders on index
2018-02-09 14:43:52 +11:00
Rob Harrington
b9316422d2
Adding method to determine state of standing orders
2018-02-09 14:43:52 +11:00
Rob Harrington
8d1899b13d
Adding pause and unpause actions to standing orders
2018-02-09 14:43:52 +11:00
Rob Harrington
8ff9ffbc38
Adding controller actions and routes for pausing and unpausing a standing order
2018-02-09 14:43:52 +11:00
Rob Harrington
961df756c5
Adding paused_at column to standing orders
2018-02-09 14:43:52 +11:00
Rob Harrington
736de4826f
Renaming cancelled_at column to canceled_at, for consistency
2018-02-09 14:43:52 +11:00
Rob Harrington
774245f540
Adding cancel button to standing orders index
2018-02-09 14:43:51 +11:00
Rob Harrington
a2ddf78842
Ensure red buttons have white text
2018-02-09 14:43:51 +11:00
Rob Harrington
f4ce0a4b81
Adding ConfirmDialog service
2018-02-09 14:43:51 +11:00
Rob Harrington
a23a0a233e
Renaming info dialog stylesheet to more general dialogs.css
2018-02-09 14:43:51 +11:00
Rob Harrington
7dcf7ec5b0
Adding controller action and route for cancelling a standing order
2018-02-09 14:43:51 +11:00
Rob Harrington
b643829fe2
Standing Orders can be marked as cancelled
2018-02-09 14:43:51 +11:00
Rob Harrington
076a05f8a9
Adding spec for case when standing_order_orders aren't linked to an order cycle
...
This should never happen, but came up in specs
2018-02-09 14:43:50 +11:00
Rob Harrington
284103b6b6
Adding canceled_at column to standing_orders table
2018-02-09 14:43:50 +11:00
Rob Harrington
dd099eae54
Visualising standing order order state, still some spec failures
2018-02-09 14:43:50 +11:00
Rob Harrington
309781d5b1
Individual StandingOrder orders can be resumed from Standing Order index
2018-02-09 14:43:50 +11:00
Rob Harrington
2023a1a2fc
Adding translations for StandingOrderOrder resume/cancel errors
2018-02-09 14:43:50 +11:00
Rob Harrington
d1ca9a6e14
Adding a #resume action to StandingOrderOrdersController
2018-02-09 14:43:49 +11:00
Rob Harrington
fc463fd608
Adding resume logic to StandingOrderOrder model
2018-02-09 14:43:49 +11:00
Rob Harrington
d89a05aec8
Adding an error message when cancellation of standing order order fails
2018-02-09 14:43:49 +11:00
Rob Harrington
6dd31a947e
Show closing times for orders in standing order orders panel
2018-02-09 14:43:49 +11:00
Rob Harrington
5191877fbe
BasicOrderCycleSerializer renders order open and close times
2018-02-09 14:43:49 +11:00
Rob Harrington
f6af5098b0
Using MomentJS to handle dates on bulk order management
2018-02-09 14:43:48 +11:00
Rob Harrington
7644f08d5c
Individual StandingOrder orders can be cancelled from Standing Order index
2018-02-09 14:43:48 +11:00
Rob Harrington
27b22acd37
Fixing bug that caused references to stale DOM objects to be kept and used by Panels service
...
Was causing panels to break when used in conjuction with ng-repeat + filters
2018-02-09 14:43:48 +11:00
Rob Harrington
50b84c4ced
Fixing typo in SO spec description
2018-02-09 14:43:48 +11:00
Rob Harrington
9160a3ff6b
Displaying Order Cycle names in orders panel on standing orders index
2018-02-09 14:43:48 +11:00
Rob Harrington
a57815edbb
Refactoring standing line item delete logic
...
Using StandingOrderForm rather than separate endpoint
2018-02-09 14:43:47 +11:00
Rob Harrington
4c754e2cdb
Ensuring that new standing_line_items are added to orders and totals are updated
2018-02-09 14:43:47 +11:00
Rob Harrington
fcf2681abc
WIP: Adding basic order panel to standing order index
2018-02-09 14:43:47 +11:00
Rob Harrington
ffcffb30ca
Moving standing orders products panel template into separate partial
2018-02-09 14:43:47 +11:00
Rob Harrington
cdff1ef7b6
TEMP: Adding scopes for standing_order_orders
2018-02-09 14:43:47 +11:00
Rob Harrington
d95d9df0f1
Standing Order Orders can be cancelled
2018-02-09 14:43:47 +11:00
Rob Harrington
56fb50f644
Refactoring customer_search_override directive
...
Passing distributor_id into isolate scope, rather than pulling from separate element
2018-02-09 14:43:47 +11:00
Rob Harrington
f4cbd90400
Storing estimated prices for standing line items in the database
2018-02-09 14:43:46 +11:00
Rob Harrington
9baaf1efc9
Only running StandingOrder service 'after' callbacks for known standing orders
...
ie. those in byID or pristineByID
2018-02-09 14:43:46 +11:00
Rob Harrington
0196218d06
Conditionally loading an edit path for standing orders
...
ie. only if they have an id
2018-02-09 14:43:46 +11:00
Rob Harrington
b253373d4d
Styling save button for standing order panels, and updating pristineByID array on update/save
2018-02-09 14:43:46 +11:00
Rob Harrington
8f71b56c26
Using same serializer for standing order index and edit pages
2018-02-09 14:43:46 +11:00
Rob Harrington
e8ee1dad04
Building params for adding new customer in the dialog directive, rather than generic Customers service
2018-02-09 14:43:45 +11:00
Rob Harrington
dc2551d881
Moving Schedules and ScheduleResource services to admin.resources module
2018-02-09 14:43:45 +11:00
Rob Harrington
c167780cad
Adding auto-loading of schedules to Schedules service via constructor
2018-02-09 14:43:45 +11:00
Rob Harrington
534e69fde5
Including errors attribute from StandingOrderPrototype in spec
2018-02-09 14:43:45 +11:00
Rob Harrington
e92b17a341
Adding an error message when attempting to add duplicate variant to a standing order
2018-02-09 14:43:45 +11:00
Rob Harrington
1bd01c83a7
WIP: Adding panel for editing items to standing order index
2018-02-09 14:43:44 +11:00
Rob Harrington
05bc2bd293
All methods on StandingOrder service are instance methods, StandingOrders service loads instances of StandingOrder
2018-02-09 14:43:44 +11:00
Rob Harrington
6f4c9070f6
Adding StandingLineItemsController to handle addition and removal of SLIs from standing orders
2018-02-09 14:43:44 +11:00
Rob Harrington
198f63d0b3
Removing unrequired StatusMessage injection
2018-02-09 14:43:44 +11:00
Rob Harrington
a72da7036b
buildItem and removeItem are instanceMethods standingOrder objects
2018-02-09 14:43:44 +11:00
Rob Harrington
3571b8c5fa
Fixing date specification for order cycle spec
2018-02-09 14:43:43 +11:00
Rob Harrington
91a2274fe5
Adding link and dialog for creating a new standing order
2018-02-09 14:43:43 +11:00
Rob Harrington
0f2adaa8d2
Adding link to standing orders index to orders sub-menu
2018-02-09 14:43:43 +11:00
Rob Harrington
c3e071b0d1
Removing retry from stabilised customers codes feature spec
2018-02-09 14:43:43 +11:00
Rob Harrington
8c9765749e
Ensuring that backorders are disabled when testing quantity capping for standing orders
2018-02-09 14:43:43 +11:00
Rob Harrington
6cf23b46c5
Fixing broken country and state selection for customer addresses
2018-02-09 14:43:42 +11:00
Rob Harrington
7fa55fe5c6
Adding spec to ensure that invalid changes to standing orders are not propagated to associated orders
2018-02-09 14:43:42 +11:00
Rob Harrington
21d8aafd97
Using numbers for state and countries ids in AddressSerializer
2018-02-09 14:43:42 +11:00
Rob Harrington
fbd3d99b1b
OC feature spec: Using find for columns dropdown instead of first
2018-02-09 14:43:42 +11:00
Rob Harrington
f14c36ed6b
Sending placement email when standing order order in placed on OC open
2018-02-09 14:43:42 +11:00
Rob Harrington
65db856054
Order confirmation emails are not sent for standing order orders.
2018-02-09 14:43:42 +11:00
Rob Harrington
8ab698d4dc
Generating orders for standing orders ignores stock on hand at initialisation
2018-02-09 14:43:42 +11:00
Rob Harrington
5598a0d24f
line_item.unit_value delegates to variant when quantity is 0 or final_weight_volume is missing
2018-02-09 14:43:41 +11:00
Rob Harrington
ef00dca5a0
Changing format of changes object in standing order placement job
2018-02-09 14:43:41 +11:00
Rob Harrington
7a308f1651
Updating letter_opener gem
2018-02-09 14:43:41 +11:00
Rob Harrington
3edfd07a40
WIP: adding method to StandingOrderPlacementJob to send emails
2018-02-09 14:43:41 +11:00
Rob Harrington
5e0186fa1f
Standing Order Placement Job: capping line items quantities to available stock level
2018-02-09 14:43:41 +11:00
Rob Harrington
1c7e9923f9
Checking for sufficient stock takes variant overrides into account
2018-02-09 14:43:41 +11:00
Rob Harrington
a8928a0ccc
Capping line item quantity at stock takes overrides into account
2018-02-09 14:43:40 +11:00
Rob Harrington
2aad722b4b
WIP, SO placement job: preventing payments on standing orders from being processed when OC opens
2018-02-09 14:43:40 +11:00
Rob Harrington
9ad6dce2d6
WIP, SO placement job: processing orders to completion
2018-02-09 14:43:39 +11:00
Rob Harrington
178aadb311
WIP, SO placement job: Finding orders to be placed
2018-02-09 14:43:39 +11:00
Rob Harrington
6f629e112a
WIP, OC open-close job: performing the job spawns StandingOrderPlacementJobs for each recently opened OC
2018-02-09 14:43:39 +11:00
Rob Harrington
5b25f63e44
WIP, OC open-close job: finding recently opened order cycles
2018-02-09 14:43:39 +11:00
Rob Harrington
140d62939a
Adding processing marker column standing_orders_placed_at to order cycles
2018-02-09 14:43:39 +11:00
Rob Harrington
95a7fc8ef5
Initialisation and removal of standing order orders respects begins_at and ends_at contraints
2018-02-09 14:43:39 +11:00
Rob Harrington
3eff65f1f5
Finish refactoring of Standing Order Updaters, replacing with form class used by controller
2018-02-09 14:43:38 +11:00
Rob Harrington
2a3dc33f86
WIP: Pushing shipment and payment update logic down into separate methods
2018-02-09 14:43:38 +11:00
Rob Harrington
6ea4aac361
WIP: Refactoring StandingOrderUpdater into StandingOrderForm
...
Update logic coupled to update action on controller rather than changes to the model
2018-02-09 14:43:38 +11:00
Rob Harrington
0b35cb6619
Standing Order Updater handles changes to line item quantities
2018-02-09 14:43:38 +11:00
Rob Harrington
9468dcb406
Adding lib class to maintain standing order orders
2018-02-09 14:43:38 +11:00
Rob Harrington
d5349e7ad0
Standing Orders: adding association between orders and standing orders
2018-02-09 14:43:38 +11:00
Rob Harrington
a7132684e5
Standing Orders: create join table for linking orders with standing orders
2018-02-09 14:43:37 +11:00
Rob Harrington
7eac6e725a
Standing Orders: adding order_cycles association to StandingOrder model
2018-02-09 14:43:37 +11:00
Rob Harrington
aeae0f245e
Standing Orders: standing line items can be deleted from existing standing order
2018-02-09 14:43:37 +11:00
Rob Harrington
38d75d2b1c
Standing Orders: adding routing and controller action for deleting standing line items
2018-02-09 14:43:37 +11:00
Rob Harrington
594bec1b37
StandingLineItems can be removed when creating a StandingOrder
2018-02-09 14:43:37 +11:00
Rob Harrington
1b711bcd46
Standing Orders can be edited
2018-02-09 14:43:37 +11:00
Rob Harrington
4ad6b1a65e
Billing and Shipping addresses can be set on new standing orders
2018-02-09 14:43:37 +11:00
Rob Harrington
b701ca43f4
WIP: adding shiping and billing address to StandingOrder model
2018-02-09 14:43:37 +11:00
Rob Harrington
88563431b8
Module arguments passed to injection functions in consistent way
2018-02-09 14:43:36 +11:00
Rob Harrington
06fffb9ef7
SO Index: centering data in some columns
2018-02-09 14:43:35 +11:00
Rob Harrington
ab0728cd0b
SO Index: Adding day to standing order dates
2018-02-09 14:43:35 +11:00
Rob Harrington
44d7537744
SO Index: Adding items column
2018-02-09 14:43:34 +11:00
Rob Harrington
6fadeacf0e
SO Index: Adding begins_on and ends_on columns
2018-02-09 14:43:34 +11:00
Rob Harrington
af9376b60c
SO Index: Adding column dropdown
2018-02-09 14:43:34 +11:00
Rob Harrington
a395f183f9
SO Index: adding spec for changing shops
2018-02-09 14:43:34 +11:00
Rob Harrington
7c57d3d4c6
SO Index: standing orders can be filtered using quick search
2018-02-09 14:43:34 +11:00
Rob Harrington
bbd43f7026
SO Index: User must select a shop first in order to load relevant standing orders
2018-02-09 14:43:34 +11:00
Rob Harrington
a94742e4db
Ensuring ransack restrictions are applied in StandingOrderController#collection
2018-02-09 14:43:33 +11:00
Rob Harrington
24cb823c90
Loading managed shops into standing orders index, to be used for filtering
2018-02-09 14:43:33 +11:00
Rob Harrington
8372317a8f
Enterprise User can view basic listing of standing orders
2018-02-09 14:43:33 +11:00
Rob Harrington
ef08fd4bb3
Adding dedicated standing order serializer for index
2018-02-09 14:43:33 +11:00
Rob Harrington
1d58ef55f7
Calling Standing Orders index controller action using json returns serialized data
2018-02-09 14:43:33 +11:00
Rob Harrington
a1ccf8a28e
Adding initial defaults for standing orders index column visibility
2018-02-09 14:43:32 +11:00
Rob Harrington
7ab05cf857
Basic AngularJS controller and service for loading StandingOrders
2018-02-09 14:43:32 +11:00
Rob Harrington
c18c1c67d1
Adding visibility permissions for standing orders
2018-02-09 14:43:32 +11:00
Rob Harrington
cd2d73810d
StandingOrderResource can handle index action
2018-02-09 14:43:32 +11:00
Rob Harrington
91917886a8
Adding basic routing and templates for standing orders index
2018-02-09 14:43:32 +11:00
Rob Harrington
8bbc0b7790
Adding translations to standing order form
2018-02-09 14:43:32 +11:00
Rob Harrington
2e83ab80cf
Tweaking layout of details section of standing order creation form
2018-02-09 14:43:32 +11:00
Rob Harrington
bba4b54f9b
Adding a wizard progress indicator to standing order creation form
2018-02-09 14:43:31 +11:00
Rob Harrington
897eb11512
Standing Orders: form split into ngForm elements with staggered validation
2018-02-09 14:43:31 +11:00
Rob Harrington
ac5fe6a9fb
Each section of standing order form has a title
2018-02-09 14:43:31 +11:00
Rob Harrington
29760d6419
Renaming 'items' partial as 'products'
2018-02-09 14:43:31 +11:00
Rob Harrington
1808e3881f
Making standing order creation more like a wizard
2018-02-09 14:43:31 +11:00
Rob Harrington
a9ea042791
Splitting details section of standing order form out into partial
2018-02-09 14:43:31 +11:00
Rob Harrington
6d5ca1501c
Moving standing order form into separate partial
2018-02-09 14:43:31 +11:00
Rob Harrington
946046e53b
Moving action for estimating standing_line_item prices into StandingLineItemController#build
2018-02-09 14:43:31 +11:00
Rob Harrington
71b84d490e
Adding validation contraints to standing order associations
2018-02-09 14:43:30 +11:00
Rob Harrington
6bd5a895b3
Moving InfoDialog into admin.utils module
2018-02-09 14:43:30 +11:00
Rob Harrington
e661430cc9
StandingLineItems added to StandingOrder are saved
...
Adding some additional validation
2018-02-09 14:43:30 +11:00
Rob Harrington
415955e7b3
SO: Adding variants to a new standing order, price estimate provided
2018-02-09 14:43:30 +11:00
Rob Harrington
5aa993f5b4
Moving select2 config for variant-autocomplete into a directive
2018-02-09 14:43:30 +11:00
Rob Harrington
6934b87816
SO: Adding basic interface for Standing Order creation
2018-02-09 14:43:29 +11:00
Rob Harrington
e4de7e262d
SO: Adding StandingLineItem model
2018-02-09 14:43:29 +11:00
Rob Harrington
d711c321b6
SO: Adding Standing Order Model
2018-02-09 14:43:29 +11:00
Rob Harrington
733dc76c6c
Order Cycles can be assigned to schedules via new/edit form
2018-02-09 14:43:29 +11:00
Rob Harrington
4195bd6cd8
Order Cycles can be filtered by Schedule
2018-02-09 14:43:29 +11:00
Rob Harrington
8c0bad3115
Schedules can be deleted from OC index
2018-02-09 14:43:28 +11:00
Rob Harrington
a9b9cbf4bd
Restoring 'Loading' flash to order cycle index
2018-02-09 14:43:28 +11:00
Rob Harrington
33e5601658
Adding translation for schedule without OCs error
2018-02-09 14:43:28 +11:00
Rob Harrington
2a1ca1c206
Using angular-ui sortable instead of pure jQuery, refactoring logic around including blanks in select2s
2018-02-09 14:43:28 +11:00
Rob Harrington
357040f67a
Enterprise User can create and update schedules via OC index
2018-02-09 14:43:28 +11:00
Rob Harrington
920f52e112
Adding schedules to Order Cycles interface
2018-02-09 14:43:28 +11:00
Rob Harrington
a25f2141a5
Adding Order Cycle Schedules join table
2018-02-09 14:43:27 +11:00
Rob Harrington
c51b956b01
Adding Schedule model
2018-02-09 14:43:27 +11:00
Rob Harrington
0d845b0fd6
Adding column toggling interface to Order Cycles index
2018-02-09 14:43:27 +11:00
Rob Harrington
fe9f147ff0
Adding ability to filter OC index by OC name or 'involved' enterprise
2018-02-09 14:43:27 +11:00
Rob Harrington
2a5f598fb0
Angularising Order Cycles Index
2018-02-09 14:43:20 +11:00
Maxime Lalisse
bf69ed0008
Add and namespace a missing translation key
2018-02-09 11:57:44 +11:00
Maxime Lalisse
8bd952ed56
Add i18n for defaced elements in admin_product_tabs
2018-02-09 11:57:44 +11:00
Maxime Lalisse
9a3f61904b
Add translation keys for admin_product_tabs
2018-02-09 11:57:44 +11:00
Godfrey Chan
fbc5318a7b
Add Skylight instrumentation
...
If you’re not already familiar with [Skylight](https://www.skylight.io ),
it is a smart profiler for Rails apps. Skylight makes it easy to
pinpoint performance issues in Rails applications.
We work on a lot of open source projects ourselves, and in our
experience it can be pretty hard to get contributors to work on
application performance issues. Few contributors consider working
on performance problems, and the ones that might be interested may
not even know where to start.
By making performance information more accessible, we hope to
inspire potential contributors to tackle slow parts of your app,
and have a good way to see if their contributions helped.
Local deployments that are interested in this can request an API
token from https://www.skylight.io/oss and set it in
`config/application.yml` (if no token is set, it will log a message to
`log/skylight.log` but won't otherwise prevent the app from working
normally).
2018-02-07 11:37:30 -08:00
Matt-Yorkley
41ce7047cc
Tidy up order cycle spec
2018-02-07 17:48:16 +11:00
Matt-Yorkley
f28471e456
Fixed datepicker button intermittent failure
2018-02-07 17:48:16 +11:00
Matt-Yorkley
4cb9e3a3f1
Datepicker CSS tweaks
2018-02-07 17:48:16 +11:00
Matt-Yorkley
2f6a249b5f
Fix missing datepicker icon
2018-02-07 17:48:16 +11:00
Pau Perez
0634735288
Adjust Codeclimate config to ignore Rails patch
...
Since it is a file copied from Rails 4, we want to keep it in its
original state and not refactor it.
2018-02-07 16:21:16 +11:00
Pau Perez
719c45b408
Apply Rails 4 patch at boot time not only specs
...
This makes this patch available also for things like database-related
rake tasks. It moves the patch to an initializer.
2018-02-07 16:21:16 +11:00
Maikel Linke
b70edd5424
Enabling non-privileged postgres users to run specs
...
Addressing issue #245 .
A combination of fixtures and foreign key constraints requires the postgres
user to be superuser. Otherwise an attempt to disable constraints fails.
This got fixed in Rails 4 and this patch brings the same behaviour back to
Rails 3. It will allow us to run the specs with a nosuperuser postgres user.
See:
- https://github.com/matthuhiggins/foreigner/issues/61
- 9bb27f7ffe
2018-02-07 16:21:16 +11:00
Aaron Hursh
a6498c2f96
Removed ng-disabled conditional from submit button on admin customers index.
2018-02-07 15:09:07 +11:00
Maxim Colls
5db1559f28
Fixed spec to use unuppercased states
2018-02-07 13:35:50 +11:00
Maxim Colls
09f98307f4
Do not upcase State abbreviation
2018-02-07 13:35:50 +11:00
Rob Harrington
56be7b1d46
Fix spec to handle non-deterministic ordering
2018-02-07 11:45:48 +11:00
Rob Harrington
b2f3477261
Change unused creation_date translation key back to confirmation_date
...
See 22eae753fe for original change
2018-02-07 11:42:38 +11:00
Matt-Yorkley
14b73149be
Remove stale form validation messages when showing new confirmation sent message
2018-02-07 10:41:54 +11:00
Matt-Yorkley
0ab7d95607
Remove mention of confirmation email from enterprise creation wizard
2018-02-07 10:41:53 +11:00
Matt-Yorkley
ee08dcfeb4
Use owner as contact if user record doesn't exist
2018-02-07 10:41:53 +11:00
Matt-Yorkley
b893dea810
Make sure userSelect directive uses our Admin::UserSerializer instead of base Spree api view
2018-02-07 10:41:53 +11:00
Matt-Yorkley
ec5ce45850
Change confirmation email wording
2018-02-07 10:41:53 +11:00
Matt-Yorkley
9afb97fa0f
Show contact email without full permissions
2018-02-07 10:41:53 +11:00
Matt-Yorkley
676abe0ced
Remove serialized contact attributes
2018-02-07 10:41:53 +11:00
Matt-Yorkley
73d38cb91b
Re-add text version of confirmation email for accessibility
2018-02-07 10:41:53 +11:00
Matt-Yorkley
fffae46a63
Remove enterpriseRoles from enterprsies controller
2018-02-07 10:41:53 +11:00
Matt-Yorkley
6ed91cab1f
Remove old translation keys
2018-02-07 10:41:53 +11:00
Matt-Yorkley
cc5d0c35dd
Refactor enterprise contact user assignment
2018-02-07 10:41:53 +11:00
Matt-Yorkley
c34570154c
Use contact model in printed tickets
2018-02-07 10:41:53 +11:00
Matt-Yorkley
a5940e1641
Fix user controller spec
2018-02-07 10:41:53 +11:00
Matt-Yorkley
39f0c5b5b0
Rename contact name field and revert contact name specs
2018-02-07 10:41:53 +11:00
Matt-Yorkley
abb5adec43
Enterprise managers UI specs
2018-02-07 10:41:53 +11:00
Matt-Yorkley
525cb4826f
Code review refactoring
2018-02-07 10:41:53 +11:00
Matt-Yorkley
fde0aba96c
Feedback when user changes email addess
2018-02-07 10:41:53 +11:00
Matt-Yorkley
ff18fd25f1
Adjust Discourse login for user confirmations
2018-02-07 10:41:53 +11:00
Matt-Yorkley
9248ac05ac
Adjustments for failing specs
2018-02-07 10:41:53 +11:00
Matt-Yorkley
a066c6391d
Adjust injection data namespacing
2018-02-07 10:41:53 +11:00
Matt-Yorkley
4d11485283
Use receives_notifications flag for enterprise contact
2018-02-07 10:41:53 +11:00
Matt-Yorkley
9e270690ef
Remove enterprise email
...
A user with the same email address is receiving notifications now.
If the email address is invalid, the owner receives notifications.
2018-02-07 10:41:53 +11:00
Matt-Yorkley
15b781b271
Update enterprise managers and contact role
2018-02-07 10:41:52 +11:00
Matt-Yorkley
5dc8f21b7b
Show confirmed status in enterprise managers UI
2018-02-07 10:41:52 +11:00
Matt-Yorkley
9ccb3ee80b
Add receives_notifications flag to enterprise_roles
2018-02-07 10:41:52 +11:00
Matt-Yorkley
27de66b055
Owner's permissions can't be deleted
2018-02-07 10:41:52 +11:00
Matt-Yorkley
ba98c7e2c5
Rewrite enterprise contact functionality
2018-02-07 10:41:52 +11:00
Matt-Yorkley
22eae753fe
Remove enterprise confirmations
2018-02-07 10:41:52 +11:00
Pierre de Lacroix
d832d850fe
Revert removed translations for Enterprise mails
2018-02-07 10:41:52 +11:00
Matt-Yorkley
aead867ea0
Set all current users to confirmed
2018-02-07 10:41:51 +11:00
Matt-Yorkley
97f5022bdd
Show signup message in modal wihout redirect
2018-02-07 10:41:51 +11:00
Matt-Yorkley
0cb7a555d3
Adjust confirmation template
2018-02-07 10:41:51 +11:00
Maikel Linke
52b7872a55
Simplify conditionals
2018-02-07 10:41:51 +11:00
Matt-Yorkley
522aaee1a3
Update login modal for resending confirmations
2018-02-07 10:41:51 +11:00
Matt-Yorkley
179cf6e484
Tidy up confirmation migrations
2018-02-07 10:41:51 +11:00
Matt-Yorkley
28ded1f0c2
Adjust user signup feedback
2018-02-07 10:41:51 +11:00
Pierre de Lacroix
7d971fc39d
Add UserConfirmationsController spec
2018-02-07 10:41:51 +11:00
Pierre de Lacroix
4f0b20e8ad
Better tests
2018-02-07 10:41:51 +11:00
Pierre de Lacroix
a6f2ee1367
Add migration to confirm already confirmed email addresses
2018-02-07 10:41:51 +11:00
Pierre de Lacroix
eb1c598a6c
Fix tests
2018-02-07 10:41:51 +11:00
Pierre de Lacroix
4706bf0528
Remove changes on FR locale file
2018-02-07 10:41:51 +11:00
Matt-Yorkley
969b6caa96
Code cleanup
2018-02-07 10:41:51 +11:00
Matt-Yorkley
69ea1e6d26
Set test users to confirmed by default
2018-02-07 10:41:51 +11:00
Pierre de Lacroix
91704d9df7
Create user confirmation email
2018-02-07 10:41:51 +11:00
Pierre de Lacroix
dbbc2ddb1c
Add confirmable email to user model
2018-02-07 10:41:51 +11:00
Pau Pérez Fabregat
99729457cc
Merge pull request #2063 from coopdevs/autocorrect-cop
...
Autocorrect rubocop Layout/BlockEndNewline cop
2018-02-05 08:50:58 +01:00
Pau Pérez Fabregat
5a58294bc6
Merge pull request #2042 from erose357/master
...
addresses issue #1275
2018-02-02 13:41:23 +01:00
Enrico Stano
398b3bbd8b
Merge pull request #1960 from coopdevs/remove-warning
...
Fix payment_method_decorator boot-time warning
2018-02-02 10:43:51 +01:00
Pau Perez
6cb038c362
Autocorrect rubocop Layout/BlockEndNewline cop
2018-02-01 09:52:53 +01:00
Pau Pérez Fabregat
cc40948783
Merge pull request #2051 from coopdevs/regenerate-knapsack-report
...
Regenerate Knapsack report
2018-01-31 15:04:30 +01:00
Enrico Stano
00bdcd3948
Merge pull request #2045 from coopdevs/use-symbol-hash-syntax
...
Enable HashSyntax rubocop cop with symbol style
2018-01-31 09:30:06 +01:00
Matt-Yorkley
c860ffc176
Adjust use of non-translatable open/closed icons
2018-01-24 15:33:26 +11:00
Pau Perez
8664411880
Disable knapsack report generation again
...
No need to enable it to regenerate the report again until Knapsack
itself tells us.
2018-01-23 09:21:56 +01:00
Pau Perez
f17f1008e3
Update knapsack report file with latest CI values
2018-01-23 09:21:10 +01:00
Pau Perez
a2828f3b9a
Regenerate Knapsack report
...
It's already asking for it in the CI output
2018-01-23 08:06:53 +01:00
Pau Perez
cbfdfb43e3
Enable HashSyntax rubocop cop with symbol style
...
This enforces the ruby 1.9 symbol hash syntax and consistency among the
style of the keys.
# bad
{:a => 1, :b => 2}
{c: 2, 'd' => 3} # should just use hash rockets
# good
{a: 1, b: 2}
{:c => 3, 'd' => 4}
The .rubocop-todo.yml is also updated to keep track of the existing
violations.
2018-01-20 12:50:50 +01:00
Matt-Yorkley
23e672aef9
Add updated globe icon to mobile view
2018-01-19 10:56:11 +00:00
Matt-Yorkley
6d9cc7e29d
Fix account page locale
2018-01-18 10:22:40 +11:00
Matt-Yorkley
8a47788a09
Remake OFN icon font
2018-01-18 10:22:40 +11:00
Matt-Yorkley
afed5ab666
Refector spec
2018-01-18 10:22:40 +11:00
Matt-Yorkley
357eda8c19
Adjustments for failing specs
2018-01-18 10:22:40 +11:00
Matt-Yorkley
f18401d183
Language switcher frontend
2018-01-18 10:22:40 +11:00
Matt-Yorkley
4ea91d14f9
Template I18n changes
2018-01-17 12:03:27 +11:00
Pau Perez
f57661b13f
Fix payment_method_decorator boot-time warning
...
Removes the annoying message "warning: already initialized constant
Spree::PaymentMethod::DISPLAY" that appears 4 times when booting the
app.
We are declaring said constant exactly as our Spree version does so
there's no point on repeating work.
2018-01-15 12:50:05 +01:00
Pau Pérez Fabregat
ad25c1d1b2
Merge pull request #2033 from coopdevs/add-setup-script
...
Add setup script
2018-01-15 12:05:19 +01:00
Pau Perez
87af5dcee5
Point to rbenv and nodenv from setup script
...
Show the appropriate links when the Ruby and Node dependencies are not
met. This will make it easier for newcomers to install them.
2018-01-12 08:22:50 +01:00
Pau Perez
106871b956
Check node version and install npm packages
2018-01-11 14:14:08 +01:00
Pau Perez
4d25abcfce
Add setup script
...
It aims to aid new open source contributors on setting up their dev
env by means of a single command with meaningful output.
Although ofn-install ansible scripts also work for development we don't
want to add too much burden to those single-time beginner contributions.
2018-01-11 14:14:08 +01:00
Rob Harrington
2ccdf3c97a
Use upstream and origin as remote names
...
Also fixed a couple of typos
2018-01-11 14:30:08 +11:00
Rob Harrington
89bd9c8038
Update CONTRIBUTIONS.md to reflect current processes
2018-01-11 14:30:08 +11:00
Enrico Stano
88627dc837
Merge pull request #2038 from boveus/master
...
Update README.md
2018-01-10 12:17:21 +01:00
Brandon Stewart
8ca57b0705
Update README.md
2018-01-09 14:02:27 -07:00
Brandon Stewart
c7db283e8c
Update README.md
2018-01-09 14:00:07 -07:00
erose357
83ca3b7b8b
Adds a css rule to target the logo in .footer-local and padding between the logo and open source info at the bottom
2018-01-09 12:54:41 -07:00
Brandon Stewart
830699d2b8
Update README.md
2018-01-09 10:29:02 -07:00
Brandon Stewart
f822e658c4
Update README.md
2018-01-09 10:23:51 -07:00
Brandon Stewart
8817a1afb7
Update README.md
2018-01-09 10:23:30 -07:00
Brandon Stewart
693adf181e
Update README.md
2018-01-09 10:21:24 -07:00
Brandon Stewart
f269f13b09
Update README.md
2018-01-08 11:50:44 -07:00
Matt-Yorkley
9845258a25
Merge pull request #2035 from Matt-Yorkley/uk/rubocop_fix
...
Update rubocop.yml
2018-01-05 20:16:44 +00:00
Enrico Stano
edbed2c8d3
Merge pull request #1984 from coopdevs/fix/api-key-taxons
...
Disable api auth as there is no Spree api key set
2018-01-05 10:31:36 +01:00
Matt-Yorkley
8e0f2d2500
Merge pull request #2037 from Matt-Yorkley/uk/codeclimate_checks
...
Codeclimate yml update
2018-01-05 01:37:06 +00:00
Matt-Yorkley
e022504c26
Codeclimate yml update
2018-01-04 17:10:55 +00:00
Matt-Yorkley
62e4cbd052
Update rubocop.yml
2018-01-04 16:01:06 +00:00
Enrico Stano
70ae59550d
Merge pull request #2032 from Matt-Yorkley/uk/codeclimate_migrations
...
Adjust codeclimate engine for migrations folder
2018-01-03 13:48:47 +01:00
Lynne
f74af8fa2d
Merge pull request #2034 from lin-d-hop/translations-uk
...
Manual uk translation update
2018-01-03 06:00:07 +01:00
lin-d-hop
82d1b57005
Not updated from transifex so manually commiting
2018-01-03 03:40:04 +00:00
Lynne
c32aacc1b3
Delete en-GB.yml
...
Superseded by en_GB.yml
2018-01-03 03:29:52 +00:00
Matt-Yorkley
523b4045bf
Adjust codeclimate engine for migrations folder
2018-01-02 13:54:41 +00:00
Enrico Stano
8e4e273b7c
Merge pull request #1994 from openfoodfoundation/transifex
...
Transifex
2017-12-22 16:36:44 +11:00
Enrico Stano
816297e22f
Merge pull request #2022 from ltrls/add-order-print-ticket-feature-test
...
Add feature test for the Spree::Admin::OrdersController print_ticket action
2017-12-22 15:07:17 +11:00
Pau Perez
72889b5c36
Stub current_user instead of api key's user
2017-12-21 10:24:29 +11:00
Pau Perez
0f0216fe79
Upgrade spree to get our latest patch
2017-12-21 10:24:29 +11:00
Pierre de Lacroix
42433d1ad4
Add feature test for the Spree::Admin::OrdersController print_ticket action
2017-12-20 23:01:18 +01:00
Pau Perez
52533fc04c
Rely on Spree's default value for requires_auth
2017-12-20 17:25:23 +11:00
Pau Perez
bb0223877c
Remove unused arguments and reduce object creation
2017-12-20 17:25:23 +11:00
Pau Perez
5eb1fcddbb
Remove dependency on TestingSupport by inlining
2017-12-20 17:25:23 +11:00
Pau Perez
c646eb3939
Disable api auth as there is no Spree api key set
...
Although Spree::Api::Config[:requires_authentication] is set to false by
default for some unknown reason if not done explicitly Spree still
returns it as false.
This amends the change done in a87c89c83d ,
which introduced the bug. As there is no Spree api key set the auth
fails when getting taxons.
2017-12-20 17:25:23 +11:00
Enrico Stano
a313c99370
Merge pull request #2005 from coopdevs/upgrade-spree-fork-version
...
Upgrade spree's fork to latest commit
2017-12-20 17:23:48 +11:00
Enrico Stano
0f84d9f02e
Merge pull request #2004 from coopdevs/is-this-needed
...
Remove unused Enterprise scopes
2017-12-20 16:59:15 +11:00
Enrico Stano
900a9c6145
Merge pull request #2000 from coopdevs/issue-template-improvement
...
Mention screenshot in the issue template
2017-12-20 16:48:54 +11:00
Pau Perez
5b33cbe9aa
Upgrade spree's fork to latest commit
...
Needed to get
3289b5e31c
2017-12-20 16:37:14 +11:00
Enrico Stano
114ce3b764
Merge pull request #1940 from coopdevs/improve-readability-shop
...
Improve readability of shop's code
2017-12-20 16:28:53 +11:00
Enrico Stano
660d3f326f
Remove unused Enterprise scopes
2017-12-20 16:00:35 +11:00
Pau Perez
b8d51ae0de
Mention screenshot in the issue template
...
For things like translations it's enough sharing a screenshot when
reporting a bug. See
https://github.com/openfoodfoundation/openfoodnetwork/issues/1999
2017-12-20 10:16:53 +11:00
Enrico Stano
0bdda6387a
Merge pull request #1996 from coopdevs/add-issue-template
...
Create issue template
2017-12-19 18:00:04 +11:00
Pau Perez
4fbdbb1aa2
Link to placeholder feature template
...
We'll write the template later on
2017-12-19 15:26:21 +11:00
Pau Perez
72ddcb4fff
Create issue template
...
It assumes most of the times issues will be reported to keep track of
bugs.
2017-12-19 11:07:29 +11:00
Transifex-Openfoodnetwork
50ef2de5f9
Updating translations for config/locales/fr.yml
2017-12-15 20:06:43 +11:00
Transifex-Openfoodnetwork
55d3ee1af0
Updating translations for config/locales/pt.yml
2017-12-13 21:19:42 +11:00
Transifex-Openfoodnetwork
422166441e
Updating translations for config/locales/en_US.yml
2017-12-09 02:29:48 +11:00
Transifex-Openfoodnetwork
9d3f85628c
Updating translations for config/locales/nb.yml
2017-12-08 18:44:22 +11:00
Pierre de Lacroix
669d9c3c66
Fix translations on account page
2017-12-06 15:21:19 +11:00
Enrico Stano
dcb406d246
Merge pull request #1986 from andypalmer/github_protocol_warning
...
Change github definition to remove insecure protocol warning.
2017-12-04 21:49:05 +11:00
Andy Palmer
cadad28b0c
Change github definition to remove insecure protocol warning. Consistently use 1.9.3 hash syntax
2017-12-04 16:50:36 +11:00
Enrico Stano
01b0a033fd
Merge pull request #1904 from oeoeaio/spree-test-config
...
Use Spree's approach for preventing config caching when testing
2017-12-04 15:57:11 +11:00
Pierre de Lacroix
0fb66ab258
Fix CodeClimate issues
2017-12-01 13:37:30 +11:00
Pierre de Lacroix
a49c21cfd1
Add instance switch to enable number localization
2017-12-01 13:37:24 +11:00
Pierre de Lacroix
f67a8c1f2d
Add tests
2017-12-01 13:37:24 +11:00
Pierre de Lacroix
f4624ead42
Make all products reload when updating in bulk edit
2017-12-01 13:37:24 +11:00
Pierre de Lacroix
2cd570383f
Use localize_number in models
2017-12-01 13:37:24 +11:00
Pierre de Lacroix
920900b619
Add Spree::LocalizedNumber module
2017-12-01 13:37:24 +11:00
Pau Perez
e98d934a67
Include localization files as documented in gem
...
I followed the Usage help in
https://github.com/derekprior/momentjs-rails .
2017-11-29 10:13:05 +11:00
leandroalemao
31a846b9c3
Refactor _i18n_script.html.haml file and add new momentjs internationalisation files
2017-11-29 10:13:05 +11:00
leandroalemao
5eaea28401
Switch momentjs internationalisation according to I18n locale
2017-11-29 10:13:05 +11:00
Pierre de Lacroix
50ef902adb
Add missing tooltip in products' bulk edit page
2017-11-23 11:31:41 +11:00
Pierre de Lacroix
75b6a078c6
Add missing translation
2017-11-23 11:31:41 +11:00
Pierre de Lacroix
c0c93c172e
Add tooltips in products bulk edit page
2017-11-23 11:31:41 +11:00
Pau Perez
ed18244070
Remove TODO in favour of an issue in Github
...
It has become the issue
https://github.com/openfoodfoundation/openfoodnetwork/issues/1961
2017-11-23 11:12:17 +11:00
Pierre de Lacroix
e13063e0c6
Fix before_filter for Spree::Admin::OrdersController#print_ticket
2017-11-23 11:01:41 +11:00
Rob Harrington
6c38997010
Fix 1664: product tag rules not working
...
Caused by a combination of: fe7bd5e2cd and 38d3b446cc
Have added/tweaked specs to prevent this from happening again
2017-11-15 10:26:24 +11:00
Pau Perez
0e01c0d69b
Turn TODO into issue #1957
...
TODOs that live in the code can't be prioritized and tend to be
forgotten.
2017-11-15 09:44:11 +11:00
Pau Perez
caab3ea74d
Add spree user as admin of Enterprise 2 in seed
2017-11-15 09:42:21 +11:00
Lynne
c543dff2e1
Merge pull request #1956 from coopdevs/improve-pr-template
...
Add special keyword syntax to close issue from PR
2017-11-14 14:16:08 +01:00
Pau Perez
92badfd88c
Add special keyword syntax to close issue from PR
...
We want the issue to be closed when the PR gets merged but we always
forget to add the "magic" comment as described in
https://help.github.com/articles/closing-issues-using-keywords/ .
2017-11-14 09:02:52 +01:00
Lynne
dca64e6939
Merge pull request #1944 from lin-d-hop/master
...
Adding UK About pages to menus
2017-11-10 16:33:58 +01:00
Saimon Moore
a9c4d27d5e
Undo i18n_fallbacks change to production.rb
2017-11-10 12:30:24 +11:00
Saimon Moore
610c2f9519
Ensure en is an I18n fallback in all environments
...
Since `en` is considered as the main fallback for all locales
ensure that it is present in all environments.
Note: Setting `config.i18n.fallbacks` to `true` means use the default locale
which means that if a particular instance is not using an `en` based locale
(the parent `en` locale is automatically derived as a fallback) then `en` will
not be available as a fallback.
2017-11-10 12:30:24 +11:00
Saimon Moore
05d757e7c4
Ensure we have min i18n fallbacks
...
This setting defines which locales will be exported to the frontend.
In general, ofn currently functions under a single locale
(which is also the default locale) but all translations are made from
the `en` locale.
The current process of ensuring translations are translated and make
their way into code is manual and prone to issues so occasionally
translations for keys in the default locale of a particular instance
are not deployed and the UI displays `missing translation` messages.
In these cases, it is far friendlier for the user to see fallbacks to
`en` rather than these errors so this commit ensure that at the very
least apart from the current default locale, `en` is also made available
and as such will be exported to the frontend so that it's translations
are available as a fallback in JS land.
I18n fallback config was already enabled in both frontend and backend.
Until now, available locales may not have been set (determined by the
`AVAILABLE_LOCALES` env var) and the translations for `en` not therefore
be present in the frontend for fallback to actually work.
This commit will ensure that a fallback to `en` is always possible in the
case of missing translations.
2017-11-10 12:30:24 +11:00
Maxim Colls
31a2453882
Bootstrap angular module in new_variant form
2017-11-10 09:37:36 +11:00
Rob Harrington
5febd0a0d6
Restructure flaky customer spec
2017-11-10 08:47:12 +11:00
Rob Harrington
694f1e9b25
Update knapsack report
2017-11-10 08:47:12 +11:00
Andy Palmer
131bf842a9
Update matchers to non-deprecated protocol
2017-11-10 08:47:12 +11:00
Andy Palmer
8ec1c2e04a
No longer use expensive page.evaluate_script for imperative methods
2017-11-10 08:47:12 +11:00
Andy Palmer
e94dc257a1
We actually need to restart the driver, not the session
2017-11-10 08:47:12 +11:00
Andy Palmer
3bd4fc59d4
We reset the phantom js driver after each context to prevent it memory leaking and dying
2017-11-10 08:47:12 +11:00
Andy Palmer
7b8463b03a
PhantomJS no longer crashes due to too specific selector
2017-11-10 08:47:12 +11:00
Rob Harrington
00e7fc1c0d
Bump capybara version
2017-11-10 08:47:12 +11:00
Rob Harrington
2ca20ad701
Bump poltergeist version to 1.16.0
2017-11-10 08:47:12 +11:00
Maikel Linke
775da82072
Add waiting conditions to spec
2017-11-10 08:47:12 +11:00
Maikel Linke
162b392004
Use expect syntax, correct spec description
2017-11-10 08:47:12 +11:00
Maikel Linke
26bedf0523
Make title matcher more robust
2017-11-10 08:47:12 +11:00
Maikel Linke
ff3ee62509
Remove old comment
2017-11-10 08:47:12 +11:00
Maikel Linke
9c2a78adf2
Avoid warnings, use expect syntax
2017-11-10 08:47:12 +11:00
Maikel Linke
5a767ba3ef
Avoid warning, use new syntax
2017-11-10 08:47:12 +11:00
Rob Harrington
691d642721
Use url helper instead of string to define expected url
2017-11-10 08:47:12 +11:00
Rob Harrington
7dbfc3740d
Revert "Add workaround to pass Spree core tests in Travis"
...
This reverts commit 9cdec737078caa6eb5a90480cabb6ca477ab597b.
2017-11-10 08:47:12 +11:00
Rob Harrington
b2897d7feb
Reset Spree::Config.allow_backorders to original value in spec
2017-11-10 08:47:12 +11:00
Julius Pabrinkis
b18177c215
Add workaround to pass Spree core tests in Travis
2017-11-10 08:47:12 +11:00
Julius Pabrinkis
cec0a8c2e7
Specify page object for Capybara#find methods
2017-11-10 08:47:12 +11:00
Julius Pabrinkis
412de318ed
Manually disable backorders in failing features
2017-11-10 08:47:12 +11:00
Julius Pabrinkis
92cc7a4648
Another try for failing feature
2017-11-10 08:47:12 +11:00
Julius Pabrinkis
96c0481e17
Fix intermittently failing product distribution feature
2017-11-10 08:47:12 +11:00
Julius Pabrinkis
5dd7ddc288
Refactor base controller with new rspec syntax
2017-11-10 08:47:12 +11:00
Julius Pabrinkis
ea91a82f30
Try to fix shopping cart failing feauture in Travis
2017-11-10 08:47:12 +11:00
Julius Pabrinkis
8e10269b50
Try to fix intermittently failing test for product distribution
2017-11-10 08:47:12 +11:00
Julius Pabrinkis
dae74666c5
Add missing 'type: :request' for request spec
2017-11-10 08:47:12 +11:00
Julius Pabrinkis
94e31e35ba
Fix Spree::Admin::BaseController related issues
2017-11-10 08:47:12 +11:00
Rob Harrington
c835b4eb1a
Replacing stub_model objects with actual factory generated instances
2017-11-10 08:47:12 +11:00
Rob Harrington
ef9e43fbd3
Replacing mock_model objects with instance_doubles
2017-11-10 08:47:12 +11:00
Rob Harrington
f083433854
Explicitly specifying 'type: :helper' for all helper specs
2017-11-10 08:47:12 +11:00
Rob Harrington
9052b1c3db
A few updates to spec where 'be true' and 'be false' didn't cut it
2017-11-10 08:47:12 +11:00
Rob Harrington
59578a73af
Changing all references to 'be_true' and 'be_false' to 'be true' and 'be false'
...
See next commit for changes where this substitution was broken
2017-11-10 08:47:12 +11:00
Rob Harrington
c691e260cf
Rspec matcher enqueue_job for Delayed::Job supports block expectations
2017-11-10 08:47:12 +11:00
Rob Harrington
82072c8970
Explicitly specifying 'type: :controller' for all controller specs
2017-11-10 08:47:12 +11:00
Rob Harrington
d0c52ac176
Updating outdated guard gems
2017-11-10 08:47:12 +11:00
Rob Harrington
6811a62568
Updating RSpec Gems
2017-11-10 08:47:12 +11:00
Buildkite
8653d03969
Merge remote-tracking branch 'origin/master' into HEAD
2017-11-09 13:49:39 +00:00
lin-d-hop
90d5a04368
Adding UK About pages to menus
2017-11-09 11:06:58 +00:00
Pau Perez
84e4ebef08
Do not notify Bugsnag of a cache miss
...
It's not the responsibility of a error tracking software to track
neither cache misses nor logs. That is what log monitoring is for.
2017-11-09 10:22:31 +01:00
Pau Perez
98603c4042
Do not test private methods
2017-11-09 10:22:31 +01:00
Pau Perez
26a4ee0171
Do not stub object under test
2017-11-09 10:22:31 +01:00
Pau Perez
4f03a2d25c
Remove unnecessary require
2017-11-09 10:22:31 +01:00
Pau Perez
6a830a3843
Isolate ArraySerializer case in injection helper
...
This makes this special case with the ArraySerializer stand out so that
the reader notices it.
2017-11-09 10:22:30 +01:00
Pau Perez
3ffd049135
Remove commented out code
2017-11-09 10:22:30 +01:00
Rob Harrington
e6d1b38b82
Remove upgrade_bundler script by reverting 250062bd2, 3f2299e52 and 5dfac10599
2017-11-09 19:46:41 +11:00
Rob Harrington
f8a892faf2
Remove upgrade_bundler script by reverting 250062bd2, 3f2299e52 and 5dfac10599
2017-11-09 18:24:22 +11:00
Pierre de Lacroix
54e141489a
Add noindex meta tag for invisible shops and staging environment
2017-11-09 12:04:27 +11:00
Pau Perez
e64fd1d308
Lower log level in prod to :info so we can debug
...
Otherwise, there are no log lines for any request, which makes it
impossible to find out anything about the app in production.
Obviously this increases the size of the log files but this has to be
dealt with log rotation. The data is our most important asset.
2017-11-09 11:13:32 +11:00
Matt-Yorkley
01647c3df9
Disable allow_backorders by default in test environment
2017-11-02 17:43:46 +11:00
Rob Harrington
cd6d7c76f6
Fix spec that requires preference persistence
2017-11-02 17:43:04 +11:00
Rob Harrington
efa71c4ac8
Use Spree's approach for handling config when testing
2017-11-02 17:43:04 +11:00
Rob Harrington
d4eb27a4ed
Fix race condition in shipping method order spec
2017-11-01 16:37:12 +11:00
Duende13
eca18ba6ee
Test to control order of shipping methods by name
2017-11-01 15:30:42 +11:00
Duende13
31fa49feed
Added orderBy 'name' to the list of shipping methods offered.
2017-11-01 15:30:42 +11:00
yasirazgar
b68aafdb72
1799 - adding missing translations in new shipping methods page
2017-11-01 10:50:21 +11:00
Andy Palmer
fd09a63e48
Imperative specs as per review comments
2017-10-24 17:56:04 +11:00
Andy Palmer
afc50863cd
Replace Deface with update to overridden template
2017-10-24 17:39:34 +11:00
Andy Palmer
fea2240c39
Disabled product links in cart for openfoodfoundation/openfoodnetwork#1075
2017-10-24 14:56:35 +11:00
Rob H
9642e8295e
Merge transifex translations
2017-10-21 00:23:40 +11:00
Enrico Stano
1424d44eab
Merge pull request #1919 from nicolauduran/add-dev-doc
...
Add more development documentation
2017-10-20 14:31:43 +02:00
Nicolau Duran
0a5f0a518d
Add development doc
2017-10-20 13:18:21 +02:00
Transifex-Openfoodnetwork
ff1672e411
Updating translations for config/locales/nb.yml [skip ci]
2017-10-20 19:50:21 +11:00
Transifex-Openfoodnetwork
32d8368990
Updating translations for config/locales/fr.yml [skip ci]
2017-10-20 19:42:24 +11:00
Lynne
e7f8102eb9
Update en-GB.yml
2017-10-20 08:29:18 +01:00
Rob Harrington
24e1d0b775
Fix mistyped translation key for 'dashboard'
2017-10-20 16:26:08 +11:00
Rob Harrington
ceadd386aa
Update order spec to test an order with a total > 0
...
This is necessary because the previous commit changed the logic
around payment state, meaning that a complete order with a total
of 0 and no complete paymnents is considered to have a payment
state of 'paid'. I don't think this is problematic, since it is
not possible to check out an order without line items.
This way the spec tests an order modelled on the real world.
2017-10-20 15:21:59 +11:00
Rob Harrington
d42dc2b286
Fix #1902 : ensure correct payment state when failed payments are present
...
Problem: order payments didn't seem to be loaded in any particular order,
and OrderUpdater#update_payment_state was relying on payment order to de-
termine payment state.
Strategy: Adapt a version of this method from a future version of Spree.
I tried to select a version where I would have to make the absolute mini-
mum number of changes to get it to work. See comments in code for justif-
ications of the changes that I did make.
2017-10-20 15:21:59 +11:00
Continuous Integration
e9c8e17710
Merge remote-tracking branch 'origin/master' into HEAD
2017-10-19 20:42:35 +11:00
Lynne
bfd845915c
Update en-GB.yml
2017-10-19 10:41:21 +01:00
Rob Harrington
b7976a2356
Do not update finalized fee adjustments
2017-10-19 16:54:39 +11:00
Rob Harrington
cd744dab68
Ignore .byebug_history after recent update of byebug gem
2017-10-19 10:45:24 +11:00
Transifex-Openfoodnetwork
02e3aac3f0
Updating translations for config/locales/fr.yml [skip ci]
2017-10-19 04:38:24 +11:00
Transifex-Openfoodnetwork
50075f02a0
Updating translations for config/locales/es.yml [skip ci]
2017-10-18 19:29:14 +11:00
Enrico Stano
05d8cd09e3
Merge pull request #1890 from coopdevs/add-node-version
...
Track node version in .node-version
2017-10-18 09:24:06 +02:00
Justyna Field
02fd87158e
Add display flex on active table row to fix misalignment
2017-10-18 15:05:55 +11:00
Pierre de Lacroix
165af4b812
Use I18n "lazy" lookup
2017-10-18 14:38:40 +11:00
Pierre de Lacroix
dba8e36752
Change key for uncapitalized "items" translation
2017-10-18 14:38:40 +11:00
Pierre de Lacroix
a245590114
Fix some translations
2017-10-18 14:38:40 +11:00
Continuous Integration
5ecae39051
Merge remote-tracking branch 'origin/master' into HEAD
2017-10-17 19:36:45 +11:00
Transifex-Openfoodnetwork
2508234a7c
Updating translations for config/locales/en_GB.yml [skip ci]
2017-10-17 19:23:35 +11:00
Transifex-Openfoodnetwork
da5f9e7ebc
Updating translations for config/locales/nb.yml [skip ci]
2017-10-16 20:00:37 +11:00
Rob Harrington
0d483882de
Update helper messages in Stripe Connect config UI
2017-10-16 10:37:04 +11:00
Rob Harrington
9e40502876
Update stripe controller routing comments
2017-10-16 09:39:15 +11:00
Continuous Integration
c38e58159f
Merge remote-tracking branch 'origin/master' into HEAD
2017-10-13 18:57:25 +11:00
Transifex-Openfoodnetwork
acf0919bfa
Updating translations for config/locales/en_GB.yml [skip ci]
2017-10-13 18:33:41 +11:00
Rob Harrington
bca409bfe4
Bumping very outdated versions of pry and byebug
2017-10-13 15:47:59 +11:00
Pierre de Lacroix
1fe10b4b25
Add pointer cursor to other links in products bulk edit
2017-10-13 15:33:30 +11:00
Pierre de Lacroix
768378b147
Add pointer cursor to EXPAND ALL link in products bulk edit
2017-10-13 15:33:30 +11:00
Rob Harrington
1fcbf6b44d
Clear shipping_method_id from order when restarting checkout
...
If the order is allowed to retain a shipping_method_id, then subsequent
saves of the order will cause a new shipment to be initialised. Seems to
only happen for delivery shipping methods. This is undesirable because
fees for the new shipment will appear in the checkout summary, which is
not smart enough to recognise existing shipment fees and adjust the order
total accordingly.
2017-10-13 12:53:35 +11:00
Rob Harrington
f96502c369
Add unit specs for CheckoutController#restart_checkout
2017-10-13 12:53:35 +11:00
Rob Harrington
c031b0e52b
Clear shipments and payments after failed payment at checkout
2017-10-13 12:53:35 +11:00
Rob Harrington
6006952603
Moving checkout request specs into their own folder
2017-10-13 12:53:35 +11:00
Duende13
e5fb8712d7
Simplify Product Edit Screen removing fields and adding 2 new menu options for seo and group buy ( #1741 )
2017-10-13 11:37:57 +11:00
Pierre de Lacroix
508dfa4f23
Fix failing tests assuming localizeCurrency has no "delimiter"
2017-10-13 10:26:13 +11:00
Pierre de Lacroix
65d176f533
Fix wrong way to force currency symbol after the amount
2017-10-13 10:26:13 +11:00
Pierre de Lacroix
089c754f62
Remove conversion of amounts to currency strings via Money in serializers as it's better done in JS
2017-10-13 10:26:13 +11:00
Pierre de Lacroix
aae8f1cbc4
Change localizeCurrency filter to use I18n.toCurrency
2017-10-13 10:26:12 +11:00
Matt-Yorkley
7194db40ee
Merge pull request #1895 from Matt-Yorkley/codeclimate-symbol-arrays
...
Relax rubocop Style/SymbolArray rule
2017-10-13 00:06:32 +01:00
Rob Harrington
f2ad087be5
Change inheritance of StripeAccountsController
2017-10-13 07:57:16 +11:00
Rob Harrington
0b8b5e694e
Move Stripe Connect callback action to dedicated controller
2017-10-12 22:47:51 +11:00
Rob Harrington
01f9fd3232
Rename webhook handler status mappings
2017-10-12 22:47:51 +11:00
Rob Harrington
99cac20725
Fall back to 200 when handler returns an unknown result
2017-10-12 22:47:51 +11:00
Rob Harrington
068dbe5013
Add verification to Stripe webhook endpoint
2017-10-12 22:47:45 +11:00
Rob Harrington
ed375a1e2c
Build Event object in controller instead of service object
2017-10-12 20:51:17 +11:00
Rob Harrington
4345285164
Allow more granularity in Stripe WebhookHandler responses
2017-10-12 20:51:17 +11:00
Rob Harrington
eb7cb02f33
Namespace stripe webhook controller in Stripe module
2017-10-12 20:50:29 +11:00
Rob Harrington
f22dd7513d
Add a service object for handling Stripe webhooks
2017-10-11 17:50:46 +11:00
Rob Harrington
c54119f482
Rename stripe controller action from 'deauthorize' to 'webhook'
2017-10-11 17:11:02 +11:00
Rob Harrington
23d2b3a664
Move Stripe webhook logic into dedicated frontend controller
2017-10-11 16:38:19 +11:00
Rob Harrington
c747bb5305
Remove improper use of quick_login_as_admin from unit spec
2017-10-11 16:10:08 +11:00
Matt-Yorkley
d147d2035d
Disable symbol array cop
2017-10-07 11:50:59 +01:00
Maikel Linke
4dd71c1240
Add CSS workaround to display repeated table head
...
Fixes https://github.com/openfoodfoundation/openfoodnetwork/issues/1738
2017-10-06 16:51:19 +11:00
Maikel Linke
6ad7c7b835
Tidy up HTML indent
2017-10-06 14:24:28 +11:00
Maikel Linke
10bbc5f9ef
Hide the menu on embedded group pages
2017-10-06 14:24:28 +11:00
Maikel Linke
b8a124b99e
Add preview page for embedded groups
2017-10-06 14:24:28 +11:00
Maikel Linke
28b1ea2d9f
Allow group pages to be in iframes
2017-10-06 14:24:28 +11:00
Maikel Linke
2b989f49ea
Enable iframes in development environment
2017-10-06 14:24:28 +11:00
Enrico Stano
bdc701f880
Merge pull request #1816 from coopdevs/disable-create-profile-on-submit
...
Disable create profile on submit
2017-10-05 15:25:37 +02:00
Enrico Stano
7af154d675
Merge pull request #1820 from coopdevs/missing-translations-register
...
Missing translations in Enterprise Registration
2017-10-05 13:12:09 +02:00
Pau Perez
2552b5faac
Track node version in .node-version
...
This is used by https://github.com/nodenv/nodenv
2017-09-29 16:11:22 +02:00
Pau Perez
d8e3052575
Ensure a callback function is provided
2017-09-29 16:10:11 +02:00
Transifex-Openfoodnetwork
3c797d3b86
Updating translations for config/locales/es.yml [skip ci]
2017-09-27 00:23:20 +10:00
Transifex-Openfoodnetwork
46ca3bc950
Updating translations for config/locales/fr.yml [skip ci]
2017-09-26 19:51:50 +10:00
Rob Harrington
75ec77dc31
Remove the 'confirm' step from the order checkout flow
...
This step is not being responded to anyway, since we are not rending a page for each checkout step
It was causing an issue whereby an order in the 'confirm' state was not able to progress through the
checkout controller because it was expecting to only redirect to paypal from the 'payment' state.
figured it was easiest to just remove the step, seeing as it wasn't being used in any meaningful way.
It should be fine to bring the 'confirm' step back in the future if we need it, we will just have to
make sure paypal the paypal issue is resolved.
2017-09-23 15:15:06 +10:00
Rob Harrington
a09a54e4cb
Set transaction fee adjustments to ineligible if payment is invalid or failed
2017-09-23 15:15:06 +10:00
Rob Harrington
e486dbd4f8
Respond to Stripe webhook with status of 204 if specified account is not found
2017-09-23 14:58:35 +10:00
Rob Harrington
db5503dd80
Allow destruction of StripeAccounts even if deauthorise request fails
...
Log deauthorise failures to Bugsnag
2017-09-23 14:58:35 +10:00
Rob Harrington
dd3d205536
Update deauthorize webhook to latest version of API (again)
2017-09-23 14:58:35 +10:00
Rob Harrington
90007d7114
Prevent Stripe-based payment methods that are not linked to a StripeAccount from displaying in the checkout
2017-09-23 14:58:35 +10:00
Rob Harrington
7ba99c0fe0
Update Bogus Gateway error message in checkout spec
2017-09-23 14:58:35 +10:00
Rob Harrington
ba61f94906
Expose Stripe token creation error messages in Checkout
2017-09-23 14:58:35 +10:00
Rob Harrington
7c82fa3d44
Show more helpful payment processing error in checkout
2017-09-23 14:58:35 +10:00
Rob Harrington
665749d0c5
Refactor Stripe::AccountConnector
...
Connector now handles cancellation of the connection wizard by the user more elegantly
2017-09-23 14:58:35 +10:00
Rob Harrington
d3566f9303
Update deauthorize webhook to latest version of API
2017-09-23 14:58:35 +10:00
Rob Harrington
7d2deca969
Ensure cart_spec runs in context where backorders are disabled
2017-09-23 14:58:35 +10:00
Rob Harrington
0f19be4db4
Configure StripeElements service to map cc_type to that used by activemerchant
2017-09-23 14:58:35 +10:00
Rob Harrington
393a4efbf6
Fix flaky OrderSerializer spec
...
Make sure that completed payment is for an amount less that the order total
2017-09-23 14:58:35 +10:00
Rob Harrington
34b109cbb7
Add basic validation to credit card form on account page
2017-09-23 14:58:35 +10:00
Rob Harrington
4785f3eacc
Use lowercased cc_type in CreditCard service
2017-09-23 14:58:34 +10:00
Rob Harrington
e14b017f1f
Fix broken Stripe checkout spec
2017-09-23 14:58:34 +10:00
Rob Harrington
d2096cf6d1
Make request stubs less brittle by using regex
2017-09-23 14:58:34 +10:00
Rob Harrington
fbda1a27ad
Add missing translation referenced from spree_auth_devise
2017-09-23 14:58:34 +10:00
Rob Harrington
098afc62c1
Fix rubocop issues
2017-09-23 14:58:34 +10:00
Rob Harrington
1cd1e9dc37
Extract filters for available PMs into service object
2017-09-23 14:58:34 +10:00
Rob Harrington
0bbaafbd41
Use guard clause
2017-09-23 14:58:34 +10:00
Rob Harrington
0e42c1cf30
Refactor ProfileStorer, call options as a separate method
2017-09-23 14:58:34 +10:00
Rob Harrington
620721c8cb
Use find_by_id instead of find in EnterpriseController
2017-09-23 14:58:34 +10:00
Rob Harrington
5cba635783
Add documentation to StripeConnectSettings controller
2017-09-23 14:58:34 +10:00
Rob Harrington
08c723b10f
Use expect syntax instead of should
2017-09-23 14:58:34 +10:00
Rob Harrington
61feb2b27d
Rename Stripe existing_card param key to existing_card_id
2017-09-23 14:58:34 +10:00
Rob Harrington
a2dee8d3d8
Create a Struct for Stripe Connect settings once rather than on each request
2017-09-23 14:58:34 +10:00
Rob Harrington
a74c502fd9
Refactor logic for creating a payment profile from a Stripe token into a service object
2017-09-23 14:58:34 +10:00
Rob Harrington
f6c3a2a46e
Remove new credit card initialisation logic from Spree::UsersController#show
2017-09-23 14:58:34 +10:00
Rob Harrington
4464a85a74
Add missing controller specs for CreditCardController #destroy
2017-09-23 14:58:34 +10:00
Rob Harrington
22bbe29f3d
Call single-use before_filters from actions instead
2017-09-23 14:58:34 +10:00
Rob Harrington
9832966b77
Fix Admin::PaymentsController spec
2017-09-23 14:58:34 +10:00
Rob Harrington
19213a5ca8
Rearrange new card inputs on account page
2017-09-23 14:58:34 +10:00
Rob Harrington
3a0b47c451
Add border to Stripe Elements input, make text larger
2017-09-23 14:58:34 +10:00
Rob Harrington
0cd43987de
Hide Stripe payment methods without a preferred_enterprise_id from the front-end
2017-09-23 14:58:34 +10:00
Rob Harrington
ca1987fc87
Prevent Stripe payment methods without account owners from being saved
2017-09-23 14:58:34 +10:00
Rob Harrington
2f153d799b
Hide 'save credit card' checkbox for guests
2017-09-23 14:58:34 +10:00
Rob Harrington
742dd0b5dd
Clean up jquery dialog styling
2017-09-23 14:58:34 +10:00
Rob Harrington
ecef905444
Allow Stripe-based payments to be voided (refunded)
2017-09-23 14:58:34 +10:00
Rob Harrington
dd56e03be1
Stop setting host for url helpers in specs
2017-09-23 14:58:34 +10:00
Rob Harrington
7b456461f3
Add ng-model directive to save credit card checkbox
...
I have no idea how this was working before\?!\?!\?!
2017-09-23 14:58:34 +10:00
Rob Harrington
e4872172c8
Move PaymentMethodSerializer to correct path
2017-09-23 14:58:34 +10:00
Rob Harrington
2ed5e144ca
Convert problematic embedded shopfronts feature spec into request spec
2017-09-23 14:58:34 +10:00
Rob Harrington
f9df4d4c93
Rewrite js unit specs for Stripe Elements service
2017-09-23 14:58:34 +10:00
Rob Harrington
1aa477c57c
Update feature specs to look for Stripe Elements element
2017-09-23 14:58:34 +10:00
Rob Harrington
69385370ee
Initialize Stripe object only if a publishable_key has been defined
2017-09-23 14:58:34 +10:00
Rob Harrington
65ab83a9a5
Move StripeElements element to an AngularJS directive, mount from there
2017-09-23 14:58:34 +10:00
Rob Harrington
746c2ffef9
Add 'publishable_key' property to Stripe module (enables stubbing)
2017-09-23 14:58:34 +10:00
stveep
6690f2e9e7
Restyle add card form
2017-09-23 14:58:34 +10:00
stveep
74a7cb82bc
Modify to use Stripe Elements to manually add cards in Account page. Remove StripeJS service
2017-09-23 14:58:34 +10:00
stveep
15ed4c32d9
Checkout switched to Stripe Elements from StripeJS
2017-09-23 14:58:34 +10:00
stveep
56ff877b25
Use Stripe Elements instead of StripeJS: https://stripe.com/docs/elements
2017-09-23 14:58:34 +10:00
Maikel Linke
926f196b96
Re-generate rubocop_todo
2017-09-23 14:58:34 +10:00
Maikel Linke
5b7e2f7ca8
Apply style guide
2017-09-23 14:58:34 +10:00
stveep
0a12f78444
Separate files for Payment Method serializers
2017-09-23 14:58:33 +10:00
stveep
da5c907e0f
Add/remove comments from PR feedback
2017-09-23 14:58:33 +10:00
stveep
f065cbe251
Fix specs for saved credit cards: Add payment profile ID to fixture (now denotes that a card has been saved), check for current user to avoid error attempting to inject saved cards as a guest
2017-09-23 14:58:33 +10:00
stveep
511afa0ddc
Bump Stripe gem version
2017-09-23 14:58:33 +10:00
Rob Harrington
d5ab9eb675
Hide option to 'Remember this card' when an existing card is selected
2017-09-23 14:58:33 +10:00
Rob Harrington
cb08011450
Fix typo in Stripe confirm modal
2017-09-23 14:58:33 +10:00
Rob Harrington
41b7be900c
Restrict the meaning of 'Saved Cards' to mean those with a payment profile
2017-09-23 14:58:33 +10:00
Rob Harrington
6133b302af
Use guard clause in PaymentMethodsController#restrict_stripe_account_change
2017-09-23 14:58:33 +10:00
Rob Harrington
4fb1c7fd92
Add 'Stripe is in Beta' warning
2017-09-23 14:58:33 +10:00
Rob Harrington
b31881baa5
Add explanation about configuring Stripe API keys
2017-09-23 14:58:33 +10:00
Rob Harrington
4e96487da9
Redirect to #/payment methods from stripe connect callback
2017-09-23 14:58:33 +10:00
Rob Harrington
98317e96d0
Remove unused stripe action abilities
2017-09-23 14:58:33 +10:00
Rob Harrington
4865533f26
Restrict edit permissions on Stripe payment methods
2017-09-23 14:58:33 +10:00
Rob Harrington
1f8890b430
Use an explicit date format for PaymentsSerializer#updated_at
2017-09-23 14:58:33 +10:00
Rob Harrington
11daf89005
Add admin views for Stripe payment methods
...
These views were pretty much just copied from https://github.com/spree/spree_gateway
2017-09-23 14:58:33 +10:00
Rob Harrington
fab893e60b
Fix paypal source_form view
...
The previous commit broke the selectors used by app/assets/javascripts/spree/backend/paypal_express.js
in the better_spree_paypal_express gem.
We can remove this override of the paypal source_form view when we update better_spree_paypal_express
to a version that includes the following commit:
4360a1fb82
2017-09-23 14:58:33 +10:00
Rob Harrington
a04116466e
Fix js for switching form partial for new admin payments
...
All of the functional changes made in this commit came from a future version of Spree:
8a3a80b08a
2017-09-23 14:58:33 +10:00
Rob Harrington
2f6493bb86
Use ng-cloak for admin/enterprises/edit form
2017-09-23 14:58:33 +10:00
Rob Harrington
589c2a1500
Add a modal to handle explanation of user's responsibilities before redirecting to Stripe
2017-09-23 14:58:33 +10:00
Rob Harrington
8cae874109
Fix styling on jquery dialogs
2017-09-23 14:58:33 +10:00
Rob Harrington
7c406f7c3a
Use hash navigation to direct users to #/payment_methods from Stripe PM
2017-09-23 14:58:33 +10:00
Rob Harrington
862443ed6d
Add hash navigation to admin Enterprise edit view
2017-09-23 14:58:33 +10:00
Rob Harrington
3b78179dea
Ask customer about saving card details used in checkout
2017-09-23 14:58:33 +10:00
Rob Harrington
f317cee9e9
Tweak UI for selecting an existing card at Checkout
2017-09-23 14:58:33 +10:00
Rob Harrington
35912605c3
Include customer name in source attrs for Stripe checkout requests
2017-09-23 14:58:33 +10:00
Rob Harrington
8901af897a
Store card details submitted via checkout
2017-09-23 14:58:33 +10:00
Rob Harrington
ee92f46bd5
Fix stripe request spec by providing en enterprise_id
...
The enterprise_id is used to lookup a StripeAccount which is provided to the Spree::Token#create call in the StripeConnect gateway
2017-09-23 14:58:33 +10:00
Rob Harrington
44ba499ad9
Stub rather than set Stripe api_key in specs
2017-09-23 14:58:33 +10:00
Rob Harrington
44d172f3b4
Mock stripe_account_id for StripeAccount gateway specs
2017-09-23 14:58:33 +10:00
Rob Harrington
d2b6ba4330
Provide a Stripe client_id for StripeAccountsController spec
2017-09-23 14:58:33 +10:00
Rob Harrington
576e4db9be
Authorize StripeAccount#status using the account object
...
Rather than the enterprise
2017-09-23 14:58:33 +10:00
Rob Harrington
692ccf0598
Cleaning up oauth2 extension that is no longer required
...
(We're using Stripes built-in OAuth Libraries instead)
2017-09-23 14:58:33 +10:00
Rob Harrington
ce65a9d063
Bump stripe gem version to 3.0.1
...
Allows us to use the stripe gem's built-in OAuth wrappers, rather than our own
2017-09-23 14:58:33 +10:00
Rob Harrington
ffc99df373
Consolidate Stripe routes/actions into StripeAccountsController
2017-09-23 14:58:33 +10:00
Rob Harrington
5c58d30ca7
Create payment from user-specified payment method when using existing card
2017-09-23 14:58:33 +10:00
Rob Harrington
3efabf5c50
Add translations for Stripe connection flashes
2017-09-23 14:58:33 +10:00
Rob Harrington
919e39f950
Provide a valid enterprise for building redirect path for Stripe Connect callback
2017-09-23 14:58:33 +10:00
Rob Harrington
0e14704572
Kill empty space
2017-09-23 14:58:33 +10:00
Rob Harrington
e9d062a8c2
Use nested module/class definitions instead of compact style
2017-09-23 14:58:33 +10:00
Rob Harrington
f3af36deca
Disable rubocop Style/PredicateName check against override of Spree method
2017-09-23 14:58:32 +10:00
Rob Harrington
ecb78233d9
Use guard clauses where possible
2017-09-23 14:58:32 +10:00
Rob Harrington
a68ae1fe2d
Provide a sensible flash message when CreditCard#destroy action fails
2017-09-23 14:58:32 +10:00
Rob Harrington
28ba05ec6b
Fix Lint/UselessAssignment offences for stripe-connect
2017-09-23 14:58:32 +10:00
Rob Harrington
5b675cbaba
Make OAuth private methods actually private
2017-09-23 14:58:32 +10:00
Rob Harrington
42dd58426e
Auto-correct rubocop offences for stripe-connect
2017-09-23 14:58:32 +10:00
Rob Harrington
c83755f901
Clean up StripeConnect gateway
2017-09-23 14:58:32 +10:00
Rob Harrington
ae2d3d3fd9
Refactoring StripeHelper into service objects
2017-09-23 14:58:32 +10:00
Rob Harrington
e6eb45b453
Name StripeAccountController spec file correctly
2017-09-23 14:58:32 +10:00
Rob Harrington
01ce092ebc
Handle Stripe token creation request failure
2017-09-23 14:58:32 +10:00
Rob Harrington
5d77ef52c5
Replace text strings with variables in stripe request spec
2017-09-23 14:58:32 +10:00
Rob Harrington
e8636c0cbf
Set dummy Stripe API key for front-end credits cards feature spec
2017-09-23 14:58:32 +10:00
Rob Harrington
f890927423
Implementing the Stripe Connect feature toggle
2017-09-23 14:58:32 +10:00
Rob Harrington
6499d17cb1
Adding feature toggle config variable for Stripe Connect
2017-09-23 14:58:32 +10:00
Rob Harrington
1d1e581c85
Refactoring CreditCardController, rendering card processing errors as json
2017-09-23 14:58:32 +10:00
Rob Harrington
64009a2c9e
CheckoutController can render payment gateway error messages as json
2017-09-23 14:58:32 +10:00
Rob Harrington
14f6ea4c01
Adding required Stripe config variables to application.yml.example
2017-09-23 14:58:32 +10:00
Rob Harrington
fdca1f6606
Adding message about having no saved cards to account/cards UI
2017-09-23 14:58:32 +10:00
Rob Harrington
63a15ec392
CreditCardController#destroy redirects to account#/cards
2017-09-23 14:58:32 +10:00
Rob Harrington
356dad73ba
Ensure spec has Stripe.api_key set
2017-09-23 14:58:32 +10:00
Rob Harrington
fb5784fbda
Allow updating of account settings from account tabs interface
2017-09-23 14:58:32 +10:00
Rob Harrington
4ef97aa418
Showing past orders under the orders tab
2017-09-23 14:58:32 +10:00
Rob Harrington
b9d72ce4cf
Refactoring logic for displaying orders on the front-end account page
2017-09-23 14:58:32 +10:00
Rob Harrington
9733bb3a77
Renaming account#history to account#transactions
2017-09-23 14:58:32 +10:00
Rob Harrington
532dc57725
Adding translations for /account tabs
2017-09-23 14:58:32 +10:00
Rob Harrington
f4c3fbf8bc
Refactoring credit cards interface, and backend logic
2017-09-23 14:58:32 +10:00
Rob Harrington
778526af2e
Rewriting styling for new tabs components
2017-09-23 14:58:32 +10:00
Rob Harrington
1aebee0583
WIP: rebuilding accounts page using tabs infrastructure
2017-09-23 14:58:32 +10:00
Rob Harrington
ed5c650456
Writing a new tabset component for front-end tabs
...
Modeled on back-end 'panels' infrastructure
2017-09-23 14:58:32 +10:00
Rob Harrington
b8c6da301c
Removing unnecessary dependencies from OrdersCtrl
2017-09-23 14:58:32 +10:00
Rob Harrington
269a60b36f
Adding request specs for case when using an existing card stored by Stripe for payment
2017-09-23 14:58:32 +10:00
Rob Harrington
25907f97a8
Cleaning up Stripe Connect request spec
2017-09-23 14:58:32 +10:00
Rob Harrington
d1779b9457
Keep timestamps as :null => false in schema
2017-09-23 14:58:32 +10:00
stveep
ddac179f9b
Add translations
2017-09-23 14:58:31 +10:00
stveep
25f48d944c
Add delete links, tidy up UI a bit (WIP), page refresh after adding still doesn't work
2017-09-23 14:58:31 +10:00
stveep
c9c4680ef6
Backend code to create Stripe customers and store their IDs in CreditCards. Page refresh not working
2017-09-23 14:58:31 +10:00
stveep
1449169b16
Basic UI for adding credit card details and getting a Stripe token without making a payment
2017-09-23 14:58:31 +10:00
stveep
c6e50a3f7f
Stub Stripe requests in feature spec
2017-09-23 14:58:31 +10:00
stveep
56295e5ffb
Fix request and feature specs
2017-09-23 14:58:31 +10:00
Rob Harrington
33a3db8698
Making :source attr_accessible for Spree::Payment
2017-09-23 14:58:31 +10:00
stveep
c4f9a5a234
Add code to CheckoutController to construct card attributes when using an existing card (via a818fbbecd/core/app/models/spree/order/checkout.rb:212)
2017-09-23 14:58:31 +10:00
stveep
627899bbd4
spec for source attributes to pass for saved card
2017-09-23 14:58:31 +10:00
stveep
12f4f2d17a
Add some logic to check whether a saved card has been selected before making a request from Stripe
2017-09-23 14:58:31 +10:00
stveep
300dc3084c
Add default card, disable inputs when a card is selected
2017-09-23 14:58:31 +10:00
stveep
50c3d1367d
Tidy up comment
2017-09-23 14:58:31 +10:00
stveep
a1cad82564
Only show credit cards if previously saved, split credit card db migrations and tidy up serializer
2017-09-23 14:58:31 +10:00
stveep
298fd057f5
Check for current user before injecting credit cards
2017-09-23 14:58:31 +10:00
stveep
33b570b117
Inject cards for current user into checkout and add selector dropdown to gateway partial.
2017-09-23 14:58:31 +10:00
stveep
3b05b76b80
Bring in ability to store CreditCards against Users from Spree 2.3 (spree commit d470b31798f3).
2017-09-23 14:58:31 +10:00
Rob Harrington
c97a140471
WIP: Storing Stripe card details for later use
...
NOTE: No interface for actually selecting a stored card to use yet
2017-09-23 14:58:31 +10:00
Rob Harrington
7c831c9844
Adding StripeJS to checkout page
...
Allow tokens to be request and passed through as payment source_attributes
2017-09-23 14:57:02 +10:00
Rob Harrington
5c16fefe41
Creating basic angular StripeJS wrapper service for requesting tokens
2017-09-23 14:57:02 +10:00
Rob Harrington
5ad88f992c
Adding live stripe account status display to payment method create/edit interface
2017-09-23 14:57:02 +10:00
Rob Harrington
f87f4310f0
Adding #status controller action for stripe accounts to fetch current info direct from Stripe
2017-09-23 14:57:02 +10:00
Rob Harrington
987ad0df6c
Very basic Stripe Connect payment method interface
2017-09-23 14:57:02 +10:00
Rob Harrington
d500c20d3f
Adding new StripeConnect payment gateway
2017-09-23 14:57:02 +10:00
Rob Harrington
99a7665edc
Requesting read_write permission when authorizing Stripe standalone account
2017-09-23 14:57:02 +10:00
Rob Harrington
37f60bf7a1
Setting Stripe.api_key in an initializer rather than helper
2017-09-23 14:57:02 +10:00
Rob Harrington
b5a6bcdf9d
Opening up restriction on activemerchant version by updating Spree ref
...
Allows use of v > 1.57 which includes support for Stripe Connect
2017-09-23 14:57:02 +10:00
stveep
858852123d
Add configuration example
2017-09-23 14:57:02 +10:00
stveep
ae72ebef5e
Fix disconnect button formatting
2017-09-23 14:57:02 +10:00
stveep
1450bfd726
Don't retrieve event from Stripe for a deauthorisation
2017-09-23 14:57:02 +10:00
stveep
22e4a50807
Change Stripe webhook handling to post request
2017-09-23 14:57:02 +10:00
stveep
a039286240
Webhook processing changes: fix expected request data formatting
2017-09-23 14:57:02 +10:00
stveep
9ac638f8ba
Fix some leftover refactoring from an earlier modification to enterprises controller (now not needed as moved to admin/enterprises)
2017-09-23 14:57:02 +10:00
stveep
da335703b4
Fix specs for travis
2017-09-23 14:57:02 +10:00
stveep
d374ab569d
Undo dodgy redirect changes and set spec to pending
2017-09-23 14:57:02 +10:00
stveep
47df2dc20b
Tweaking redirects and links
2017-09-23 14:57:02 +10:00
stveep
5c43c75b00
Specify SHA-256 algorithm for JWT in spec fixture
2017-09-23 14:57:02 +10:00
stveep
f83c7a88df
Specify SHA-256 algorithm for JWT
2017-09-23 14:57:02 +10:00
stveep
5ae473e07f
Add specs, fix redirect after requring relogin
2017-09-23 14:57:02 +10:00
stveep
e69b27a3c4
Tidy up (temp) UI a bit
2017-09-23 14:57:02 +10:00
stveep
e52e04ba29
Adding Stripe Connect information so we don't forget it later
2017-09-23 14:57:02 +10:00
stveep
1dcffa790d
Add JWT encoding to state param
2017-09-23 14:57:02 +10:00
stveep
f22278db51
Don't disconnect if the same Stripe account is connected to multiple Enterprises
2017-09-23 14:57:02 +10:00
stveep
0280e04008
Move OAuth2 patching to an initializer
2017-09-23 14:57:02 +10:00
Steve Pettitt
41607c5846
De-associate accounts in response to webhook (not tested with a real deauth request yet)
2017-09-23 14:57:02 +10:00
Steve Pettitt
1c69f2c670
Stripe Helper specs
2017-09-23 14:57:02 +10:00
Steve Pettitt
05a69ff0c6
Worklow to disconnect Stripe from OFN admin interface
2017-09-23 14:57:02 +10:00
Steve Pettitt
758f57a889
Remove CSRF check - doesn't work properly as implemented, but connect request should probably be changed to POST
2017-09-23 14:57:02 +10:00
Steve Pettitt
eed11faa62
Monkey patching OAuth2 gem to include Stripe disconnection method
2017-09-23 14:57:02 +10:00
Steve Pettitt
7fd8c5956d
Check CSRF, allow a Stripe account to be connected to more than one enterprise (but not vice versa)
2017-09-23 14:57:02 +10:00
Steve Pettitt
8ed983cf03
Correct spelling :)
2017-09-23 14:57:02 +10:00
Steve Pettitt
b6292e2723
Add some logic to check for a connected Stripe Account in form
2017-09-23 14:57:02 +10:00
Steve Pettitt
8bdf57d0d9
Add Stripe Connect button (CSS) in admin/enterprises/:id/edit#payment_methods
2017-09-23 14:57:02 +10:00
Steve Pettitt
03f590ccc4
Callback creates a new StripeAccount with id and publishable key.
2017-09-23 14:57:02 +10:00
Steve Pettitt
06279848c6
Stripe auth and callback working. Still need to process callback.
2017-09-23 14:57:02 +10:00
Steve Pettitt
3623325cab
Add missing files
2017-09-23 14:57:01 +10:00
Steve Pettitt
df18329233
Starting Stripe integration
2017-09-23 14:57:01 +10:00
Steve Pettitt
1db0bbef09
Create table for stripe accounts
2017-09-23 14:57:01 +10:00
Rob Harrington
f3322dd82e
Transfer responsibility for checking for orphaned PayPal payments from Payment model to Spree::PayPalController
2017-09-23 14:26:03 +10:00
Rob Harrington
d2d07f0362
Update translation scope for PayPal checkout cancellation message
2017-09-23 14:26:03 +10:00
Rob Harrington
131d9384c2
Use flash.notice instead of flash.success to display order confirmation message
...
This way it overwrites any message that is set from spree, rather than displaying duplicate messages
2017-09-23 14:25:55 +10:00
Rob Harrington
7beb6e624c
Darkswarm flash loader works with :notice flash messages
2017-09-23 14:09:13 +10:00
Maikel Linke
73041e9263
Show shop profiles without closed shops
...
The filter for closed shops was filtering profiles as well. That made it
impossible to show profiles without showing closed shops as well.
Replacing the filter for closed shops fixes the "show profiles" feature.
Fixes https://github.com/openfoodfoundation/openfoodnetwork/issues/1718
2017-09-22 12:53:21 +10:00
Maikel Linke
e600621883
Spec issue 1718
2017-09-22 12:53:21 +10:00
Maikel Linke
0f1fb68ee8
Simplify specs
2017-09-22 12:53:21 +10:00
Maikel Linke
20b2e831e9
Convert specs to RSpec 2.14.4 syntax with Transpec
...
This conversion is done by Transpec 3.3.0 with the following command:
transpec spec/features/consumer/shops_spec.rb
* 6 conversions
from: obj.should
to: expect(obj).to
* 3 conversions
from: obj.should_not
to: expect(obj).not_to
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2017-09-22 12:53:21 +10:00
Rob Harrington
11ccb9a6d2
Revert "Fix for #1826 , ensure that adjustment states are initialized prior to validation"
...
This reverts commit d7de7d462f .
No longer required after we pulled in the correct migrations from Spree
2017-09-22 11:16:29 +10:00
Rob Harrington
074018d2a6
Copy and run adjustment states migration from updated version of spree
...
Note: this migration took 28.7571s to run against Aus production data on my local machine
2017-09-22 11:16:29 +10:00
Rob Harrington
386972db3b
Update spree gem reference
2017-09-22 11:15:59 +10:00
Continuous Integration
4cec7213b5
Merge remote-tracking branch 'origin/master' into HEAD
2017-09-22 10:07:55 +10:00
Rob Harrington
3f3085c66b
Add detailed explanation of why #destroy_orphaned_paypal_payments is required
2017-09-21 12:11:46 +10:00
Rob Harrington
f4b1c5de9c
Remove orphaned PayPalExpress payments when processing actual PayPalExpress payment
...
Fixes both #1074 and #1837
2017-09-21 12:11:39 +10:00
Maikel Linke
ca677a3ccd
Reset I18n.locale to not affect other specs
...
Otherwise spec/models/enterprise_spec.rb fails if run after this.
2017-09-20 13:23:16 +10:00
Maikel Linke
4cdd0831e8
Spec the I18n helper on its own
2017-09-20 13:23:16 +10:00
Maikel Linke
39dc765c63
Add/replace comments and remove useless
2017-09-20 13:23:16 +10:00
Julius Pabrinkis
1fe20eba45
Add backend to be able to switch language by param and persist in cookies and user db
2017-09-20 13:23:15 +10:00
Pierre de Lacroix
72d264fab9
Make "on demand" columns visible by default
...
on admin "bulk product edit" and "inventory" (variant overrides) tables
2017-09-15 16:09:26 +10:00
Pau Perez
f50e745826
Change title when navigating to new product page
...
We navigate to it by replacing the content of the page through an ajax
call, so we also need change the section title with JS.
2017-09-15 10:09:25 +10:00
Maikel
949faa7fde
Merge pull request #1789 from coopdevs/missing-translations-order-cycle-page
...
Missing translations order cycle page
2017-09-14 18:12:28 +10:00
Pau Perez
96e31235da
Replace hardcoded strings with i18n keys
2017-09-14 17:31:52 +10:00
Pau Perez
e217f96454
Use Rails lazy lookup for translation keys
...
See "lazy" lookup in
http://guides.rubyonrails.org/i18n.html#abstracting-localized-code
2017-09-14 17:31:52 +10:00
Rob Harrington
3aa50ed38f
Attempt to fix intermittent fail in product_import_spec
2017-09-14 14:02:09 +10:00
Rob Harrington
d7de7d462f
Fix for #1826 , ensure that adjustment states are initialized prior to validation
2017-09-14 13:39:22 +10:00
Rob Harrington
4c238748c6
Prevent accordion controllers from showing missing nextPanel
...
Resolves this issue:
https://travis-ci.org/oeoeaio/openfoodnetwork/jobs/273323915
2017-09-11 11:07:31 +10:00
Rob Harrington
2c65218ce3
Bumping spree version to remove kaminari duplicate from gemspec
2017-09-09 00:40:15 +10:00
Pau Perez
613016a6cf
Refactor spec using expect_any_instance
2017-09-08 23:55:51 +10:00
Pau Perez
1899e2fa98
Fix rubocop failures
2017-09-08 23:55:51 +10:00
Pau Perez
c7608c6f44
Fix flaky integration test
...
This removes a pointless expectation in a before block and refactors the
test in expect-style.
2017-09-08 23:55:51 +10:00
Pau Perez
0349e2026b
Upgrade spree sha
2017-09-08 23:55:51 +10:00
Pau Perez
a763c24f3c
Doc what with_lock does
2017-09-08 23:55:51 +10:00
Pau Perez
1faa1579f3
Update enterprise fees while locking the order
2017-09-08 23:55:51 +10:00
Pau Perez
630e61ee5a
Go back to the Spree's branch we use for step6
...
The fix introduced with https://github.com/coopdevs/spree/pull/2 was
already merged so we can point back to the `spree-upgrade-step-6`
branch.
2017-09-08 23:55:51 +10:00
Pau Perez
47468df2a5
Fix js unit tests
2017-09-08 23:55:51 +10:00
Pau Perez
5b1947429e
Fix odd-even background by relying on Spree
...
This removes unnecessary duplication of #destroy. We can make it work by
adding a simple fix in Spree.
2017-09-08 23:55:50 +10:00
Pau Perez
8db1fa4e77
Move JSON line items responses to a new controller
...
Extracts the JSON response from the admin's line item controller which
are only used by the bulk management feature into its own controller.
This decouples spree from an OFN-only feature and allows to remove
unnecessary code. Furthermore, Admin::LineItemsController is gone in
Spree 2.4.0.beta. See: https://github.com/spree/spree/pull/5280
2017-09-08 23:55:50 +10:00
Pau Perez
b3c94fd688
Revert "Load order also on open and close adjustments"
...
This reverts commit d77588431aa26422e2956fd3510a20b35dab1b1c.
2017-09-08 23:55:50 +10:00
Enrico Stano
7a33b9cea7
Backport latest Spree changes from coopdevs/spree
2017-09-08 23:55:50 +10:00
Pau Perez
4d94b65d25
Load order also on open and close adjustments
...
@order is not loaded by Spree because we overrode the :before_filter in
spree/admin/orders_controller_decorator.rb. We need to also specify so in the
decorator.
2017-09-08 23:55:50 +10:00
Enrico Stano
d27b8f8fcb
Add spree_auth_devise initializer
2017-09-08 23:55:50 +10:00
Enrico Stano
fe7d3b0d58
Revert "Use older spree_auth_devise"
...
This reverts commit 2f63fb16f36c96c793d5aba1889a274315ccdf00.
2017-09-08 23:55:50 +10:00
Enrico Stano
318f89f9a2
Use older spree_auth_devise
2017-09-08 23:55:50 +10:00
Pau Perez
7e5e167215
Create a mail method when inserting seed data
2017-09-08 23:55:50 +10:00
Enrico Stano
665acdef8f
Backport fix for hidden input tag
...
https://github.com/coopdevs/spree/pull/1
2017-09-08 23:55:50 +10:00
Enrico Stano
d8e17231ec
Revert "Order email translation keys"
...
This reverts commit dc30e0b1042602ed8f03fe97444ccce8526e51b3.
2017-09-08 23:55:50 +10:00
Enrico Stano
ff2b2e17d9
Order email translation keys
2017-09-08 23:55:50 +10:00
Rob Harrington
4b89a1d736
Fix Layout/EmptyLinesAroundClassBody offence in ResetOrderService
2017-09-08 23:55:50 +10:00
Rob Harrington
595d7b5594
Remove conditional assignment from PaymentsController#fire decorator
2017-09-08 23:55:50 +10:00
Enrico Stano
bc62ad5797
Fix spec
2017-09-08 23:55:50 +10:00
Enrico Stano
3b8cab9392
Revert "Fix removal of producer properties - remove href attr so Spree doesn't attempt an XHR"
...
This reverts commit 8126161df2b96f9cec5c34ffaefa093fe5aed858.
2017-09-08 23:55:50 +10:00
Enrico Stano
9aca5459b7
Revert "Fix removal of product properties"
...
This reverts commit 3b94e12f8db0d4d2b2e48c085fab8231ec8e86e8.
2017-09-08 23:55:50 +10:00
Enrico Stano
819a003f26
Backport Spree fix for product properties delete icon
...
fea76b907b
2017-09-08 23:55:50 +10:00
Pau Perez
3a9b71bd1f
Add doc to methods and classes [skip ci]
2017-09-08 23:55:50 +10:00
Enrico Stano
62c5ccf904
Address CodeClimate complains
2017-09-08 23:55:50 +10:00
Enrico Stano
2f3f20e433
Remove html_safe and add spec
2017-09-08 23:55:50 +10:00
Pau Perez
85fefcd946
Replace helper with service object
2017-09-08 23:55:50 +10:00
Pau Perez
e087a008c2
Reduce coupling from controller
2017-09-08 23:55:50 +10:00
Pau Perez
4c4969e86b
Do not couple with controller's ivar and session
2017-09-08 23:55:50 +10:00
Pau Perez
f6c8a11b7b
Move ResetOrderService to new app/services
2017-09-08 23:55:50 +10:00
Pau Perez
1ef4bf5da0
Refactor tests and remove duplicated ones
2017-09-08 23:55:50 +10:00
Pau Perez
a18bf4b666
Add unit tests for service object
2017-09-08 23:55:50 +10:00
Pau Perez
bdfd718c51
Use service object directly from controller
2017-09-08 23:55:50 +10:00
Pau Perez
3c73282d57
Manually reset the order once completed
...
Spree does not call after_<order.state> methods any more as of
https://github.com/spree/spree/pull/2557 , so our #after_complete method
is never triggered and thus the order never reset.
This makes the condition:
```ruby
if current_order.andand.distributor == @order.distributor
```
in app/views/spree/orders/form/_update_buttons.html.haml return false
and as a result the "Back To Cart" button is not shown.
This commit resets the order (emptying the session[:order_id] and
creating a new order, aka. cart) right from the
CheckoutController#update rather than relying on infernal callbacks (of
what the Spree core team itself was unhappy about since long ago
https://github.com/spree/spree/issues/2488 ). There is the first place
where we know the order has been successfully completed.
2017-09-08 23:55:50 +10:00
Enrico Stano
d09e0cd44a
Deal with both JS and JSON format
2017-09-08 23:55:50 +10:00
Enrico Stano
d581fc4863
Fix specs to contemplate XHR requests and more coverage
2017-09-08 23:55:50 +10:00
Enrico Stano
790bc5b187
Use JS format for #update
2017-09-08 23:55:50 +10:00
Pau Perez
f0e2d426c3
Fix getting HTML when deleting line item in admin
...
In the step 6 of the spree upgrade, when deleting an order's line item
from /admin we get an HTML response (the whole edit form) that gets
inserted into the flash error.
It's not 100% clear why we added a respond_to block for JSON but since
juery-rails sends ajax requests with application/javascript, */* in
the ACCEPTS request header, Rails falls back to the first specified respond_to
block, which is HTML. We don't hit the JSON block.
In order for this to work, this commit replaces the JSON respond_to
block with one for JS with the exact same behaviour; returning a 204.
This is also the format the spree controller action we duplicated originally
has besides HTML.
2017-09-08 23:55:50 +10:00
Pau Perez
8c56bd23fc
Add missing translation
2017-09-08 23:55:50 +10:00
Enrico Stano
6254dfde11
Backport Spree commit to fix PaymentMethodsController #create
2017-09-08 23:55:50 +10:00
Enrico Stano
49d96206e1
Add missing email i18n key
2017-09-08 23:55:50 +10:00
Enrico Stano
ce562889a9
Update js and css assets
2017-09-08 23:55:50 +10:00
Enrico Stano
5a2c3f5c5c
Set Spree configuration related to locales before the promo environment gets initialized
2017-09-08 23:55:50 +10:00
Enrico Stano
7874d96003
Set MailMethod for test environment when needed
2017-09-08 23:55:50 +10:00
Enrico Stano
8e5b94b5ca
Fixing orders controller issue by setting data up correctly
2017-09-08 23:55:49 +10:00
Enrico Stano
4a989f705b
No more order.payment
2017-09-08 23:55:49 +10:00
Rob Harrington
3e6e3173ee
Fixing line item controller issue by setting data up correctly
2017-09-08 23:55:49 +10:00
Enrico Stano
72292b1dd3
Use new state API instead of locked
...
be554fde9f
2017-09-08 23:55:49 +10:00
enricostano
6816061915
Fix confirmation email subject
...
c38537173f
2017-09-08 23:55:49 +10:00
enricostano
23585e6ea8
Initialize custom calculators using Spree API
...
Freely inspired by https://github.com/coopdevs/spree/blob/2-0-stable/core/lib/spree/core/engine.rb#L78
2017-09-08 23:55:49 +10:00
enricostano
cf4bd8d755
WIP Preparing to get rid of MailMethod model
...
Please give a look at the following links:
- http://guides.spreecommerce.org/release_notes/spree_2_0_0.html#mailmethod-model-no-longer-exists
- https://github.com/spree/spree/pull/2643
2017-09-08 23:55:49 +10:00
enricostano
22b5431279
Start spree upgrade step 6
2017-09-08 23:55:49 +10:00
enricostano
4e35c0448b
Use the state machine API to add state transition callbacks
...
See the following links for more context:
http://guides.spreecommerce.org/release_notes/spree_2_0_0.html#removal-of-checkoutcontrollerstatecallback
1d9581c884
2017-09-08 23:55:49 +10:00
enricostano
fd259e0a63
Use cherry-picked commit in spree fork from the future 🚀
...
2aee282d6d
2017-09-08 23:55:49 +10:00
enricostano
e7ecdcc251
Import schema migration for spree gem upgrade step 5
2017-09-08 23:55:49 +10:00
Em-AK
a70cdaadb6
Start spree upgrade step 5
2017-09-08 23:55:49 +10:00
enricostano
d8c227c43f
Import data migration from latest spree_paypal_express gem
2017-09-08 23:55:49 +10:00
enricostano
a87c89c83d
Require authentication for API endpoints
...
Authentication and authorization layers (cancan) should not be mixed
c594d6111b
2017-09-08 23:55:49 +10:00
Em-AK
6817ac0d79
Regenerate knapsack report on my slow machine
2017-09-08 23:55:49 +10:00
enricostano
c439a23ef9
Adapt CheckoutController to new Spree changes
...
Freely inspired by ad5551bf84
2017-09-08 23:55:49 +10:00
enricostano
a80d75e7e2
Fix Spree taxons route reference
2017-09-08 23:55:49 +10:00
enricostano
d2b6a47ae4
Use new #available_to_order API
2017-09-08 23:55:49 +10:00
enricostano
5ad0f8bb2e
Fix module namespace
2017-09-08 23:55:49 +10:00
enricostano
a9966f48af
Use new product_search method
2017-09-08 23:55:49 +10:00
Em-AK
b5bac722ca
Fix: make rspec run
2017-09-08 23:55:49 +10:00
Em-AK
8a42b606eb
Start spree upgrade step 4
2017-09-08 23:55:49 +10:00
Em-AK
31f2551116
Update the JS unit spec to the new endpoint
2017-09-08 23:55:49 +10:00
enricostano
c992095959
Use new /clone JSON endpoint
2017-09-08 23:55:49 +10:00
enricostano
513330cfff
Add JSON api for products clone
2017-09-08 23:55:49 +10:00
Em-AK
1136cb40a9
Revert to OFN spree fork
...
This reverts commit 92f50d96803f9d0f302be51aad085c9a68ec4c32.
And bundle update to the last commit of openfoodfoundation/spree, branch: spree-upgrade-step-3
2017-09-08 23:55:49 +10:00
Em-AK
e73330d597
Fix removal of product properties
...
Prevent spree to make a post request on deletion of a property
The data should be updated on the server by clicking on the Update
button
2017-09-08 23:55:49 +10:00
Em-AK
f22a12d657
Revert later: depend on our spree fork
2017-09-08 23:55:49 +10:00
Em-AK
d68104cecb
Update a dependency to run the specs
2017-09-08 23:55:49 +10:00
Em-AK
5eb42eac3c
Delete the override of a deleted field
...
https://github.com/openfoodfoundation/spree/compare/spree-upgrade-step1c...spree-upgrade-step-3#diff-a63d9d7f4c1375ca141931651f799956
2017-09-08 23:55:49 +10:00
Rohan Mitchell
ac8cfe24e6
Fix removal of producer properties - remove href attr so Spree doesn't attempt an XHR
2017-09-08 23:55:49 +10:00
Rohan Mitchell
bfaaf16030
Fix spree adjustments fix that maybe never worked?
2017-09-08 23:55:49 +10:00
Rohan Mitchell
c47af55bb9
Fix: When a user fires an event (eg. capture payment), take them back to where they came from
2017-09-08 23:55:49 +10:00
Rohan Mitchell
3ff051f238
Restore route for variant search. Fixes admin order product selection.
2017-09-08 23:55:49 +10:00
Rohan Mitchell
0a8e8dfbbb
Add specs and fix line items HTML response
2017-09-08 23:55:49 +10:00
Rohan Mitchell
1170897587
Add our own JSON handling actions for update and delete. Spree no longer does this for us.
2017-09-08 23:55:48 +10:00
Rohan Mitchell
73abb93737
Update Spree: Bring forward simplified version of Spree.t for spree_auth_devise
2017-09-08 23:55:48 +10:00
Rohan Mitchell
0a043a6919
Add permissions to :line_item resource, now called by Spree
2017-09-08 23:55:48 +10:00
Rohan Mitchell
2c374b448a
check_authorization removed in Spree. Add load_order before_filter to cover our custom actions.
2017-09-08 23:55:48 +10:00
Rohan Mitchell
2a44b190fe
Use spree_paypal_express 2-0-stable pretending to be 1.3
2017-09-08 23:55:48 +10:00
Rohan Mitchell
3605b610fe
Use spree_auth_devise 2-0-stable pretending to be 1.3
2017-09-08 23:55:48 +10:00
Rohan Mitchell
0219118e19
Admin JS/CSS now in spree_backend
2017-09-08 23:55:48 +10:00
Rohan Mitchell
5ad197278c
Fix rendering of order form for JSON requests
2017-09-08 23:55:48 +10:00
Rohan Mitchell
3135ef6b7f
Reinstate explicit class name Spree::Calculator on calculated_adjustments association
2017-09-08 23:55:48 +10:00
Rohan Mitchell
0446b8d72f
TestingSupport moved out of Core namespace
2017-09-08 23:55:48 +10:00
Rohan Mitchell
858576d870
CalculatedAdjustments requires include first
2017-09-08 23:55:48 +10:00
Rohan Mitchell
48e50540db
Start Spree upgrade step 3
2017-09-08 23:55:48 +10:00
Rohan Mitchell
8eca260297
Update Spree: Prevent duplicate copies of images appearing
2017-09-08 23:55:48 +10:00
Rohan Mitchell
017b63fa71
Update Spree: Fix further admin authorization errors
2017-09-08 23:55:48 +10:00
Rohan Mitchell
efe0d3ab22
Update spree, upgrading jquery-rails to provide jquery 1.9. Fixes ng-tags-input.
2017-09-08 23:55:48 +10:00
Rohan Mitchell
bfd54ef621
Update Spree: Fix admin authorization errors
2017-09-08 23:55:48 +10:00
Rohan Mitchell
38da4c8e12
Adjustments now have state instead of locked/unlocked
2017-09-08 23:55:48 +10:00
Rohan Mitchell
b5d33fc4b5
Add migrations from Spree
2017-09-08 23:55:48 +10:00
Rohan Mitchell
f5c4537afa
Start Spree upgrade step 2
2017-09-08 23:55:48 +10:00
Saimon Moore
09aed63cd4
Add todos to remove redundant i18n keys
2017-09-08 13:57:50 +02:00
Saimon Moore
757f886af5
Use proper namespaced translations
...
... in enterprise registration wizard Type step
2017-09-08 13:35:19 +02:00
Saimon Moore
f73f0d4bf9
Use proper namespaced translations
...
... in enterprise registration wizard Details step
2017-09-08 12:50:54 +02:00
Saimon Moore
d4f7efd08a
Use proper namespaced translations
...
... in enterprise registration wizard Contact step
2017-09-08 12:49:08 +02:00
Saimon Moore
a1aac7643a
Translate Entp registration modal tab titles
...
- Add proper namespaced translations for Details and Contact tabs
2017-09-08 12:47:53 +02:00
Enrico Stano
36022fb143
Merge pull request #1815 from leandroalemao/missing-translations-edit-product-page
...
Fix i18n translation keys for Edit Product Page
2017-09-08 10:57:25 +02:00
leandroalemao
c70de9f73c
Fix i18n translation keys for Edit Product Page
2017-09-08 09:27:20 +01:00
Pau Perez
d3d4628e29
Add doc
2017-09-08 09:51:06 +02:00
Pau Perez
942ab55ddc
Disable create profile from signup when submitting
...
This prevents people re-submitting the form multiple times. Although the
backend validates it, we show an ugly alert message that is hard for
users to understand.
2017-09-07 16:02:06 +02:00
Enrico Stano
86460ffbde
Merge pull request #1792 from leandroalemao/missing-translations-new-product-page
...
Fix i18n translation keys for New Product Page
2017-09-04 16:07:15 +02:00
Leandro C
90d1d5400a
Fix i18n translation keys for New Product Page
2017-09-04 13:38:33 +01:00
Pau Perez
1b151ee015
Add missing translations in registration wizard
2017-09-01 14:57:16 +02:00
Enrico Stano
3a04136705
Merge pull request #1758 from coopdevs/simplify-karma-rake-task
...
Always execute local karma
2017-08-28 10:21:41 +02:00
Maikel
880fda7b40
Merge pull request #1775 from openfoodfoundation/transifex
...
Transifex
2017-08-25 16:48:51 +10:00
Enrico Stano
67b992cf44
Merge pull request #1771 from coopdevs/feature/add-enterprise-relationhips-tab-name
...
Translate Enterprise Relationships tab name
2017-08-23 17:40:37 +02:00
Transifex-Openfoodnetwork
a1a2a66d21
Updating translations for config/locales/fr.yml [skip ci]
2017-08-21 06:20:59 +10:00
Transifex-Openfoodnetwork
0117e2e8b5
Updating translations for config/locales/es.yml [skip ci]
2017-08-19 02:22:36 +10:00
Enrico Stano
8645b4a7f6
Translate Enterprise Relationships tab name
2017-08-18 16:40:32 +02:00
Matt-Yorkley
a76b64b80b
Spec for missing password confirmation
2017-08-18 13:59:54 +10:00
Matt-Yorkley
483db2bc29
Fix signup password confirmation
2017-08-18 13:59:54 +10:00
stveep
bd3f626872
Call toScroll after any new panel is . Also added an actual delay as it still scrolled to the 'old' location.. 10 ms was too short to allow the location to update after the old panel closes (on Chrome), 50 ms seems ok.
2017-08-18 10:51:48 +10:00
Continuous Integration
2650dc209e
Merge remote-tracking branch 'origin/master' into HEAD
2017-08-12 20:52:20 +10:00
Julius Pabrinkis
efd3c34a0c
Change JS I18n.fallbacks to be less confusing
2017-08-12 11:21:47 +01:00
Julius Pabrinkis
3e01636f77
Add missing i18n-js partial to registration layout
2017-08-12 11:20:58 +01:00
Pau Perez
f9c0edf4b9
Always execute local karma
...
This ensure the dev will run the version specified in the package.json.
Besides, makes the rake task work as all rails tests, allowing you to
pass a RAILS_ENV.
2017-08-11 16:48:24 +02:00
Enrico Stano
58d7d8f016
Merge pull request #1753 from coopdevs/complete-seed-data
...
Complete seed data to purchase to Enterprise 2
2017-08-11 15:42:03 +02:00
Enrico Stano
1fbb4b25d1
Merge pull request #1746 from oeoeaio/fix-flash-error-color
...
Fix styling of error flash in admin section
2017-08-11 11:45:31 +02:00
Continuous Integration
b43b92dcfd
Merge remote-tracking branch 'origin/master' into HEAD
2017-08-11 18:16:25 +10:00
Pau Perez
649c25622a
Add doc to method
2017-08-11 14:41:02 +10:00
Pau Perez
1f2820f6d4
Add #delivery? in ShippingMethod
2017-08-11 14:41:02 +10:00
Pau Perez
22f018f2bc
Fix all specs of LastUsedAddress
2017-08-11 14:41:02 +10:00
Pau Perez
8c5ac4cb23
Fix extra empty line reported by rubocop
2017-08-10 11:35:26 +02:00
Lynne
b9ff5674af
Correction for Transifex name mismatch
2017-08-04 16:18:57 +01:00
Lynne
f0968109c6
Copy transifex updates to en-GB
2017-08-03 20:33:26 +01:00
Transifex-Openfoodnetwork
eeb41ccfdd
Updating translations for config/locales/en_GB.yml [skip ci]
2017-08-04 04:30:40 +10:00
Continuous Integration
587a53d36d
Merge remote-tracking branch 'origin/master' into HEAD
2017-08-04 03:56:40 +10:00
Transifex-Openfoodnetwork
ec7b7e0391
Updating translations for config/locales/sv.yml [skip ci]
2017-08-03 17:43:53 +10:00
Pau Perez
7f982c0c90
Complete seed data to purchase to Enterprise 2
2017-08-02 13:11:41 +02:00
Rob Harrington
6c71ef8760
Fix styling of error flash in admin section
2017-08-02 19:50:18 +10:00
Enrico Stano
936355d54b
Merge pull request #1681 from coopdevs/release-notes-in-template
...
Add release notes section in github template
2017-08-02 10:59:30 +02:00
Enrico Stano
07620c2e62
Merge pull request #1707 from oeoeaio/mirror-db-session-data
...
Exclude session data when mirroring data
2017-08-02 10:45:46 +02:00
Maikel Linke
686a8f3af9
Add legacy and default values for LOCALE
...
This makes sure there is a value in `config.i18n.available_locales` so
that i18n-js doesn't crash.
2017-08-02 10:44:55 +10:00
Maikel Linke
199bfe531e
Correct typo in comment
2017-08-02 10:01:12 +10:00
Julius Pabrinkis
e4627fe0d0
Update README
2017-08-02 09:57:33 +10:00
Julius Pabrinkis
ec6a365227
Add test coverage for switching language in darkswarm and admin
2017-08-02 09:57:33 +10:00
Julius Pabrinkis
c6f6f5bc55
Adapt karma js tests for i18n-js
2017-08-02 09:57:33 +10:00
Julius Pabrinkis
5166a3d958
Add available_locales config feature
2017-08-02 09:57:33 +10:00
Julius Pabrinkis
9429695e15
Add i18n helper for controllers to switch language by params
2017-08-02 09:57:32 +10:00
Julius Pabrinkis
f396d30747
Render i18n-js config inside darkswarm and admin layouts
2017-08-02 09:57:32 +10:00
Julius Pabrinkis
2637574c93
Require new i18n-js translations in darkswarm and admin
2017-08-02 09:57:32 +10:00
Julius Pabrinkis
d2ba4650e5
Add temporary i18n-js workaround for Spree translations until upgrade
2017-08-02 09:57:32 +10:00
Julius Pabrinkis
3adb13e62c
Add i18n-js gem
2017-08-02 09:57:32 +10:00
Transifex-Openfoodnetwork
f69d86ab8f
Updating translations for config/locales/nb.yml [skip ci]
2017-07-31 20:50:37 +10:00
Rob Harrington
7c0feab08f
Fix #1526 : add descriptions for reports *before* they are filtered
2017-07-28 17:15:57 +10:00
Matt-Yorkley
ea784d6362
Invoice date and translation adjustments
2017-07-28 16:34:43 +10:00
Maikel
6e57f917d2
Merge pull request #1736 from oeoeaio/fix-zeus-crash
...
Fix zeus issue caused by location of iframe_test.html
2017-07-28 16:31:41 +10:00
Maikel Linke
ba97f61c9e
Move translations into right scope
2017-07-28 15:23:18 +10:00
Maikel Linke
c5eca68d79
Remove unused translation
2017-07-28 15:23:18 +10:00
Maikel Linke
92814162dc
Remove unused translation
2017-07-28 15:23:18 +10:00
Maikel Linke
44374e8499
Display "+1 More" correctly
2017-07-28 15:23:18 +10:00
Rob Harrington
2ca04bb84e
Revert translations of LettuceShare report headers
2017-07-28 12:07:58 +10:00
Rob Harrington
66a85bb99f
Revert translations of Xero report headers
2017-07-28 12:07:52 +10:00
Rob Harrington
9f6931ba18
Move embedded shopfronts iframe view into spec/support/views
...
Was causing issues with zeus where it was (in spec/dummy)
Didn't get to the bottom of what was happening, this was
just a quick, simple and zero-cost solution
2017-07-28 11:54:48 +10:00
Rob Harrington
8fe6800151
Add documentation to the top of mirror_db script
2017-07-27 12:58:54 +10:00
Rob Harrington
e86122cb3e
Exclude session data when mirroring data
...
Probably a better long term solution would be to add a job to clean
up old session data on the server, but this is a quick & dirty fix
to speed mirroring up on a slow connection.
2017-07-27 12:58:54 +10:00
Laura Turk
7641dcc1be
Add media query to panepadding mixin
2017-07-26 16:29:44 +10:00
Leta Keane
8648070a05
Add disabled class to shopfront property selectors
2017-07-26 15:46:00 +10:00
Matt-Yorkley
5200937165
Safari/iOS iframe issue fix
2017-07-26 13:56:36 +10:00
Matt-Yorkley
6215777986
Shopfront review adjustments
2017-07-26 13:56:36 +10:00
Matt-Yorkley
0eb4c7f7ba
Require https for embedding sites
2017-07-26 13:56:36 +10:00
Matt-Yorkley
782a812596
Basic Embedded Shopfronts
2017-07-26 13:56:36 +10:00
Matt-Yorkley
113f6565be
Enable iframes for embedded shopfronts
2017-07-26 13:56:36 +10:00
Maikel Linke
b1452f097d
Add spanish translations manually
...
A change in the Transifex API made the automated commit fail. Hence
doing it manually here.
2017-07-26 13:38:35 +10:00
Transifex-Openfoodnetwork
6384b5abb3
Updating translations for config/locales/fr.yml [skip ci]
2017-07-26 13:38:35 +10:00
Transifex-Openfoodnetwork
2c14ed848f
Updating translations for config/locales/nb.yml [skip ci]
2017-07-26 13:38:35 +10:00
Maikel Linke
5dfac10599
Mention upgrade_bundler.sh in README
2017-07-26 13:37:42 +10:00
Maikel Linke
250062bd2f
Upgrade bundler according to Gemfile.lock on CI
2017-07-26 13:37:42 +10:00
Maikel Linke
3f2299e52e
Add script to upgrade bundler to Gemfile version
...
Useful to sync your bundler version or the CI bundler version with the
rest of the team.
2017-07-26 13:37:42 +10:00
Rob Harrington
327753b7ca
Remove zeus and guard-zeus from the bundle
...
Having guard-zeus specified as a dependency is problematic because
it also pulls in the zeus gem as a dependency. This makes it impo-
ssible to update or switch zeus versions locally without affecting
other developers.
The maintainers of zeus say that it is designed to be installed and
run outside of the bundle: https://github.com/burke/zeus
2017-07-26 13:36:58 +10:00
Matt-Yorkley
ba447b547d
Order tooltip localisation
2017-07-26 13:36:16 +10:00
Matt-Yorkley
8ebd49ec0f
Company number localisation
2017-07-26 13:35:46 +10:00
Maikel Linke
155a2574bb
Fix typo to display email address
2017-07-21 12:17:14 +10:00
Maikel Linke
b8c2e54194
Fix i18n key and spec
2017-07-21 12:17:14 +10:00
Maikel Linke
9f243e6d3c
Fix title of /admin/content/edit
...
Spree uses the global i18n key `contents` to print the title. A previous
change made that an object containing other i18n keys which was then
displayed as title.
This change moves the i18n content to the scope of the view where they
are displayed.
2017-07-21 12:17:13 +10:00
Maikel Linke
ece8d8b518
Fix typo to display "Producer signup page"
2017-07-21 12:17:13 +10:00
Maikel Linke
0624c49a4f
Fix typo to display "Tax Rates" report
2017-07-21 12:17:13 +10:00
Maikel Linke
71742a80b5
Make two more strings translatable
2017-07-21 12:17:13 +10:00
Maikel Linke
f4b1667005
Replace global translations by local ones
2017-07-21 12:17:13 +10:00
Maikel Linke
e5c9845b10
Remove duplicate haml code
2017-07-21 12:17:13 +10:00
Maikel Linke
d3fc89f42a
Unify haml code for colouring
2017-07-21 12:17:13 +10:00
Maikel Linke
9c6454b47a
Remove duplicated code
...
A label was accidentally inserted twice. Also removed some duplicate
translation.
2017-07-21 12:17:13 +10:00
Maikel Linke
7d2484c8bf
Remove superfluous string interpolation
2017-07-21 12:17:13 +10:00
Maikel Linke
9723c8b82b
Move translation into the right place
...
The dashboard couldn't find a translation, because it is in the spree
namespace.
Also simplified the translation using the `count` feature.
2017-07-21 12:17:13 +10:00
Julius Pabrinkis
8b2b51d511
Fix code style for Rubocop
2017-07-21 12:17:13 +10:00
Julius Pabrinkis
872a150c7d
Refactor some translations to use interpolation
2017-07-21 12:17:13 +10:00
Julius Pabrinkis
3a0c0fd638
Fix failing tests
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
739d06cf03
Extract translations from javascript
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
9fa7a30c7e
Fix failing tests and extract validation message Procs into methods
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
ba0b17e168
Extract translations from controllers
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
5caaec8ef3
Extract translations from mailers and helpers
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
9971c9f923
Extract translations from models
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
974099747b
Fix failing specs after text extraction
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
1920ee7e88
Extract translations from serializers and overrides
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
55b2c19b64
Extract translations from lib folder
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
60060a7017
Start admin/reports extract translations
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
ef488133e8
Add missing translations from files list.
2017-07-21 12:17:12 +10:00
clairezed
5c66a2fc9d
Fix wrong key replacement for producer_shop_description_text
2017-07-21 11:15:03 +10:00
clairezed
5f8890e963
update producers pack translation key from sell_description_text to producer_shop_description_text
2017-07-21 11:15:03 +10:00
clairezed
58c463497a
#1541 fixing wrong translation key in producers packs
2017-07-21 11:15:03 +10:00
Rob Harrington
3bb6d68adf
Exclude node_modules from rubocop analysis
...
I don't need to see offences for node modules when I run rubocop locally
2017-07-21 11:06:16 +10:00
Duende13
705295049e
Improved test for variant serializer
2017-07-21 10:18:55 +10:00
Duende13
a07fd854f6
New test for variant serializer
2017-07-21 10:18:55 +10:00
Duende13
b2bae242d9
Sorting variants by name_to_display and unit_value. Issue 1604.
2017-07-21 10:18:55 +10:00
Maikel Linke
1a57a0b3ca
Revert changes in fr.yml
2017-07-19 09:46:23 +10:00
François Turbelin
a0595bc45a
Add missing translations on views
2017-07-19 09:45:11 +10:00
Enrico Stano
8853340fa1
Merge pull request #1655 from oeoeaio/update-eventmachine
...
Bump eventmachine version to resolve openssl issue on macOS
2017-07-13 13:04:28 +02:00
Enrico Stano
bde3fa4ce6
Merge pull request #1671 from coopdevs/multiline-method-calls
...
Use indented style for multiline method calls
2017-07-12 18:40:34 +02:00
Pau Perez
cee24dcca7
Use indented style for multiline method calls
...
This enables the Rubocop's Style/MultilineMethodCallIndentation cop with
indentend enforced style. Which makes you split multiline method calls like:
orders = Spree::Order
.an_scope
.another_scope
.where(id: list_of_ids)
It also autofixes the current violations and updates the
rubocop_todo.yml
2017-07-12 10:40:53 +02:00
Pau Perez
c1789c4833
Add release notes section in github template
...
Hopefully, this will make it easier for Kirsten to fill in the release
notes from all the pull requests included in a release.
2017-07-12 08:26:45 +02:00
Maikel
6fbf902562
Merge pull request #1680 from mkllnk/entreprise-typo
...
Correct typo raised by Sergi
2017-07-12 15:14:06 +10:00
Maikel Linke
dc0da6f7b7
Correct typo raised by Sergi
2017-07-12 14:40:44 +10:00
Pau Perez
385847d7da
Doc why FinalizeAccount uses order objects
...
Read the top-level class documentation for the details.
2017-07-12 11:49:04 +10:00
Rob Harrington
9d7f63db42
Bump eventmachine version to resolve openssl issue on macOS
2017-07-12 11:42:15 +10:00
Pau Perez
d0c6292e9d
Add github template for pull requests
2017-07-07 13:56:12 +10:00
Matt-Yorkley
994023ec10
Update codeclimate version
2017-07-06 18:15:24 +10:00
Pau Perez
1028b49719
Stop using Order#shipment as it will be deprecated
...
Spree 2.0 adds a deprecation warning to it and Spree 2.1 removes it.
2017-07-05 16:33:04 +10:00
Maikel Linke
b7f99c3185
Merge branch 'transifex'
2017-06-30 16:28:08 +10:00
Rob Harrington
ce85027b79
Update rubocop_todo.yml using rubocop 0.49.1
2017-06-29 10:47:56 +10:00
Rob Harrington
94b6a61665
Bump rubocop to latest version (0.49.1)
2017-06-29 10:47:56 +10:00
Rob Harrington
f84acf44f3
Disable scss-lint for CodeClimate
...
Until we can tweak #1393 to work with CodeClimate
2017-06-28 18:09:03 +10:00
Diogo Matsubara
386d651678
Fix #1611 (Rephrase error message for people logging in with an existing user email)
...
update test to use new rspec syntax
2017-06-28 15:35:21 +10:00
Matt-Yorkley
23a6e2dd8f
Changed modal redirect behaviour
2017-06-28 14:35:17 +10:00
Transifex-Openfoodnetwork
6c69eebcbf
Updating translations for config/locales/nb.yml [skip ci]
2017-06-27 05:41:31 +10:00
Rob Harrington
d8a158c56d
Rubocop: Update comment on Rails/DynamicFindBy, justifying Enabled: false
2017-06-24 13:37:47 +10:00
Rob Harrington
dfda30f4cb
Rubocop: Regenerate rubocop_todo.yml using --exclude-limit 100
2017-06-24 13:33:57 +10:00
Rob Harrington
d26970d04c
Rubocop: Move Style/ClassAndModuleChildren back to rubocop_todo.yml
2017-06-24 12:59:03 +10:00
Transifex-Openfoodnetwork
63e453e2c7
Updating translations for config/locales/fr.yml [skip ci]
2017-06-23 18:09:39 +10:00
Rob Harrington
c7ed27286a
Rubocop: Correct Lint/ParenthesesAsGroupedExpression offences
2017-06-23 17:02:20 +10:00
Rob Harrington
e5340cb53a
Rubocop: Correct Lint/UselessAssignment offences, disable for /spec in main config
2017-06-23 16:49:08 +10:00
Rob Harrington
7079952f6b
Add rubocop to development group in gemfile
2017-06-23 16:49:08 +10:00
Rob Harrington
f79dcaba15
Rubocop: Add Rails cops to config and todo
2017-06-23 16:49:08 +10:00
Rob Harrington
33a1d97d5e
Rubocop: Disable Style/ClassAndModuleChildren in main config
2017-06-23 16:49:08 +10:00
Rob Harrington
28ea23965b
Rubocop: Correct Lint/AmbiguousOperator offences
2017-06-23 16:49:08 +10:00
Rob Harrington
fbdbbb980f
Rubocop: Disable Lint/AmbiguousBlockAssociation in main config
2017-06-23 16:49:08 +10:00
Rob Harrington
fc5b339e2a
Rubocop: Correct Lint/DuplicateMethods offences
2017-06-23 16:49:08 +10:00
Rob Harrington
4acb3f1962
Rubocop: Use Relaxed.Ruby.Style as starting point for settings
...
Updated .rubocop_todo.yml
2017-06-23 16:49:08 +10:00
Rob Harrington
7bb58342fc
Rubocop: Auto-correct Style/EmptyLineBetweenDefs offences
2017-06-23 16:49:08 +10:00
Rob Harrington
b277ff03ea
Rubocop: Auto-correct Style/TrailingBlankLines offences
2017-06-23 16:49:07 +10:00
Rob Harrington
5061d0c4cd
Rubocop: Tweak config, and add todo file
2017-06-23 16:49:07 +10:00
Continuous Integration
931a5be162
Merge remote-tracking branch 'origin/master' into HEAD
2017-06-22 13:19:25 +10:00
Maikel Linke
e437cba155
Make style flexible for all sizes of logos
...
Trying to support logos that are big. But logos that are too small
should not be stretched either, better small than ugly.
Remove static size declaration from HTML template since it doesn't
reflect the logo size.
Unfortunately, there are other CSS files that are in conflict. The file
mail/email.css.scss defines this globally:
img {
max-width: 100%;
}
2017-06-16 16:49:43 +10:00
Maikel Linke
ec53d9df7a
Merge tag 'v1.8.11' into transifex
2017-06-15 09:59:59 +10:00
Maikel Linke
3330e9b219
Init registration form with default country
2017-06-14 16:47:02 +10:00
Maikel Linke
884743ce97
Filter countries without states for registration
2017-06-14 16:47:01 +10:00
Maikel Linke
b482d1e57c
Spec current behaviour of country selector
...
The enterprise sign-up form shows invalid countries without states and
does not choose the default country. See:
https://github.com/openfoodfoundation/openfoodnetwork/issues/1330
2017-06-14 16:47:01 +10:00
Maikel Linke
78f5002be5
Separate variant names by spaces
...
To enable the search for the beginning of a variant name, they need to
be separated.
See: https://github.com/openfoodfoundation/openfoodnetwork/pull/1545
2017-06-14 16:37:46 +10:00
Maikel Linke
a42799dff4
Initialise product.variant_names
...
Not initialising `product.variant_names` causes it to become the string
"undefinedVariant1Variant2" while it should just be "Variant1Variant2".
This mistake did not matter when `variant_names` was just used to search
for a sub-string. A recent change to search only for the beginning of a
word, caused this to fail.
See: https://github.com/openfoodfoundation/openfoodnetwork/pull/1545
2017-06-14 16:28:55 +10:00
Maikel Linke
1196cd7df4
Add style guide to the source locale
...
There has been a lack of rules how to structure our locale en.yml. This
is a start to document some guidelines which can evolve over time.
Rules can be discussed in the community forum or in pull requests. Once
there is a strong agreement, we should add it to this guide.
2017-06-14 15:20:01 +10:00
Enrico Stano
3c1eae1f47
Do not blindly clear the whole Rails cache
2017-06-09 10:32:57 +10:00
Matt-Yorkley
ba27d63f9c
Fix logo sizing
2017-06-06 13:59:42 +01:00
Julius Pabrinkis
0083733c4c
#1471 Do no let long producers' name go under icon
2017-06-02 16:29:43 +10:00
Julius Pabrinkis
a1ffc869f3
Refactor code by suggestion to use RegExp and add tests coverage
2017-06-02 15:42:35 +10:00
Rhodri Karim
7a07e8fa16
Issue 1233: product filter should only match if name begins withs search term
2017-06-02 15:42:35 +10:00
enricostano
699da16049
Remove unused spec support method
2017-05-31 15:22:30 +10:00
sseerrggii
18c7b03f3d
Add plurals
2017-05-26 16:51:29 +10:00
Rob Harrington
8b560e6cee
Cleaning up angular variant units controllers a little bit
2017-05-24 15:05:33 +10:00
Matt-Yorkley
7974ac45f2
Add unit description placeholder
2017-05-24 15:05:33 +10:00
Matt-Yorkley
41b5cf10dd
Quick testing update
2017-05-24 15:05:33 +10:00
Matt-Yorkley
b6955cb98c
Updated variant feature spec
2017-05-24 15:05:33 +10:00
Matt-Yorkley
6c36c269c8
Product Edit UX adjustments
2017-05-24 15:05:33 +10:00
Pierre de Lacroix
b879ea5a96
add comments
2017-05-24 14:37:54 +10:00
Pierre de Lacroix
a6ed4a2c6a
fix bad return value
...
in method Spree::Adjustment#find_closest_tax_rates_from_included_tax
2017-05-24 14:37:54 +10:00
Pierre de Lacroix
6972822c49
fix escaping problems on ticket view
2017-05-24 13:35:59 +10:00
Pierre de Lacroix
db63f30a76
cosmetic fixes to the ticket view
2017-05-24 13:35:59 +10:00
Rob Harrington
848193434b
Show item single_display_amount instead of variant price in order details table
...
Also has the effect of taking the inventory price into account (since it is stored against the line item price)
2017-05-19 17:27:04 +10:00
stveep
570f0344da
Remove unused method in wrong controller ^_^
2017-05-19 16:14:22 +10:00
stveep
38c25c412f
Remove duplicated spec, better error message suppression, fix shipping test to wait correctly
2017-05-19 16:14:22 +10:00
stveep
3b4ffe1f70
Suppress line item validation error for newly-created orders
2017-05-19 16:10:06 +10:00
stveep
4699c654fc
Fix feature specs for new 'new admin order' flow
2017-05-19 16:10:06 +10:00
stveep
c1c5d00f45
Add new view to set distribution, ensure the scoped variant single item price is used.
2017-05-19 16:10:06 +10:00
stveep
220693f4e3
Starting alternative flow for new manual order
2017-05-19 16:06:43 +10:00
stveep
fcce858ea4
Fix OC with override factory
2017-05-19 16:06:43 +10:00
stveep
1f9698f7a2
Test to reproduce bug with overridden price not being displayed when an order is added manually
2017-05-19 16:06:43 +10:00
Rob Harrington
1766da9d60
Adding ng-cloak directive to changeable orders banner
2017-05-19 15:54:55 +10:00
Rob Harrington
15ee62aaa8
Fixing race condition on link click in spec/features/consumer/shops_spec.rb
2017-05-19 13:29:47 +10:00
Rob Harrington
6fc4a297a0
Fixing race condition on link click in spec/features/consumer/shopping/products_spec.rb
2017-05-19 13:15:30 +10:00
Rob Harrington
74d8dc48b4
Rewriting shopfront alert regarding changeable orders to be dynamic
2017-05-18 15:35:07 +10:00
Rob Harrington
b6f4ce373e
Preloading variants for VariantOverride.indexed
2017-05-18 15:34:22 +10:00
Rob Harrington
c9f186f48f
Fixing SlideOutUp animation for darkswarm
2017-05-18 15:33:14 +10:00
Rob Harrington
daab0dfd7a
Refactor: Splitting changeable_order_from_number out into separate method
2017-05-17 12:38:17 +10:00
Rob Harrington
22b5dafad2
Further tweaks to LineItemsController
2017-05-17 12:27:29 +10:00
Transifex-Openfoodnetwork
110f74eee8
Updating translations for config/locales/es.yml [skip ci]
2017-05-12 20:49:15 +10:00
Rob Harrington
61cb78fc93
Tweaks to LineItemsController, renaming #index to #bought
2017-05-12 16:29:15 +10:00
Rob Harrington
38d3b446cc
Removing unused #tag_list method on VariantSerializer
2017-05-12 16:11:16 +10:00
Rob Harrington
e47e10d267
Removing n+1 query from #items_bought_by_user
2017-05-12 16:11:16 +10:00
Rob Harrington
77c8c85775
Memoizing the result of OrdersController#order_to_update
2017-05-12 16:11:16 +10:00
Rob Harrington
fab6d70832
Changeable orders only returns orders if the shop allows changes
2017-05-12 16:11:16 +10:00
Rob Harrington
9586666248
Updating translation for allow_changes option
2017-05-12 16:11:16 +10:00
Continuous Integration
f5ab9a3445
Merge remote-tracking branch 'origin/master' into HEAD
2017-05-12 10:39:06 +10:00
Continuous Integration
1ac8c85113
Merge remote-tracking branch 'origin/master' into HEAD
2017-05-12 09:55:25 +10:00
Rob Harrington
56c2350d36
Updating enterprise fees on completed order from OrdersController#update
2017-05-10 12:04:32 +10:00
Transifex-Openfoodnetwork
6eafed00f5
Updating translations for config/locales/fr.yml [skip ci]
2017-05-05 21:35:28 +10:00
Transifex-Openfoodnetwork
74661c0b77
Updating translations for config/locales/nb.yml [skip ci]
2017-05-05 18:10:25 +10:00
Rob Harrington
c4fbcb19d0
Only show Admin & Handling fees once on completed order form
2017-05-05 15:28:01 +10:00
Rob Harrington
08e391856c
Ask user to confirm cancellation of order
2017-05-05 15:17:14 +10:00
Rob Harrington
8c8b40c5a8
Showing order cycle close time on banner when multiple open orders are present
2017-05-05 14:20:57 +10:00
Rob Harrington
c3eda435eb
Hiding 'Back to Cart' and 'Back to Store' buttons on completed orders when distributor does not match cart
2017-05-05 14:20:57 +10:00
Rob Harrington
5eadb33db9
Using changes_allowed? to authorize cancellation of line_items
2017-05-05 14:20:57 +10:00
Rob Harrington
f977a05b08
Fixing broken spec for fetching list of bought items as json
2017-05-05 14:20:57 +10:00
Rob Harrington
217eda8362
Shipping and payment fees are updated for completed orders when the order changes
2017-05-05 14:20:57 +10:00
Rob Harrington
579f3bf90a
Changing quantity and deleting line_items of completed orders works with inventory where present
2017-05-05 14:20:57 +10:00
Rob Harrington
348ab81c42
Overriding #increment! using variant overrides
2017-05-05 14:20:57 +10:00
Rob Harrington
3df629bc6e
Prevent users from removing the final line item of an order, suggest cancelling instead
2017-05-05 14:20:57 +10:00
Rob Harrington
07b2f0a7c2
Showing banner for distributor of order on order summary, regardless of current_distributor
2017-05-05 14:20:57 +10:00
Rob Harrington
c0445d46f3
Changeable orders ignores cancelled orders
2017-05-05 14:20:57 +10:00
Rob Harrington
6c90b4e6d0
Adding alert to order summary, notifying user of remaining time to make changes
2017-05-05 14:20:57 +10:00
Rob Harrington
e79a23a554
Disabling save button on order page until changes are made to the order
2017-05-05 14:20:57 +10:00
Rob Harrington
314ccc2f27
Ensuring that #items_bought_by_user doesn't return items from cancelled orders
2017-05-05 14:20:57 +10:00
Rob Harrington
68c8759af1
Count of items in cart form looks is consistent with rest of UI (ie. uses quantities)
2017-05-05 14:20:57 +10:00
Rob Harrington
314e9a4f15
Open shopfront existing orders flash link in a new window
2017-05-05 14:20:57 +10:00
Rob Harrington
0029a1b6cf
Ensure order adjustments are displayed in edit form for customers
2017-05-05 14:20:57 +10:00
Rob Harrington
bfcde72855
Use explicit format for dates on front-end account page
2017-05-05 14:20:57 +10:00
Rob Harrington
3d0ada803f
Test presence of 'Edit' link for previous orders in cart
2017-05-05 14:20:57 +10:00
Rob Harrington
840c936a6f
OrderSerializer#changes_allowed_until returns 'Not allowed' unless changes are allowed
2017-05-05 14:20:57 +10:00
Rob Harrington
7ea74ccf4a
Order confirmation redirects 'Back to Cart' if cart is non-empty
2017-05-05 14:20:57 +10:00
Rob Harrington
b55036e165
Adding alert to shopfront to alert user to presence of orders open for editing
2017-05-05 14:20:57 +10:00
Rob Harrington
47011e11ff
order_cycle.items_bought_by_user actually scopes to the current distributor
2017-05-05 14:20:57 +10:00
Rob Harrington
ae28d7a96b
Adding a link in cart to allow user to edit existing + open orders for same OC
2017-05-05 14:20:57 +10:00
Rob Harrington
0dd8959bf7
Use an actual completed order for OrdersController#order_to_update spec
2017-05-05 14:20:57 +10:00
Rob Harrington
316b0915e4
Just display the date that orders can be changed until
...
No fancy moment.js stuff
2017-05-05 14:20:57 +10:00
Rob Harrington
e21bfd95f4
Renaming order.editable? to order.changes_allowed?
2017-05-05 14:20:57 +10:00
Rob Harrington
893331c7bb
Adding 'Open Orders' section to the top of customer accounts page
2017-05-05 14:20:57 +10:00
Rob Harrington
b94bcd697f
Restructuring customer accounts spec
2017-05-05 14:19:32 +10:00
Rob Harrington
b0ff7ca767
Making accounts page orders listing full-width
2017-05-05 14:19:32 +10:00
Rob Harrington
493a537f2c
Making out-of-stock products in the cart more visible
2017-05-05 14:19:32 +10:00
Rob Harrington
cda43f075b
Moving bought items listing up into main section of cart
2017-05-05 14:19:32 +10:00
Rob Harrington
5d9f92eaa7
Adding 'Cancel Order' button to order confimation interface
2017-05-05 14:19:32 +10:00
Rob Harrington
c6afa1849c
Basic routing for front-end OrdersController#cancel action
2017-05-05 14:19:32 +10:00
Rob Harrington
eec3a21c89
Allow editing of completed orders from confirmation page where distributor allows it
2017-05-05 14:19:32 +10:00
Rob Harrington
768240a5ba
Reorganising darkswarm order views into partials
2017-05-05 14:19:32 +10:00
Rob Harrington
5af8668560
Rewriting Spree::Taxons.distributed_taxons for better performance
2017-05-05 14:19:32 +10:00
Rob Harrington
630b8a2577
Add OrdersController#order_to_update method, to allow updating a complete order where appropriate
2017-05-05 14:19:32 +10:00
Maikel Linke
12a6f652ad
Warn when allowing guest orders and order changes
2017-05-05 14:19:32 +10:00
Maikel Linke
db4a528ba3
Update shipment to re-calculate included tax
...
And re-create tax charges on the order. (untested)
2017-05-05 14:19:32 +10:00
Maikel Linke
479c7ba24b
Update transaction fees of completed orders
...
The adjustments associated to incomplete payments are re-calculated when
a line item is removed from a completed order.
2017-05-05 14:19:32 +10:00
Maikel Linke
1f08729df3
Update shipping fees after removing item
...
After removing an item from a completed order, update the shipping fees
of all shipments that are pending or ready (not completed).
2017-05-05 14:19:32 +10:00
Maikel Linke
811671661e
Remove item from dropdown cart after deletion
2017-05-05 14:19:32 +10:00
Maikel Linke
936df71d0d
Link to bought products on cart page
...
The checkout page was just linking to the cart page, but not scrolling
down.
2017-05-05 14:19:32 +10:00
Maikel Linke
f3f6714472
Add message about previous orders on checkout page
...
The message appears if the user ordered before within the same order
cycle and the shop allows to change previous orders.
2017-05-05 14:19:32 +10:00
Maikel Linke
3bce2eb7b5
Rename translation key checkout to avoid conflicts
...
A top-level translation key `checkout` can't co-exist with translation
keys in the path `checkout`. Moving the old key to
`shared.menu.cart.checkout` avoids conflicts. It also structures the
locale better by view.
2017-05-05 14:19:32 +10:00
Maikel Linke
bf05866f92
Change headline of already ordered items
2017-05-05 14:19:32 +10:00
Maikel Linke
219ad4a3a7
Reload bought products after choosing order cycle
2017-05-05 14:19:32 +10:00
Maikel Linke
a7d8028d5a
Add retry: 3 to intermittently failing spec
2017-05-05 14:19:32 +10:00
Maikel Linke
d49469a3e6
Show bought items only if changes are allowed
...
An enterprise can decide to allow changes to orders in open order
cycles. The items of these orders are then displayed in the shopping
cart and can be removed on the cart edit page.
2017-05-05 14:19:32 +10:00
Maikel Linke
4835ef067f
Add feature to remove line items from open order cycle
...
- Add JS controller to send delete requests.
- Add resource controller to destroy items.
- Add authorisation check to abilities.
- Update fees after removing line item.
2017-05-05 14:19:32 +10:00
Maikel Linke
4112c3cc75
Set auth token for all JS HTTP requests
2017-05-05 14:19:32 +10:00
Maikel Linke
0fe4030d71
Display bought items only if present
2017-05-05 14:19:32 +10:00
Maikel Linke
e8d2d4d96f
Display already bought items in edit cart view
2017-05-05 14:19:32 +10:00
Maikel Linke
88c3f414fb
Handle missing order in cart
2017-05-05 14:18:20 +10:00
Maikel Linke
c0d6b68233
Apply some style guidelines to older code
2017-05-05 14:18:20 +10:00
Maikel Linke
65f62c42b9
Display products already ordered in this oc
...
Github issue #1083 , part of standing orders.
For now, just display already bought products within the same order
cycle in the popup cart view. The edit cart view should follow. Later,
it should be possible to remove items as well.
2017-05-05 14:18:20 +10:00
Maikel Linke
fe7bd5e2cd
Serialise tag_list only for variant overrides
...
Don't try to call tag_list on just variants since that will fail.
Normally, all variants of `current_order` should be extended to
VariantOverrides of the current order cycle. But in development
environment, it can happen that the variants are reloaded without being
extended again.
2017-05-05 14:18:20 +10:00
Maikel Linke
e1b40142b8
Remove unused translations
2017-05-05 14:18:20 +10:00
Maikel Linke
963b4617a9
Add allow-order-changes option to enterprise
2017-05-05 14:18:20 +10:00
Maikel Linke
95ddfc4e40
Merge tag 'v1.8.10' into transifex
2017-05-05 12:28:16 +10:00
François Turbelin
01746ed470
Add missing translations on views
2017-05-04 21:33:17 +02:00
Julius Pabrinkis
f25e3bc6f7
Implement with_currency rspec helper for money amounts
2017-05-04 18:02:38 +01:00
Julius Pabrinkis
e63f1c2991
Refactor time and currency symbol getters
2017-05-03 12:59:16 +01:00
Lynne
29e2886b05
Update contributing.md
...
Include link to discourse post: How to raise a github issue
2017-05-03 11:50:07 +01:00
Julius Pabrinkis
a97bcf74de
Use more simple getter to retrieve currency symbol
2017-05-03 11:25:37 +01:00
Julius Pabrinkis
1e6f4aa73d
Restore bundler version
2017-05-03 11:25:37 +01:00
Julius Pabrinkis
7c7933f8bb
Use local time zone in tests instead of hardcoded
2017-05-03 11:25:37 +01:00
Julius Pabrinkis
dc69c6e825
Use currency symbol from config in tests
2017-05-03 11:25:37 +01:00
Julius Pabrinkis
41e91765ca
Add capybara-screenshot gem for integration tests debugging
2017-05-03 11:25:37 +01:00
Julius Pabrinkis
19569f9316
#1291 Fix dropdown font-size not to zoom in iOS
2017-05-03 10:57:23 +01:00
Maikel Linke
d91c3d1241
Format reset password instructions like Spree
2017-05-03 11:06:48 +10:00
Maikel Linke
b302deb7a3
Add UserMailer specs adapted from Spree code
2017-05-03 11:06:48 +10:00
François Turbelin
2fae467e9a
Translate ResetPasswordConfirmation mail
2017-05-03 11:06:48 +10:00
Transifex-Openfoodnetwork
6a5e4bb592
Updating translations for config/locales/sv.yml [skip ci]
2017-04-30 23:38:53 +10:00
Em-AK
c72d17dc83
Run karma task only in test environment
...
and fails otherwise, as it needs the defaults defined in test environment
2017-04-28 11:28:24 +10:00
Em-AK
78ffdec693
Force english locale in test environment
2017-04-28 11:28:24 +10:00
Pierre de Lacroix
49c19a1d6a
update wkhtmltopdf-binary and wicked_pdf
2017-04-27 18:38:47 +10:00
Pierre de Lacroix
e854eb0426
add tests
...
for methods Spree::Order#tax_adjustment_totals
and Spree::Adjustment#find_closest_tax_rate_from_included_tax
2017-04-27 17:32:36 +10:00
Pierre de Lacroix
4a9c17cb28
better tax aggregation
2017-04-27 17:32:36 +10:00
Matt-Yorkley
0d1547f439
Require OC ready_for in simple OC UI
2017-04-21 09:34:50 +10:00
Matt-Yorkley
fa5ed529cb
Added OC form validation
2017-04-21 09:32:49 +10:00
Matt-Yorkley
accb3076e9
Updated translations
2017-04-21 09:32:49 +10:00
Matt-Yorkley
a4e4e1ec68
Require OC name
2017-04-21 09:32:49 +10:00
Transifex-Openfoodnetwork
507e12adba
Updating translations for config/locales/fr.yml [skip ci]
2017-04-20 22:05:19 +10:00
Maikel Linke
4809237ecc
Fast fail set_order_cycles if distributor not ready
2017-04-19 14:28:17 +10:00
Maikel Linke
81877fedb6
Remove useless andand called on scope
2017-04-19 14:28:17 +10:00
Matt-Yorkley
1f2c6f2a85
Ensure shops display as closed when not configured for sales
...
squashme
squashme
squash
squash
squash
2017-04-19 14:28:17 +10:00
Matt-Yorkley
4fe5e60967
Updated controller stub to pass test
2017-04-19 14:28:17 +10:00
Matt-Yorkley
f4eb9cb790
Hubs display as closed when not configured for payment or shipping
2017-04-19 14:28:16 +10:00
Maikel Linke
775f9b3ada
Move text from view to locale (i18n)
2017-04-12 10:06:53 +10:00
Maikel Linke
188b33921c
Remove test entry in locale
2017-04-12 09:56:24 +10:00
Maikel Linke
20c033317f
Remove unnecessary string interpolation from view
2017-04-12 09:49:24 +10:00
Matt-Yorkley
e7a5d063ac
Update simple OC form
2017-04-12 09:41:40 +10:00
Matt-Yorkley
1fda781d7e
Set maxlength on OC displayname field
2017-04-12 09:41:39 +10:00
Matt-Yorkley
45fc801a08
Added tooltips to OC form
2017-04-12 09:41:39 +10:00
Transifex-Openfoodnetwork
5fa45c0716
Updating translations for config/locales/es.yml [skip ci]
2017-04-08 01:22:10 +10:00
Maikel Linke
21337a5b50
Merge tag 'v1.8.9' into transifex
2017-04-06 10:36:14 +10:00
Maikel Linke
ec36a843cf
Merge tag 'v1.8.8' into transifex
2017-04-06 10:31:26 +10:00
Transifex-Openfoodnetwork
e99dbaf4d8
Updating translations for config/locales/es.yml [skip ci]
2017-04-05 19:40:18 +10:00
Rob Harrington
c83ad2ecc4
Fixing broken limited reached page in registration flow
2017-04-05 17:02:40 +10:00
Matt-Yorkley
80d8d18eb2
Update terms of service config
2017-04-05 15:48:50 +10:00
Rob Harrington
903d1afb53
Stripping html tags from products description on new form as well
2017-04-05 14:29:23 +10:00
Matt-Yorkley
cd55d2e2ff
Product Description - strip weird tags on paste
...
squashme
2017-04-05 11:29:35 +10:00
Rob Harrington
05cf8c4351
Sanitizing product description for textAngular input
2017-04-05 11:29:35 +10:00
Matt-Yorkley
b04d815408
Changes for code review
...
Fixed spec
2017-04-05 11:29:35 +10:00
Matt-Yorkley
7b370a2eb6
Removed underline option
2017-04-05 11:29:35 +10:00
Matt-Yorkley
5808b601b8
Added specs for HTML product description
2017-04-05 11:29:35 +10:00
Matt-Yorkley
fdcd3dc3e3
Fixed Capybara not interacting with textAngular
2017-04-05 11:29:35 +10:00
Matt-Yorkley
c4bd085393
Added Angular and textAngular to edit product page
2017-04-05 11:29:35 +10:00
Matt-Yorkley
0e91d01412
UX improvement for selected formatting options
2017-04-05 11:29:35 +10:00
Matt-Yorkley
fcb9e9fa56
Changed buttons
2017-04-05 11:29:35 +10:00
Matt-Yorkley
3591354cb1
Minor tweaks
2017-04-05 11:29:35 +10:00
Matt-Yorkley
b38eab11eb
Fixed frontend HTML display
2017-04-05 11:29:35 +10:00
Matt-Yorkley
c43dea60b7
Product Descriptions formatting
2017-04-05 11:29:35 +10:00
Pierre de Lacroix
268bea25d0
add qz/ folder from ofn-qz gem to list of assets
2017-03-30 20:37:20 +02:00
Pierre de Lacroix
e94ae20b31
fix print_ticket authorization
2017-03-30 20:37:20 +02:00
Maikel Linke
a94961c0a7
Fixup merge conflicts and remove unused text
2017-03-29 14:58:19 +11:00
Lynne Davis
0d5fde919b
Property name spans signle col heading
2017-03-29 14:47:17 +11:00
Matt-Yorkley
429ef4e2ba
Altered product property headings for issue #522
2017-03-29 14:44:30 +11:00
Lynne Davis
e8999d23e1
Updated translations
2017-03-29 13:12:29 +11:00
Keir Osborn
209c9242d9
remove word-wrap class from enterprise.email_address and enterprise.website in javascripts/templates/partials/contact.html.haml
2017-03-24 12:55:30 +11:00
Transifex-Openfoodnetwork
6defb09d2e
Updating translations for config/locales/fr.yml [skip ci]
2017-03-21 09:03:15 +11:00
Transifex-Openfoodnetwork
2774c09d7a
Updating translations for config/locales/nb.yml [skip ci]
2017-03-20 07:10:53 +11:00
Matt-Yorkley
c62a044598
PI highlight invalid fields in feedback tables
2017-03-17 16:11:52 +11:00
Matt-Yorkley
f73fbe7f23
SpreadsheetEntry Class and PI refactor
2017-03-17 16:11:52 +11:00
Matt-Yorkley
5e1e4c1d19
Product Import UX review updates
...
Minor tweaks
Minor fix
2017-03-17 16:11:52 +11:00
Matt-Yorkley
cc5a335fb7
Refactor and additional permissions checks
...
Don't include non-permitted enterprises in existin product count
Tweaked feedback
2017-03-17 16:11:52 +11:00
Matt-Yorkley
91fc3f33a0
PI reset and save step improvements
2017-03-17 16:11:52 +11:00
Matt-Yorkley
648753b412
Improved save step UI
2017-03-17 16:11:52 +11:00
Matt-Yorkley
24fcc3dd34
PI reset absent products
2017-03-17 16:11:52 +11:00
Matt-Yorkley
14fb40a996
Product Import options and defaults
...
Added available_on test
Obscure case fix and extra spec
2017-03-17 16:11:52 +11:00
Matt-Yorkley
f4511fc74d
PI permission test
2017-03-17 16:11:52 +11:00
Matt-Yorkley
3d0f192490
Product Import update
2017-03-17 16:11:52 +11:00
Matt-Yorkley
6b7cdf3a37
Product Import Refactoring
2017-03-17 16:11:52 +11:00
Matt-Yorkley
052d6c6b02
Product Import basic specs
2017-03-17 16:11:52 +11:00
Matt-Yorkley
6e5c878491
Product Import cancan permissions and ui tab
2017-03-17 16:11:52 +11:00
Matt-Yorkley
c0c6cd1a60
Product Import feature
2017-03-17 16:11:52 +11:00
Matt-Yorkley
2ad433590d
Add roo gem
2017-03-17 16:11:52 +11:00
Rohan Mitchell
2cb3da56ab
Fix regression: Transaction fee double-charged
2017-03-17 12:02:13 +11:00
Rohan Mitchell
8582e6d6b4
Add robustness check against intermittent spec failure
2017-03-17 12:02:13 +11:00
Rohan Mitchell
170101cbfe
Avoid reloading order during checkout request, which clears credit card number
2017-03-17 12:02:13 +11:00
Maikel Linke
8107f49373
Merge remote-tracking branch 'origin/master' into transifex
...
Conflicts:
config/locales/fr.yml
2017-03-16 09:30:22 +11:00
Rob Harrington
7ef0964af2
Adding shortcuts for both sales tax reports to the reports index
2017-03-15 23:57:13 +11:00
Rob Harrington
18472ea8c3
Making 'tax types' report the default sales tax report
2017-03-15 23:56:44 +11:00
Rob Harrington
36e0f45a89
Show the shops invoice text on old invoice template
2017-03-15 17:39:21 +11:00
Rob Harrington
bea0b2b1e5
Adding feature toggle for receipt printing using qz
2017-03-15 16:39:04 +11:00
Rob Harrington
9a69951136
Using correct key for invoice_settings title translation
2017-03-15 16:12:50 +11:00
Rob Harrington
e19bab1aa2
Fixing translations for invoice settings edit template
2017-03-15 15:06:28 +11:00
Rob Harrington
8e2a111a0b
Changing ofn-qz to openfoodfoundation fork
2017-03-15 15:06:28 +11:00
Pierre de Lacroix
70707969f3
Add Qz integration
2017-03-15 15:06:28 +11:00
Pierre de Lacroix
2fe25c6219
Allow both invoice layouts to coexist
...
Add a new "Invoice" page in the admin backend
with a checkbox to toggle between layouts
2017-03-15 15:06:28 +11:00
Pierre de Lacroix
cc1ef5b28b
fixes on invoice and tax report
2017-03-15 15:04:57 +11:00
Pierre de Lacroix
3fc2070b2c
fix aggregation of taxes for taxes on adjustments
2017-03-15 15:03:46 +11:00
Pierre de Lacroix
d22f5678be
small fixes for sales tax report
2017-03-15 15:03:46 +11:00
Rob Harrington
0429906eed
Slight adjustments to invoice layout
...
1. Hide tax column when no tax included in the order
2. Save a little bit of space in the header by sharing rows
2017-03-15 15:03:46 +11:00
Pierre de Lacroix
88a09da325
fix for pull request #1374
2017-03-15 15:03:18 +11:00
Pierre de Lacroix
963f0d601f
fix test for tax report
2017-03-15 15:03:18 +11:00
Pierre de Lacroix
8570471c00
add tax rates report
2017-03-15 15:03:18 +11:00
Pierre de Lacroix
7925af30d6
add enterprise logo and custom text on invoices
2017-03-15 15:03:18 +11:00
Pierre de Lacroix
6f59751582
change i18n fallbacks parameter to EN in production settings
2017-03-15 15:03:18 +11:00
Pierre de Lacroix
2d2792225a
change invoice layout to include amount for each relevant tax rate
2017-03-15 15:03:18 +11:00
Maikel Linke
a079a64cbe
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into i18n2
2017-03-15 12:35:39 +11:00
Maikel Linke
656be690a3
Remove space from permalink tip
2017-03-15 12:11:56 +11:00
Maikel Linke
167045f695
Remove forgotten " character
2017-03-15 12:01:31 +11:00
François Turbelin
dbe968afbb
Fixing translated interpolation in fr locale
2017-03-12 12:42:00 +01:00
François Turbelin
179b995fa0
Fixing wrong string interpolation in i18n files
2017-03-12 12:41:06 +01:00
François Turbelin
4791086207
Fixing i18n multiline issues
2017-03-12 12:39:29 +01:00
François Turbelin
be6b09a6e0
Adding i18n keys on JS templates
2017-03-12 12:22:13 +01:00
Transifex-Openfoodnetwork
f235099859
Updating translations for config/locales/fr.yml [skip ci]
2017-03-11 16:50:17 +11:00
Matt-Yorkley
ff8ca521ff
Open tos pdf in new tab
2017-02-22 13:40:17 +11:00
Rob Harrington
98f7d52493
Refactor: wrapping registration templates in script tags
2017-02-22 13:40:17 +11:00
Rob Harrington
4815405839
WIP: Moving registration templates in app/views as partials
2017-02-22 13:40:17 +11:00
Rob Harrington
42a6e35185
Making registration spec click_and_ensure assertions more generic
...
Assertions can be made about checking checkboxes
2017-02-22 13:40:17 +11:00
Matt-Yorkley
408a57479e
Flaky tests
2017-02-22 13:40:17 +11:00
Matt-Yorkley
beaf54107c
Moved angular template to views folder
2017-02-22 13:40:17 +11:00
Matt-Yorkley
e45d1d42b4
Tidying up
2017-02-22 13:40:17 +11:00
Matt-Yorkley
bc442c7819
Re-adding a line removed in testing
2017-02-22 13:40:17 +11:00
Matt-Yorkley
6a361f2d7b
Specced the new terms of service functionality
2017-02-22 13:40:17 +11:00
Matt-Yorkley
a62998e5f1
Enterprise Terms of Service
2017-02-22 13:40:17 +11:00
François Turbelin
ebcb8ff3e7
Finishing Translations keys implemtentation on Admin ERB views
2017-02-19 22:08:34 +01:00
Maikel Linke
da8c107331
Merge remote-tracking branch 'origin/master' into transifex
...
Conflicts:
config/locales/fr.yml
2017-02-15 15:47:25 +11:00
Continuous Integration
5870927518
Merge remote-tracking branch 'origin/master' into HEAD
2017-02-10 16:42:27 +11:00
Transifex-Openfoodnetwork
e008a154e5
Updating translations for config/locales/sv.yml [skip ci]
2017-02-09 02:36:14 +11:00
Continuous Integration
a2d01b5144
Merge remote-tracking branch 'origin/master' into HEAD
2017-02-08 16:53:53 +11:00
Rob Harrington
8afd5c509b
Using coffescript syntax to check for presence of enterprise_form
2017-02-08 15:59:11 +11:00
Matt-Yorkley
311f72e4cb
Fixing JS spec failure
2017-02-08 15:59:11 +11:00
Matt-Yorkley
78563a7d75
Changed for build failure
2017-02-08 15:59:11 +11:00
Matt-Yorkley
9284dd9b63
Enable save after deleting enterprise manager
2017-02-08 15:59:11 +11:00
Continuous Integration
92981e4fcd
Merge remote-tracking branch 'origin/master' into HEAD
2017-02-08 10:38:47 +11:00
Matt-Yorkley
9235727d45
Merge pull request #5 from mkllnk/pr-1329-enterprise-switcher
...
Re-use NavigationCheck logic
2017-02-02 15:26:01 +00:00
Matt-Yorkley
fc4ead9b05
Ensure on_demand set properly on new products
2017-02-02 01:06:20 +00:00
Maikel Linke
b8622e95b7
Re-use NavigationCheck logic
...
The enterprise switcher now uses the same code as NavigationCheck to
confirm leaving a changed form. This makes FormState obsolete.
Conflicts:
app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
2017-02-02 10:58:32 +11:00
Continuous Integration
f8341dccd4
Merge remote-tracking branch 'origin/master' into HEAD
2017-02-01 10:35:53 +11:00
Lynne
b8ed7789f0
Merge pull request #1427 from openfoodfoundation/revert-1424-master
...
Revert "translate ABN and ACN to company number, charity number"
2017-01-30 13:18:16 +00:00
Lynne
6d19613ecc
Revert "translate ABN and ACN to company number, charity number"
2017-01-30 12:53:01 +00:00
Lynne
0d56cbf169
Merge pull request #1424 from OliverUK/master
...
translate ABN and ACN to company number, charity number
2017-01-30 12:04:54 +00:00
Lynne
67730e82c3
Update en-GB.yml
2017-01-30 12:04:24 +00:00
OliverUK
940ca7ade1
translate ABN and ACN to company number, charity number
2017-01-27 15:02:38 +00:00
Continuous Integration
05f9747f15
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-25 12:41:02 +11:00
Matt-Yorkley
27903ab744
Merge branch 'master' into uk/switcher
2017-01-22 18:57:25 +00:00
Matt-Yorkley
931e528e14
Code review changes
2017-01-22 18:55:28 +00:00
Matt-Yorkley
6bed94a09b
Include E2E permissions
2017-01-22 18:42:23 +00:00
Paul Mackay
165b437f31
#1226 : fix OSM URL to use HTTPS
2017-01-20 15:59:22 +00:00
Continuous Integration
b526307ad1
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-18 18:14:10 +11:00
Continuous Integration
a7bfddfcb5
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-18 17:22:21 +11:00
Continuous Integration
52e4722dcb
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-18 11:19:57 +11:00
Rob Harrington
017916b193
Enterprise distributing_products scope uses INNER JOINS instead of OUTER JOINS
2017-01-17 19:28:21 +11:00
Paul Mackay
02e5ba4dfd
Convert .sass files to .scss format
2017-01-15 12:11:53 +00:00
Paul Mackay
651626eb4f
#1365 : Remove /test dir as it is not used
2017-01-14 11:47:21 +00:00
Continuous Integration
20d01c3047
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-13 11:44:47 +11:00
Continuous Integration
a391b6f076
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-13 11:12:17 +11:00
Continuous Integration
ade73f66c8
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-13 10:50:32 +11:00
Maikel Linke
44970a13bb
Fix translation of email confirmation notice
...
The `_html` suffix was missing leading to `<br />` being displayed in
plain text. The new version also integrates the email address as a
variable in the translation.
2017-01-13 10:21:25 +11:00
Paul Mackay
d80f080af5
#1027 : Use url helpers for basic pages
...
Set groups change frequency to monthly.
2017-01-12 10:18:30 +00:00
Continuous Integration
6ec7276cfc
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-11 16:30:37 +11:00
Continuous Integration
2444d3b547
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-11 15:54:08 +11:00
Maikel Linke
e899633aff
Merge duplicate locale entry admin.enterprises.index
2017-01-11 14:48:05 +11:00
Maikel Linke
a9f01c0f0d
Fix typos in en.yml
2017-01-11 11:15:44 +11:00
Matt-Yorkley
e021afdd8a
Updated spec
2017-01-10 23:53:13 +00:00
François Turbelin
88dea0f2b8
Adding i18n keys on Admin side (Rails views)
2017-01-11 10:00:06 +11:00
Matt-Yorkley
5150025641
Updated tag rules UI
2017-01-10 22:54:22 +00:00
Paul Mackay
fc400741b4
Remove lastmod for groups
2017-01-10 11:44:57 +00:00
Paul Mackay
5cb2194f5e
#1027 : Add sitemap.xml generation
2017-01-10 11:39:17 +00:00
Transifex-Openfoodnetwork
64f6a794fc
Updating translations for config/locales/nb.yml [skip ci]
2017-01-08 23:36:57 +11:00
elf Pavlik
764c95488c
made api key optional (google maps)
2017-01-07 10:25:32 -06:00
Lynne
6cabba4cd8
Merge pull request #1354 from openfoodfoundation/uk/translation
...
Uk/translation
2017-01-06 10:00:23 +00:00
elf Pavlik
bd1cd527d3
configurable google maps api key
2017-01-03 20:57:10 -06:00
Lynne Davis
d17f9dc504
update
2017-01-03 16:35:01 +00:00
Lynne Davis
f62c583130
uk translation updates
2017-01-03 16:12:41 +00:00
Maikel
b1e27e0dad
Auto-merged master into uk/translation on deployment.
2017-01-04 02:24:40 +11:00
Levent Ali
6ae1272281
Mark order cycle form as dirty when removing fees
...
Resolves an issue where removing coordinator/exchange fees
wasn't allowing users to save the OC.
Fixes #1165
2016-12-23 09:33:34 +11:00
Lynne
e0cb6ed60a
Merge pull request #1349 from openfoodfoundation/tos
...
Adding UK ToS to repo
2016-12-22 18:31:30 +00:00
Maikel
8aeec74fed
Auto-merged master into tos on deployment.
2016-12-22 23:19:27 +11:00
Lynne Davis
7cd7e7367b
Adding UK TOS to repo
2016-12-22 12:09:44 +00:00
Continuous Integration
4f4fe90db4
Merge remote-tracking branch 'origin/master' into HEAD
2016-12-21 15:27:57 +11:00
Continuous Integration
7a7cd3a937
Merge remote-tracking branch 'origin/master' into HEAD
2016-12-21 14:16:08 +11:00
Continuous Integration
bfc01e7c89
Merge remote-tracking branch 'origin/master' into HEAD
2016-12-21 11:21:42 +11:00
Matt-Yorkley
bc5672b5eb
Added translation
2016-12-20 13:30:24 +00:00
Lynne Davis
d77f775c4c
Moving commits from 1241 to trigger build on UK staging
2016-12-19 15:06:43 +00:00
Matt-Yorkley
7531c8cbc9
Removed dashes
2016-12-19 11:10:12 +00:00
Matt-Yorkley
38fe0afc03
Changed p widths
2016-12-17 22:59:29 +00:00
Matt-Yorkley
252f876827
Fixed orders closed display for mobile view
2016-12-17 22:54:59 +00:00
Matt-Yorkley
6d9bae8ef9
Checkout layout adjustments for mobile view
2016-12-17 20:39:13 +00:00
Matt-Yorkley
0b2281dfe2
Adjustment for chrome browser
2016-12-17 16:07:39 +00:00
Continuous Integration
72cff0688a
Merge remote-tracking branch 'origin/master' into HEAD
2016-12-16 15:24:52 +11:00
Rohan Mitchell
9793450ed0
Make mobile menu mimic the large menu
2016-12-16 14:40:13 +11:00
Rohan Mitchell
c8f0502e71
Apply connect_learn_homepage feature toggle to mobile menu
2016-12-16 14:32:48 +11:00
Continuous Integration
b075ed373a
Merge remote-tracking branch 'origin/master' into HEAD
2016-12-16 13:46:08 +11:00
Rafael Braz
eef308c4f6
create a pr-br translate file ( #1266 )
2016-12-15 08:39:37 +11:00
Transifex-Openfoodnetwork
70225afa13
Updating translations for config/locales/fr.yml [skip ci]
2016-12-12 05:53:28 +11:00
Matt-Yorkley
0a67876815
Update angular-file-uploader-rails to v1.1.6
2016-12-09 18:47:16 +00:00
Lynne
b59e5ad248
Merge pull request #1243 from openfoodfoundation/uk/translations
...
Translation updates
2016-12-09 16:37:38 +00:00
Matt-Yorkley
287e0b5b55
Enterprise switcher and navigation check
2016-12-09 15:15:42 +00:00
Continuous Integration
c6a1560845
Auto-merge from CI [skip ci]
2016-12-10 01:42:26 +11:00
Lynne Davis
45dc1341d3
translation updates
2016-12-09 14:41:16 +00:00
Matt-Yorkley
7d7197da58
Reordered enterprises submenu
2016-12-09 14:31:34 +00:00
Matt-Yorkley
066f42070a
Fixed confusing wysiwyg line breaks display discrepency
2016-12-09 14:12:00 +00:00
Lynne Davis
cad3464f56
Adjusted BOM spec to reflect currency symbol changes
2016-12-09 11:40:55 +00:00
Rohan Mitchell
bbcaef20a8
Add unit specs for Spree::Admin::NavigationHelper
2016-12-09 11:24:58 +11:00
Rohan Mitchell
43726a0b23
Fix inventory link not appearing on menu
2016-12-08 10:38:29 +11:00
Rohan Mitchell
6e6efea328
Fix groups link not appearing on menu
2016-12-08 10:38:23 +11:00
Maikel Linke
a2a6ce1b3e
Revert "TEMP: Remove override for no-longer-present method"
...
This reverts commit a3b91dabe5 .
Conflicts:
app/helpers/spree/admin/navigation_helper_decorator.rb
2016-12-08 10:38:21 +11:00
Maikel Linke
3a69c958ef
Hide super admin menu items for enterprise users
...
Imported temporarily missing Spree functionality. This patch becomes
obsolete with another Spree upgrade.
2016-12-08 10:38:21 +11:00
Continuous Integration
14ee7a06ae
Merge remote-tracking branch 'origin/master' into HEAD
2016-12-07 17:03:27 +11:00
Maikel Linke
6cd8289b27
Correct more typos
2016-12-02 16:50:54 +11:00
Rob Harrington
d0509b54bf
Disabling override the adds coupon field to cart page
2016-11-30 18:30:20 +11:00
Lynne Davis
ee905cad5f
Translation updates
2016-11-29 15:07:35 +00:00
Transifex-Openfoodnetwork
01efb63ad3
Updating translations for config/locales/en_GB.yml [skip ci]
2016-11-30 01:07:53 +11:00
Matt-Yorkley
7981feefa1
Updated form to include help tip for clarity
2016-11-28 14:38:13 +00:00
Rohan Mitchell
d4fd66461e
Add retry to flaky specs
2016-11-25 14:37:47 +11:00
Rohan Mitchell
071ba5285d
Put timecop config in spec support
2016-11-25 14:28:05 +11:00
Rohan Mitchell
6795237a2d
Put timecop into safe mode and fix leaky Timecop.freeze
2016-11-25 14:14:42 +11:00
Rohan Mitchell
57363e2da5
When a product is deleted, touch the supplier and distributors
2016-11-25 14:14:42 +11:00
Rohan Mitchell
da9a3ce9f3
Refresh products cache when product is deleted (cf. destroyed)
2016-11-25 14:14:42 +11:00
Rohan Mitchell
c4318030d3
Fix spec: Second visit doesn't actually reload the page
2016-11-25 14:14:42 +11:00
Rohan Mitchell
44a301edb1
When touching distributing enterprises, do not touch self -> infinite recursion
2016-11-25 14:14:42 +11:00
Rohan Mitchell
dabac50128
Replace Enterprise.distributing_product and Enterprise.distributing_any_product_of with Enterprise.distributing_products
2016-11-25 14:14:42 +11:00
Rohan Mitchell
6030e9a294
Cache enterprise supplied and distributed properties and producer properties
2016-11-25 14:14:42 +11:00
Rohan Mitchell
9b656eaf4f
Property / ProducerProperty changes update distributor enterprise cache
2016-11-25 14:14:42 +11:00
Rohan Mitchell
22080a9a08
Property / ProducerProperty changes update supplier enterprise cache
2016-11-25 14:14:42 +11:00
Rohan Mitchell
d93fe3cf2c
Cache enterprise supplied and distributed taxons
2016-11-25 14:14:42 +11:00
Rohan Mitchell
1ea4f4274c
Add enterprise cache invalidation for order cycle changes
2016-11-25 14:14:42 +11:00
Rohan Mitchell
bd11c6ce14
New hash style
2016-11-25 14:14:42 +11:00
Rohan Mitchell
e8848451a5
Spacing
2016-11-25 14:14:42 +11:00
Rohan Mitchell
f4f38b4183
Re-apply shop property filters - including performance regression
...
This reverts commit 7d149ed198 .
2016-11-25 14:14:42 +11:00
Rob Harrington
27283c50b8
Customers service clears array fo each #index request
2016-11-25 12:43:48 +11:00
Matt-Yorkley
3e77534dcf
Product variant form script
2016-11-25 01:31:45 +00:00
Rob Harrington
5e214a32b3
Moving ShippingMethods service to admin.resource module
2016-11-25 11:59:00 +11:00
Rob Harrington
7498b7f098
Moving PaymentMethods service to admin.resource module
2016-11-25 11:57:59 +11:00
Rob Harrington
268c8dbcdd
Moving Customers and CustomerResource services to admin.resource module
2016-11-25 11:46:51 +11:00
Rob Harrington
dbbd52cace
Fixing broken taxons filter on bulk product edit
...
Was referencing Taxons.taxons instead of Taxons.all
2016-11-25 10:37:01 +11:00
Rob Harrington
1770a67cd9
Adding #load function to services for resources, for generic loading of data into byID and pristineByID
2016-11-25 10:37:01 +11:00
Rob Harrington
3678d4d018
Creating new 'resources' module for holding interdependent ngResource services
2016-11-25 10:37:01 +11:00
Rob Harrington
3de69987e6
Changing convention for angular resource services to generic 'byID' object and 'all' array
2016-11-25 10:37:01 +11:00
Rob Harrington
cbbb047fc1
Expunge all mentions of includeBlank and blankOption from angular services
2016-11-25 10:37:01 +11:00
Maikel Linke
338d3cbc38
Delete old commented code
2016-11-25 10:27:13 +11:00
Maikel Linke
4c438ff101
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into shop-navigation-directive
2016-11-25 10:24:42 +11:00
Rohan Mitchell
631b19084a
Fix intermittent failure via FK when deleted taxon is primary taxon on p2
2016-11-25 09:37:05 +11:00
Levent Ali
63e815c7fc
Correct spelling of further in translations
2016-11-24 08:31:01 +00:00
Rohan Mitchell
b7e9ffc9da
Fix enterprise user being denied access to admin when spree dash configured (as on production)
2016-11-24 13:35:49 +11:00
Rohan Mitchell
d8ce0e7d58
A user without enterprises does not have access to the dashboard, so it's not meaningful to spec
2016-11-24 13:35:04 +11:00
Continuous Integration
a115f2a268
Merge remote-tracking branch 'origin/master' into HEAD
2016-11-23 15:00:02 +11:00
Maikel Linke
c0c8b07add
Let shopping tabs listen to URL changes
...
When clicking on a shopping tab like "contact", it changed the URL. But
changing the URL did not change the tab. Listening to URL changes
enables manual manipulation of the URL and simple links to "#/contact"
to open the contact tab.
2016-11-11 17:11:39 +11:00
Rohan Mitchell
5913004e14
Fix datepicker error parsing date
2016-11-09 11:47:57 +11:00
Rohan Mitchell
f4034b1065
Fix spec
2016-11-04 09:39:17 +11:00
Rob Harrington
db93b74490
Refactoring ofnSelect2, works with multiple, and with promised data
2016-11-04 09:39:17 +11:00
Rohan Mitchell
d574b8943b
WIP: Cherry-pick b2d82b6 - Using ofnSelect2 instead of plain select on BOM
2016-11-04 09:39:17 +11:00
Rohan Mitchell
46fcf7b62e
Fix enterprise group save error - initialise address correctly
2016-11-04 09:39:17 +11:00
Rohan Mitchell
3e565ad7cb
Mark admin enterprises form dirty when property removed
2016-11-04 09:39:17 +11:00
Rohan Mitchell
0e01350107
Use jquery-migrate instead of downgrading jQuery to access $.browser
2016-11-04 09:39:17 +11:00
Rohan Mitchell
7d79fffa33
Reinstate Spree::PaymentMethod::DISPLAY (removed in Spree but used by us)
2016-11-04 09:39:17 +11:00
Rohan Mitchell
4117b32ebd
Fix specs: We had no permission to update the specified supplier (how did this ever work?)
2016-11-04 09:39:17 +11:00
Rohan Mitchell
7a68cc7da1
Remove spec for product distributions
2016-11-04 09:39:17 +11:00
Rohan Mitchell
20e6b703d9
Rewrite alias_method to alias_method_chain
2016-11-04 09:39:17 +11:00
Rohan Mitchell
a1535d6c04
Catch flash messages after fadeout
2016-11-04 09:39:17 +11:00
Rohan Mitchell
f33df883a0
Fix link_to_remove_fields - does not immediately delete the field
2016-11-04 09:39:17 +11:00
Rohan Mitchell
48acf80c85
Fix tabbing
2016-11-04 09:39:17 +11:00
Rohan Mitchell
d8f8c0df16
Fix API auth: Need Spree::Api::UsersController for authorise_api action to work
2016-11-04 09:39:17 +11:00
Rohan Mitchell
8ce917a422
Work around click obscuration
2016-11-04 09:39:17 +11:00
Rohan Mitchell
6546d2763b
Add Spree::Money#to_html (from Spree 2.0)
2016-11-04 09:39:17 +11:00
Rohan Mitchell
d3a3b2da9a
Pin jquery-rails to 2.1.4 (older version) to prevent missing $.browser errors
2016-11-04 09:39:17 +11:00
Rohan Mitchell
fdd6400cb8
Fix perms for API soft delete
2016-11-04 09:39:17 +11:00
Rohan Mitchell
225e436293
Update included tax param before loading resource
2016-11-04 09:39:17 +11:00
Rohan Mitchell
0e354f8fc1
Remove unused currency config vars: decimal_mark, thousands_separator
2016-11-04 09:39:17 +11:00
Rohan Mitchell
a6a0bdb063
Sanitize values before they're used
2016-11-04 09:39:17 +11:00
Rohan Mitchell
6753320336
Do not stomp address on create
2016-11-04 09:39:17 +11:00
Rohan Mitchell
a3b91dabe5
TEMP: Remove override for no-longer-present method
2016-11-04 09:39:17 +11:00
Rohan Mitchell
257441c9be
Re-add object-level auth to Spree::Admin::ResourceController
2016-11-04 09:39:17 +11:00
Rohan Mitchell
1497d2c3bb
Remove missing call
2016-11-04 09:39:17 +11:00
Rohan Mitchell
8f0bc367d0
Include missing helpers
2016-11-04 09:39:17 +11:00
Rohan Mitchell
764219b9ed
Fix OrderMailer#find_order
2016-11-04 09:39:17 +11:00
Rohan Mitchell
7f7ee25e27
Money accessors changed to dollars/cents
2016-11-04 09:39:17 +11:00
Rohan Mitchell
1765ba0422
Fix spec dependent on product on_demand
2016-11-04 09:39:17 +11:00
Rohan Mitchell
32d2adc8a2
Fix mailers - provide from address
2016-11-04 09:39:17 +11:00
Rohan Mitchell
d890770104
Order state transition condition removed in Spree
2016-11-04 09:39:17 +11:00
Rohan Mitchell
376c4c3e0e
Fix factories - base_product and base_variant removed
2016-11-04 09:39:17 +11:00
Rohan Mitchell
a0b740f52d
Generalise fix for missing EnterpriseFee::Calculator to any use of calculated_adjustments
2016-11-04 09:39:17 +11:00
Rohan Mitchell
0d4c4f20df
Fix missing EnterpriseFee::Calculator error
...
Conflicts:
app/models/enterprise_fee.rb
2016-11-04 09:39:17 +11:00
Rohan Mitchell
ab707cf312
Bundle incremental Spree upgrade
2016-11-04 09:39:17 +11:00
Rohan Mitchell
9989b76b7d
Integrate from Spree fork: Calculators work against LineItems
2016-11-04 09:39:17 +11:00
Rohan Mitchell
04a714426f
Integrate from Spree fork: Fix spree issues #3531 and #2210 (patch provided by leiyangyou)
2016-11-04 09:39:17 +11:00
Maikel Linke
b66cf14bcb
Merge remote-tracking branch 'origin/master' into transifex
...
Conflicts:
config/locales/en_GB.yml
2016-10-28 15:21:03 +11:00
Transifex-Openfoodnetwork
b78739f777
Updating translations for config/locales/it.yml [skip ci]
2016-10-21 22:51:27 +11:00
Bing Xie
fb08759bec
Add more tests
2016-10-21 14:45:04 +11:00
Bing Xie
a4755865ca
Fix customer name
2016-10-21 11:58:50 +11:00
Bing Xie
5318aaedcf
Fix country id and state in type bug
2016-10-21 11:42:13 +11:00
Rob Harrington
3e56571e59
Making checkout accordion work with new local storage library
2016-10-21 10:51:36 +11:00
Rob Harrington
e57a25d05f
Replacing local storage library with actively maintained one: grevory/angular-local-storage
2016-10-21 10:51:36 +11:00
Rob Harrington
b59a1cc232
Using true/false instead of YES/NO for address defaults and billing same as shipping
2016-10-21 10:51:36 +11:00
Bing Xie
720ca17533
Fix the mistake
2016-10-21 10:51:36 +11:00
Bing Xie
d48b00c77c
Fix failed user spec
2016-10-21 10:51:36 +11:00
Bing Xie
77f43e3ca7
Refactor setting default addresses
2016-10-21 10:51:36 +11:00
Bing Xie
23b8fbbbc7
Update customer's default address
2016-10-21 10:51:36 +11:00
Bing Xie
b0402daf32
Fix failed customers filter spec
2016-10-21 10:51:36 +11:00
Bing Xie
079788b4eb
Add customer preferred bill and ship address
2016-10-21 10:51:36 +11:00
Bing Xie
21ed37189a
Only search customers in user managed enterprises
2016-10-21 10:51:36 +11:00
Bing Xie
80d755da0d
Convert state_id and country_id in serializer
2016-10-21 10:51:36 +11:00
Bing Xie
8d534041b2
Refactor js CurrentOrder
2016-10-21 10:51:36 +11:00
Bing Xie
e91c313f1e
Fix state_id and country_id type bug
2016-10-21 10:51:36 +11:00
Bing Xie
2f241485a2
Set default addresses for user or customer
2016-10-21 10:51:36 +11:00
Bing Xie
f14ca87eb5
Set new address for user
2016-10-21 10:51:36 +11:00
Bing Xie
1caf648fe5
Move customer search to directive
2016-10-21 10:51:36 +11:00
Bing Xie
ac39c93bbf
Fix failed js test
2016-10-21 10:51:36 +11:00
Bing Xie
63617f80c5
Add confirm when delete customer
2016-10-21 10:51:36 +11:00
Bing Xie
a94a30f422
Update the orders spec
2016-10-21 10:51:36 +11:00
Bing Xie
63dc48a075
Override customer search UI
2016-10-21 10:51:36 +11:00
Bing Xie
bc798504e0
Add new enterprise customers search API
2016-10-21 10:51:36 +11:00
Bing Xie
fd32152e88
Search customers in enterprises
2016-10-21 10:51:36 +11:00
Bing Xie
1877bea68d
Customer serializer without tag_rule_mapping option
2016-10-21 10:51:36 +11:00
Bing Xie
f7523ad88c
Create customer with default name and addresses
2016-10-21 10:51:36 +11:00
Bing Xie
ae2357d309
Edit customer address with first name and last name
2016-10-21 10:51:36 +11:00
Bing Xie
8afbdcaf79
Move phone down
2016-10-21 10:51:36 +11:00
Bing Xie
3e590f92ff
Set default billing address and shipping address
2016-10-21 10:51:36 +11:00
Bing Xie
a6cfa061e4
Fix ship_address_same_as_billing checkbox value with string
2016-10-21 10:51:36 +11:00
Maikel Linke
d59db1cd97
Merge remote-tracking branch 'origin/master' into uk/delivery-address
2016-10-19 11:01:24 +11:00
Transifex-Openfoodnetwork
7cfb25ace9
Updating translations for config/locales/en_GB.yml [skip ci]
2016-10-15 01:48:24 +11:00
Continuous Integration
51f97f5b28
Merge remote-tracking branch 'origin/master' into HEAD
2016-10-12 13:02:27 +11:00
Transifex-Openfoodnetwork
33d940c736
Updating translations for config/locales/fr.yml [skip ci]
2016-10-12 01:03:42 +11:00
Maikel Linke
08b9b50f33
Re-phrase shop options
2016-10-07 13:17:28 +11:00
Maikel Linke
7c3968b64e
Hide guest checkout if deactivated
2016-10-05 15:41:09 +11:00
Maikel Linke
c59cd21698
Add option 'allow guest orders' to enterprise
...
An enterprise manager can choose to allow guest orders (default) or
require a valid login for checkout.
2016-10-05 14:04:08 +11:00
Maikel Linke
92694c729f
Move 'shopfront requires login' setting
...
Move 'shopfront requires login' setting to 'shop preferences' tab in
Profile Edit.
Solves issue #901 .
2016-10-05 14:04:08 +11:00
Maikel Linke
7b2b285ba7
Rescue spec fails within enqueue_job matcher
...
Failing code tested by the enqueue_job matcher made it fail with:
expected ConfirmOrderJob to be enqueued matching {} (??? others enqueued)
That was not helpful and masking the real failure. That failure is now
passed on. The hidden intermittent failure happened in 5% of runs on
Travis.
2016-10-05 14:04:08 +11:00
Maikel Linke
caeb8f08e7
Use link_to with mailto attribute to un-reverse email
2016-10-05 12:31:42 +11:00
Continuous Integration
499237715e
Auto-merge from CI [skip ci]
2016-10-05 03:08:43 +11:00
Lynne Davis
7eb2dfba48
Update delivery report to use shipping address
2016-10-04 17:04:35 +01:00
Continuous Integration
815cf16822
Auto-merge from CI [skip ci]
2016-10-05 01:33:18 +11:00
Lynne Davis
a3722dee80
delete file - fix conflict
2016-10-04 15:29:57 +01:00
Lynne Davis
79ea2fd39d
Reverse email address
2016-10-03 16:54:15 +01:00
Transifex-Openfoodnetwork
b349c28b9b
Updating translations for config/locales/nb.yml [skip ci]
2016-10-02 00:38:02 +10:00
Lynne Davis
40ca2ccee4
Updating TOS url in confirmation email to refer to content_config
2016-09-25 15:14:44 +01:00
Lynne Davis
84b4a9bcbe
update to internationalise email address in sell page
2016-09-25 14:00:11 +01:00
Maikel
1742367b36
Auto-merged master into issue_1134 on deployment.
2016-09-22 04:50:28 +10:00
Rhodri Karim
8a1d34e711
Fix for issue 1134 - 'Pack by supplier' report now groups by order rather than last name.
2016-09-21 19:41:43 +01:00
Maikel Linke
fba72498e3
Merge remote-tracking branch 'origin/master' into transifex
2016-09-21 16:36:22 +10:00
Lynne Davis
c533f6a15e
Updates to UK translations
2016-09-19 20:33:58 +01:00
Transifex-Openfoodnetwork
23a216004e
Updating translations for config/locales/en_GB.yml [skip ci]
2016-09-20 01:02:27 +10:00
Rob Harrington
7d149ed198
Revert shop property filters - causing 10x slowdown
...
This commit reverts commits 7eeee78c4e to e8f96e4818 (inclusive)
2016-09-18 17:46:43 +10:00
Rohan Mitchell
e8f96e4818
When a shop is open, only show taxon badges for currently open order cycles
2016-09-16 11:47:45 +10:00
Rohan Mitchell
3ca42ae055
Extract ids_to_objs to SerializerHelper
2016-09-16 11:36:27 +10:00
Rohan Mitchell
c0db23af90
Spree::Taxon.distributed_taxons can be scoped to taxons in open order cycles
2016-09-16 11:36:27 +10:00
Rohan Mitchell
db583df198
Use inner join for Spree::Taxon.distributed_taxons
2016-09-16 11:36:27 +10:00
Rohan Mitchell
306bd25dd9
EnterpriseSerialiser shows current properties for open shops and all properties for closed shops
2016-09-16 11:36:27 +10:00
Rohan Mitchell
f98b25b719
Add Spree::Property.ever_sold_by
2016-09-16 11:36:27 +10:00
Rohan Mitchell
1bc477f6b1
Add ProducerProperty.ever_sold_by
2016-09-16 11:36:26 +10:00
Rohan Mitchell
c37bf3d077
Rename Property#sold_by and ProducerProperty#sold_by to currently_sold_by
2016-09-16 11:36:26 +10:00
Rohan Mitchell
3a2e0b7eff
Fix spacing
2016-09-16 11:36:26 +10:00
Rohan Mitchell
38c63fc88b
Available producer filters update when taxon filter changed
2016-09-16 11:36:26 +10:00
Rohan Mitchell
8ec2ebbf94
Swap to using multi-line selectors for property filters - z-index issues with single-line-selectors
2016-09-16 11:36:26 +10:00
Rohan Mitchell
e00846776e
Client-side, always show properties by their presentation, not their name
2016-09-16 11:36:26 +10:00
Rohan Mitchell
8339d247f8
Shops on groups page filter by property
2016-09-16 11:36:26 +10:00
Rohan Mitchell
ed2522f6d2
Explicitly specify supplied or distributed properties for ng filters: properties, propertiesOf
2016-09-16 11:36:26 +10:00
Rohan Mitchell
63ef5de0e5
Use short syntax for render partial
2016-09-16 11:28:45 +10:00
Rohan Mitchell
38d5682762
Add property filters for shops
2016-09-16 11:28:45 +10:00
Rohan Mitchell
4c40219352
Move hubs partials from home to shops, their rightful home
2016-09-16 11:28:45 +10:00
Rohan Mitchell
7eeee78c4e
WIP: Move hubs partials from home to shops, their rightful home
2016-09-16 11:28:45 +10:00
Rob Harrington
0760d4cc1f
Fixing property filters on shopfront
2016-09-08 12:15:36 +10:00
Rob Harrington
261a574da9
Tweaking styling on enterprise change form, and dashboard header row
2016-09-07 11:13:48 +10:00
Rob Harrington
da55eb6d27
Form for changing enterprise type specifies trial length
2016-09-07 11:13:05 +10:00
Rob Harrington
be51a55f16
Only display shopfront trial message on dashboard page. Fixes #1120
2016-09-02 13:45:49 +10:00
Rob Harrington
b2e14711ac
Gateway providers inherit from decorated Gateway and PaymentMethod classes in production
...
Achieved by requiring payment method and gateway decorators in Spree initializer
2016-08-31 12:43:22 +10:00
Rob Harrington
1059c170d1
Adding require_relative of Gateway decorator in attempt to fix inheritance for Gateway::PayPalExpress
2016-08-31 11:32:09 +10:00
Rohan Mitchell
08465a531d
Make properties and propertiesOf filters compatible with both products and enterprises
2016-08-26 12:13:48 +10:00
Rohan Mitchell
58e0b95cf6
Show property badges on shops
2016-08-26 12:13:48 +10:00
Rohan Mitchell
7b5e8fa603
Rename API field properties to supplied_properties
2016-08-26 12:13:47 +10:00
Rohan Mitchell
c70993ce75
Find producer properties of items sold by a shop
2016-08-26 12:13:47 +10:00
Rohan Mitchell
aa6e7cba30
Do not return duplicates with Spree::Property.sold_by
2016-08-26 12:13:47 +10:00
Rohan Mitchell
4529ced3f2
Find properties of items sold by a shop
2016-08-26 12:13:47 +10:00
Rohan Mitchell
509564819a
Remove FlatPercentPerItem calculator for shipping methods and payment methods to reduce confusion
2016-08-26 10:26:50 +10:00
Rohan Mitchell
24d0e4fcf8
Update specs for calculator change
2016-08-26 09:29:09 +10:00
Rohan Mitchell
308c24caf4
Add FlatPercentPerItem calculator for shipping methods, remove FlatPercentItemTotal for enterprise fees (causes shopfront cart discrepencies).
2016-08-26 09:29:09 +10:00
Rohan Mitchell
10b076562f
Make all calculators use FlatPercentPerItem instead of FlatPercentItemTotal
2016-08-26 09:29:09 +10:00
Rohan Mitchell
701c047a0a
Move our customisations of FlatPercentItemTotal calculator to a new calc: FlatPercentPerItem
2016-08-26 09:28:29 +10:00
Rohan Mitchell
fa30e28335
Update spec: Our pricing calculations are now consistent between the frontend and backend carts
2016-08-26 09:28:29 +10:00
Rohan Mitchell
5b964ef502
Provide price to calculator to meet new requirements of FlatPercentItemTotal
2016-08-26 09:28:29 +10:00
Rohan Mitchell
b0eebc2e45
Round FlatPercentItemTotal calcs per-item before summing full quantity
2016-08-26 09:28:29 +10:00
Rohan Mitchell
7b2f65a965
Refactor spec so we can have different products in the cart
2016-08-26 09:28:29 +10:00
Rohan Mitchell
0dc12d8791
Parameterise add_product_to_cart spec helper method
2016-08-26 09:28:29 +10:00
Continuous Integration
88b9514090
Merge remote-tracking branch 'origin/master' into HEAD
2016-08-24 11:18:41 +10:00
Bing Xie
e5d7b545c9
I18n and refactoring
2016-08-24 10:43:50 +10:00
Maikel Linke
c4f81b019e
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into sign_up_email_i18n
2016-08-19 09:27:17 +10:00
Transifex-Openfoodnetwork
528af8759d
Updating translations for config/locales/nb.yml [skip ci]
2016-08-19 01:23:43 +10:00
Maikel Linke
c34e9c046b
Remove quotes around url
2016-08-17 16:44:27 +10:00
Transifex-Openfoodnetwork
baeabdd668
Updating translations for config/locales/nb.yml [skip ci]
2016-08-12 19:53:12 +10:00
Transifex-Openfoodnetwork
1de2300099
Updating translations for config/locales/nb.yml [skip ci]
2016-08-12 19:07:43 +10:00
Transifex-Openfoodnetwork
53e8056450
Updating translations for config/locales/fr.yml [skip ci]
2016-08-12 18:56:13 +10:00
Transifex-Openfoodnetwork
5773876cbc
Updating translations for config/locales/fr.yml [skip ci]
2016-08-12 17:26:28 +10:00
Bing Xie
ed1f05e674
Show successful message
2016-08-12 16:31:49 +10:00
Bing Xie
98f3e15d87
Updating customer address feature tests
2016-08-12 14:44:59 +10:00
Bing Xie
95c152420c
Test customer model updating shipping address
2016-08-12 14:44:59 +10:00
Bing Xie
bdb2b5cce8
Style and i18n the edit address page
2016-08-12 14:44:59 +10:00
Bing Xie
22ccbd5556
Required fields validation
2016-08-12 14:44:59 +10:00
Bing Xie
81d9ec71d9
Front-end updating address function
2016-08-12 14:44:59 +10:00
Bing Xie
45e3f8ab3a
Fill the from with model
2016-08-12 14:44:59 +10:00
Bing Xie
5b40c745f3
Add address serializer to customer serializer
2016-08-12 14:44:59 +10:00
Bing Xie
69addf056b
Edit customer address form
2016-08-12 14:44:59 +10:00
Bing Xie
34d5df69a5
Fix failed customers controller spec
2016-08-12 14:44:59 +10:00
Bing Xie
d160142945
Make bill address and ship address as nested attributes
2016-08-12 14:44:59 +10:00
Bing Xie
8234956a61
Inject available countries on admin customers page
2016-08-12 14:44:59 +10:00
Bing Xie
225bed9990
Add a simple edit address dialog
2016-08-12 14:44:59 +10:00
Bing Xie
7f203f5491
Show billing address and shipping address on customers index page
2016-08-12 14:44:59 +10:00
Bing Xie
add39f7401
Enterprise user can update customer's name
2016-08-12 14:44:59 +10:00
Bing Xie
ca0c3a028d
Add name to customers
2016-08-12 14:44:59 +10:00
Bing Xie
b08a642377
Add billing_address and shipping_address to Customer
2016-08-12 14:44:59 +10:00
Bing Xie
37ace77734
Add bill_address_id and ship_address_id to customers
2016-08-12 14:44:59 +10:00
Maikel Linke
8645144231
Merge remote-tracking branch 'origin/master' into transifex
2016-08-10 21:01:12 +10:00
Rob Harrington
47df8d6d8e
Refactoring AngularJS Shop Variant filtering logic for improved speed
2016-08-10 12:08:03 +10:00
Rob Harrington
f9b58b7b90
Ensure bill is > 0 for spec
2016-08-10 12:08:03 +10:00
Rob Harrington
b957555c82
Adding infinite-scroll to the shopfront
...
For performance improvement with large data sets
2016-08-10 12:08:03 +10:00
Maikel Linke
d40733d447
Add redirects to global site for /connect, /learn
2016-08-07 10:24:07 +10:00
Rohan Mitchell
1f5da8699d
Build plz
2016-08-05 15:58:00 +10:00
Rohan Mitchell
fcd422c6ce
Fix path helper fail in footer
2016-08-05 15:18:29 +10:00
Rohan Mitchell
5eecdb8c9c
Update footer: Link to sell instead of individual register links
2016-08-05 15:03:07 +10:00
Rohan Mitchell
3b0084025a
Add copy for home page learn and connect panes
2016-08-05 15:02:44 +10:00
Rohan Mitchell
8f4cbf1d9f
Update page alert label and background colour
2016-08-05 15:02:10 +10:00
Rohan Mitchell
0dba54a4b8
Update page alert text
2016-08-05 14:43:44 +10:00
Rohan Mitchell
61c9355ffb
Fill in sell page copy
2016-08-05 14:40:42 +10:00
Rohan Mitchell
0830a5bd85
Add basic sell page
...
Conflicts:
config/routes.rb
2016-08-05 12:33:09 +10:00
Rohan Mitchell
1054fd2d05
View closed shops by URL
2016-08-03 16:07:15 +10:00
Rohan Mitchell
f03839b70c
Update shopping header
2016-08-03 16:07:15 +10:00
Rohan Mitchell
0076b1b9a0
Add connect and learn panes to home page
2016-08-03 16:07:15 +10:00
Rohan Mitchell
d3ab9faede
Show registration CTA in footer rather than connect and learn CTA
2016-08-03 16:07:15 +10:00
Rohan Mitchell
ee2c1ef195
Extract home page tagline to partial
2016-08-03 16:07:15 +10:00
Rohan Mitchell
57a2f1b339
Simplify, simplify
2016-08-03 16:07:15 +10:00
Rohan Mitchell
d93d1653db
Add directive for smooth scrolling to anchor
2016-08-03 16:07:15 +10:00
Rohan Mitchell
140589fc2d
Extract classical backgrounds to mixins
2016-08-03 16:07:15 +10:00
Rohan Mitchell
1216da38d1
Update menu: [Groups, About] -> [Connect, Learn]
2016-08-03 16:07:15 +10:00
Rohan Mitchell
5b43d7a87a
Add connect and learn links to page alert
2016-08-03 16:07:15 +10:00
Rohan Mitchell
87e063593a
Add feature toggle helper, allow hash or string queries
2016-08-03 16:07:15 +10:00
Rohan Mitchell
23827d6c57
Add feature toggle for Connect+Learn homepage
2016-08-03 16:07:15 +10:00
Rohan Mitchell
e966b474b4
Remove order cycles feature toggle
2016-08-03 16:07:11 +10:00
Rohan Mitchell
1388c077ea
Remove unused feature toggles
2016-08-03 12:08:51 +10:00
Transifex-Openfoodnetwork
4d1a5c6ffc
Updating translations for config/locales/en_GB.yml [skip ci]
2016-08-01 21:47:34 +10:00
Rohan Mitchell
1586cd3992
Uncache enterprise producer properties - we have no cache invalidation for this
2016-07-29 15:40:24 +10:00
Rohan Mitchell
4db29ce322
Update css_splitter, fixes problem with keyframes spanning limit
...
https://github.com/zweilove/css_splitter/issues/53
2016-07-29 11:53:46 +10:00
Rohan Mitchell
243dfa7a93
Add retry for intermittently failing spec in variant overrides
2016-07-29 11:01:52 +10:00
Rohan Mitchell
d9d3a4a645
Set up producer filters on group producers page
2016-07-29 11:01:52 +10:00
Rohan Mitchell
b13360d2d0
Extract filter helpers from individual spec to spec helper
2016-07-29 11:01:52 +10:00
Rohan Mitchell
13cf5d29de
Add guard for selector overflow (only seen in phantom, not selenium/firefox or dev server/chrome)
2016-07-29 11:01:52 +10:00
Rohan Mitchell
1257ee09f2
Reorder methods for clarity
2016-07-29 11:01:52 +10:00
Rohan Mitchell
e3173c955d
Refit filters when box opens
2016-07-29 11:01:51 +10:00
Rohan Mitchell
69382c4c13
Move properties filter dropdown in front of search results
2016-07-29 11:01:51 +10:00
Rohan Mitchell
0b84afd67a
Display property filters for producers
2016-07-29 11:01:51 +10:00
Rohan Mitchell
6f947380cb
Remove unused overrides and views
2016-07-29 09:18:31 +10:00
Rohan Mitchell
160c535fd7
Update knapsack report
2016-07-29 09:18:30 +10:00
Rohan Mitchell
377074416e
Remove CMS tables. Adds migration helper: drop_table_cascade
2016-07-29 09:18:30 +10:00
Rohan Mitchell
932edeb1c1
Remove CMS style shim - Spree/CMS compatibility
2016-07-29 09:18:30 +10:00
Rohan Mitchell
d3ad823d97
Remove CMS configuration, gem. Fix permalink check dependent on CMS glob path.
2016-07-29 09:18:30 +10:00
Rohan Mitchell
b637b5b75a
Remove CMS helper: home_page_cms_content
2016-07-29 09:14:36 +10:00
Rohan Mitchell
eb8cedc497
Remove CMS views and overrides
2016-07-29 09:14:36 +10:00
Rohan Mitchell
ba854d12c8
Remove CMS specs
2016-07-29 09:14:36 +10:00
Lynne Davis
9e03a130c2
Updating GB translation, from transifex
2016-07-27 18:43:48 +01:00
Maikel Linke
dee0fa6724
Trigger checkout click more reliably in specs
2016-07-22 14:10:16 +10:00
Maikel Linke
84c434c279
Remove unused/broken multi-cart feature and views
...
This removes ten old overrides of the Spree view. Since the Spree view
is not used any more and got completely replaced by custom views, the
overrides were just adding noise to the code base.
2016-07-22 13:49:20 +10:00
Transifex-Openfoodnetwork
f8898bc722
Updating translations for config/locales/nb.yml [skip ci]
2016-07-22 01:04:58 +10:00
Transifex-Openfoodnetwork
2b7da4738c
Updating translations for config/locales/nb.yml [skip ci]
2016-07-22 00:59:57 +10:00
Maikel Linke
11a702667d
Merge branch 'transifex' into HEAD
2016-07-20 17:12:59 +10:00
Maikel Linke
11ec903131
Merge tag 'v1.8.3' into transifex
2016-07-20 17:11:42 +10:00
Maikel Linke
e57c06c610
Use require_relative introduced in Ruby 1.9.2
...
The new `require_relative` command is much shorter and easier to read
then the previous:
-require File.expand_path('../config/application', __FILE__)
+require_relative 'config/application'
2016-07-20 16:07:35 +10:00
Maikel Linke
984641e46c
Merge remote-tracking branch 'origin/master' into uk/trial-length
...
Conflicts:
config/locales/en.yml
2016-07-20 11:40:52 +10:00
Transifex-Openfoodnetwork
477d48e9da
Updating translations for config/locales/nb.yml [skip ci]
2016-07-15 19:46:47 +10:00
Maikel Linke
ddb54d1924
Delete fee on payment method if payment invalid
...
PayPalExpress is always creating two payments. The first one is
invalidated and the second one succeeds. Without deleting the old fee on
the invalidated payment, the order lists the fee twice.
2016-07-15 17:43:26 +10:00
Maikel Linke
c6bd548413
Don't trigger deployment for transifex branch
2016-07-15 11:19:19 +10:00
Maikel Linke
af6d0ec107
Remove unused code from order confirmation page
2016-07-13 13:54:55 +10:00
Maikel Linke
e693f71775
Inject only needed enterprises into order confirmation page
2016-07-13 13:54:32 +10:00
Maikel Linke
0ff1c95c3d
Keep unreferenced entries when dereferencing in js
2016-07-13 12:08:11 +10:00
Maikel Linke
b5bc3a4ca3
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into enterprise-load
2016-07-13 10:01:16 +10:00
Maikel
b587a72eb6
Auto-merged master into transifex on deployment.
2016-07-12 17:44:55 +10:00
Maikel Linke
8e73a2e0d6
Dereference enterprises and taxons later
2016-07-06 16:20:07 +10:00
Rohan Mitchell
e373284934
Fix intermittent spec failure
2016-07-06 16:14:32 +10:00
Rohan Mitchell
b5a9a1b6bf
Add translation for business_model_configuration
2016-07-06 16:14:25 +10:00
Rohan Mitchell
13c8f0a230
Improve spec reliability
...
It seems that the success message on the customers page is disappearing before the spec can
detect it. This seems unlikely since it's present for 3 s, but this is my best theory right now.
2016-07-06 15:29:04 +10:00
Maikel Linke
f733c7f207
Include shop enterprise on shop front
2016-07-06 12:45:12 +10:00
Rohan Mitchell
d3c423f7ce
Only perform URL search once, not every time map tiles change
2016-07-06 11:56:41 +10:00
Maikel Linke
52f68dac33
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into enterprise-load
2016-07-06 11:35:26 +10:00
Maikel Linke
f984871b23
Inject only needed enterprises into cart and checkout
2016-07-06 11:14:13 +10:00
Rohan Mitchell
f09cd9e477
Allow groups to be searched by URL
2016-07-06 11:08:38 +10:00
Rohan Mitchell
d6f21b24da
Add specs for producers and shops search by URL
2016-07-06 11:08:38 +10:00
Rohan Mitchell
34b2f72ae8
When query changed (typing or autocomplete), update URL. When page loads, perform query search.
2016-07-06 10:44:25 +10:00
Rohan Mitchell
e6bdd2303d
Extract showing search result
2016-07-06 10:44:25 +10:00
Rohan Mitchell
a9a68151ec
Syntax
2016-07-06 10:44:25 +10:00
Rohan Mitchell
f586dbc3e1
Extract OSM tile setup to own directive
2016-07-06 10:44:19 +10:00
Continuous Integration
5fb5ef1974
Auto-merge from CI [skip ci]
2016-07-02 00:58:27 +10:00
Rohan Mitchell
54028f4e7e
Split directive into functions
2016-07-01 15:31:32 +10:00
Rohan Mitchell
e8b83bef41
Simplify responding to search
2016-07-01 15:31:32 +10:00
Bing Xie
78b22c4a82
Fix incorrectly aligned columns
2016-06-30 21:38:10 +10:00
Continuous Integration
e252414263
Auto-merge from CI [skip ci]
2016-06-30 01:30:53 +10:00
Lynne Davis
320db21d5c
Updating spec with $ (not £) for automated testing
2016-06-29 16:30:11 +01:00
Maikel Linke
c253d73d11
Refactoring with feedback on pr #1073
2016-06-29 15:46:51 +10:00
Maikel Linke
08fdc8a5bd
Load producers of all or selected order cycles into shop
2016-06-29 12:57:09 +10:00
Rohan Mitchell
9cc0bb831a
Show properties alongside taxons on producer fat view
2016-06-24 07:57:06 +10:00
Rohan Mitchell
a5a00e9cef
Show taxons and properties on producer modal (seen on map, shop producer info)
2016-06-24 07:57:06 +10:00
Rohan Mitchell
4134cbfc9c
Include producer properties on producer listing
2016-06-24 07:57:06 +10:00
Rohan Mitchell
58379a5e28
Extract property merging to lib class
2016-06-24 07:57:06 +10:00
Rohan Mitchell
aae1689a27
Show product properties on producers page
2016-06-24 07:57:06 +10:00
Rohan Mitchell
4338f632f6
Add scope: Spree::Property.applied_by
2016-06-24 07:57:06 +10:00
Rohan Mitchell
fa0cc6f2c8
Add spec for filtering producers by taxon
2016-06-24 07:57:06 +10:00
Maikel
12df5de43c
Auto-merged master into sign_up_email_i18n on deployment.
2016-06-24 00:45:34 +10:00
Lynne
4da7668dfc
Merge pull request #1048 from lin-d-hop/sign_up_email_i18n
...
code cleanup
2016-06-23 15:30:42 +01:00
Lynne Davis
9c29e56fc3
More typo
2016-06-21 17:44:45 +01:00
Lynne Davis
e253590c1c
code cleanup
2016-06-21 17:07:42 +01:00
Lynne
43b5216002
Merge pull request #1046 from lin-d-hop/sign_up_email_i18n
...
Sign up email i18n
2016-06-20 18:45:31 +01:00
Lynne Davis
e7adacc541
Typo
2016-06-20 18:34:54 +01:00
Lynne Davis
fa52712e35
More syntax fixes
2016-06-20 18:32:32 +01:00
Lynne
36093c0f64
Merge pull request #1045 from lin-d-hop/sign_up_email_i18n
...
Sign up email i18n
Merging so that I can test emails on UK staging.
2016-06-20 17:29:37 +01:00
Lynne Davis
02d8f52426
Fixing syntax
2016-06-20 17:02:10 +01:00
Lynne Davis
5b22e19ec9
Undoing locale changes accidentally committed
2016-06-20 15:24:24 +01:00
Lynne Davis
99d22649a2
Undoing this change, shouldn't be on this branch
2016-06-20 15:21:34 +01:00
Lynne Davis
98548e15c5
I18n of enterprise emails
2016-06-20 15:18:25 +01:00
Lynne Davis
f37f89dd07
Adding Community forum to ContentConfig
2016-06-20 15:13:49 +01:00
Lynne Davis
ed37604bc2
Update from address in notification emails
2016-06-18 09:09:43 +01:00
Maikel Linke
e284ad62b2
Inject only relative enterprises into shopfront
...
Other shops displayed in producer modals are lazy loaded when opening
their modal.
2016-06-17 17:15:16 +10:00
Rob Harrington
d28c0159ab
Use have_selector x, count: y; instead of all(x).count.should == y
2016-06-17 16:44:02 +10:00
Rob Harrington
e40ecae681
Removing inline styles for links dropdown
2016-06-17 16:44:02 +10:00
Rob Harrington
1e142aa628
Refactoring OrderCycleFormApplicator logic for improved update speed
2016-06-17 16:44:02 +10:00
Rob Harrington
6586e67a5c
Better messaging around deletion of customers
2016-06-17 14:47:04 +10:00
Rob Harrington
d9b3366a5c
Auto-select shop on customers index when only one available
2016-06-17 11:28:20 +10:00
Rob Harrington
61969f5c84
Ensure CustomersController#update.json gives an appropriate response
...
pendingChanges submits an empty string when a field is blank (rather than undefined)
2016-06-16 22:42:53 +10:00
Rob Harrington
2a4737147f
Tweaking the way new customer form error messages are display for latest version of AngularJS
2016-06-16 16:32:10 +10:00
Rob Harrington
a909f0ddb8
Merge remote-tracking branch 'origin/master' into pr/1033
2016-06-16 15:12:30 +10:00
Rob Harrington
25cdd4af8e
Preventing shop from being changed when unsaved customer changes exist
...
Also making layout of filters on customer index more consistent with other pages
2016-06-16 15:10:16 +10:00
Maikel Linke
be7e46300c
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into prod-log-warn
2016-06-15 11:56:29 +10:00
Continuous Integration
9ba07a2afb
Merge remote-tracking branch 'origin/master' into HEAD
2016-06-15 11:26:02 +10:00
Bing Xie
a39d15d685
Fix failed adds a new tag rule js test
2016-06-15 10:51:34 +10:00
Rob Harrington
d424c2eb20
Enterprise form SaveBar becomes available when adding a new rule
2016-06-15 10:51:34 +10:00
Rob Harrington
c8c8f0d02d
Removing old cancel button from bottom of OC forms
2016-06-15 10:51:34 +10:00
Rob Harrington
8221f1f193
Use scope. to ensure that tag rule sorting is applied
2016-06-15 10:51:34 +10:00
Bing Xie
c83952571f
Fix failed test
2016-06-15 10:51:34 +10:00
Bing Xie
18a8efed5f
Resize window to fix failed test
2016-06-15 10:51:34 +10:00
Bing Xie
82dc2a8c98
Update bulk products editing page
2016-06-15 10:51:34 +10:00
Bing Xie
001ae19b26
Update create and update order cycle page save-bar
2016-06-15 10:51:34 +10:00
Bing Xie
c003dcded9
Update editing enterprise page save-bar
2016-06-15 10:51:34 +10:00
Bing Xie
7aa8f2c73c
Fix failed tests
2016-06-15 10:51:34 +10:00
Bing Xie
41837eb31d
Tweak create order cycle spec
2016-06-15 10:51:34 +10:00
Bing Xie
860a537f30
Add save bar to bulk editing product page
2016-06-15 10:51:34 +10:00
Bing Xie
33fd88507d
Fix failed tests
2016-06-15 10:51:34 +10:00
Bing Xie
d8bf66a6c9
Use save bar on enterprise editing page
2016-06-15 10:51:34 +10:00
Bing Xie
2065d81bb4
Use save bar directive in enterprise editing page
2016-06-15 10:51:34 +10:00
Bing Xie
7994e2594a
Update create order cycle feature test
2016-06-15 10:51:34 +10:00
Bing Xie
baa6fda3e0
Use save bar in create order cycle page
2016-06-15 10:51:34 +10:00
David Ajnered
fb33be78dd
#591 show selected hub dropdown on customers page and enable easy switch to different hub
2016-06-10 15:42:40 +02:00
Maikel Linke
db3637fe84
Allow removing customer codes
2016-06-10 18:14:19 +10:00
Maikel Linke
ee0a226388
Try to remove random failure from spec
2016-06-10 10:06:35 +10:00
Maikel Linke
5cd269411d
Trigger order button instead of click
2016-06-10 09:46:56 +10:00
Maikel Linke
cb679a6aba
Remove duplicate "What's this?" from order cycles overview
2016-06-10 09:18:26 +10:00
Maikel Linke
ad1ef877c0
Warn about duplicate customer codes
...
The admin customer page displays a warning you change a code to an
existing one.
2016-06-10 09:09:56 +10:00
Rob Harrington
c5ba0b8f8c
Merge branch 'master' into 1014-image-diet
2016-06-08 15:12:33 +10:00
Rob Harrington
365c6b3a83
Streamlining button clicking on registration spec
2016-06-08 13:06:57 +10:00
Steve Pettitt
a504a10b52
Change to explicitly check complete state (default Spree::Order.complete scope checks only for presence of 'completed_at' timestamp)
2016-06-08 11:15:02 +10:00
Steve Pettitt
caf35d0ad7
Add a spec to exclude canceled orders (failing)
2016-06-08 11:15:02 +10:00
Paul Mackay
b718cf729a
Set production log level to warn
2016-06-01 20:51:31 +01:00
Maikel Linke
489feb4e01
Longer default page size for feature specs
2016-06-01 16:28:43 +10:00
Maikel Linke
89c3758bae
Avoid race conditions in feature specs
2016-06-01 16:15:44 +10:00
Maikel Linke
4bde890eaa
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into error-pages
2016-06-01 15:22:34 +10:00
Continuous Integration
ee10a4b173
Merge remote-tracking branch 'origin/master' into HEAD
2016-06-01 12:16:10 +10:00
Mike iLL Kilmer
6f375306c2
Some US-Specific copy. ( #1018 )
...
Add locale en-US.yml
2016-06-01 12:13:03 +10:00
Rob Harrington
98f8f7b89f
Adding new help-modal dialog, use for explaining tag rule UI
2016-05-28 01:16:07 +10:00
Rob Harrington
7028fbe288
Find current_customer via current_distributor and current_user rather than current_order
...
Moving available_payment_methods to enterprises_helper, as per available_shipping_methods
2016-05-28 00:31:59 +10:00
Rob Harrington
07384edb2d
Can delete default tag rules
2016-05-27 22:00:08 +10:00
Rob Harrington
12e685bd92
Restricting number of tags for tag rules to one
2016-05-27 16:25:10 +10:00
Rob Harrington
6dd05ca4da
Intermittent fail hunting
2016-05-27 16:25:10 +10:00
Rob Harrington
a1c7a44fa0
Tag Rules can be rearranged in UI to set priority
2016-05-27 16:25:10 +10:00
Rob Harrington
cb9e3b43f9
Tag attributes are auto-initialized via directive if not present on object
2016-05-27 16:25:10 +10:00
Rob Harrington
011c8c74d9
Updating remove button character for tags in ngTagsInput
2016-05-27 16:25:10 +10:00
Rob Harrington
38e37a4dfa
Using new jasmine2 syntax in variant override spec
2016-05-27 16:25:10 +10:00
Rob Harrington
607b674c57
Refactoring tag rule logic, placing in TagRuleApplicator lib class
2016-05-27 16:25:10 +10:00
Rob Harrington
fa3b43a970
Adding default tag rules
2016-05-27 16:25:10 +10:00
Rob Harrington
bf0db2287b
More structured layout for Tag Rules UI
2016-05-27 16:25:10 +10:00
Rob Harrington
339074a66e
Making templates available to paymentMethods module
2016-05-27 16:25:10 +10:00
Rob Harrington
c568ac4d64
Re-adding button clicks removed in 885d489bc3
2016-05-27 16:25:10 +10:00
Rob Harrington
3d7786e185
Optional autocomplete for tag rules directive
2016-05-27 16:25:10 +10:00
Rob Harrington
9b12b86053
Simplifying supplier and distributor row counts
2016-05-27 16:25:10 +10:00
Rob Harrington
84817b0124
Fixing specs broken by faster PhantomJS
2016-05-27 16:25:10 +10:00
Rob Harrington
5624fa0c5e
Adding FilterOrderCycles tag rules to UI
2016-05-27 16:25:10 +10:00
Rob Harrington
10434f5ee3
Renaming class
2016-05-27 16:25:10 +10:00
Rob Harrington
e32e3ddf70
Applying FilterOrderCycles rules in the frontend
2016-05-27 16:25:10 +10:00
Rob Harrington
70e6428c1f
Adding FilterOrderCycle tag rule
2016-05-27 16:25:10 +10:00
Rob Harrington
9dc1294ec5
Outgoing exchanges can be tagged
...
Using panels infrastructure to display tags and products interfaces
2016-05-27 16:25:10 +10:00
Rob Harrington
e81858c0dc
Renaming PanelToggleRow to PanelCtrl
2016-05-27 16:25:10 +10:00
Rob Harrington
8035b3f24a
Refactoring admin table panels infrastructure
...
Updating enterprise index
2016-05-27 16:25:10 +10:00
Rob Harrington
d201e4a039
Tweaking styling for JQuery Dialog box in admin section
2016-05-27 16:25:10 +10:00
Rob Harrington
e999b5715a
Adding FilterPaymentMethods rules to tag rule UI
2016-05-27 16:25:10 +10:00
Rob Harrington
3fb6fba0f0
Adding payment method tag rule logic to Spree::Order.available_payment_methods
2016-05-27 16:25:10 +10:00
Rob Harrington
e21735b037
Removing naughty save_screenshot call from payment method spec
2016-05-27 16:25:10 +10:00
Rob Harrington
e553b8c590
Adding filter payment method tag rule logic
2016-05-27 16:25:10 +10:00
Rob Harrington
4d83bf2135
Payment methods can be tagged
2016-05-27 16:25:10 +10:00
Rob Harrington
385fd91e70
Adding angularjs payment method controller, updating payment method edit form
2016-05-27 16:25:10 +10:00
Rob Harrington
2d666caaf2
Nitpicking
2016-05-27 16:23:26 +10:00
Rob Harrington
c61cb1bdcd
Renaming paymentMethodCtrl to paymentMethodsCtrl
2016-05-27 16:23:26 +10:00
Rob Harrington
eedb2854ec
Adding FilterProducts rules to tag rule UI
2016-05-27 16:23:26 +10:00
Rob Harrington
1cb51b5c71
CodeClimate fixes for filter-products branch
2016-05-27 16:23:26 +10:00
Rob Harrington
48d4c8733d
When we load up incomplete orders, make sure that they have a user associated if the user is logged in
...
Also associate customer ONLY if one already exists. This is required to prevent unauthorised access to customer-only shopfronts.
2016-05-27 16:23:26 +10:00
Rob Harrington
302bdfd628
Implementing FilterProducts rules in the frontend
2016-05-27 16:23:26 +10:00
Rob Harrington
cc6ef7b8f5
Load uncached products json into shop when in testing or development environment
2016-05-27 16:23:26 +10:00
Rob Harrington
50738f28e9
Refactoring tag rule application
...
To allow rules to be loaded and counted before being checked for relevance
2016-05-27 16:23:26 +10:00
Rob Harrington
8b8da33ffc
Further refinements to FilterProducts tag rule
2016-05-27 16:23:26 +10:00
Rob Harrington
17fa0d2baf
Adding tag rule logic for filtering products
2016-05-27 16:23:26 +10:00
Rob Harrington
3f8420b0e9
Adding tags to variant overrides
2016-05-27 16:23:26 +10:00
Maikel Linke
ddc7e86e6c
Update xero report spec
2016-05-27 15:00:54 +10:00
Maikel Linke
8a77062888
Include transaction fees in reports
2016-05-27 14:40:22 +10:00
Maikel Linke
e3b43243cc
Add line_items getter to Payment
...
The calculator of a payment method calls `line_items` on the payment.
The code got copied from Spree::Shipment.
2016-05-27 11:30:07 +10:00
Maikel
61a4228e6b
Auto-merged master into uk/trial-length on deployment.
2016-05-25 18:56:17 +10:00
Lynne Davis
f0a2098826
Adding text generation to new business model features
2016-05-25 09:45:47 +01:00
Maikel Linke
a624a57bfb
Pass current order to PaymentMethodSerializer
2016-05-25 17:12:47 +10:00
Maikel Linke
0af8377844
Add payment method fees to order during checkout
...
The fee is displayed as "Transaction fee".
2016-05-25 14:56:52 +10:00
Maikel Linke
e4f855b64a
Display calculator in payment method edit form
2016-05-25 14:56:52 +10:00
Maikel Linke
16b80a2f1b
Extend PaymentMethod with calculated_adjustments
2016-05-25 14:56:52 +10:00
Maikel Linke
21b8445753
Include job name in failure message
2016-05-25 11:58:57 +10:00
Maikel Linke
63432c2acc
Resize tested page to find all products
2016-05-25 11:45:18 +10:00
Maikel Linke
03f98af60b
Merge remote-tracking branch 'origin/master' into uk/spree-google-analytics
2016-05-25 10:05:09 +10:00
Rob Harrington
852a12db61
Remove caching of global npm phantomjs install
2016-05-25 08:10:20 +10:00
Rob Harrington
b804a70469
Columns service updates state of columns (especially id) when data received from server
...
Also showing saving status
2016-05-25 08:10:20 +10:00
Rob Harrington
924d155012
Using correct syntax for attributes on columns
2016-05-25 08:10:20 +10:00
Rob Harrington
604418d699
Install phantomjs with npm
2016-05-25 08:10:20 +10:00
Rob Harrington
b9f6cb8800
Adding translations for all column names
2016-05-25 08:10:20 +10:00
Rob Harrington
f2de498d61
Show saved status of column preferences
2016-05-25 08:10:20 +10:00
Rob Harrington
55da83d0c0
Removing obsolete BOM controller (replaced by LineItemsCtrl)
2016-05-25 08:10:20 +10:00
Rob Harrington
1d8719b474
Default column visibility can be set per user using ColumnPreferences model
2016-05-25 08:10:20 +10:00
Rob Harrington
3647b17110
Removing save_screenshot call
2016-05-25 08:10:20 +10:00
Rob Harrington
533a94267a
Refactoring save-bar
2016-05-25 08:10:20 +10:00
Rob Harrington
ecb9646ccb
Using new syntax for save-bar on customers page
2016-05-25 08:10:20 +10:00
Rob Harrington
162b11dcc5
Updating spec to new Jasmine syntax
2016-05-25 08:10:20 +10:00
Rob Harrington
93a4f19b40
Hash Navigation works on with Group and Shopping page tabs
2016-05-25 08:10:20 +10:00
Rob Harrington
92d8ee1a36
Making sure that hash navigation works with auth tabs
2016-05-25 08:10:20 +10:00
Rob Harrington
4b8146dd00
Fixing translation error on final registration page
2016-05-25 08:10:20 +10:00
Rob Harrington
abc906186e
Using ngSrc correctly in frontend
2016-05-25 08:10:20 +10:00
Rob Harrington
564c1a3650
Improvements to customers page
...
Create customer from dialog
Limiting the number of products shown as once
Adding SaveBar and StatusMessage
2016-05-25 08:10:20 +10:00
Rob Harrington
c44f9d2537
Making text (and links) within shopfront message more legible
2016-05-25 08:10:20 +10:00
Rob Harrington
7e932f091d
Use have_current_path rather than current_path.should ==
2016-05-25 08:10:20 +10:00
Rob Harrington
2c9697ff4e
Adding -nc option to wget of PhantomJS, so that we only download it if needed
2016-05-25 08:10:20 +10:00
Rob Harrington
6bfe1be045
Update spec looking for matching img src
2016-05-25 08:10:20 +10:00
Rob Harrington
efaf728737
Upgrading ngTagsInput
2016-05-25 08:10:20 +10:00
Rob Harrington
ddcfe1535a
Making TagRule autocomplete available to models other than Customer
...
Incorporate ng admin.tags module and rails TagController into existing admin.tagRules module + TagRuleController
2016-05-25 08:10:20 +10:00
Rob Harrington
9e0b97dc9c
Upgrading textAngular
2016-05-25 08:10:20 +10:00
Rob Harrington
245db8971a
Fixing specs broken by faster PhantomJS
2016-05-25 08:10:20 +10:00
Rob Harrington
0586a71071
Bumping Poltergeist and Capybara versions
2016-05-25 08:10:20 +10:00
Rob Harrington
2146a55c3b
Linking to PhantomJS installed on PATH
2016-05-25 08:10:20 +10:00
Rob Harrington
a0254f30cd
Adding package.json with npm dev dependencies for js specs
2016-05-25 08:10:20 +10:00
Rob Harrington
7a498362b3
Upgrading AngularJS specs to Jasmine 2 syntax
2016-05-25 08:10:20 +10:00
Rob Harrington
cfbfe8416f
WIP (AngularJS 1.5.5 upgrade): updating npm karma packages for travis
2016-05-25 08:10:20 +10:00
Rob Harrington
1b0897d53a
Bump to AngularJS to 1.5.5
2016-05-25 08:10:20 +10:00
Rob Harrington
9d1ca6eaca
Renaming customers form to prevent conflict with customers array
2016-05-25 08:10:20 +10:00
Rob Harrington
39a062e90a
WIP (Angular 1.4 Upgrade): Moving controllers for login tabs to prevent multiple directives asking for isolate scope
2016-05-25 08:10:20 +10:00
Rob Harrington
af5eec7094
WIP (Angular 1.4 Upgrade): Adding filters to ofn-select2 and using on order create/edit UI
2016-05-25 08:10:20 +10:00
Rob Harrington
668bffcd84
Bumping AngularJS to 1.4.8
2016-05-25 08:10:20 +10:00
Rob Harrington
02d093f6b6
Loading selectors into product modal to display proprties and taxons
2016-05-25 08:10:20 +10:00
Rob Harrington
383f7c57aa
Wait for login before visiting CMS
2016-05-25 08:10:20 +10:00
Rob Harrington
10133a13f2
Make sure that changes are saved before attempting to click link
2016-05-25 08:10:20 +10:00
Rob Harrington
8838a89ecc
Don't typecast product and variant on_hand from DOM when it is 'On demand'
2016-05-25 08:10:20 +10:00
Rob Harrington
cf94d67caf
Preventing default submit behaviour for order cycle form submission buttons
2016-05-25 08:10:20 +10:00
Rob Harrington
97e53900ad
Updating translation to start with a capital letter
2016-05-25 08:10:20 +10:00
Rob Harrington
9fc7908af5
Removing '?' to meet expectations of js spec
2016-05-25 08:10:20 +10:00
Rob Harrington
7bc118b598
Final steps to remove bindonce
2016-05-25 08:10:20 +10:00
Rob Harrington
1d837c32ee
Replacing bindonce with native Angularjs syntax in admin
2016-05-25 08:10:20 +10:00
Rob Harrington
e5ca494db8
Replacing bindonce with native Angularjs syntax in Darkswarm
...
Involved changing bo-text -> ng-bind, bo-href-i -> ng-href, bo-src-i -> ng-src and ng-html -> ng-bind-html
2016-05-25 08:10:20 +10:00
Rob Harrington
5de9eed48a
Fixing broken instagram link
2016-05-25 08:10:20 +10:00
Rob Harrington
fe739f6a8d
angular-foundation tabs directive on shop pages is closed by default
2016-05-25 08:10:20 +10:00
Rob Harrington
02be661163
Bumping angularjs version to 1.3.15
2016-05-25 08:10:20 +10:00
David Leuliette
22ae668c74
Diet for images
2016-05-23 19:50:48 +02:00
Rob Harrington
fc69adb135
Fixing producer emails spec
2016-05-23 10:40:46 +10:00
elf Pavlik
4e4175ee4c
fixed i18n on admin edit groups
2016-05-22 19:18:58 -05:00
elf Pavlik
aa04da48f3
fixed i18n on admin edit enterprise
2016-05-22 18:40:42 -05:00
Rob Harrington
a2d875655c
Nothing
2016-05-20 14:13:10 +10:00
Rob Harrington
6a610ff7a4
Merge remote-tracking branch 'origin/master' into uk/trial-length
2016-05-20 12:22:47 +10:00
Rob Harrington
5d3adc0bdb
Fixing producer emails so that they calculate tax correctly
...
Also listing items by full_name rather than by variant, to catch cases where line item weights/volumes have been adjusted
2016-05-20 11:01:33 +10:00
Rob Harrington
6a3f6e7bfa
Revert "Add line item included_tax_amount method to multiply by quantity"
...
This reverts commit 547fcf49e0 .
2016-05-20 09:46:31 +10:00
Rob Harrington
d043de08cd
Revert "Temporarily comment out tax column"
...
This reverts commit 858beb97c5 .
2016-05-20 09:42:19 +10:00
Steve Pettitt
858beb97c5
Temporarily comment out tax column
2016-05-18 08:49:05 +01:00
Maikel Linke
379bad9f46
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into error-pages
2016-05-18 15:54:58 +10:00
Maikel Linke
041d9814a7
Remove redundant CSS and jpg
2016-05-18 15:54:20 +10:00
Steve Pettitt
c66ac0827e
Add translations to plain text part
2016-05-16 21:35:40 +01:00
Steve Pettitt
419402c554
Add some HTML email specs
2016-05-16 21:30:56 +01:00
Steve Pettitt
93f0a7c58d
Remove debug statement
2016-05-15 23:25:19 +01:00
Steve Pettitt
38316bae3f
Add Stroudco wording to en-GB
2016-05-15 23:24:59 +01:00
Steve Pettitt
bd4debe91b
Merge branch 'uk/order_cycle_report' of https://github.com/openfoodfoundation/openfoodnetwork into uk/order_cycle_report
2016-05-15 23:13:17 +01:00
Steve Pettitt
08eaff1c24
Formatting changes
2016-05-15 23:10:38 +01:00
Steve Pettitt
547fcf49e0
Add line item included_tax_amount method to multiply by quantity
2016-05-14 11:00:13 +01:00
Steve Pettitt
3a813cb612
Merge master
2016-05-14 10:09:31 +01:00
Rohan Mitchell
da57e04a50
Merge branch 'fix-groups-map' of https://github.com/bingxie/openfoodnetwork into fix-groups-map
2016-05-13 16:02:22 +10:00
Bing Xie
ba2d5548ff
Fix groups map view
2016-05-13 15:44:34 +10:00
Maikel
a4e5e49a08
Auto-merged master into uk-order-cycle-report on deployment.
2016-05-13 11:28:15 +10:00
Rohan Mitchell
027976626c
Add spec for error summing Spree::Money
2016-05-13 11:19:44 +10:00
Rohan Mitchell
9f56494c4c
Simplify
2016-05-13 10:36:23 +10:00
Steve Pettitt
ab37cd2577
Fix specs, need to add new for HTML
2016-05-13 10:30:21 +10:00
Steve Pettitt
559f7afc60
HTML order cycle report email, text customisable in translations
2016-05-13 10:30:21 +10:00
Steve Pettitt
ef418c7f50
Change to use total rather than display_total (which returns a Spree::Money object)
2016-05-13 10:30:21 +10:00
Steve Pettitt
c80255e9ab
Add total to producer emails
2016-05-13 10:30:21 +10:00
Rohan Mitchell
7b994adc23
Merge branch 'use-save-bar' of https://github.com/bingxie/openfoodnetwork into use-save-bar
...
Conflicts:
app/assets/javascripts/admin/order_cycles/controllers/edit.js.coffee
app/assets/javascripts/templates/admin/save_bar.html.haml
app/views/admin/order_cycles/edit.html.haml
app/views/admin/variant_overrides/_products.html.haml
app/views/spree/admin/orders/bulk_management.html.haml
2016-05-13 10:05:39 +10:00
Bing Xie
f8ec0d316a
Save bar can support cancel button
2016-05-12 11:04:40 +10:00
Bing Xie
7040e4baae
Resize window to fix failed test
2016-05-12 10:45:41 +10:00
Bing Xie
fed3ae9e85
Make the page long enough to avoid the save bar overlaying the form
2016-05-12 10:45:41 +10:00
Bing Xie
89ae77dfd9
Make the save bar look better
2016-05-12 10:45:41 +10:00
Bing Xie
7bf6881cb2
Tweaks
2016-05-12 10:45:41 +10:00
Bing Xie
ed1a06495b
Remove unused test code
2016-05-12 10:45:41 +10:00
Bing Xie
e5d2e5010b
Fix failed tests
2016-05-12 10:45:41 +10:00
Bing Xie
3760a34b2b
Add save_bar to the order cycles simple editing form
2016-05-12 10:45:41 +10:00
Bing Xie
26bb1a9beb
Update AdminEditOrderCycleCtrl unit tests
2016-05-12 10:45:41 +10:00
Bing Xie
d59dea29ab
Fix failed test for the default form
2016-05-12 10:45:41 +10:00
Bing Xie
78b4a35d12
Keep the action with save button
2016-05-12 10:45:41 +10:00
Bing Xie
7fc37e4737
Tweak save_bar css
2016-05-12 10:45:41 +10:00
Bing Xie
2214c83ec7
Use save_bar on order cycle update form
2016-05-12 10:45:41 +10:00
Bing Xie
d10719330d
Extend save_bar directive to support more buttons
2016-05-12 10:45:41 +10:00
Bing Xie
38efa218d0
Use save bar on order cycle form
2016-05-12 10:45:41 +10:00
Rohan Mitchell
8c747f02b5
Merge branch 'use-save-bar' of https://github.com/bingxie/openfoodnetwork into use-save-bar
2016-05-11 14:41:41 +10:00
Rob H
6c625297f2
Merge pull request #934 from oeoeaio/uk/trial-length
...
More intuitive logic for minimum billable turnover
2016-05-11 12:36:54 +10:00
Maikel
8a47d49dfc
Auto-merged master into uk/order_cycle_report on deployment.
2016-05-11 08:20:05 +10:00
Steve Pettitt
d5a7e907a3
Fix specs, need to add new for HTML
2016-05-10 23:11:14 +01:00
Steve Pettitt
6ecf896fa2
HTML order cycle report email, text customisable in translations
2016-05-10 23:04:06 +01:00
Paul Mackay
6dd989484a
Switch to using the Spree GA tracker code
2016-05-10 05:32:40 +01:00
Bing Xie
a37820a963
Resize window to fix failed test
2016-05-06 14:55:16 +10:00
Continuous Integration
f90e7d3239
Merge remote-tracking branch 'origin/master' into HEAD
2016-05-06 13:58:37 +10:00
Bing Xie
08f0011244
Make the page long enough to avoid the save bar overlaying the form
2016-05-06 12:43:50 +10:00
Maikel Linke
3e231da472
Translate subjects of enterprise emails
...
Minor text change
Fix #906
Thanks to Nicolas Blanc:
https://github.com/openfoodfoundation/openfoodnetwork/pull/937
2016-05-06 11:31:15 +10:00
Bing Xie
064e3c426e
Make the save bar look better
2016-05-06 11:00:34 +10:00
Continuous Integration
f0b80b47f1
Auto-merge from CI [skip ci]
2016-05-05 23:23:34 +10:00
Paul Mackay
22a6661b51
Improved layout and image for 404 and 500 error pages
2016-05-05 14:21:16 +01:00
Steve Pettitt
7f1fc56f78
Change to use total rather than display_total (which returns a Spree::Money object)
2016-05-04 07:58:23 +01:00
Bing Xie
3cac9c452f
Tweaks
2016-05-04 14:56:21 +10:00
Bing Xie
57ec7bb9a9
Remove unused test code
2016-05-04 12:45:23 +10:00
Bing Xie
8b5e5105a8
Fix failed tests
2016-05-04 12:45:23 +10:00
Bing Xie
1833f0dd5d
Add save_bar to the order cycles simple editing form
2016-05-04 12:45:23 +10:00
Bing Xie
019e16c5ba
Update AdminEditOrderCycleCtrl unit tests
2016-05-04 12:45:23 +10:00
Bing Xie
885d489bc3
Fix failed test for the default form
2016-05-04 12:45:23 +10:00
Bing Xie
63b644551c
Keep the action with save button
2016-05-04 12:45:23 +10:00
Bing Xie
70ce58f5e1
Tweak save_bar css
2016-05-04 12:45:23 +10:00
Bing Xie
33d0f9fc1b
Use save_bar on order cycle update form
2016-05-04 12:45:23 +10:00
Bing Xie
00858656b5
Extend save_bar directive to support more buttons
2016-05-04 12:45:23 +10:00
Bing Xie
ef0e41e624
Use save bar on order cycle form
2016-05-04 12:45:23 +10:00
Rohan Mitchell
a11696b85e
Include BugHerd script only if configured, and with configured API key
2016-05-04 12:13:03 +10:00
Rohan Mitchell
9ac6de4215
Admin can set bugherd API key
2016-05-04 11:42:07 +10:00
Steve Pettitt
bed7ec5953
Add total to producer emails
2016-05-01 12:59:55 +01:00
Rob Harrington
1d7308bf5d
More intuitive logic for minimum billable turnover
2016-04-29 18:03:32 +10:00
Maikel Linke
4d6a21254f
Merge remote-tracking branch 'origin/master' into openstreetmap-tiles
2016-04-29 16:40:54 +10:00
Maikel Linke
fa5fa9e228
Auto-complete tags on customers page
...
- new controller serving tags for an enterprise as JSON
- customers page suggesting these tags
- emphasising tags that have rules
2016-04-29 15:18:17 +10:00
Rohan Mitchell
36a4aab020
Adjust styling to blend
2016-04-29 15:07:55 +10:00
Rohan Mitchell
42a327211e
Merge branch 'openstreetmap-tiles' of https://github.com/bingxie/openfoodnetwork into openstreetmap-tiles
2016-04-29 14:36:47 +10:00
Rohan Mitchell
88e9eb59cf
Do not allow invalid quantity to reach model, triggering server update
2016-04-29 11:56:48 +10:00
Rohan Mitchell
65895752da
Remove cruft
2016-04-29 11:49:30 +10:00
Rohan Mitchell
8996acf314
Fix spec
2016-04-27 15:25:05 +10:00
Rohan Mitchell
1384140e41
Notify when stock limit reached on cart rather than silently capping
2016-04-27 15:10:54 +10:00
Rohan Mitchell
1220ff8a06
Notify when stock limit reached on shopfront rather than silently capping
2016-04-27 15:05:44 +10:00
Rohan Mitchell
f691636c75
Fix spec
2016-04-27 14:47:45 +10:00
Bing Xie
824a29624f
Tweak the map UI
2016-04-27 14:17:29 +10:00
Bing Xie
daa5b00a2a
Uses openstreetmap tiles
2016-04-27 13:50:15 +10:00
Rohan Mitchell
36f4df2931
Allow max value in cart of what's on hand
2016-04-27 12:27:24 +10:00
Rohan Mitchell
cf40e0432a
When cart is updated with insufficient stock, show amount in cart, not amount entered
2016-04-27 12:27:24 +10:00
Rohan Mitchell
8f8a1191cb
Remove stock cap on max_quantity
2016-04-27 12:27:24 +10:00
Steve Pettitt
2b921542a5
Code styling
2016-04-26 04:24:44 +01:00
Steve Pettitt
ad6037ac63
Fix user spec, check config is set
2016-04-26 04:21:50 +01:00
Steve Pettitt
43d6e49c3a
Fix spec
2016-04-26 03:31:56 +01:00
Steve Pettitt
53d50f16d6
Merge current master
2016-04-26 03:18:27 +01:00
Steve Pettitt
7f38f1dd1c
Exclude Accounts & Billing distributor
2016-04-26 03:14:13 +01:00
Maikel Linke
2367b73d3a
Revert "Associate new users with existing customer records"
...
This reverts commit a25f4fdf44 .
Since email addresses are not validated, these associations would allow
an attacker to signup with the email address of another person and view
their orders.
2016-04-22 14:55:43 +10:00
Maikel Linke
23e598f2f8
Destroy customer without flash notice
2016-04-22 14:55:43 +10:00
Maikel
7bec139987
Auto-merged master into products-caching-add-to-cart on deployment.
2016-04-22 10:58:26 +10:00
Rohan Mitchell
a26266159c
Fix timing issue: change in client-side value during server update
2016-04-22 10:47:20 +10:00
Rob Harrington
28d40bf27d
Fixing font styling on enterprise name in shop product summary
2016-04-21 21:27:52 +10:00
Rohan Mitchell
779be7c5a0
Extract params parsing into single method
2016-04-21 16:37:15 +10:00
Rohan Mitchell
6cba935a65
Add close button to out of stock modal
2016-04-21 11:26:30 +10:00
Rohan Mitchell
06d7665bf9
Prospective fix for intermittent spec fail
2016-04-21 09:54:56 +10:00
Rohan Mitchell
5151779f80
When update is for another line item, still update all stock levels and show warnings
2016-04-21 09:36:23 +10:00
Rohan Mitchell
3dcfa810fd
Display out of stock banner when viewing cart directly
2016-04-21 09:36:23 +10:00
Rohan Mitchell
9b3139dba9
When there's an out of stock product in the cart, visiting the shopfront returns user to the cart
2016-04-21 09:36:23 +10:00
Rohan Mitchell
b2d78e7df6
Set allow_backorders explicitly for consistency in CI
2016-04-21 09:36:23 +10:00
Rohan Mitchell
dac90c8003
Fix specs
2016-04-21 09:36:23 +10:00
Rohan Mitchell
35117f7af4
Show a modal when available stock levels have reduced
2016-04-21 09:36:23 +10:00
Rohan Mitchell
5e39b11c2f
Spec out of stock handling for group buy
2016-04-21 09:36:23 +10:00
Rohan Mitchell
cfe062918b
When a variant goes out of stock, disable the input and grey out the row
2016-04-21 09:36:23 +10:00
Rohan Mitchell
8695dea0a5
Remove variant from cart when it becomes out of stock
2016-04-21 09:36:23 +10:00
Rohan Mitchell
792e17c385
When removing variant from order, if not found then do nothing
2016-04-21 09:36:23 +10:00
Rohan Mitchell
6fbbe580c5
After adding an item to the cart, when less quantity available, reduce quantity and reset client-side stock level
2016-04-21 09:36:23 +10:00
Rohan Mitchell
8a62d26af4
After adding an item to the cart, when out of stock, remove from cart and reset client-side stock level
2016-04-21 09:36:23 +10:00
Rohan Mitchell
fee0f90a1b
After adding products to cart, return status of cart and available stock levels
2016-04-21 09:36:22 +10:00
Rohan Mitchell
292d027498
When adding an item to cart with not enough stock, add as much as we can without erroring
2016-04-21 09:36:22 +10:00
Rohan Mitchell
a1bcdc616f
Extract add-to-cart inputs into partials
2016-04-21 09:36:22 +10:00
Rohan Mitchell
17f69bd182
Remove trailing whitespace
2016-04-21 09:36:22 +10:00
Rohan Mitchell
d45b525497
When there's an out of stock product in the cart, placing order returns user to the cart
2016-04-21 09:36:22 +10:00
Rohan Mitchell
243f59c87d
When there's an out of stock product in the cart, checkout returns user to cart
2016-04-21 09:36:22 +10:00
Rohan Mitchell
9e321a63c0
Don't put master in order cycle - we don't do that no more
2016-04-21 09:36:22 +10:00
Lynne
f986c5898e
Updating en-GB file to reflect recent additions ( #909 )
2016-04-16 12:23:26 +10:00
Lynne Davis
8dd2d17cd5
Merge branch 'uk/trial-length' of https://github.com/openfoodfoundation/openfoodnetwork into uk/trial-length
2016-04-15 18:51:14 +01:00
Lynne Davis
a0e9163d27
Reverting clever syntax since I clearly don't understand it
2016-04-15 18:50:37 +01:00
Lynne Davis
cc7d27b030
fixing conflicts
2016-04-15 17:05:18 +01:00
Lynne Davis
cbd0ace098
Code tidying and currency symbol internationalisation
2016-04-15 16:56:09 +01:00
Lynne Davis
6884f5533e
Missing Specs
2016-04-15 16:56:09 +01:00
Lynne Davis
30ed6df38d
Adding super admin configuration for the minimum billable turnover functionality
2016-04-15 16:56:09 +01:00
Lynne Davis
240be2be0f
Updating specs to explore the cases around zero turnover with fixed rate and minimum billable turnover
2016-04-15 16:56:09 +01:00
Lynne Davis
ae88a9c2e1
Updating spec with minimum_billable_turnover preference
2016-04-15 16:56:09 +01:00
Lynne Davis
af4c8bee94
Adding preference def for minimum_billable_turnover
2016-04-15 16:56:09 +01:00
Lynne Davis
44ac44e1dd
Updating Bill Calculator to include a minimum billable turnover. Shopfronts are not charged if their tunrover is under the minimum billable.
2016-04-15 16:55:07 +01:00
Lynne Davis
4033a78887
Removing incorrect angular watch
2016-04-15 16:55:07 +01:00
Lynne Davis
51629cd0c0
Adding translations for shop front trials
2016-04-15 16:55:06 +01:00
Lynne Davis
4fc33c7da2
Fixing wild typo
2016-04-15 16:51:07 +01:00
Lynne Davis
abfb8149d9
Adding configurable Shop Trial Length in business model
2016-04-15 16:51:07 +01:00
Lynne Davis
a1ebd18b7c
Updating en-GB file to reflect recent additions
2016-04-15 10:55:31 +01:00
Steve Pettitt
0b820361de
Merge master
2016-04-15 08:29:52 +01:00
Steve Pettitt
fc719230a3
Add failed payments, update spec
2016-04-15 08:26:12 +01:00
Maikel Linke
49febc6333
Store customer email as lower case
2016-04-15 15:35:43 +10:00
Maikel Linke
48f1794d70
Allow admin user to create customers
2016-04-15 14:34:29 +10:00
Maikel Linke
e17b609517
Apply code standards
2016-04-15 14:31:54 +10:00
Maikel Linke
a25f4fdf44
Associate new users with existing customer records
2016-04-15 11:57:18 +10:00
Maikel Linke
831df0b222
Create and delete customers in admin interface
...
Removed Customers service and extended CustomerResource.
2016-04-15 11:12:22 +10:00
Maikel Linke
ecd32819a6
Remove unused matcher
2016-04-15 11:12:22 +10:00
Maikel Linke
9e4610f9bd
Customers: enable change of hub if no customers
...
Fix #588 .
And show search bar even when no customers are shown. Previously, the
search bar disappeared when you entered a search without results.
2016-04-15 11:12:22 +10:00
Maikel Linke
df5b554f24
Merge branch 'issue-878' of https://github.com/elf-pavlik/openfoodnetwork into locale-patches
2016-04-15 09:49:14 +10:00
Maikel Linke
ef0d6bd4d6
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into state_translation_override
...
Conflicts:
spec/lib/open_food_network/order_cycle_management_report_spec.rb
2016-04-15 08:27:09 +10:00
elf Pavlik
f15e948085
small i18n fixes #878
2016-04-14 16:10:21 -05:00
Rohan Mitchell
53e6d391e3
Fix intermittent fail on insignificant result ordering
2016-04-14 09:40:55 +10:00
Maikel Linke
a2c58c7ca1
Match array without order in ocm spec
...
That spec was randomly failing.
2016-04-13 16:59:54 +10:00
Maikel Linke
0ac87b9e55
Override spree_i18n payment_state, shipment_state
2016-04-13 16:50:01 +10:00
Rohan Mitchell
59b564c4be
Report job queue status via API
2016-04-13 16:48:24 +10:00
Rohan Mitchell
193580d5d9
Enqueue jobs directly via SQL rather than loading full Rails stack
2016-04-13 16:48:24 +10:00
Rohan Mitchell
eb846e27fd
Run a job queue heartbeat every 5 minutes
2016-04-13 16:48:24 +10:00
Maikel Linke
e3ed831e30
Merge branch 'state_translation_override' of https://github.com/stveep/openfoodnetwork into state_translation_override
2016-04-13 16:42:28 +10:00
Maikel Linke
e6b1d545a3
Merge branch 'default-logos' of https://github.com/bingxie/openfoodnetwork into default-logos
2016-04-13 15:12:01 +10:00
Steve Pettitt
b79b0d7586
Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into uk/state_translation_override
2016-04-11 22:31:56 +01:00
Steve Pettitt
39e3374ece
Add comment
2016-04-11 22:27:47 +01:00
Steve Pettitt
1483023769
Add a sweet warning sign
2016-04-10 22:48:38 +01:00
Steve Pettitt
bc048a943c
Show all payments, format unsuccessful payments grey, add 'invalid' translation.
2016-04-10 22:23:39 +01:00
Steve Pettitt
4414a3f287
Fix spelling mistake
2016-04-09 10:05:45 +01:00
Steve Pettitt
27fdfb60af
Override incorrect Spree GB translations for state/county
2016-04-09 09:41:21 +01:00
Bing Xie
852dce2dff
Add default logos and home_hero
2016-04-08 14:41:44 +10:00
Maikel Linke
b050f27a84
Default logos for new installations
2016-04-06 16:10:32 +10:00
Rob Harrington
44077a2c6f
Fixing styling (bottom margin for save-bar) on inventory page
2016-04-06 15:43:55 +10:00
Rob Harrington
0ed97d820c
Removing unrequired Spree::Order#with_payment_method_name scope
2016-04-02 01:04:09 +11:00
Rob Harrington
9b5bfdeb00
Allowing Order Management Report to filter by multiple payment / shipping methods at once
...
Also switched to using id rather than name to filter
2016-04-02 01:04:09 +11:00
Lynne Davis
f8e3f29d1a
More bug fixes. Spec updated to reflect changes
2016-04-02 01:04:09 +11:00
Lynne Davis
d844dc8e1b
Bug fixes to Order Cycle Reports
2016-04-02 01:04:09 +11:00
Rob Harrington
6c5aaef86e
Removing ability to create order discount rules
...
Issue with application of tax to discounted items is yet to be resolved
2016-04-01 21:31:36 +11:00
Rob Harrington
d8c17d160a
Applying shipping method rules in checkout
2016-04-01 19:48:25 +11:00
Rob Harrington
c099711f97
Removing dialogOptions library, not required anymore
2016-04-01 19:48:25 +11:00
Rob Harrington
d278b72289
Updating Tag Rules UI to allow management of new FilterShippingMethods rule type
2016-04-01 19:48:25 +11:00
Rob Harrington
82bc26fe90
Splitting tag rule feature specs out into their own spec file
2016-04-01 19:48:25 +11:00
Rob Harrington
47df106237
Refactor tragsWithTranslation directive to handle dynamic attr names
2016-04-01 19:48:25 +11:00
Rob Harrington
f70b1f4572
Refactoring tag rule model and adding new rule type: FilterShippingMethod
2016-04-01 19:48:25 +11:00
Rob Harrington
ed134bac84
Removing unrequired initSelection option from ofn-select2
2016-04-01 19:48:25 +11:00
Rob Harrington
33aad10e73
Adding dialogOptions library for adding responsiveness to jquery dialog
2016-04-01 19:48:25 +11:00
Rob Harrington
3d78b375c6
Moving angularjs tag rule logic into its own module
2016-04-01 19:48:25 +11:00
Rob Harrington
f9acee2be4
Shipping methods can be tagged
2016-04-01 19:48:25 +11:00
Rob Harrington
86c80124fc
Moving tags-with-translation directive to admin.utils
2016-04-01 19:48:25 +11:00
Rob Harrington
443e232ea4
Renaming angular admin.shipping_methods and admin.payment_methods modules
2016-04-01 19:48:25 +11:00
Rob Harrington
c74c274a9e
Renaming shippingMethodCtrl to shippingMethodsCtrl
2016-04-01 19:48:25 +11:00
Rob Harrington
f902474591
Relevant DiscountOrder tag rules are applied to orders on update
2016-04-01 19:48:25 +11:00
Rob Harrington
bf72864c2b
Tag Rules can be deleted
2016-04-01 19:48:25 +11:00
Rob Harrington
4c2552e0bf
Enterprise users can create tag rules
2016-04-01 19:48:25 +11:00
Rob Harrington
066190c16f
First cut at an interface for updating tag rules
2016-04-01 19:48:25 +11:00
Rob Harrington
3aea387b9a
First iteration of a model for tag rules
2016-04-01 19:44:17 +11:00
Maikel Linke
d12c486dd2
Use new spree_paypal_express branch to hide password
2016-04-01 15:48:21 +11:00
Maikel Linke
97bcbb81b9
Change text of register call in the dropdown
...
Unified code for the dropdown and the footer.
Both contain the register call and are both pointing to the register
path now. The footer still pointed to the global site before.
2016-04-01 14:39:43 +11:00
Maikel Linke
04f661f646
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into hide-closed-shops
...
Conflicts:
config/locales/en.yml
2016-04-01 13:02:53 +11:00
Maikel Linke
c4f92fd4cc
Hide closed shops by default, add "show" button
2016-04-01 11:45:24 +11:00
Maikel Linke
813dff8af2
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into require-login
2016-04-01 11:04:36 +11:00
Maikel Linke
db0b345241
Add "Show all on map" button under shops
2016-03-31 15:24:43 +11:00
Maikel Linke
21be27d722
Remove duplicate filtering of visible enterprises
...
Increase readability of enterprises_controller.js.coffee.
2016-03-31 15:00:22 +11:00
Maikel Linke
3d31a37dd3
Remove unused method Enterprise::find_near
2016-03-31 15:00:22 +11:00
Maikel Linke
17f168ed06
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into uk/account-balances
...
Applied code conventions.
Conflicts:
config/locales/en.yml
2016-03-30 13:30:44 +11:00
Maikel Linke
de35940341
Apply coding standards
2016-03-30 09:45:45 +11:00
stveep
d67db76b88
Formatting credit/debit green/red
2016-03-28 20:35:14 +01:00
stveep
5a6caa294e
Revert to Arel query and separate filtering
2016-03-28 20:13:30 +01:00
Maikel Linke
c4f499d518
Allow admins and managers to see restricted shops
2016-03-25 12:04:26 +11:00
Lynne Davis
7b75fab7a1
Code tidying and currency symbol internationalisation
2016-03-24 16:57:56 +00:00
Maikel Linke
5149c5118b
Change text and style for shops requiring login
2016-03-24 21:42:21 +11:00
Maikel Linke
df36386757
Require customer instead of user
...
If a shop requires a login, then a customer needs to be logged in, not
just any user.
2016-03-24 18:24:46 +11:00
Maikel Linke
31302fb930
Translate unsaved products message correctly
2016-03-23 17:57:22 +11:00
Maikel
d51cfccd7e
Auto-merged master into i18n-hackathon on deployment.
2016-03-23 10:09:36 +11:00
Maikel Linke
79ad05d405
i18n group image help text
2016-03-23 10:01:04 +11:00
elf Pavlik
6d0dc438a7
i18n fixes after @sstead feedback in #799
2016-03-21 16:55:57 -06:00
Maikel
ca0c677d46
Auto-merged master into uk/account-balances on deployment.
2016-03-19 07:16:41 +11:00
Steve Pettitt
276d3026c8
Adding specs for orders by ditributor query
2016-03-18 20:05:52 +00:00
Maikel Linke
41970ecf07
Use auth directive for Login button
...
Use the auth directive instead of the AuthenticationCtrl for the Login
button in the menu and on checkout.
2016-03-18 17:08:32 +11:00
Maikel Linke
2a9e35355e
Add auth directive to use AuthenticationService
...
The auth directive binds to all elements with the auth attribute. It
adds a click event that opens the login/register/password modal.
2016-03-18 16:46:29 +11:00
Maikel Linke
a48b992ec0
Shops can require users to login
...
Enterprise users have a new option to restrict their shopfronts to
logged in users only. If a guest visits one of these shopfornts, the
guest is prompted to login and is not shown any products.
Closes #849 .
2016-03-18 16:46:28 +11:00
Maikel Linke
599e39ce16
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into uk/filter-producers-for-map
2016-03-18 13:41:45 +11:00
Maikel Linke
d07daede68
Merge remote-tracking branch 'origin/master' into uk/filter-producers-for-map
2016-03-18 11:04:42 +11:00
Rohan Mitchell
16741598fd
Merge branch 'master' into products-caching
...
Conflicts:
spec/features/admin/variant_overrides_spec.rb
2016-03-18 09:59:56 +11:00
Lynne Davis
56a6593dd6
Missing Specs
2016-03-17 13:40:25 +00:00
Lynne Davis
096962b778
Adding super admin configuration for the minimum billable turnover functionality
2016-03-17 12:54:03 +00:00
Lynne Davis
2d97bc49bd
Updating specs to explore the cases around zero turnover with fixed rate and minimum billable turnover
2016-03-17 12:36:38 +00:00
Lynne Davis
da10b5decf
Updating spec with minimum_billable_turnover preference
2016-03-17 12:24:34 +00:00
Lynne Davis
430c6c0642
Adding preference def for minimum_billable_turnover
2016-03-17 12:22:27 +00:00
Lynne Davis
bfaefa4dc9
Updating Bill Calculator to include a minimum billable turnover. Shopfronts are not charged if their tunrover is under the minimum billable.
2016-03-17 11:15:06 +00:00
Lynne Davis
b43e770420
Removing incorrect angular watch
2016-03-16 14:17:43 +00:00
Lynne Davis
3a083723f0
Merge branch 'uk/trial-length' of https://github.com/openfoodfoundation/openfoodnetwork into uk/trial-length
2016-03-16 12:36:25 +00:00
Lynne Davis
ba49a5a783
Adding translations for shop front trials
2016-03-16 12:35:45 +00:00
Maikel
4adf332480
Auto-merged master into uk/trial-length on deployment.
2016-03-16 22:42:50 +11:00
Lynne Davis
d9d5d9cda5
Fixing wild typo
2016-03-16 11:38:00 +00:00
Lynne Davis
a4efd3d44c
Adding configurable Shop Trial Length in business model
2016-03-16 11:35:31 +00:00
Maikel Linke
6eb6a01339
Filter incomplete payments on database level
...
Using explicit `LEFT OUTER JOIN ... ON ...` to query only completed
payments for the order overview of consumers.
They were filtered in Ruby before.
2016-03-16 11:12:09 +11:00
Maikel
388b25ddf9
Auto-merged master into uk/account-balances on deployment.
2016-03-12 09:11:42 +11:00
Steve Pettitt
e81ef564e3
Capitalize Spree state translations
2016-03-11 22:01:09 +00:00
Steve Pettitt
e1fdd3a210
Apply style guide
2016-03-11 21:59:22 +00:00
Maikel Linke
2546603a67
Remove what_is_this from locale
...
It got replaced by admin.whats_this.
Changed views to use the new key.
2016-03-11 17:08:13 +11:00
Maikel Linke
e81343c8e4
Merge remote-tracking branch 'origin/master' into i18n-hackathon
2016-03-11 16:50:48 +11:00
Maikel Linke
51f94119ff
Restore links_dropdown
2016-03-11 16:39:07 +11:00
Maikel Linke
ac88817a34
Add translation for unsaved_changes_warning
2016-03-11 15:46:29 +11:00
Maikel Linke
2a3b3b6dd2
Merge remote-tracking branch 'origin/master' into i18n-hackathon
...
Conflicts:
app/assets/javascripts/admin/enterprise_fees.js
app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee
app/views/admin/shared/_columns_dropdown.html.haml
app/views/admin/variant_overrides/_header.html.haml
app/views/admin/variant_overrides/_products.html.haml
spec/features/admin/bulk_order_management_spec.rb
spec/features/admin/variant_overrides_spec.rb
2016-03-11 15:38:28 +11:00
Maikel Linke
711f525d98
Remove from locale en.yml
2016-03-11 14:45:43 +11:00
Maikel Linke
21a7942de6
Merge remote-tracking branch 'origin/master' into indicate-required-fields-for-new-enterprise-form
2016-03-11 14:14:45 +11:00
Maikel Linke
b7320a0bd7
Translate "Price" in Bulk Order Management
2016-03-11 12:48:35 +11:00
Maikel Linke
5225686d8f
Re-merge bulk order view
2016-03-11 12:23:12 +11:00
Maikel Linke
3e5f53b082
Rename i18n key what_is_this
2016-03-11 12:13:17 +11:00
Maikel Linke
3595685f9a
Merge text change in LineItemsCtrl into en.yml
2016-03-11 11:46:06 +11:00
Steve Pettitt
b324207121
Merge current master
2016-03-10 21:48:13 +00:00
Steve Pettitt
fe3c0b8d29
Move data processing to model, add payment method preload
2016-03-10 21:42:42 +00:00
Maikel Linke
02cc5adf78
Revert false HAML indent
2016-03-09 19:04:37 +11:00
Maikel Linke
02cbad2697
Remove duplicate lines from merging
2016-03-09 18:49:35 +11:00
Maikel Linke
071ee9ab54
Add brackets to t call in js line items controller
...
The missing brackets made all columns of the bulk order management
invisible.
Also removed trailing whitespaces.
2016-03-09 18:39:23 +11:00
Maikel Linke
61fb34e738
Use user's email address as enterprise.email
...
During registration, use the given email address only as public visible
profile email address. Set the internal notification email address
`enterprise.email` to the owner's email address. That can be changed
later.
2016-03-09 14:52:52 +11:00
Maikel
f2c8ea9722
Auto-merged master into uk/account-balances on deployment.
2016-03-09 14:43:05 +11:00
Maikel Linke
b6406b54b4
Apply code style
2016-03-09 14:40:04 +11:00
Maikel Linke
9ce5c45799
Update gem nokogiri to 1.6.7.2
...
Previous versions had security vulnerabilities. See:
http://rubysec.com/advisories/CVE-2015-5312/
2016-03-09 14:34:25 +11:00
Maikel Linke
f1cc3a7b0d
Apply code style following Rubocop
2016-03-09 14:32:41 +11:00
Maikel Linke
d925c2aefc
Translate Spree payment, shipment and order states
...
- Copied translations for payment_states, shipment_states and order_states
into locale en.yml.
- Enabled global Javascript function `translate` to deal with scopes like
'spree.shipment_states'.
- Removed `humanize` call from order serializer and added translation
scopes to accounts page.
- Test OrderSerializer for untranslated attributes
- Require spec helper in serializer specs
2016-03-09 14:29:54 +11:00
Rohan Mitchell
7e65b3176d
Add retry to failing payment method spec
2016-03-09 14:20:48 +11:00
Rohan Mitchell
9645ec727b
Refresh products cache when inventory items are changed
2016-03-09 14:07:04 +11:00
Rohan Mitchell
6f29a8b642
Refresh cache when inventory setting product_selection_from_inventory_only is changed
2016-03-09 13:29:33 +11:00
Rohan Mitchell
27d7b3026b
Move OpenFoodNetwork::ProductsCacheIntegrityChecker.active_exchanges to Exchange model
2016-03-09 12:28:09 +11:00
Maikel Linke
c1647ccd2c
Set public enterprise.email_address at registration
...
Sets the public email address to the given email address as well as the
internal enterprise.email (notification email address).
The field is not mandatory any more since enterprise.email is populated
from the owner's email address if no value was given.
2016-03-04 17:50:04 +11:00
Maikel Linke
28e2d4041f
Hide create-enterprise-group button from non-admins
...
Only admin users can create groups. The button was still displayed for
users that owned a group.
Unused HTML attributes were removed from that button as well.
2016-03-04 14:24:24 +11:00
Rohan Mitchell
780ec598d6
Use preferred_currency instead of preferences[:currency]. Use constant for currency instead of config var.
...
Conflicts:
spec/models/spree/shipping_method_spec.rb
2016-03-04 11:53:32 +11:00
Rohan Mitchell
73b53e02fc
Exclude performance specs from CI, which were modifying Spree::Config.currency
2016-03-04 11:42:27 +11:00
Rohan Mitchell
1440544b2d
Use persisted models
2016-03-04 11:41:49 +11:00
Maikel Linke
6300f87987
Use have_no_selector in VO spec
2016-03-04 10:23:13 +11:00
Rohan Mitchell
bc2223fb8e
Fix intermittent spec fails: currency inconsistencies on CI and retry on VOs
2016-03-04 10:15:57 +11:00
Maikel Linke
b5d4f8b781
Merge remote-tracking branch 'origin/master' into groups
2016-03-04 09:36:46 +11:00
Steve Pettitt
939356ef26
Update spec with nulls
2016-03-03 07:18:49 +00:00
Steve Pettitt
4966290f87
Check missing lat/long instead of zero
2016-03-03 06:41:59 +00:00
Rohan Mitchell
422061f137
Merge branch 'master' into products-caching
...
Conflicts:
app/controllers/shop_controller.rb
app/models/enterprise_fee.rb
app/models/order_cycle.rb
app/models/variant_override.rb
db/schema.rb
lib/open_food_network/products_renderer.rb
spec/lib/open_food_network/products_renderer_spec.rb
2016-03-03 09:42:52 +11:00
Rohan Mitchell
7e6d544180
Do not serialize product count_on_hand - reduce coupling between variant create and products JSON
2016-03-03 09:33:32 +11:00
Steve Pettitt
c1d068aeb9
Add/modify karma specs
2016-03-02 20:07:39 +00:00
Steve Pettitt
6a2319e16d
Remove producers without lat + long from map
2016-03-02 19:08:57 +00:00
Rob Harrington
0d65838e5d
Adding a second migration to auto-add variants to inventories
...
(I stuffed up the first one, oops)
2016-03-02 17:09:39 +11:00
Maikel Linke
587d06dced
Merge remote-tracking branch 'origin/master' into groups
...
Conflicts:
db/schema.rb
2016-03-02 15:31:35 +11:00
Rob Harrington
465649475d
Revoke ability to overide variants based on shared management/ownership (ie. only explicit permissions)
2016-03-02 12:10:49 +11:00
Rob Harrington
aff346071f
Automatically selecting a hub on inventory page when it is the only option
2016-03-02 12:10:49 +11:00
Rob Harrington
3f466e86b6
Renaming 'Override Variant Details' permission to 'Add Products To Inventory'
...
Style changes to make enterprise relationships page more useable
2016-03-02 12:10:49 +11:00
Rob Harrington
4bf27982f4
Applying variant override permissions when they are added or removed
...
Also remove variant overrides with revoked permissions from the default scope
2016-03-02 12:10:49 +11:00
Rob Harrington
8e1b4e299c
Adding column 'permission_revoked_at' to VOs
...
And a migration to flag any VOs which should not be permitted, update previous migration so that new enterprise relationships don't try to revoke variant overrides
2016-03-02 12:10:49 +11:00
Rob Harrington
51d77d5781
Adding migration to explicitly grant VO permission where it is currently implicitly granted via managers/owners
...
In preparation for removing implicitly granted permissions
2016-03-02 12:10:49 +11:00
Rob Harrington
186d1c1f26
Revoking ability to create variant overrides via OC permission
2016-03-02 12:10:49 +11:00
Rob Harrington
e00fe824ac
Updating text for inventory only product selection setting for enterprises
2016-03-02 12:10:49 +11:00
Rob Harrington
b2657ddc72
Adding data migration to populate inventories of enterprises that are already using variant overrides
2016-03-02 12:10:49 +11:00
Rob Harrington
4de0a5c220
Renaming 'Variant Overrides' index page to 'Inventory'
2016-03-02 12:10:22 +11:00
Rob Harrington
ed40ebace6
Existing Exchange Variants must be explicitly set to true by form data to remain in an exchange when an order cycle is updated
2016-03-02 12:10:22 +11:00
Rob Harrington
1d83809866
Bugfix: Spree::Variant#not_hidden_for scope was broken
...
Was getting confused by presence of inventory items for other enterprises when none existed for a given variant/enterprise combo
2016-03-02 12:10:22 +11:00
Rob Harrington
6ee4e4190e
New product count for inventory takes permissions into account
2016-03-02 12:10:22 +11:00
Rob Harrington
f280b96215
Hiding a variant from inventory prevents it being available on the shopfront
...
User preferences around inventory-only product selection immediately affect the shopfront
2016-03-02 12:10:22 +11:00
Rohan Mitchell
e16ca82e76
Extract product JSON rendering to lib class. Fix HTML stripping that never actually worked.
2016-03-02 12:10:22 +11:00
Rob Harrington
77e74c5642
OC Coordinators can opt to restrict products in an order cycle to those in their inventory only
2016-03-02 12:10:22 +11:00
Rob Harrington
f288c09380
Moving inventory settings to their own section within the enterprise edit form
2016-03-02 12:10:22 +11:00
Rob Harrington
488daed8f3
Translating variant overrides / inventory page
2016-03-02 12:10:22 +11:00
Rob Harrington
f05f88c1cb
Adding global config to allow shop users to only select from inventory variants in OC interface
2016-03-02 12:10:22 +11:00
Rob Harrington
28b143da73
WIP: Splitting Variant overrides into views
2016-03-02 12:10:22 +11:00
Rob Harrington
8f37aa0522
WIP: Adding Loading flash to variant overrides page
2016-03-02 12:10:22 +11:00
Rob Harrington
7008d26f68
WIP: Alerting user to presence of new variant for inventory, new variants can be filtered + limited
2016-03-02 12:10:22 +11:00
Rob Harrington
f06d909c23
WIP: Adding infrastructure to show/hide variants + overrides using inventory items
2016-03-02 12:10:22 +11:00
Rob Harrington
095b420997
WIP: Adding InventoryItem model for managing contents of inventories
2016-03-02 12:10:22 +11:00
Rob Harrington
59745fbc73
EnterpriseFees can inherit tax_category from product
2016-03-02 11:56:46 +11:00
Rob Harrington
caa8818f02
Adding option to 'Inherit From Product' for enterprise_fee tax categories
2016-03-02 11:56:46 +11:00
Rob Harrington
a66582a8fb
WIP: Using directive for EnterpriseFee index select elements, to properly bind data to the model
2016-03-02 11:56:46 +11:00
Rob Harrington
0bd9dc7af0
Enterprise Fees: Splitting ng controllers and directives into separate files, reanming module and coffee-ising
2016-03-02 11:56:46 +11:00
Rob Harrington
69ee1a98a7
EnterpriseFeeCalculator return empty list when retrieving applicators without distributor or order_cycle being present
2016-03-02 11:56:46 +11:00
Rob Harrington
137003c671
Correct calculation of tax on EnterpriseFees with TaxRates where included_in_price=false
2016-03-02 11:56:46 +11:00
Rohan Mitchell
4a7a40425a
Fix problems in rake file
2016-03-02 11:38:42 +11:00
Maikel
81ec3fef60
Auto-merged master into products-caching on deployment.
2016-03-02 11:12:40 +11:00
Maikel Linke
7cb64e8804
Merge remote-tracking branch 'origin/master' into groups
2016-03-02 11:12:33 +11:00
Maikel Linke
39708d773d
Merge branch 'transifex' into groups
...
Just to keep master up-to-date.
2016-03-02 11:11:43 +11:00
Rohan Mitchell
ec55af5b8a
Display products cache integrity checker results on cache settings admin page
2016-03-02 11:05:03 +11:00
Rohan Mitchell
2abee3fcdd
Extract integrity checking to lib class
2016-03-02 11:01:41 +11:00
Maikel Linke
23a1c2a772
Remove scroll bar from enterprise modal description
...
Multiple scroll bars within a modal were confusing. The inner scroll bar
for the long enterprise description got removed. The general modal
scroll bar persists.
Fix #806 Full profile modal about section copy display improvement
2016-03-02 10:42:40 +11:00
Rohan Mitchell
f394cf559c
Fix integrity checker rake task name
2016-03-02 08:49:36 +11:00
elf Pavlik
54ecdb670d
fixed failing i18n test in variant overrides
2016-02-28 19:58:16 +00:00
elf Pavlik
68db9b9926
fixing faling tests
2016-02-28 19:58:03 +00:00
Nicolas Blanc
cb33ede9dc
Revert "elf-pavlik@ee52f1d"
...
This reverts commit a8d7732a39 .
2016-02-28 19:54:44 +00:00
Nicolas Blanc
a8d7732a39
elf-pavlik@ee52f1d
2016-02-28 19:23:26 +00:00
Maikel Linke
1770cbb6bf
Display footer_email in confirmation emails correctly
...
A bug introduced in a9c37c162e caused the
creation of confirmation emails for shops to fail. The email template
got fixed now and the email address from the database is displayed if
present.
2016-02-26 16:09:14 +11:00
Rohan Mitchell
21ce7ab30a
Fix integrity checker error message, add task to warm products cache
2016-02-26 13:04:55 +11:00
Rohan Mitchell
d89e9620ac
Fix output of cache integrity checker errors
2016-02-26 12:05:49 +11:00
Rohan Mitchell
45a7b13e9a
Refresh cache when option type destroyed
2016-02-26 10:09:16 +11:00
Rohan Mitchell
8928e461d4
Refresh cache when option type changed
2016-02-26 09:59:16 +11:00
Nicolas Blanc
4621f625a0
new validation6 02/25/2016
2016-02-25 12:36:21 +00:00
Nicolas Blanc
5e71790cd1
new validation5 02/25/2016
2016-02-25 11:04:21 +00:00
Rohan Mitchell
b5204a4820
Refresh cache when option value changed or destroyed
2016-02-25 11:08:53 +11:00
Steve Pettitt
b84f49a1c3
Satisfy style police
2016-02-24 20:39:26 +00:00
Steve Pettitt
8e88cd6255
Localise dates
2016-02-24 20:33:37 +00:00
Steve Pettitt
c07fefde1a
Change non-js translations to be done in rails
2016-02-24 20:23:13 +00:00
Maikel Linke
098d313163
Using should syntax in payment method spec
2016-02-24 16:33:31 +11:00
Maikel Linke
a7e3b2d9df
Update enterprise email tests
2016-02-24 16:21:18 +11:00
Rohan Mitchell
71862e00a7
Perform products cache refresh when producer property changed or destroyed
2016-02-24 16:11:59 +11:00
Maikel Linke
68f3d0951a
Merge branch 'groups' into indicate-required-fields-for-new-enterprise-form
...
Conflicts:
app/views/admin/enterprises/_new_form.html.haml
2016-02-24 15:36:25 +11:00
Maikel Linke
4feb7c893b
Introduce contact email address for enterprises
...
Add a new column email_address to enterprises.
Use this new field for public display of contact details.
The old field enterprise.email is still used internally.
It is still displayed on orders and emails sent to customers.
A new enterprise has the owner's email address by default now.
Fix GH #757
2016-02-24 15:14:07 +11:00
Rohan Mitchell
1b62dd06b8
Add products cache integrity checker
2016-02-24 15:05:03 +11:00
Rohan Mitchell
687fb6f0aa
Enqueue RefreshProductsCacheJob with lower than default priority
2016-02-24 15:05:03 +11:00
Rohan Mitchell
98961fef74
Trigger cache refresh when producer property changed or destroyed
2016-02-24 15:05:03 +11:00
Rohan Mitchell
8b070fddbb
Refresh products cache when exchange fee is changed or destroyed
2016-02-24 15:05:03 +11:00
Rohan Mitchell
8af6866ae4
Refresh products cache when exchange is changed or destroyed
2016-02-24 15:05:03 +11:00
Rohan Mitchell
146797ea61
Generalise method for reuse
2016-02-24 15:05:03 +11:00
Rohan Mitchell
8bd5a36aaf
Remove enterprise fee destruction cache callback - responsibility to be handled by dependent models
2016-02-24 15:05:03 +11:00
Rohan Mitchell
a64a501dbb
Smarter job queuing: Do not enqueue a RefreshProductsCacheJob if there's already one waiting to run
2016-02-24 15:05:03 +11:00
Rohan Mitchell
0a90a48b04
Refresh products cache when coordinator fees are changed or destroyed
2016-02-24 15:05:03 +11:00
Rohan Mitchell
540687515e
Reify coordinator_fees HABTM join table as CoordinatorFee model using HMT
2016-02-24 15:05:03 +11:00
Rohan Mitchell
62c6530ca9
Do not refresh products cache when price destroyed - variant destruction is main (only?) trigger, it causes refresh
2016-02-24 15:05:03 +11:00
Rohan Mitchell
f78826c9c7
Fix rare case where price is saved without variant
2016-02-24 15:05:03 +11:00
Rohan Mitchell
2f602f2a57
Shop controller uses CachedProductsRenderer
2016-02-24 15:05:02 +11:00
Rohan Mitchell
fa543fed63
Deal with unset distribution
2016-02-24 15:05:02 +11:00
Rohan Mitchell
235c463849
Hide wrapped exception, too
2016-02-24 15:05:02 +11:00
Rohan Mitchell
ff493c21d4
Log a warning on cache MISS
2016-02-24 15:05:02 +11:00
Rohan Mitchell
d0b7b4ee50
Add CachedProductsRenderer - wraps ProductsRenderer using Rails cache
2016-02-24 15:05:02 +11:00
Rohan Mitchell
339f3fc2f0
Refresh products cache when price is changed or destroyed
2016-02-24 15:05:02 +11:00
Rohan Mitchell
d8d803546b
Refresh products cache when master variants or images are changed or destroyed
2016-02-24 15:05:02 +11:00
Rohan Mitchell
6d80d91873
Refresh products cache when taxons or classifications are changed or destroyed
2016-02-24 15:05:02 +11:00
Rohan Mitchell
7c4e9e5838
Refresh products cache when product properties are changed
2016-02-24 15:05:02 +11:00
Rohan Mitchell
f756749e02
Fix specs
2016-02-24 15:05:02 +11:00
Rohan Mitchell
3bcd3257a1
Perform refresh of products cache when supplier fee is changed
2016-02-24 15:05:02 +11:00
Rohan Mitchell
fbedff4eca
Perform refresh of products cache when distributor fee is changed
2016-02-24 15:05:02 +11:00
Rohan Mitchell
af7e3380d3
Perform refresh of products cache when coordinator fee is changed
2016-02-24 15:05:02 +11:00
Rohan Mitchell
0c65d1ddd8
Trigger products cache refresh when enterprise fee changed or destroyed
2016-02-24 15:05:02 +11:00
Rohan Mitchell
378a703cc3
Order cycles are undated unless they have both open and close dates defined
2016-02-24 15:05:02 +11:00
Rohan Mitchell
fe41430d1e
Rerefesh products cache when an order cycle is changed
2016-02-24 15:05:02 +11:00
Rohan Mitchell
1ec329284c
Refresh products cache when a variant override is destroyed
2016-02-24 15:05:02 +11:00
Rohan Mitchell
b7a88fd03b
Perform refresh of products cache for variant override change
2016-02-24 15:05:02 +11:00
Rohan Mitchell
5f188650d8
Trigger cache refresh on VariantOverride save/destroy
2016-02-24 15:05:01 +11:00
Rohan Mitchell
c98e44c5a1
Perform refresh of products cache on product change
2016-02-24 15:05:01 +11:00
Rohan Mitchell
0c0c98a0b0
Refresh products cache on product change
2016-02-24 15:05:01 +11:00
Rohan Mitchell
6d39cc39c6
When a variant is destroyed, update product cache
2016-02-24 15:05:01 +11:00
Rohan Mitchell
a0a61b65cb
Refresh the appropriate product caches when a variant is changed
2016-02-24 15:05:01 +11:00
Rohan Mitchell
5d20b4fb51
Add OrderCycle scopes: not_closed, dated
2016-02-24 15:05:01 +11:00
Rohan Mitchell
3621c34bd5
Job calls ProductsRenderer with object instances rather than ids
2016-02-24 15:05:01 +11:00
Rohan Mitchell
eba636c929
When variant is changed/destroyed, trigger product cache refresh
2016-02-24 15:05:01 +11:00
Rohan Mitchell
0d0eb6117f
Add job to cache products JSON
2016-02-24 15:05:01 +11:00
Rohan Mitchell
6df8f73bb0
Make method naming more explanatory
2016-02-24 15:05:01 +11:00
Rohan Mitchell
b0207f2b49
Clean up specs
2016-02-24 15:05:01 +11:00
Rohan Mitchell
920d3bb974
Do not show knapsack time offset warnings unless in CI
2016-02-24 15:05:01 +11:00
Rohan Mitchell
0d5d015d88
Extract product JSON rendering to lib class. Fix HTML stripping that never actually worked.
2016-02-24 15:05:01 +11:00
Rohan Mitchell
6193bb896b
Sanitize input for ofnTaxonAutocomplete and userSelect directives
2016-02-24 11:26:38 +11:00
Rohan Mitchell
4314bfb99c
Fix karma fail due to file load order change
2016-02-24 11:26:38 +11:00
Rohan Mitchell
ae03170984
Sanitize input for ofn-select2
2016-02-24 11:26:38 +11:00
Rohan Mitchell
977ff7b35d
Fix compatibility issues with new version of select2
2016-02-24 11:26:37 +11:00
Rohan Mitchell
1e288e5f14
Further styling for select2 after upgrade
2016-02-24 11:26:37 +11:00
Rohan Mitchell
9747b0cf96
Upgrade select2-rails
2016-02-24 11:26:37 +11:00
Rohan Mitchell
258e84fc0a
Replace with-tip with ofn-with-tip: misc
2016-02-24 11:26:37 +11:00
Rohan Mitchell
17cda86dfa
Replace with-tip with ofn-with-tip: enterprise groups
2016-02-24 11:26:37 +11:00
Rohan Mitchell
bdd6d3ba6b
Replace with-tip with ofn-with-tip: business model configuration
2016-02-24 11:26:37 +11:00
Rohan Mitchell
d699f8321a
Replace with-tip with ofn-with-tip: dashboard
2016-02-24 11:26:37 +11:00
Rohan Mitchell
b4976a5445
Replace with-tip with ofn-with-tip: enterprise forms
2016-02-24 11:26:37 +11:00
Rohan Mitchell
e2722710de
Clean up syntax
2016-02-24 11:26:37 +11:00
Rohan Mitchell
45d4dd6b88
Add ofnWithTip directive to sanitise HTML going into tooltips
2016-02-24 11:26:37 +11:00
Rohan Mitchell
d79a6d7e19
Escape HTML entities in JSON
2016-02-24 11:26:37 +11:00
Rohan Mitchell
6a2e07064b
Fix stomped spree JS file
2016-02-24 11:26:37 +11:00
Nicolas Blanc
52d5b8936e
new validation4 02/22/2016
2016-02-22 14:54:31 +00:00
Nicolas Blanc
c91eb9f345
new validation3 02/22/2016
2016-02-22 14:31:31 +00:00
Nicolas Blanc
44508f0f1e
new validation2 02/22/2016
2016-02-22 13:38:19 +00:00
Nicolas Blanc
1738db9e1f
new validation 02/22/2016
2016-02-22 13:00:27 +00:00
Steve Pettitt
f7387048b0
Remove cruft and 2nd active table, to stop constant hover
2016-02-21 12:40:53 +00:00
Steve Pettitt
92cfcb8fc9
remove debug statement
2016-02-20 21:22:10 +00:00
Nicolas Blanc
614f83799e
new test 2016/02/20
2016-02-20 19:23:22 +00:00
Steve Pettitt
d39b62aa31
Fallback to a default tractor logo if missing
2016-02-20 19:00:37 +00:00
Steve Pettitt
ec3e158781
Merge current master
2016-02-20 17:24:57 +00:00
Steve Pettitt
d5e51dada6
Don't serialize payment ID (not used)
2016-02-20 17:22:26 +00:00
Steve Pettitt
23e774bede
Styling, fewer columns in small/medium screen, logo resize
2016-02-20 17:20:43 +00:00
Maikel Linke
0cb5dfbbe0
delete old sidebar partials
2016-02-19 16:29:19 +11:00
Maikel Linke
6ba534fb58
Show noticeboard in mobile menu
2016-02-19 15:16:24 +11:00
Maikel Linke
38cac3a3c4
Explicitly referencing main_app.discourse_login_path
...
Fixes #830 .
2016-02-19 11:23:38 +11:00
Maikel Linke
82182d24e7
Merge remote-tracking branch 'origin/master' into discourse-sso
2016-02-19 11:02:59 +11:00
stveep
83d248469f
Running balances
2016-02-16 20:32:09 +00:00
Lynne Davis
2d620071f0
Fxing conflicts
2016-02-11 16:14:44 +00:00
Paul Mackay
50c657133a
Change "&" to "and"
...
There are very few places where ampersands are appropriate.
Minor typo in footer.
2016-02-09 10:01:51 +00:00
Paul Mackay
fb7fb62f79
Add SCSS lint config
2016-02-09 06:11:13 +00:00
Paul Mackay
98e5df6aac
Add Rubocop config file
2016-02-09 06:00:05 +00:00
Paul Mackay
ee168bcbfb
Add codeclimate config file
2016-02-08 21:07:42 +00:00
Paul Mackay
8cdf2254d8
Fix to make shell block highlight correctly
2016-02-06 20:07:57 +00:00
Paul Mackay
57a929d718
#268 : add notes in README about creating OFN user
2016-02-06 20:05:23 +00:00
Paul Mackay
2b0788ec9c
#737 : add link to dev wiki
2016-02-06 11:13:17 +00:00
Paul Mackay
c7f6d4e4fe
Add Travis badge, link to wiki, UK contributors
2016-02-06 11:09:53 +00:00
Paul Mackay
979baf80dd
Rename README to have consistent short file extension
2016-02-06 10:50:01 +00:00
Maikel Linke
3db79aa6b2
Prevent body from scrolling when a modal is open
2016-02-05 15:18:18 +11:00
Rob Harrington
2ebad800b2
Try again: using :site_meta_description for translation of global site meta description
2016-02-05 14:57:18 +11:00
Rob Harrington
dbe7fbc760
Using :meta_description for translation of global site description
2016-02-05 14:17:42 +11:00
Transifex-Openfoodnetwork
ad2e10c33e
Updating translations for fr.yml and nb.yml
2016-02-05 14:17:42 +11:00
Maikel Linke
ac413937f3
Merge remote-tracking branch 'origin/master' into groups
2016-02-05 11:05:40 +11:00
Rohan Mitchell
48b02db70d
Order cycles are undated unless they have both open and close dates defined
2016-02-05 09:27:25 +11:00
Maikel Linke
eef62d4128
fix hub filter style
2016-02-04 16:34:03 +11:00
Maikel Linke
f5ff5bd5b0
Merge remote-tracking branch 'origin/master' into groups
2016-02-04 16:12:57 +11:00
Maikel Linke
bd19bf5f3c
Refactoring filter selectors
...
The FilterSelectorsService is now able to create multiple independent
lists of selectors. These lists are explicitly given to the
filter-selector directive.
For example a group's page has one set for the group's producers and one
set for the group's shops.
2016-02-04 16:08:19 +11:00
Steve Pettitt
0ad3d8f351
WIP: styling updates
2016-02-02 23:21:04 +00:00
Nicolas Blanc
2be005d344
i18n from berlin hackathon
2016-01-31 12:16:33 +00:00
Steve Pettitt
79808acd9f
Merge branch 'uk/account-balances' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances
2016-01-31 11:00:18 +00:00
Steve Pettitt
dcb07237d8
Spec worked, links didn't :)
2016-01-31 11:00:07 +00:00
Maikel
381fb6291e
Auto-merged master into uk/account-balances on deployment.
2016-01-31 21:35:44 +11:00
Steve Pettitt
e3b9ce4d80
Delegate url helper to pass specs
2016-01-31 10:28:19 +00:00
Nicolas Blanc
fb557dd682
Merge branch 'hackweek/i18n' of https://github.com/elf-pavlik/openfoodnetwork into elf-pavlik-hackweek/i18n
2016-01-31 09:16:33 +00:00
Steve Pettitt
4438cbd5d0
Merge branch 'uk/account-balances' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances
2016-01-30 19:53:53 +00:00
Steve Pettitt
ec6b0f873e
style credit/debit, spec updates
2016-01-30 19:53:37 +00:00
Steve Pettitt
92d830b884
Table styling
2016-01-30 17:56:04 +00:00
Maikel
3c8df7c4aa
Auto-merged master into delivery_email_updates on deployment.
2016-01-30 05:04:11 +11:00
Lynne Davis
c0afa6be49
Bug fix
2016-01-29 17:57:10 +00:00
Maikel Linke
d0cb9008a2
Delete unused shopfront haml
2016-01-29 16:09:34 +11:00
Transifex-Openfoodnetwork
e551a6b9f5
Updating translations for fr.yml and nb.yml
2016-01-29 14:18:48 +11:00
Rohan Mitchell
533124fe91
Display receival instructions when editing order cycle
2016-01-29 12:17:20 +11:00
Steve Pettitt
5b73b80e81
sorting orders in reverse date order
2016-01-28 23:10:27 +00:00
Steve Pettitt
ccd66bba9c
Credit/debit formatting, use filters for money formatting, use full page width for table
2016-01-28 22:42:45 +00:00
Lynne Davis
02616a8ac7
Updates based on testing on staging
2016-01-27 18:43:01 +00:00
Steve Pettitt
aa8457c40f
Fix order serializer spec: change from id to number
2016-01-26 19:03:19 +00:00
Lynne Davis
a9c37c162e
Update email footer to use instance email and social media contacts
2016-01-26 13:14:29 +00:00
Maikel
93de2e4b02
Auto-merged master into delivery_email_updates on deployment.
2016-01-26 11:01:47 +11:00
Lynne Davis
a0f51af355
Correcting name tag for order conf email
2016-01-25 23:50:53 +00:00
Maikel
3dd3cfa7ec
Auto-merged master into uk/account-balances on deployment.
2016-01-25 04:43:25 +11:00
Steve Pettitt
295ee47c3a
Merge branch 'uk/account-balances' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances
2016-01-24 17:34:43 +00:00
Steve Pettitt
c9a8d7efa5
Message for users with no orders
2016-01-22 19:49:03 +00:00
Maikel Linke
1f1b0bd783
styling groups blurb
2016-01-22 16:20:07 +11:00
Maikel Linke
d562f6537e
Cleaner opengraph meta tags
2016-01-20 15:42:01 +11:00
Maikel Linke
1c46b8dccb
check_github_status.sh can check for user defined statuses
...
You can call it like this:
./script/ci/check_github_status.sh "pending|success"
It will check if the status is pending or success.
2016-01-20 14:58:21 +11:00
Maikel Linke
8c1a16b371
groups blurb text
2016-01-20 14:00:46 +11:00
Maikel Linke
ea796d4f94
Taxon filter for group hubs
2016-01-20 13:32:08 +11:00
Maikel Linke
d5aea1b00d
Taxon filter for group producers
2016-01-20 13:32:08 +11:00
Maikel Linke
fd9de730c8
group producer style adjustment
2016-01-20 13:32:08 +11:00
Maikel Linke
fbdeb557ca
Loading only visible enterprises for group
2016-01-20 13:32:08 +11:00
Rohan Mitchell
07d691fc97
Only apply cart scrolling to non-mobile devices
2016-01-15 16:54:56 +11:00
Maikel
eeb31f65c3
Auto-merged master into combined/cart-fit-to-screen_preserve-max-quantity on deployment.
2016-01-15 16:15:09 +11:00
Rohan Mitchell
046d0f0d19
Merge branch 'preserve-max-quantity' into combined/cart-fit-to-screen_preserve-max-quantity
2016-01-15 16:07:25 +11:00
ludivinecp
a611e73bed
Opengraph facebook: images and description for shops and groups and home => ok
2016-01-15 14:03:33 +11:00
Maikel Linke
aea766327c
Add say_no and say_yes to locale
2016-01-15 12:07:43 +11:00
Maikel Linke
f68f7ea2b6
Fix display of "Total"
2016-01-15 12:07:43 +11:00
Maikel
ddf6eef370
Auto-merged master into ng-vo-inventory-reset on deployment.
2016-01-15 09:21:54 +11:00
Rob Harrington
9979e31220
Final tidy up after rebasing default_inventory and ng-vo onto origin/master
...
Fixes a few VO feature specs and a few interface tweaks
2016-01-15 09:07:51 +11:00
Rob Harrington
669642292b
Refactoring VariantOverridesController#bulk_reset to only reset VOs for a specified hub
2016-01-15 09:07:51 +11:00
stveep
ecf1aac5cb
Added failure message to VO reset
2016-01-15 09:07:51 +11:00
Rob Harrington
4103ed0ba7
Combining variant override controller specs
2016-01-15 09:07:51 +11:00
Rob Harrington
0bbae19b41
Variant Overrides Index: User can manually reset inheritance
2016-01-15 09:07:51 +11:00
Rob Harrington
607a66b6c6
WIP: Fixing a few broken VO specs
2016-01-15 09:07:50 +11:00
Steve Pettitt
a3f7ff19b0
Add new VO fields to shopping spec
2016-01-15 09:07:50 +11:00
Steve Pettitt
0f4479aceb
Back to original (current master) Rspec version
2016-01-15 09:07:50 +11:00
Steve Pettitt
1d38866f86
Add migration file to git repo
2016-01-15 09:07:50 +11:00
Steve Pettitt
e423e890e0
Changed name enable_reset to resettable in Variant Overrides table & updated views, specs accordingly
2016-01-15 09:07:50 +11:00
Steve Pettitt
25454d3e97
Added new fields to fix VO deletion feature specs
2016-01-15 09:07:49 +11:00
Steve Pettitt
75127f2a63
Fix feature specs for VO reset
2016-01-15 09:07:49 +11:00
Rob Harrington
94785d4157
Fixing authorization for VariantOverridesController#bulk_reset
2016-01-15 09:07:49 +11:00
Rob Harrington
d01da727f0
Removing :bulk_update action from actions allowed on nil object, using collection_actions methods on controller instead
2016-01-15 09:07:49 +11:00
Steve Pettitt
5a62098b95
Cleaning up and attempt to add feature spec
2016-01-15 09:07:49 +11:00
Steve Pettitt
0ee078e232
Added toggle to enable/disable reset stock. Updated specs
2016-01-15 09:07:48 +11:00
Steve Pettitt
2921958788
Variant override controller spec added
2016-01-15 09:07:48 +11:00
Steve Pettitt
34c603a9c3
Added angular service tests for variant overrides stock reset
2016-01-15 09:07:48 +11:00
Steve Pettitt
6c0dd7e25f
Adding 'default_stock' to VariantOverride
2016-01-15 09:07:48 +11:00
Rob Harrington
53d97dab08
WIP: Adding view and routes for resetting variant_overrides count_on_hand
2016-01-15 09:07:48 +11:00
Rob Harrington
3b7700131c
Specify controller specs as such
2016-01-15 09:07:47 +11:00
Rob Harrington
14c8683535
Updating active_model_serializers
2016-01-15 09:07:47 +11:00
Continuous Integration
e070168c4a
Auto-merge from CI [skip ci]
2016-01-15 03:30:02 +11:00
Rob Harrington
cc4dc068ab
Adding variant SKU field to BPE
2016-01-13 18:49:34 +11:00
Rob Harrington
64cd52e067
Adding SKU and on demand to a few VO specs
2016-01-13 18:49:34 +11:00
Rob Harrington
4553bc2997
Moving SaveBar directive and StatusMessage service into admin.utils module
2016-01-13 18:49:33 +11:00
Rob Harrington
521f227f74
Adding sku and on_demand to VariantOverride
2016-01-13 18:49:33 +11:00
Rob Harrington
cab6871de3
Pulling bulk actions dropdown out into partial
2016-01-13 18:49:33 +11:00
Rob Harrington
7cd8f35ac8
Tidying up styling and use of skeleton columns on index pages
2016-01-13 18:49:33 +11:00
Rob Harrington
2b70ddb23c
Adding columns toggle to variant overrides index
2016-01-13 18:49:33 +11:00
Rob Harrington
9eaec6061e
Pulling columns dropdown out into a shared partial
2016-01-13 18:49:32 +11:00
Rob Harrington
54e7677888
Integrating StatusMessages into save-bar, adding to variant overrides index
2016-01-13 18:49:32 +11:00
Rob Harrington
c781113a65
Adding filters to variant overrides interface
2016-01-13 18:49:32 +11:00
Rob Harrington
4237a83028
Moving components required for variant overrides into appropriate modules
2016-01-13 18:49:32 +11:00
Rob Harrington
f11e878e7f
WIP: Reorganising variant overrides javascript files
2016-01-13 18:49:31 +11:00
Maikel
68e2b9a0b9
Auto-merged master into preserve-max-quantity on deployment.
2016-01-13 16:57:31 +11:00
Rohan Mitchell
406338ea05
Remove cruft
2016-01-13 16:45:14 +11:00
Rohan Mitchell
2c3ff37980
Split order cycles controller into parts
2016-01-13 16:45:03 +11:00
Maikel Linke
c33835e751
fixup whitespace
2016-01-13 16:23:14 +11:00
Maikel
826d045532
Auto-merged master into cart-fit-to-screen on deployment.
2016-01-13 16:12:41 +11:00
Maikel Linke
c4b0245399
Merge branch 'master' of https://github.com/marito59/openfoodnetwork into marito59-master
2016-01-13 16:07:21 +11:00
Maikel Linke
0c434c197b
Making Travis fail if karma fails
2016-01-13 16:07:04 +11:00
Rohan Mitchell
a07eabca55
Fit cart to screen and allow scrolling so we can always access all of it
2016-01-13 16:00:43 +11:00
Maikel Linke
1cfb5a7feb
Merge branch 'master' of https://github.com/blancnic/openfoodnetwork into blancnic-master
2016-01-13 15:06:11 +11:00
Maikel Linke
00af6ef9de
cleanup knapsack integration
2016-01-13 15:05:48 +11:00
Maikel Linke
7a998663b2
Knapsack report and test splitting
2016-01-13 15:05:48 +11:00
Maikel Linke
749061d60a
knapsack report generation
2016-01-13 15:05:48 +11:00
Steve Pettitt
667d1c5428
More reliable spec
2016-01-10 16:16:30 +00:00
Steve Pettitt
f5db1cd921
Images, first attempt at column formatting
2016-01-10 15:53:14 +00:00
Nicolas Blanc
770a8d0b17
#771-minor-bug-on-Firefox
...
Z-index:1 solved problem on Firefox. It works on Chrome too.
2016-01-10 09:54:35 +01:00
Steve Pettitt
262a8e75f9
slugs
2016-01-10 07:58:04 +00:00
stveep
81b688f0e8
Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances
2016-01-07 13:26:13 +00:00
stveep
698d36180d
Move query from injector to User instance method
2016-01-07 13:25:15 +00:00
Maikel Linke
46382e669f
more verbose example of Discourse config
2016-01-07 22:44:03 +11:00
Maikel Linke
217fa9a57c
UI integration of Discourse login
2016-01-07 19:01:09 +11:00
Christian
01bf64e6b0
Allow delayed_job to use the locale defined for application
...
delayed_job requires a different configuration variable for locale than
the application.
See
https://stackoverflow.com/questions/8478597/rails-3-set-i18n-locale-is-not-working
for reference
2016-01-07 07:15:18 +01:00
Christian
839bf8794f
Fix a hard cocded string on Order summary screen
...
Created an order_pickup_time entry in locale files.
2016-01-07 07:06:26 +01:00
Rohan Mitchell
037c524df2
Preserve max quantity when reloading shopfront
2016-01-07 16:35:54 +11:00
Rohan Mitchell
71569324f4
Serialise cart updates - do not submit another until the previous has completed
2016-01-07 13:53:37 +11:00
Maikel Linke
030f4f63ed
SingleSignOn controller with routes and config
2016-01-07 12:58:30 +11:00
Rohan Mitchell
257b5a9eef
Move premature Spree::Order#update prevention up a level, for even greater efficiency gains
2016-01-07 12:09:57 +11:00
Rohan Mitchell
ac650ebd46
Add support for mirroring Norway's database
2016-01-07 10:56:56 +11:00
Rohan Mitchell
e24027a8d0
Speed up add to cart: Update the order once per fee calculation, rather than for every line item x fee
2016-01-07 10:52:36 +11:00
Rohan Mitchell
a27e593924
Fix deprecation notices
2016-01-07 10:51:39 +11:00
Maikel Linke
09086b8dd8
Reference implementation of SSO from Discourse
2016-01-06 15:39:41 +11:00
stveep
6992d66202
Add payments data, reformat dates
2016-01-01 09:37:21 -05:00
Maikel Linke
9342ceb968
Adding translation notes to en.yml
2015-12-24 11:44:13 +11:00
Maikel
324f58a636
Updating translations for es.yml, fr.yml and nb.yml
2015-12-24 11:44:12 +11:00
Maikel Linke
20b3ad2cd6
Transifex configuration file
...
This configuration file enables easy use of the Transifex client to
download and upload translations.
2015-12-24 11:44:12 +11:00
Christian
823a6bff5b
Use config to get logo in mails
...
Use ContentConfig.footer_logo to get localized logo file instead of
defaut AUS logo.
2015-12-24 11:31:47 +11:00
Maikel Linke
59c51f9e7c
Fixing typo in locale: email_payment_method
2015-12-24 11:09:37 +11:00
stveep
f9435a3c34
Starting i18n
2015-12-23 14:39:56 +00:00
stveep
59adf88cad
Feature spec
2015-12-22 22:59:07 +00:00
stveep
48896ab3d8
More serializer specs
2015-12-22 15:09:24 +00:00
stveep
668c6ff74f
Order serializer spec
2015-12-21 23:22:15 +00:00
stveep
da0810382b
Sorting by most orders, currency symbol, hide until clicked, reformatting table headers
2015-12-21 22:19:00 +00:00
stveep
90e627ad60
Data manipulation and balance calc in rails instead
2015-12-21 17:40:36 +00:00
stveep
7e50cc9ce8
Data organisation in angular, basic table structure and balance calculation.
2015-12-21 14:12:38 +00:00
Emmanuel
5e081ce3ee
Translations of validation messages in app/models
2015-12-21 10:11:08 +01:00
elf Pavlik
2a4f3f9ae4
making test pass
2015-12-21 10:11:08 +01:00
knopfler81
ed48b691e1
translations in app/assets/javascripts/admin
2015-12-21 10:11:08 +01:00
Emmanuel
30141bd488
few translations in app/assets/javascripts/admin/
2015-12-21 10:11:08 +01:00
victor goutay
e16e3fba40
translations in app/assets/javascripts/admin/
2015-12-21 10:11:08 +01:00
ludivinecp
69ab113201
translations in app/assets/javascripts/admin/
2015-12-21 10:11:07 +01:00
Florian Vallen
7192f12a49
first js translation for admin interface
2015-12-21 10:11:07 +01:00
Florian Vallen
ec6962ea2c
Implements i18n translation for admin interface
...
it takes the i18n.js files from darkswarm.
This should be changed later and added to the
shared js folder.
At best, the namespacing for yml files should work
just as they work together with ruby, so
general:
sure: sure?
should point to t(general.sure)
2015-12-21 10:11:07 +01:00
elf Pavlik
8a390dd237
fixing test failing after i18n changes
2015-12-21 10:11:07 +01:00
julienFR88
5290d0be6b
add translation in /cache/code/ofn/openfoodnetwork/app/views/spree/admin
2015-12-21 10:11:07 +01:00
Edem
6cd7fbb455
all string translated in admin bulk orders management
2015-12-21 10:11:07 +01:00
Edem
8ccf527e01
all strings in app/views/spree/admin/overview/* translated!
2015-12-21 10:11:06 +01:00
Edem
d2ec4fcf88
Everything string translated in admin/entreprise_relationships
2015-12-21 10:11:06 +01:00
julienFR88
8fa293f561
my admin interface translations
2015-12-21 10:10:58 +01:00
apprenti
b58306aad8
my first translations
2015-12-21 09:47:18 +01:00
Edem
2a2f8f3531
admin entreprise_group are translated!
2015-12-21 09:47:18 +01:00
stveep
16ab8f04c3
Angularise /account page: Order service/controller, rough layout
2015-12-18 17:06:04 +00:00
Maikel Linke
61a58bca7d
Travis can trigger the Github deploy API
...
And other build tools like Buildkite can listen to the deploy event.
2015-12-18 10:41:25 +11:00
Rob Harrington
e67e22ee73
Merge remote-tracking branch 'Em-AK/682-xero-report-defaults' into customer-name-security
...
Conflicts:
lib/open_food_network/xero_invoices_report.rb
2015-12-17 14:22:16 +11:00
Rob Harrington
7a23f671a2
Restricting access to orders within Sales Tax Report
...
Managers of suppliers should not be able to generate sales tax reports for orders they only supply products for
2015-12-17 14:21:30 +11:00
Rob Harrington
d115eb816e
Restricting access to orders within Xero Invoices Report
...
Managers of suppliers should not be able to generate xero invoices for orders they supply products for
2015-12-17 14:21:30 +11:00
Rob Harrington
4b5e33d5b0
Implementing new permissions for producers in reports_controller_spec
2015-12-17 14:21:30 +11:00
Rob Harrington
c579d302d5
Fixing customer info security for orders and distributors report
2015-12-17 14:21:30 +11:00
Rob Harrington
2f2ebf419c
Fixing customer info security for packing reports
2015-12-17 14:21:30 +11:00
Rob Harrington
2f13ab6adf
Fixing customer info security for orders and fulfillments report
2015-12-17 14:21:29 +11:00
Rob Harrington
b121984e76
Fixing customer info security for bulk coop report
2015-12-17 14:21:29 +11:00
Continuous Integration
23b9dd5c71
Auto-merge from CI [skip ci]
2015-12-17 13:02:37 +11:00
Maikel Linke
bc6110c178
Re-defining in_distributor scope as method to allow chaining
2015-12-17 12:42:28 +11:00
Rob Harrington
72f7e545dc
Making sure bill > 0 for finalize account invoice spec
2015-12-17 12:04:24 +11:00
Rob Harrington
e0da49e4df
Formatting dates for account invoices in rails time zone
2015-12-17 11:34:06 +11:00
Rob Harrington
b004060679
Printing invoices doesn't fail when order has no order cycle
2015-12-17 11:33:18 +11:00
Maikel Linke
ea68619f0b
Use bundled rails to prepare imported database
2015-12-17 10:31:31 +11:00
Rob Harrington
555f639026
Fixing unstable update_account_invoice specs
...
Rounding first then summing != summing first then rounding
2015-12-17 09:16:19 +11:00
Rob Harrington
26a2f1a280
Adjustments on account invoices are created based on presence of a bill
...
Rather than of turnover
2015-12-16 23:10:47 +11:00
Rob Harrington
83e3fb98f7
Only display billable period adjustments where the amount in > 0
...
Rather than where the bill (which is calculated according to current settings) is > 0
2015-12-16 19:18:59 +11:00
Rob Harrington
bac4fcbd8f
Make sure that adjustments for billable periods have a valid order to attach to when creating/updating
2015-12-16 19:18:59 +11:00
Rob Harrington
ecd11702c3
Fixing up enterprise user account page
2015-12-16 19:18:59 +11:00
Rob Harrington
fe0652e243
When updating a line_item quantity from 0, final_weight_volume is recalculated from the variants unit value
2015-12-16 19:18:59 +11:00
Rob Harrington
f49722ba90
Fixing broken BMC specs
2015-12-16 19:18:58 +11:00
Rob Harrington
0370723edd
Attempt to add a sensible name and contact number to Account Invoice addresses
2015-12-16 19:18:58 +11:00
Rob Harrington
d46712de84
Obsolete BillablePeriods only deleted if their associated order is not already complete
2015-12-16 19:18:58 +11:00
Rob Harrington
199a3c38f9
Bill is capped before tax is applied, like we say it is
2015-12-16 19:18:58 +11:00
Rob Harrington
0ed8cf973d
Adding an example bill calculator to business model config edit page
...
To allow super admin to see the effects of any changes they make to BMC settings
2015-12-16 19:18:58 +11:00
Rob Harrington
76d4f74f6b
Ammending BillablePeriod spec to be ensure tax is charged correctly
2015-12-16 19:18:58 +11:00
Rob Harrington
ca3c464fda
Reorganising busines model config settings, moving account invoice tax rate in busines model config settings
2015-12-16 19:18:57 +11:00
Rob Harrington
85f61364f8
BillablePeriods use global config to calculate bills
2015-12-16 19:18:57 +11:00
Rob Harrington
c1d04af5cc
Implementing monthly billing description logic in required pages
2015-12-16 19:18:57 +11:00
Rob Harrington
5b72f53738
Adding helper for describing monthly billing charges
2015-12-16 19:18:57 +11:00
Rob Harrington
da325780b1
Adding BMC link to configurations menu
2015-12-16 19:18:57 +11:00
Rob Harrington
a40a03905f
Reorganising BMC edit view
2015-12-16 19:18:57 +11:00
Rob Harrington
044e423543
Adding update logic to business model config controller
2015-12-16 19:18:57 +11:00
Rob Harrington
cb9b61f393
WIP: Adding an edit view for BMC variables
2015-12-16 19:18:56 +11:00
Rob Harrington
58031408f1
Adding basic business model configuration variables to app config
2015-12-16 19:18:56 +11:00
Rob Harrington
e20b06bb97
Adding basic route and controller for business model configuration
2015-12-16 19:18:56 +11:00
Rob Harrington
cc4f9dd09b
Making lettuceshare report spec more robust
2015-12-16 18:14:19 +11:00
Rob Harrington
18ea0c1717
Pulling VariantOverride scoping down into products and inventory report base
2015-12-16 14:23:43 +11:00
Rob Harrington
2bb85eb8e0
Revert "Add SKU to LettuceShare report"
...
This reverts commit 15ea64b409 .
2015-12-16 13:42:58 +11:00
Rob Harrington
5d28a7fdf8
Adding SKU to Products and Inventory reports (except lettuceshare)
2015-12-16 13:37:19 +11:00
Rob Harrington
befc558224
Pulling product_and_variant_name down into VariantAndLineItemNaming, renaming to product_and_full_name
...
Also allowing this method to be used in reports (Xero), to reflect appropriate name for weight/volume adjusted line items
2015-12-16 11:55:24 +11:00
Rob Harrington
c91f1301f0
Adding preferences to enterprises for sorting of order cycles in shopfront list
2015-12-16 11:55:23 +11:00
Rob Harrington
e6a51bb49d
Adding actions dropdown to admin order view/pages
2015-12-16 11:55:23 +11:00
Rob Harrington
ae0ad73b4a
Printable Invoices Improvements for Food Connect
...
Adding cusotmer instructions, hiding tax column when not present, order cycle name appears at top of invoice and items are sorted by product name
2015-12-16 11:55:23 +11:00
Continuous Integration
b7edf5e046
Auto-merge from CI [skip ci]
2015-12-16 10:58:03 +11:00
Em-AK
81f244025f
Update due_date in feature test
...
due_date = invoice_date + 1 month
2015-12-13 18:42:27 +01:00
Em-AK
fcc328f00a
Display default xero invoice dates
...
fixes #682
* pre-fill the invoice_date and due_date in the xero report generation form
* increase the default period between invoice_date and due_date to 1 month in
XeroInvoiceReport
2015-12-13 16:42:32 +01:00
Maikel Linke
758b1f8e64
using in_stock? to filter variants in lettuceshare report
2015-12-11 15:12:28 +11:00
Maikel Linke
bb58473b90
Consider variant overrides in LettuceShare report
2015-12-11 15:12:28 +11:00
Maikel Linke
1d46c2febd
LettuceShare report: display only if count_on_hand > 0
...
Use the inventory of a distributor if selected.
2015-12-11 15:12:27 +11:00
Maikel Linke
15ea64b409
Add SKU to LettuceShare report
2015-12-11 15:12:27 +11:00
Maikel Linke
6787709693
LettuceShare report: total in unit value column and total blank
2015-12-11 15:12:27 +11:00
Rohan Mitchell
a3874d42af
Spec moved to OpenFoodNetwork::LastUsedAddress
2015-12-11 13:25:40 +11:00
Rohan Mitchell
3f8d470d23
When admin associates user with an order, look up last used address
2015-12-11 13:06:59 +11:00
Rohan Mitchell
ae3061df80
All orders specs use JS
2015-12-11 13:06:59 +11:00
Rohan Mitchell
5579fa5e0b
Extract last used address finding into service object
2015-12-11 13:06:59 +11:00
Rohan Mitchell
e33ede0ec2
Include order cycle status in new order form
2015-12-11 13:06:58 +11:00
Rohan Mitchell
76d4fbccf9
Use select2 for order cycle selection
2015-12-11 13:06:58 +11:00
Rohan Mitchell
60e971ad63
Take variant overrides into account for price when admin adds line item to order
2015-12-11 13:06:57 +11:00
Rohan Mitchell
222b390b31
Fix error display
2015-12-11 13:06:57 +11:00
Rohan Mitchell
932ac45ea5
Do not show form until distribution has been chosen
2015-12-11 13:06:57 +11:00
Rohan Mitchell
80ebaece2d
Sort distribution choices by name
2015-12-11 13:06:57 +11:00
Rohan Mitchell
3419198635
Disable distributors that do not have an order cycle
2015-12-11 13:06:57 +11:00
Rohan Mitchell
1026b81d0c
Do not show order cycle choice until distributor is chosen
2015-12-11 13:06:57 +11:00
Rohan Mitchell
c74463404d
Only show order cycle options that include the chosen distributor
2015-12-11 13:06:57 +11:00
Rohan Mitchell
2081744cf6
Fix spec
2015-12-11 13:06:57 +11:00
Rohan Mitchell
cbaf2a0cb3
Angularise edit order form
2015-12-11 13:06:57 +11:00
Rohan Mitchell
6e7b6b5dfc
Tidy render partial calls and hash syntax
2015-12-11 13:06:57 +11:00
Rohan Mitchell
815694de31
Move orders/edit template from Spree
2015-12-11 13:06:57 +11:00
Rohan Mitchell
2daceb1111
Angularise new order form
2015-12-11 13:06:57 +11:00
Rohan Mitchell
eb07680f1f
Inject shops and order cycles
2015-12-11 13:06:57 +11:00
Rohan Mitchell
47c23c986a
Move distribution fields from override to partial
2015-12-11 13:06:56 +11:00
Rohan Mitchell
742e2279ae
Tidy render partial calls
2015-12-11 13:06:56 +11:00
Rohan Mitchell
eaae16a486
Copy orders/new template from Spree
2015-12-11 13:06:56 +11:00
Continuous Integration
ae945ace9d
Auto-merge from CI [skip ci]
2015-12-11 11:09:54 +11:00
Rohan Mitchell
9d5606a4fd
Fix enterprise index page 500
2015-12-11 10:06:07 +11:00
Maikel Linke
cd7721a127
Using date and time of current timezone
...
Using Time.zone.now and Date.current instead of Time.now and Date.today.
This should make all specs timezone independent.
2015-12-10 11:38:41 +11:00
Rohan Mitchell
ee447c9ce6
Move blankOption service to admin.utils module
2015-12-10 09:35:27 +11:00
Rohan Mitchell
eba2aae353
Copy StatusMessage to admin.utils module, eventually to be moved here
2015-12-10 09:32:04 +11:00
Rohan Mitchell
c1a80b1e8f
Require confirmation when saving an order cycle without distributors
2015-12-10 09:17:25 +11:00
Rohan Mitchell
6998df25e0
Fix indentation
2015-12-10 09:17:25 +11:00
Rohan Mitchell
921210012a
Swap in StatusMessage service for custom message display in order cycles interface
2015-12-10 09:17:25 +11:00
Rohan Mitchell
8d270e919f
Sort exchanges for display when editing an order cycle
2015-12-10 09:17:25 +11:00
Rohan Mitchell
1e397a41ae
Refactor to simplify outgoing_exchange_variant_ids
2015-12-10 09:17:25 +11:00
Rohan Mitchell
243ef4ee16
When an outgoing exchange includes a variant that is not in an incoming exchange, remove it from the outgoing exchange
2015-12-10 09:17:25 +11:00
Rohan Mitchell
ea6974d438
Add OrderCycle#supplied_variants
2015-12-10 09:17:25 +11:00
Rohan Mitchell
ccb23cd186
Do not allow re-adding exchange
2015-12-10 09:17:25 +11:00
Rohan Mitchell
d4ee20455e
Remove enterprise options from list when added
2015-12-10 09:17:25 +11:00
Rohan Mitchell
ef603a070e
Add methods to check for novel suppliers and distributors in an order cycle
2015-12-10 09:17:25 +11:00
Rohan Mitchell
1a4448c6d2
Do not allow adding blank enterprises
2015-12-10 09:17:25 +11:00
Rohan Mitchell
a78d8fa6af
Build exchange form on front-end
2015-12-10 09:17:25 +11:00
Rohan Mitchell
8c0a82f26f
Provide issues summary for enterprises, pass enterprises through to controller
2015-12-10 09:17:25 +11:00
Rohan Mitchell
93c42d24c7
Extract issue detection into service object
2015-12-10 09:17:25 +11:00
Rohan Mitchell
036ffeb634
Enterprise service splits enterprises into hubs and producers
2015-12-10 09:17:25 +11:00
Rohan Mitchell
3dcbdad088
Show/hide all products
2015-12-10 09:17:25 +11:00
Rohan Mitchell
7820c31976
Show supplier as secondary in information hierarchy
2015-12-10 09:17:25 +11:00
Rohan Mitchell
d314f07887
Use flexbox to more neatly lay out order cycle products
2015-12-10 09:17:25 +11:00
Rohan Mitchell
2efaedc225
Add .exchange-products container div, fill full row with products
2015-12-10 09:17:25 +11:00
Rohan Mitchell
c5e2ed5aa1
Order outgoing products by name
2015-12-10 09:17:24 +11:00
Rohan Mitchell
8f917817b8
Fix broken styles
2015-12-10 09:17:24 +11:00
Rohan Mitchell
a2c0088c91
Do not show flash message if we're performing an async update without reload
2015-12-10 09:17:24 +11:00
Rohan Mitchell
9fef0a9909
When order cycle is updated, display message instead of reloading the page
2015-12-10 09:17:24 +11:00
Rohan Mitchell
29bfac5f54
Order cycle interface may update or update and close
2015-12-10 09:17:24 +11:00
Maikel Linke
efa7c215e2
Removing usage of SimpleCov
2015-12-04 14:51:44 +11:00
Maikel Linke
1589bd9ac3
Use mail() instead of devise_mail
...
The EnterpriseMailer used `devise_mail` to send confirmation
instructions. That call is more complicated than `mail` and added an
unwanted reply-to header.
2015-12-04 10:37:55 +11:00
Maikel Linke
a810a6e2b7
fix succeed_if_master_merged
2015-12-04 10:37:55 +11:00
Maikel Linke
c4fb4a8510
Removing Suburbs from the code
...
Suburbs are not used any more. Removing the last code bits should avoid
confusion and save a tiny bit of test time.
2015-12-04 10:37:55 +11:00
Maikel Linke
d67a5aba0e
Remove script/delayed_job.sh
...
This version was dependent on the Australian environment. It is better
to call delayed_job directly from monit. The deployment repository has
been updated.
2015-12-04 10:37:55 +11:00
Maikel Linke
d5c4da3bf0
Not using Paperclip's to avoid HTTP calls to S3
2015-12-04 10:37:55 +11:00
Maikel Linke
261a464b50
Fixing display of shop list in group producer modal
2015-12-04 10:37:55 +11:00
Maikel Linke
0f2ae79e05
Fixing "Shop for" label on groups producer modal
2015-12-04 10:37:55 +11:00
Maikel Linke
caffdee047
Removing depricated sensor parameter for Google Maps
2015-12-04 10:37:55 +11:00
Rohan Mitchell
d320b2e7d4
Merge branch 'fix-delayed-job' into combined/producer-emails-simplify_fix-delayed-job
2015-12-02 15:06:38 +11:00
Rohan Mitchell
e8ccd35363
Simplify producer email to make it more generic
2015-12-02 15:05:49 +11:00
Rohan Mitchell
bd854bf2dd
Remove receival_time from exchange, just use receival_instructions
2015-12-02 15:05:49 +11:00
Rohan Mitchell
10edb2b056
Fix delayed job startup - prevent error caused by double load
2015-12-02 10:48:50 +11:00
Rob H
86f1afae92
derp
2015-11-29 18:10:49 +11:00
Rob H
1cffd35968
Fixing up specs pertaining to full_name generation for line_items
2015-11-29 17:52:01 +11:00
Rob H
baeacfb8a9
LineItem inherits display_name from variant
...
Allows line_items to be named correctly.
2015-11-29 17:25:28 +11:00
Rob Harrington
7ecf5df26a
Updating line items through admin controller causes enterprise fees to be recalculated
2015-11-27 15:06:49 +11:00
Rob Harrington
a5a886c51f
Only test for coordination when orders actually have order_cycles
2015-11-25 15:27:27 +11:00
Rob Harrington
96aace971f
Merge remote-tracking branch 'origin/master' into line_item_naming
2015-11-25 15:13:56 +11:00
Rob Harrington
6c254c534f
Upgrade fog to resolve 'Digest::Digest is deprecated; use Digest' warning
2015-11-25 15:13:25 +11:00
Rob Harrington
b341c1ef8a
Ensure that dates in BOM AJAX requests have timezones
2015-11-25 15:06:15 +11:00
Rob Harrington
7e6b43266f
Making sure that price and final_weight_volume can be updated (by distributor or coordinator)
2015-11-25 14:23:55 +11:00
Maikel
3975eef0c4
Merge pull request #716 from openfoodfoundation/uk/i18n
...
#715 : Add missing strings for en-GB locale.
2015-11-24 18:36:32 +11:00
Paul Mackay
a2a87cc68f
#715 : Add missing strings for en-GB locale.
2015-11-23 16:44:39 +00:00
Rob Harrington
4bdc1bc418
LineItem final_weight_volume is updated whenever quantity is changed, though can be set directly
2015-11-18 16:22:36 +11:00
Rob Harrington
33454a7090
Adding server validation errors messages to BOM interface
2015-11-18 14:32:29 +11:00
Rob Harrington
6268b7cc7e
Printing/sending an invoice uses the same template for generating a pdf
2015-11-18 10:02:51 +11:00
Rob Harrington
75846a4d1f
Merge branch 'master' into line_item_naming
2015-11-16 10:38:42 +11:00
Rob Harrington
c199e22190
Make a few BOM specs more robust
2015-11-16 10:31:41 +11:00
Rob Harrington
3b2bdb8397
Change the way changes to underlying model are watched and updated for select2 elements
2015-11-16 10:31:22 +11:00
Rob Harrington
767671c3b4
New pattern: blank Options for index drop down filters are added within service
...
Rather than in the controller after data is loaded
2015-11-16 10:30:44 +11:00
Rob Harrington
76414dedff
Bumping coffee-script version
2015-11-16 10:27:32 +11:00
Rob Harrington
ae7fb91a9a
Only reloading line_items and orders on BOM, $timeout for adding blankOption
...
$timeout required for adding a blank option to lists of suppliers,
distributors and orderCycles to prevent spec failures related to the
use of select2
2015-11-13 15:59:33 +11:00
Maikel Linke
229070a76b
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into i18n
2015-11-13 15:20:58 +11:00
Maikel Linke
8bfe459241
i18n fixes of html display
2015-11-13 14:22:17 +11:00
Rohan Mitchell
bb6fb2f5e8
Merge branch 'sell-food-link' into combined/add-to-cart-speed_and_sell-food-link
2015-11-13 14:03:32 +11:00
Rohan Mitchell
6de44877c8
Update link for uber-style sell food dropdown
2015-11-13 14:03:14 +11:00
Rohan Mitchell
b6f3e6eca6
Fix broken spec
2015-11-13 14:03:07 +11:00
Rohan Mitchell
a86cc96452
Use pluck instead of map
2015-11-13 14:03:07 +11:00
Rohan Mitchell
178e5f59e6
Update cart by applying differences rather than clear-and-readd every time
2015-11-13 14:03:07 +11:00
Rohan Mitchell
7fffa03d8d
Fix bug: set difference comparison of string with number
2015-11-13 14:03:07 +11:00
Rohan Mitchell
888e4d80ef
Add reliable way to check if cart is dirty. Previous way returned true when cart empty.
2015-11-13 14:03:07 +11:00
Rohan Mitchell
d3c7c46800
Add method to remove a variant from an order
2015-11-13 14:03:07 +11:00
Rohan Mitchell
c432ed9e08
Build list of variants removed from the cart when overwriting
2015-11-13 14:03:07 +11:00
Rohan Mitchell
e175149e76
Add method to check whether a passed-in cart value varies from the cart
2015-11-13 14:03:07 +11:00
Rohan Mitchell
1b5901317d
Separate concerns: reading products hash and adding items to cart
2015-11-13 14:03:07 +11:00
Rohan Mitchell
2f4b5bad26
Make benchmark more realistic
2015-11-13 14:03:07 +11:00
Rohan Mitchell
64e8927ae9
Add benchmark: add to cart
2015-11-13 14:03:07 +11:00
Rohan Mitchell
c932d20ef5
Extract multi-sample benchmarking into a helper method
2015-11-13 14:03:07 +11:00
Maikel Linke
5d5fda3a25
Merge remote-tracking branch 'origin/master' into i18n
...
Conflicts:
config/locales/en.yml
2015-11-13 10:07:29 +11:00
Rob Harrington
a96cdd5ee7
Merge branch 'master' into line_item_naming
...
Conflicts:
app/views/admin/order_cycles/edit.html.haml
2015-11-13 09:54:26 +11:00
Rob Harrington
4191e2b6f0
Changing the way select filters are reset on BOM to try and fix specs
2015-11-13 09:44:57 +11:00
Rob Harrington
88fd9f72e6
Retry uncooperative BOM feature spec
2015-11-13 09:14:20 +11:00
Rob Harrington
3d36ebe2e6
Some Ransack trickery to get OrderCycles#index to load only recent OR undated OCs when no orders_close_at predicate is passed in
2015-11-12 18:29:19 +11:00
Rob Harrington
6966fbba7c
Present date limits being set in line items controller .js unless orderCycleFilter has actually been set
2015-11-12 17:40:35 +11:00
Rob Harrington
2310bc95bc
Committing changes to version used to bundle Gemfile.lock
2015-11-12 17:34:22 +11:00
Rob Harrington
27a5791e26
Fixing Angular Specs for line items controller
2015-11-12 17:33:12 +11:00
Rob Harrington
be8038e9d0
Merge branch 'master' into line_item_naming
...
Conflicts:
lib/open_food_network/order_cycle_management_report.rb
lib/open_food_network/packing_report.rb
2015-11-12 14:40:11 +11:00
Rob Harrington
1556d38b1e
Admin Enterprise#update.json renders updated enterprises using index serializer
2015-11-12 14:30:43 +11:00
Rob Harrington
4e4de65cba
Fetch undated order cycles by default for index actions
2015-11-12 12:08:39 +11:00
Rob Harrington
6e8d807408
Fixing spec using text-angular broken by upgrade of poltergeist
2015-11-12 11:35:22 +11:00
Rob Harrington
095466cb43
Fixing syntax error for new method for OCs controller
2015-11-12 10:34:09 +11:00
Rob Harrington
2719c699d7
Updating line items index spec
2015-11-12 10:06:41 +11:00
Rob Harrington
34030276d7
Cleaning up line items index (BOM)
2015-11-12 10:06:21 +11:00
Rob Harrington
330977186e
Using confirm-change and select2-min-search directive for line items index
2015-11-12 10:05:14 +11:00
Rob Harrington
fc57255b40
Adding save-bar to line items index
2015-11-12 10:04:18 +11:00
Rob Harrington
266820742d
Using request monitor on line items index (BOM)
2015-11-12 10:03:28 +11:00
Rob Harrington
722471a111
Allow use of completed_at for orders index ransacking
...
Needed to override original Spree method to allow intuitive use of
completed_at_gt and completed_at_lt
2015-11-12 10:01:35 +11:00
Rob Harrington
86b5e810e5
Only try to dereference attrs when enough information is present
2015-11-12 09:59:46 +11:00
Rob Harrington
f8a31e8864
Resetting select filters in a way that actually works
2015-11-12 09:58:55 +11:00
Rob Harrington
639472b917
WIP: Adding a request monitoring service to handle loading status
2015-11-12 09:57:02 +11:00
Rob Harrington
193325f81b
Improve formatting around saving on line items index (BOM)
2015-11-12 09:52:10 +11:00
Rob Harrington
5a7cac652c
Adding confirm-link directive
2015-11-12 09:49:36 +11:00
Rob Harrington
b5aaf36bd2
Create directive for scaling by a factor and then formatting as currency
2015-11-12 09:48:43 +11:00
Rob Harrington
c5a26249ea
Removing unneeded directives
2015-11-12 09:47:37 +11:00
Rob Harrington
69ead3c829
Line items serialiser gives a sensible value for max_quantity
2015-11-12 09:47:12 +11:00
Rob Harrington
93caa4a11d
Bumping poltergeist version to 1.7.0
2015-11-12 09:45:14 +11:00
Rohan Mitchell
e20d8d3e95
Merge branch 'master' into folklabs-producer-emails
2015-11-11 14:20:25 +11:00
Rohan Mitchell
fb3e292e20
Formatting
2015-11-11 11:53:04 +11:00
Rohan Mitchell
f499dd627a
with_tax_included_in_price handles exceptions gracefully
2015-11-11 11:53:04 +11:00
Rohan Mitchell
8e1bade355
Move adjustment specs to their own spec file
2015-11-11 11:53:04 +11:00
Rohan Mitchell
a32321df68
Clarify label
2015-11-11 11:53:04 +11:00
Rohan Mitchell
5a29311137
Choose a more sensible default tax rate: one that calculates to the same amount as the current adjustment tax
2015-11-11 11:53:04 +11:00
Rohan Mitchell
3e7a12cca1
Rename spec support method for faster tab completion on save_and_open_page
2015-11-11 11:53:04 +11:00
Rohan Mitchell
81a6e07d5c
Admin can remove tax on an adjustment
2015-11-11 11:53:04 +11:00
Rohan Mitchell
727ecae62b
Admin can modify a taxed adjustment on an order
2015-11-11 11:53:04 +11:00
Rohan Mitchell
85e45fa558
Use select2
2015-11-11 11:53:04 +11:00
Rohan Mitchell
83c0093665
Admin can include tax when creating an adjustment
2015-11-11 11:53:04 +11:00
Rohan Mitchell
46a9304ae1
Extract compute_tax from EnterpriseFeeApplicator to Spree::TaxRate model
2015-11-11 11:53:04 +11:00
Rohan Mitchell
d794981ecf
Add form field to set tax when creating adjustment on order. Display tax included in adjustments on order interface.
2015-11-11 11:53:04 +11:00
Rohan Mitchell
6476ce6ba9
Make spec more resilient
2015-11-10 15:05:45 +11:00
Maikel Linke
a06b452e7e
updated norwegian locale
2015-11-07 16:42:35 +11:00
Maikel Linke
0b6cbb43d6
updated locale nb.yml
2015-11-06 11:56:25 +11:00
Rob Harrington
27903a46e6
Adding new save-bar directive for handling save actions for index pages
2015-11-06 09:53:31 +11:00
Rob Harrington
330882c689
Pulling out styling for red buttons in admin into more generic .red class
2015-11-06 09:52:48 +11:00
Rob Harrington
b1bac703ed
WIP: BOM Refactor, delete line_items using ngResource, updating data requests in line_items_controller
2015-11-05 17:50:18 +11:00
Rob Harrington
bf6bd2dc68
Hack down routes available for Admin::LineItemsController
2015-11-05 17:18:32 +11:00
Rob Harrington
eb7b2e7a3b
Use ams_prefix not ams_suffix!
2015-11-05 17:17:45 +11:00
Rob Harrington
73c80cb5e5
Ordering index orders within query
2015-11-05 17:11:13 +11:00
Rob Harrington
6769c2c729
Can pass params for order or line items into LineItemsController#index
2015-11-05 17:07:47 +11:00
Rob Harrington
afef9e3211
WIP: BOM Refactor, building order_cycle fetch and update logic with ngResource
2015-11-05 15:13:19 +11:00
Rob Harrington
a9e5f2912f
WIP: Fixing Orders service specs
2015-11-05 14:48:26 +11:00
Rob Harrington
66d1e4297e
WIP: Renaming admin.order_cycles to admin.orderCycles for consistency
2015-11-05 14:40:42 +11:00
Maikel Linke
5e59048705
i18n typo
2015-11-05 14:39:33 +11:00
Rob Harrington
4d4e2d4abd
WIP: Moving order_cycle controller into order_cycles folder
2015-11-05 14:38:01 +11:00
Rob Harrington
db4e8382e4
Oops, updating template to make order filtering work
2015-11-05 14:05:14 +11:00
Rob Harrington
51762753f4
WIP: BOM Refactor, adding json route for OrderCyclesController#index, loading OCs based on show_more or specific order_close_at_gt
2015-11-05 14:04:29 +11:00
Rob Harrington
2483eef4be
WIP: BOM Refactor, removing obsolete OrderCycle.recently_closed scope, ordering closed OCs
2015-11-05 14:02:04 +11:00
Maikel Linke
38d2616ea0
No need to empty cache if I18n asset depends on locale
2015-11-05 12:50:11 +11:00
Rohan Mitchell
5db64b6f21
Update travis config and README with new ruby version
2015-11-05 12:48:22 +11:00
Maikel Linke
0505a45de5
Invalidate I18n asset if locale changes
2015-11-05 12:47:15 +11:00
Rob Harrington
e96fa967b8
WIP: BOM refactor, rebuilding bulk orders controller as line items controller using new AJAX routes
2015-11-05 11:54:36 +11:00
Maikel Linke
8b29612614
Merge remote-tracking branch 'origin/master' into i18n
2015-11-05 11:54:06 +11:00
Maikel Linke
90d52151b6
Updated fr.yml
2015-11-05 11:53:38 +11:00
Rohan Mitchell
6666de96b2
Update ruby version used in CI
2015-11-05 11:24:12 +11:00
Rob Harrington
b7d92786d0
Bumping ruby version to 2.1.5
2015-11-05 11:09:22 +11:00
Rob Harrington
d731d4e803
Making sure flash is a hash so that is can be used to initialize OpenStuct
2015-11-05 11:09:21 +11:00
Rob Harrington
2277b9f5a6
Changing ruby version in version manager config
2015-11-05 11:09:21 +11:00
Rob Harrington
aef8b9648e
Initial upgrade of Gemfile
2015-11-05 11:09:21 +11:00
Rohan Mitchell
65589d25c6
Display more verbose product and variant name
2015-11-05 09:50:00 +11:00
Rohan Mitchell
5ffad4d343
Fix quantity calculation
2015-11-05 09:43:44 +11:00
Rob Harrington
50a551a87e
Coffeescript!
2015-11-04 18:35:14 +11:00
Rob Harrington
1494389d34
WIP: BOM Refactor, organising admin.products files in appropriate folders
2015-11-04 18:28:53 +11:00
Rob Harrington
b43049af47
WIP: BOM Refactor, building line_item fetch and update logic with ngResource
2015-11-04 18:16:17 +11:00
Rob Harrington
f563f04f1c
WIP: BOM Refactor, building order fetch and update logic with ngResource, updating rails routes
2015-11-04 16:35:56 +11:00
Rob Harrington
ae7e744644
WIP: BOM Refactor, adding for_line_items action to enterprises controller
2015-11-04 15:02:29 +11:00
Rob Harrington
625e0888ea
Adding logic to Admin::BaseController to standardise rendering of data with AMS
2015-11-04 12:10:50 +11:00
Rohan Mitchell
a3d638df67
Merge branch 'master' into folklabs-producer-emails
2015-11-04 11:15:01 +11:00
Rohan Mitchell
9227df54b6
Display detail rows for admin adjustments
2015-11-01 15:19:03 +11:00
Rohan Mitchell
015f3eb9ac
Display summary rows for admin adjustments
2015-11-01 13:42:59 +11:00
Maikel Linke
fd747f9012
Updated French locale
2015-10-30 12:20:12 +11:00
Lynne Davis
7350dbb75e
Adding tweaks that have been missed from merges
2015-10-30 11:54:06 +11:00
Rohan Mitchell
94e1264aef
Add rspec-retry for inconsistently failing spec
2015-10-29 16:01:39 +11:00
Maikel Linke
aec3980a93
Merge remote-tracking branch 'origin/master' into i18n
2015-10-29 14:56:17 +11:00
Maikel Linke
4eed222f18
Fixed several i18n issues reported by Myriam
2015-10-29 14:55:38 +11:00
Rohan Mitchell
f63a80300b
Merge branch 'master' into folklabs-producer-emails
2015-10-29 11:49:24 +11:00
Rohan Mitchell
87cf3eda41
Amend 'Detailed orders breakdown' heading with missing content
2015-10-29 11:48:12 +11:00
Rob Harrington
02423d3a41
Using rails time zone account invoice job specs
2015-10-28 16:51:18 +11:00
Rob Harrington
cb1f79f59a
Updating front end order details, invoices and pdfs to display names of line_items as opposed to variants
2015-10-28 15:42:14 +11:00
Rob Harrington
18a7317185
Merge branch 'account-invoices' into line_item_naming
...
Conflicts:
app/models/spree/line_item_decorator.rb
2015-10-28 13:42:27 +11:00
Rob Harrington
c5810fc003
Improving BOM form validation
2015-10-28 13:08:50 +11:00
Rob Harrington
f60b6994eb
Wrapping line_item update with order.update_distribution_charge inside lock
2015-10-28 13:08:50 +11:00
Rob Harrington
50b3635e7e
Locking line_items on API update
2015-10-28 13:08:50 +11:00
Rob Harrington
ab7bfd10c5
Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"
...
This reverts commit e86e08b72e939fee61eddd41d56081395666a877.
Conflicts:
lib/open_food_network/order_and_distributor_report.rb
spec/features/admin/variants_spec.rb
spec/lib/open_food_network/order_and_distributor_report_spec.rb
2015-10-28 13:08:50 +11:00
Rob Harrington
cdb0c2db33
Admin Orders show page uses line_item.full_name to describe line_items
2015-10-28 13:07:32 +11:00
Rob Harrington
21e5895a8a
Group Buy panel on BOM takes changes to final_weight_volumes into account
2015-10-28 13:07:32 +11:00
Rob Harrington
33e1322a44
Adding form validation to BOM
2015-10-28 13:07:32 +11:00
Rob Harrington
b08556ec7f
WIP: Making final_weight_volume adjustment a bit nicer
2015-10-28 13:07:31 +11:00
Rob Harrington
a71999ba84
Weight only returned for products whose variant_unit is 'weight'
2015-10-28 13:07:31 +11:00
Rob Harrington
2d468f5022
Fixing attr_accessible for line_items (broken in previous commit)
2015-10-28 13:07:31 +11:00
Rob Harrington
eba13a0dd7
Line items inherit units from variants upon creation
2015-10-28 13:07:31 +11:00
Rob Harrington
1946bac8e4
Fixing report spec that cares about table title case
2015-10-28 13:07:31 +11:00
Rob Harrington
e52f7165c3
Overriding any last references to options_text in the spree codebase
2015-10-28 13:07:31 +11:00
Rob Harrington
6dfae1b014
Whitespace crusader
2015-10-28 13:07:31 +11:00
Rob Harrington
40972cc6ec
Updating reports to use naming information from line_items directly, rather than from the original variant
2015-10-28 13:07:31 +11:00
Rob Harrington
795830d94d
Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module
2015-10-28 13:07:31 +11:00
Rob Harrington
039fcb80eb
Extracting variant and option_value naming out into a lib class that is now shared between line items and variants, line_items have option_values
2015-10-28 13:06:10 +11:00
Rob Harrington
6a70c162bb
Account invoice jobs run according to rails config time zone rather than system time zone
2015-10-23 12:33:05 +11:00
Maikel Linke
0fd29dd32e
use expect in bulk_order_management_spec
2015-10-22 13:43:15 +11:00
Maikel Linke
bbeeb8a493
Merge remote-tracking branch 'origin/master' into i18n
2015-10-22 11:03:42 +11:00
Maikel Linke
6c1619ba60
i18n more content
2015-10-22 11:03:35 +11:00
Maikel Linke
df34f6ef8e
using default_locale for precompiled assets
2015-10-22 10:50:29 +11:00
Maikel Linke
dc8166ec84
New CI script to check test state via GitHub API
2015-10-21 16:29:41 +11:00
Rob Harrington
ef08977dbe
Prevent invoices from being sent unless the distributor of an order has set their ABN
2015-10-21 16:23:48 +11:00
Rob Harrington
9b2653aa2d
Updating order invoice template to be more legally compliant
2015-10-21 15:52:14 +11:00
Maikel Linke
adf0a84669
Use ! version of find_by_permalink to recover on missing resource
2015-10-21 15:42:28 +11:00
Maikel Linke
7163664725
updated locales fr and nb
2015-10-21 14:36:02 +11:00
Maikel Linke
2053fbecda
Merge branch 'i18n-replace-strings-in-js' into i18n
...
Conflicts:
.travis.yml
app/views/spree/order_mailer/confirm_email_for_customer.html.haml
config/locales/en.yml
2015-10-21 14:09:43 +11:00
Maikel Linke
6781051fe6
enabling Travis container-based infrastucture
2015-10-21 10:27:16 +11:00
Maikel Linke
2357f46a4e
CI scripts use env vars
...
The CI scripts are configurable through the environment. They had
hardcoded configurations before. The Australian BuildKite setup will
need global environment variables like this:
STAGING_SSH_HOST=ofn-staging2
STAGING_CURRENT_PATH=/home/openfoodweb/apps/openfoodweb/current
STAGING_SERVICE=unicorn_openfoodweb
STAGING_DB_HOST=localhost
STAGING_DB_USER=openfoodweb
STAGING_DB=openfoodweb_production
PRODUCTION_REMOTE=production:/home/openfoodweb/apps/openfoodweb/current
2015-10-21 10:04:29 +11:00
Maikel Linke
8bd78eb139
spec_helper for lib/open_food_network/permissions_spec.rb
2015-10-21 10:04:29 +11:00
Maikel Linke
f152e4054c
Remove obsolete deface
2015-10-21 10:04:29 +11:00
Maikel Linke
62d31f79ed
Remove obsolete deface
2015-10-21 10:04:28 +11:00
Maikel Linke
2ea1a59666
depricating db2fog.rb initializer due to invalid bucket name
...
Once everybody changed their server config, we can remove that file.
2015-10-21 10:04:28 +11:00
Maikel Linke
a95727b376
running all specs in Travis
2015-10-21 10:04:28 +11:00
Maikel
b35df3c945
Travis config for parallel execution on five nodes
...
This Travis configuration runs rspec on five build machines in parallel. Currently, that takes 15 to 20 minutes.
2015-10-21 10:04:28 +11:00
Rohan Mitchell
421774e46c
Do not send producer notifications when the producer has no orders for this order cycle
2015-10-17 11:02:47 +11:00
Rob Harrington
5b3e052f78
Using a compiled stylesheet for pdf styling
2015-10-16 21:36:18 +11:00
Rob Harrington
47fb2270bd
Making spec do the right thing
2015-10-16 17:25:40 +11:00
Rob Harrington
f12fd7b4a3
Adding button for print action to admin orders show page
2015-10-16 17:25:40 +11:00
Rob Harrington
40d627cb34
Adding new route for printing an order to pdf
2015-10-16 17:25:40 +11:00
Rob Harrington
6e7fc6a0f7
Adding invoice action to orders controller, to allow sending of invoice email
2015-10-16 17:25:40 +11:00
Rob Harrington
104b100fe6
Pulling distributor signoff out into separate partial
2015-10-16 17:25:39 +11:00
Rob Harrington
3a505abfc7
Adding WickedPDF for generation of order invoices
2015-10-16 17:25:39 +11:00
Rohan Mitchell
ecc3bad8c8
Merge branch 'master' into folklabs-producer-emails
2015-10-16 12:38:54 +11:00
Rohan Mitchell
13fc36bad6
Reorder methods
2015-10-15 12:00:40 +11:00
Rohan Mitchell
a766f007fc
Display xero report for account invoices
2015-10-15 11:57:51 +11:00
Rohan Mitchell
4fbeb0c3b1
Check if an order is an account invoice
2015-10-15 10:05:27 +11:00
Rohan Mitchell
de80e6d5bf
Find adjustments for billable periods
2015-10-15 09:58:22 +11:00
Rohan Mitchell
92f7b72056
Check whether an individual adjustment has tax included
2015-10-15 09:58:06 +11:00
Rob Harrington
b22d591775
BillablePeriods don't get updated when account_invoice has been finalized
2015-10-14 14:36:38 +11:00
Rob Harrington
1ad0f95536
Updating Billable Periods job ignores versions of enterprises created in the future
2015-10-14 14:36:38 +11:00
Rob Harrington
a71410042f
Ensuring that account invoice orders have an address
2015-10-14 14:36:37 +11:00
Rob Harrington
815df3d667
Only clean up account invoice orders that aren't already complete, don't attempt to destroy persisted account_invoice orders
2015-10-14 14:36:37 +11:00
Rohan Mitchell
27741863c5
Add simple contribution guide
2015-10-09 15:21:58 +11:00
Maikel Linke
1751a95909
place I18n init at right place in karma task
2015-10-09 11:40:12 +11:00
Maikel Linke
c169e4af92
rename locale nor to nb
2015-10-09 10:43:55 +11:00
Maikel Linke
7d379dbe4b
sort travis sets by run time
2015-10-09 10:23:48 +11:00
Maikel Linke
5f80043857
using translate filter instead of root scope function with parameters
2015-10-09 10:21:26 +11:00
Maikel Linke
e9d1cf6eb5
using translate filter instead of root scope function
2015-10-08 18:09:11 +11:00
Maikel Linke
d2470685cd
clearing tmp cache with rake
2015-10-08 18:08:21 +11:00
Maikel Linke
a4db4ee782
Merge remote-tracking branch 'off/travis-parallel' into i18n-replace-strings-in-js
2015-10-08 16:07:52 +11:00
Maikel
9115e1175e
Travis config for parallel execution on five nodes
...
This Travis configuration runs rspec on five build machines in parallel. Currently, that takes 15 to 20 minutes.
2015-10-08 15:24:48 +11:00
Maikel Linke
56fd91f82b
CI server has to empty the cache if language files changed
2015-10-07 19:10:44 +11:00
Maikel Linke
d62775a785
update specs and fix labels yes and no
2015-10-07 18:05:59 +11:00
Maikel Linke
8b40d094ee
new translate filter and updated specs for js translations
2015-10-07 15:47:51 +11:00
Maikel Linke
91fae79be4
Update tests for new label "Login"
2015-10-07 14:06:34 +11:00
Maikel Linke
5aa3ebde9c
Set the locale to "en" in test environment.
2015-10-07 14:05:50 +11:00
Maikel Linke
bd737ef727
I18n object file for karma
2015-10-01 16:38:47 +10:00
Maikel Linke
31e7ca9fa2
locale data as js asset
2015-10-01 15:54:46 +10:00
Maikel Linke
0eed8b4578
better testing of existence of I18n
2015-10-01 14:16:59 +10:00
Maikel Linke
6b1e66ed26
Renamed no.yml to nor.yml due to error caused by using "no"
2015-10-01 13:53:10 +10:00
Maikel Linke
da42032d92
Merge remote-tracking branch 'origin/master' into i18n-replace-strings-in-js
2015-10-01 11:15:22 +10:00
Maikel Linke
143c005f0a
Merge remote-tracking branch 'origin/i18n-replace-strings-in-views' into i18n-replace-strings-in-js
2015-10-01 11:15:01 +10:00
Maikel Linke
ae96541112
Internationalisation of Javascript views
2015-10-01 11:13:45 +10:00
Maikel Linke
f8725a0174
Removing unused JS partial
2015-10-01 11:12:31 +10:00
Rohan Mitchell
9c6264c4a0
On detailed xero report, do not show product totals (xero treats them as additional line items)
2015-09-25 13:52:51 +10:00
Rohan Mitchell
10bc3919ca
Add SKU to detailed xero report
2015-09-22 09:28:50 +10:00
Rohan Mitchell
b5bc4701fa
Detailed xero report
2015-09-22 09:15:55 +10:00
Rohan Mitchell
7552776349
Add product_and_variant_name display for Variant
2015-09-21 16:49:31 +10:00
Rohan Mitchell
8f40702369
Line items report whether they have tax included
2015-09-21 15:57:04 +10:00
Rob Harrington
9dc0598870
Adding fix to prevent account_invoice orders from being sucked into the frontend as normal orders
2015-09-18 17:25:34 +10:00
Maikel
4f05b9c28d
Changing en: to fr: in French locale file
2015-09-18 09:38:21 +10:00
Maikel
aa4f1f1dec
Fixing syntax typo in Norwegian language file
2015-09-18 09:37:35 +10:00
Rob Harrington
14fbeda29e
Adding bugsnag notification for case where account_invoice order has errors
2015-09-17 22:38:29 +10:00
Rob Harrington
1c6f3f4877
Translating words on admin accounts page
2015-09-17 22:38:29 +10:00
Rob Harrington
2dcbe2b4f2
Updating the admin account view to show use the new account_invoice model to display data
2015-09-17 22:38:29 +10:00
Rob Harrington
27384439f8
Fixing edge case in update_billable_periods job
2015-09-17 22:38:29 +10:00
Rob Harrington
13adb61b3a
Refactoring invoice update process to use new AccountInvoice model
2015-09-17 22:38:29 +10:00
Rob Harrington
77c10dafd6
Linking billable_periods to the relevant account_invoice upon creation
2015-09-17 22:38:29 +10:00
Rob Harrington
4a8f9d1e36
Adding reference to account_invoice for each billable_period
2015-09-17 22:38:29 +10:00
Rob Harrington
0debdcdd9c
Renaming files from user_invoice to account_invoice
2015-09-17 22:38:28 +10:00
Rob Harrington
ae30007fed
Redesignating all references to user_invoices as account_invoices
2015-09-17 22:38:28 +10:00
Rob Harrington
aa183dc9e0
Account Invoice jobs run by specifying a year and month rather than a specific start and end times
2015-09-17 22:38:28 +10:00
Rob Harrington
b1285cd07f
WIP: Adding AccountInvoice model to more robustly record information about enterprise user invoices
2015-09-17 22:38:28 +10:00
Rob Harrington
79497d28d2
Associating billable periods with the relevant adjustment, and moving labelling logic to model
2015-09-17 22:38:13 +10:00
Rob Harrington
5eb20fd8cd
Adding tax settings for billing enterprise users
2015-09-17 22:38:13 +10:00
Rob Harrington
01c9560a19
Account page reads from created at date of invoice
2015-09-17 22:38:13 +10:00
Rob Harrington
6cc403cd92
Preventing double creation of invoices by recognising completed invoices within the specifed period
2015-09-17 22:38:13 +10:00
Rob Harrington
11c3cf5f71
Pushing setting validation for accounts jobs into separate methods capable of logging errors to bugsnag
2015-09-17 22:38:12 +10:00
Rob Harrington
448bd12e9f
Adding billing tasks to whenever schedule
2015-09-17 22:38:12 +10:00
Rob Harrington
204a3275ac
Sorting billable_periods before adding adjustments to user invoices, partly for sanity, partly so that specs works in a logical way
2015-09-17 22:38:12 +10:00
Rob Harrington
6665f9b4a0
Adding global settings for controlling automatic scheduling of accounts tasks
2015-09-17 22:38:12 +10:00
Rob Harrington
ddb0aa4e74
Billable periods from the future are not obsolete
2015-09-17 22:38:12 +10:00
Rob Harrington
aa8e486a45
Look for job names without 'Struct', now that we aren't using structs
2015-09-17 22:38:12 +10:00
Rob Harrington
619c4959ff
Removing button for updating billable periods from accounts and billing settings page
2015-09-17 22:38:12 +10:00
Rob Harrington
1b2a06572b
Converting accounts jobs to classes, which allows initialization with start and end dates
2015-09-17 22:38:12 +10:00
Rob Harrington
cc26321ab2
Billable Period Updater does not run when end_date is in the future
2015-09-17 22:38:11 +10:00
Rob Harrington
fb01f6d32a
User Invoice Finalizer does not run when end_date is in the future
2015-09-17 22:38:11 +10:00
Rob Harrington
0fbd26a3c5
User Invoice Updater does not run when end_date is in the future
2015-09-17 22:38:11 +10:00
Rob Harrington
6f3fad5864
Adding comments
2015-09-17 22:38:11 +10:00
Rob Harrington
5f61952785
UpdateUserInvoices can be run for a specific month
2015-09-17 22:38:11 +10:00
Rob Harrington
128b6853f4
Styling tweaks to the admin account page
2015-09-17 22:38:11 +10:00
Rob Harrington
bed3815df5
User invoice updater formats date strings in localtime
2015-09-17 22:38:11 +10:00
Rob Harrington
7c5816af82
Switching accounts interface over to showing invoices
2015-09-17 22:38:10 +10:00
Rob Harrington
15df1f7f26
Tightening up user selection in UpdateUserInvoices job
2015-09-17 22:38:10 +10:00
Rob Harrington
065bc087d5
Invoice updater cleans up obsolete billable adjustments, ignore billable adjustments without bills and destroys empty invoices
2015-09-17 22:38:10 +10:00
Rob Harrington
c53b5f3edb
Adding finalize step to accounts and billing settigns page + controller
2015-09-17 22:38:10 +10:00
Rob Harrington
60cd5ce879
Splitting out invoice finalization as a separate step
2015-09-17 22:38:10 +10:00
Rob Harrington
8bbda5715d
Adding basic template for account page
2015-09-17 22:38:10 +10:00
Rob Harrington
92eb5ed367
Adding routes for a new admin account page for users to manage their billing preferences and access invoices
2015-09-17 22:38:10 +10:00
Rob Harrington
70de4fd1fd
Touching unchanged billable_periods to prevent them from being marked for deletion
2015-09-17 22:38:10 +10:00
Rob Harrington
c2c0c3684d
Refactoring accounts and billing settings controller, adding start_job action
2015-09-17 22:38:09 +10:00
Rob Harrington
38e3690f56
Adding route for start_job action on accounts and billing settings controller
2015-09-17 22:38:09 +10:00
Rob Harrington
2048800c43
Billable periods updater does not auto-run user invoices updater
2015-09-17 22:38:09 +10:00
Rob Harrington
cc0f1ccfa7
Update Billable Periods automatically runs Update User Invoices immediately afterwards
2015-09-17 22:38:09 +10:00
Rob Harrington
d3e8966e65
Update User Invoices job does not run unless necessary global settings have been configured
2015-09-17 22:38:09 +10:00
Rob Harrington
e6f6a3ad81
Commenting out global configs for nightly job switches, use a button to manually run jobs instead (for now)
2015-09-17 22:38:09 +10:00
Rob Harrington
160c0d75fe
Confirmation emails do not get send for orders distributed by accounts_distributor
2015-09-17 22:38:09 +10:00
Rob Harrington
f2389ee672
User Invoice Updater finalizes user invoices using global preferences for payment method and shipping method
2015-09-17 22:38:08 +10:00
Rob Harrington
0812643136
Adding views and feature spec for updating default payment and shipping method
2015-09-17 22:38:08 +10:00
Rob Harrington
3e9a61a693
Adding js infrastructure to dynamically fetch available payment and shipping methods for accounts distributor
2015-09-17 22:38:08 +10:00
Rob Harrington
e3e59d76a9
Adding global config for setting default payment and shipping methods for accounts distributor
2015-09-17 22:38:08 +10:00
Rob Harrington
65c26296bd
Billable period updater cleans up untouched billable periods for the current billing period
2015-09-17 22:38:08 +10:00
Rob Harrington
9c4ed5f092
Enterprises have billable_periods
2015-09-17 22:38:08 +10:00
Rob Harrington
f0fa696d2f
Default scope for BPs ignores deleted records
2015-09-17 22:38:08 +10:00
Rob Harrington
4d58faefd8
Adding timestamps to billable periods
2015-09-17 22:38:08 +10:00
Rob Harrington
311ffc3dc9
wip: user invoice updater finalizes orders on the first of the month
2015-09-17 22:37:56 +10:00
Rob Harrington
d51c69d353
WIP: User invoice updater adds adjustments to current_invoice for each relevant billable_period
2015-09-17 22:37:56 +10:00
Rob Harrington
ee8a86d495
User model can generate a current invoice for enterprise users
2015-09-17 22:37:56 +10:00
Rob Harrington
fa8c3d65dc
Adding settings for global accounts and billing setup
2015-09-17 22:37:56 +10:00
Rob Harrington
b4e58a1a79
WIP: Basic structure for daily job to update user invoices
2015-09-17 22:37:55 +10:00
Rob Harrington
550434dfe8
Renaming bill_items to billable_periods
2015-09-17 22:37:55 +10:00
Rob Harrington
fc44e57171
Finishing refactor of bill item updater spec
2015-09-17 22:37:45 +10:00
Rob Harrington
77f735c722
WIP: Refactoring bill item updater specs
2015-09-17 22:37:45 +10:00
Rob Harrington
b736e209ca
Bill Item Update handles enterprises created part-way through the month
2015-09-17 22:37:45 +10:00
Rob Harrington
af2bc99c71
Clean up update_bill_items spec after refactor
2015-09-17 22:37:44 +10:00
Rob Harrington
924b3b4cc3
Refactoring update_bill_items job
2015-09-17 22:37:44 +10:00
Rob Harrington
b724745acc
WIP: First take at a nightly job for calculating turnover for enterprises
2015-09-17 22:37:44 +10:00
Rob Harrington
bbe25da117
Adding paper_trail verisoning RSpec helpers
2015-09-17 22:37:44 +10:00
Rob Harrington
77e361dd52
Adding shop_trial_expiry method to enterpise model
2015-09-17 22:37:44 +10:00
Rob Harrington
083d7327bc
Adding BillItem to database
2015-09-17 22:37:44 +10:00
Rob Harrington
2fa217df56
Adding paper_trail to enterprise model, to track changes to owner_id and sells
2015-09-17 22:37:33 +10:00
Rob Harrington
6489848eff
Adding paper_trail gem
2015-09-17 22:37:33 +10:00
sigmundpetersen
b8e40d799b
Added translations
2015-09-17 14:18:09 +02:00
Continuous Integration
205a7f1673
Auto-merge from CI [skip ci]
2015-09-17 09:16:20 +10:00
Maikel Linke
2e591b98e1
remove unused javascript
2015-09-16 16:52:26 +10:00
Maikel Linke
0b4a43d77a
Merge remote-tracking branch 'origin/master' into i18n-replace-strings-in-views
...
Conflicts:
app/views/shared/menu/_cart.html.haml
app/views/spree/order_mailer/confirm_email_for_shop.html.haml
2015-09-16 16:32:16 +10:00
Maikel Linke
ce87ea54cd
Merge branch 'i18n-replace-strings-in-views' of github.com:openfoodfoundation/openfoodnetwork into i18n-replace-strings-in-views
2015-09-16 16:24:38 +10:00
Maikel Linke
637e5c4fee
PermalinkGenerator for products
2015-09-16 15:45:10 +10:00
Maikel Linke
ecca23488d
Merge branch 'ci-handling-git-tags' into combined/deadlock-js-spec_ci-git-tags_product-permalinks
2015-09-16 15:43:13 +10:00
Maikel Linke
2488411b94
JS feature specs completing before cleaning db
...
Some specs ran into a deadlock when the Database::Cleaner tried to do
its job while AJAX requests were still triggering other actions.
2015-09-16 15:38:09 +10:00
Maikel Linke
3f822ed0e3
trying to get rid of intermittent failures
2015-09-16 13:06:32 +10:00
Maikel Linke
33af6cbfb1
Specs pending for lagging JS spec test
2015-09-16 11:24:44 +10:00
Maikel Linke
326c972f63
Handling nil in final_weight_volume calculation
2015-09-16 10:12:59 +10:00
Myriam
11892ffe21
creation of the french translation file
2015-09-14 14:42:37 +02:00
Maikel Linke
10cd654ff5
CI Handling git tags
...
Buildkite is running tags like branches. This caused `git branch`
commands to fail. The function got extended to handle tags as well.
Ideally, Buildkite will offer an option not to rebuild tags.
2015-09-11 15:41:44 +10:00
Maikel Linke
51064f31a3
Merge remote-tracking branch 'origin/master' into uk-variable-weights-improvements
2015-09-10 16:05:28 +10:00
Maikel Linke
e25805aa78
Restoring all changes of the last combined branch
...
This reverts commit 1e55e8a907 .
2015-09-10 15:03:13 +10:00
Maikel Linke
1e55e8a907
Reverting all changes of the last combined branch
...
The production server hangs on certain requests. To rule out a code bug,
we revert to the last deployed version.
2015-09-10 12:50:40 +10:00
Maikel Linke
47d239ee3a
fix for intermittent capybara click failure
...
This fix might have to be applied at more places. We will see what CI
says...
2015-09-09 17:08:42 +10:00
Maikel Linke
2e2e767564
always displaying group_buy_unit_size
2015-09-09 12:22:28 +10:00
Myriam
3e53decd85
Delete fr.yml
2015-09-04 15:25:53 +02:00
Myriam
4f0e75893e
Create fr.yml
2015-09-04 15:22:19 +02:00
Maikel Linke
f0709d5e46
Merge branch 'show-only-visible-shops' into combined/shopfront_group-buy_customer-contact
2015-09-04 21:49:12 +10:00
Maikel Linke
e8ce9feb52
Merge branch 'customers-link' into combined/shopfront_group-buy_customer-contact
2015-09-04 21:48:58 +10:00
Maikel Linke
a3074fa51e
Merge branch 'customer-contact-in-order-email' into combined/shopfront_group-buy_customer-contact
2015-09-04 21:47:35 +10:00
Maikel Linke
c1cbf9a35c
Merge branch 'group-by-unit-size-display' into combined/shopfront_group-buy_customer-contact
2015-09-04 21:47:22 +10:00
Maikel Linke
8dffb772dc
Merge branch 'shopfron-validation' into combined/shopfront_group-buy_customer-contact
2015-09-04 21:47:08 +10:00
Maikel Linke
60b2596774
disable max quantity unless min quantity is set
2015-09-04 16:56:51 +10:00
Maikel Linke
6a2af09006
rounding decimal quantities in shopfront
2015-09-04 16:15:02 +10:00
Maikel Linke
d9b1215a01
Update clicking checkout in spec
2015-09-04 10:54:50 +10:00
sigmundpetersen
e61abb92d2
Create no.yml
2015-09-03 12:16:58 +02:00
Maikel Linke
0895bd8647
Non-integer values cannot be entered into shop front quantities
2015-09-03 17:42:26 +10:00
Maikel Linke
2e3ff8f5c6
doubling cart buttons
2015-09-03 15:52:54 +10:00
Maikel Linke
93f6667c4b
Update products group by spec
2015-09-03 15:01:28 +10:00
Maikel Linke
23355d1a25
include order email and phone number in email for shop
2015-09-03 14:46:08 +10:00
Maikel Linke
0fdd000589
Showing Bulk Unit Size in BulkCoopReport
...
The group_buy_unit_size field is now shown even if 'group buy' is not
enabled. And "Group By Unit Size" is now displayed as "Bulk Unit Size".
2015-09-03 12:26:40 +10:00
Maikel Linke
57caeb64c5
Remove unused product form partial
2015-09-03 12:24:57 +10:00
Maikel Linke
832f47d6b0
fix i18n typo
2015-09-02 16:58:04 +10:00
Continuous Integration
d3e66bcfa5
Auto-merge from CI [skip ci]
2015-09-02 14:44:05 +10:00
Maikel Linke
415dac3ae3
Updating spec for new Login label
2015-08-28 21:12:56 +10:00
Maikel Linke
8b6f5b4a99
Updating spec for new Login label
2015-08-28 18:37:24 +10:00
Continuous Integration
06010bd8ad
Auto-merge from CI [skip ci]
2015-08-28 17:04:53 +10:00
Maikel Linke
85c99102dd
i18n: Replacing all language strings in app/view/
...
Languages strings were moved to config/locale/en.yml. All views contain
according calls to t() now.
2015-08-28 16:59:23 +10:00
Maikel Linke
1a96ef88bc
Hiding invisible hubs in producer modal
2015-08-28 10:49:36 +10:00
Maikel Linke
d682a29a65
Admin menu contains link to /admin/customers
2015-08-28 10:31:53 +10:00
Maikel Linke
ced254919a
Updating JS spec
2015-08-27 14:54:46 +10:00
Maikel Linke
64834dd50a
Fixing display of cloned products
...
The producer and the unit is displayed again.
2015-08-27 13:05:09 +10:00
Maikel Linke
5d34b711e9
Handling undefined customer tags
2015-08-26 15:01:20 +10:00
Maikel Linke
4f7f2e2035
Displaying customer tags
2015-08-26 10:14:03 +10:00
Continuous Integration
d595e1558a
Auto-merge from CI [skip ci]
2015-08-26 10:03:13 +10:00
Maikel Linke
5ccae9cfab
Redirecting /products/:id to /
2015-08-21 15:18:31 +10:00
Maikel Linke
adc20e9e4e
Handling tax categories without tax rates
2015-08-21 15:16:00 +10:00
Continuous Integration
03627e2ef2
Auto-merge from CI [skip ci]
2015-08-21 13:41:02 +10:00
Rohan Mitchell
3e5028b6b9
Revise lettuceshare report - combine grower and cert cols, add column headings
2015-08-16 11:06:52 +08:00
Rohan Mitchell
e843beaf18
Remove enterprise address from order confirmation and mailer, since in these contexts the pickup location will be specified elsewhere. #636
2015-08-07 14:19:48 +10:00
Rohan Mitchell
170799f65f
Add permission for hub enterprise users to use xero report #628
2015-08-07 13:37:37 +10:00
Rohan Mitchell
9e1788a6b0
Apply migrations to db/schema.rb
2015-08-07 12:03:43 +10:00
Rohan Mitchell
719ddea789
Merge branch 'variable-weights-improvements' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-variable-weights-improvements
2015-08-07 11:10:07 +10:00
Rohan Mitchell
3eea002a0c
Put rspec-retry on flaky specs
2015-08-07 11:06:16 +10:00
Rohan Mitchell
6f4dc6943e
Add first cut of LettuceShare report
2015-08-07 10:37:59 +10:00
Rohan Mitchell
e75b595b97
Tidy syntax
2015-08-07 10:37:59 +10:00
Rohan Mitchell
af04c61528
Add rspec-retry for intermittently failing spec
2015-08-05 13:35:53 +10:00
Continuous Integration
14900655df
Auto-merge from CI [skip ci]
2015-08-05 12:18:31 +10:00
Rohan Mitchell
be66769999
SELECT DISTINCT results in inconsistent #count value. Work around this with to_a.
2015-08-05 11:05:29 +10:00
Lynne Davis
8639109372
Variable weights improvements additions
2015-08-04 20:13:28 +01:00
Rohan Mitchell
eca25a2564
Make coordinator fees apply to all variants, not just those with exchange fees
2015-07-31 16:57:47 +10:00
Rohan Mitchell
012b0517a5
Fetch order cycle variants in SQL
2015-07-31 16:57:47 +10:00
Rohan Mitchell
faa1d0d1c5
When cart clear is declined, revert order cycle selection change
2015-07-31 16:56:08 +10:00
Rohan Mitchell
b97bbae00e
Remove old selenium-related test helper, remove unused param on handle_js_confirm
2015-07-31 16:56:08 +10:00
Rohan Mitchell
679531fe2a
Prompt for clear cart when order cycle changes
2015-07-31 16:56:08 +10:00
Rohan Mitchell
eb6dcba396
Clear localstorage in Cart.clear()
2015-07-31 16:56:08 +10:00
Rohan Mitchell
9c9051498b
Rename ofnEmptiesCart to ofnChangeHub
2015-07-31 16:56:08 +10:00
Rohan Mitchell
5688cfd1dd
WIP: Rename ofnEmptiesCart to ofnChangeHub
2015-07-31 16:56:08 +10:00
Rohan Mitchell
fc409c97bf
Decouple ofn-empties-cart directive from hub-choice navigation
2015-07-31 16:56:08 +10:00
Rohan Mitchell
09b4b3e659
When order cycle is changed, clear the cart
2015-07-31 16:56:08 +10:00
Rohan Mitchell
bf2bd403a4
Clear variants when order cycle changed, not when products are initially loaded
2015-07-31 16:56:08 +10:00
Rohan Mitchell
012a210782
Add method to clear cart
2015-07-31 16:56:08 +10:00
Rohan Mitchell
7caebb11e2
Clear variants registry before reloading products - fixes fees not updating when changing order cycle
2015-07-31 16:56:08 +10:00
Rohan Mitchell
ee65452de3
Add method to clear variants registry
2015-07-31 16:56:08 +10:00
Rohan Mitchell
3a9b13b55e
Reorder methods
2015-07-31 16:56:07 +10:00
Rohan Mitchell
734b2fc766
Merge branch 'master' into redesign-cms
2015-07-31 14:59:33 +10:00
Rohan Mitchell
5559231245
Fix date spec error
2015-07-31 14:59:05 +10:00
Rohan Mitchell
3345f54e0a
Merge branch 'master' into redesign-cms
2015-07-31 14:55:01 +10:00
Rohan Mitchell
ec908fce92
Make TOS URL configurable
2015-07-31 14:51:17 +10:00
Rohan Mitchell
d8f4061030
Tidy link
2015-07-30 12:09:20 +10:00
Rohan Mitchell
759c53ec34
Add note about provisioning to README
2015-07-30 11:45:50 +10:00
Continuous Integration
8d041f5e7a
Auto-merge from CI [skip ci]
2015-07-29 12:03:03 +10:00
Continuous Integration
32d3d0f912
Auto-merge from CI [skip ci]
2015-07-28 14:03:29 +10:00
Rohan Mitchell
917c17af59
Clarify quantities used for calculations, show excess available via max_quantity
2015-07-24 18:31:49 +10:00
Rohan Mitchell
21a9681205
Do not show negative remainder when there are no purchases
2015-07-24 17:42:23 +10:00
Rohan Mitchell
54fd298e3a
Reinstate variant full name column - needed to identify variants differing only by description
2015-07-24 17:42:00 +10:00
Rohan Mitchell
9ffc97f8b6
Fix controller spec for extraction of report controller logic
2015-07-24 14:10:04 +10:00
Rohan Mitchell
211171aed4
Rename column for clarity
2015-07-24 12:49:43 +10:00
Rohan Mitchell
f43eacb75d
Revert "Do not show non-group buy products on bulk coop reports"
...
This reverts commit f5c2386296 .
2015-07-24 12:40:50 +10:00
Rohan Mitchell
fffc35d9ed
Revert "Add a blank row after summary row in all reports"
...
This reverts commit b0dd765181 .
2015-07-24 12:40:42 +10:00
Rohan Mitchell
17fb4a7247
DRY by extracting calculation to method
2015-07-24 07:17:20 +10:00
Rohan Mitchell
3abce54115
Split variant name into number and unit columns
2015-07-24 07:07:49 +10:00
Rohan Mitchell
28de125b59
Bulk coop allocation report uses unit value rather than variant weight
2015-07-24 07:00:49 +10:00
Rohan Mitchell
4d71a56e38
Update available/unallocated calculations
2015-07-23 16:40:50 +10:00
Rohan Mitchell
ae968cd0eb
Simple refactoring of original total_allocated code
2015-07-23 16:21:37 +10:00
Rohan Mitchell
1a89c3caf4
Translate bulk coop allocation report to reports DSL
2015-07-23 15:07:39 +10:00
Rohan Mitchell
bdd792a3ea
Extract helpers to new superclass
2015-07-23 15:07:15 +10:00
Rohan Mitchell
f5c2386296
Do not show non-group buy products on bulk coop reports
2015-07-23 14:17:00 +10:00
Rohan Mitchell
8665b35f1d
Units required shows amount to fulfil order, not complete units required. Remainder works in opposite direction to suit.
2015-07-23 14:16:40 +10:00
Rohan Mitchell
d68cfbff18
Use scaled value for group_buy_unit_size
2015-07-23 14:06:04 +10:00
Rohan Mitchell
e8f7ab5425
Do bulk coop report calculations using unit values rather than variant weight field
2015-07-23 14:06:04 +10:00
Rohan Mitchell
b0dd765181
Add a blank row after summary row in all reports
2015-07-23 14:05:59 +10:00
Rohan Mitchell
8ee467d2b9
Split variant name into number and unit columns
2015-07-23 12:22:30 +10:00
Rohan Mitchell
5874ecbbef
Small tweaks
2015-07-23 12:02:31 +10:00
Rohan Mitchell
dcae584673
Extract bulk coop supplier report into Report DSL
2015-07-23 12:02:24 +10:00
Rohan Mitchell
a90666467a
Add helper support to Reports DSL
2015-07-23 11:45:19 +10:00
Rohan Mitchell
cc9d0defca
Use class attributes instead of class variables to avoid leakage between subclasses
2015-07-23 11:04:36 +10:00
Rohan Mitchell
142e1d6d9a
Report outputs rules as array for use by OrderGrouper
2015-07-23 10:46:20 +10:00
Rohan Mitchell
1d39fb4438
Report rules can define a summary row
2015-07-23 10:37:47 +10:00
Rohan Mitchell
07eb857a8d
Report can define nested rules
2015-07-23 10:24:10 +10:00
Rohan Mitchell
66f64fc413
Report can define basic rules
2015-07-23 10:08:38 +10:00
Rohan Mitchell
c7a1ca29f4
Report can define and retrieve columns
2015-07-23 09:52:59 +10:00
Rohan Mitchell
0a5e8fe629
Report class can define and retrieve header
2015-07-23 09:36:09 +10:00
Rohan Mitchell
61a39ea82f
Cherry-pick 00927f7: Refactoring to move bulk out of reports_controller_decorator
2015-07-22 15:25:12 +10:00
Rohan Mitchell
eabf792238
Amend changes to readme
2015-07-22 13:25:55 +10:00
Myriam
c15e281286
Add command cd openfoodnetwork
...
Just added the command to go into the openfoodnetwork folder before bundle install
2015-07-19 12:39:51 +02:00
Myriam
5f0766cb75
When installing the gems we had only 1.9.2, there were an imprecision with >=1.9.3 or 1.9.x
2015-07-19 12:37:23 +02:00
Myriam
3a0c5bf0c3
I changed the "Get it" link as the git@ one was reserved to people with access rights
2015-07-19 12:09:20 +02:00
Rohan Mitchell
61435b2dea
Add brand guide colours next to definition
2015-07-17 17:05:44 +10:00
Rohan Mitchell
b6892c82f1
Rename australia-orange sass var to country-agnostic brand-colour
2015-07-17 16:27:17 +10:00
Rohan Mitchell
5fd3dc1d28
Customise footer logo
2015-07-17 16:24:07 +10:00
Rohan Mitchell
bb3a4170f5
Add dimensions to image upload
2015-07-17 16:06:50 +10:00
Rohan Mitchell
74f90dada3
Allow overriding mobile logo (raster and SVG) and home hero image
2015-07-17 16:06:50 +10:00
Rohan Mitchell
e4a4cdd915
Rewrite alias_method_chain to use super. Ahhhhh :)
2015-07-17 16:06:50 +10:00
Rohan Mitchell
66b4eb4c5d
Move Spree::Preferences::Configuration patches into superclass FileConfiguration
2015-07-17 16:06:50 +10:00
Rohan Mitchell
1d67e3b2b8
Fix image update, display logo on frontend
2015-07-17 16:06:50 +10:00
Rohan Mitchell
0e67a116b6
Admin can upload logo for ContentConfig
2015-07-17 16:06:49 +10:00
Rohan Mitchell
1234b35199
Add file handling to Spree::Preferences::Configuration
2015-07-17 16:06:49 +10:00
Rohan Mitchell
1b17a7fb35
Add logo field to ContentConfig
2015-07-17 16:06:49 +10:00
Rohan Mitchell
4887871474
Remove SVG TODOs - we'll ask admins to upload double-sized images for retina instead
2015-07-17 16:06:49 +10:00
Rohan Mitchell
372b17703a
Remove unused content fields and partial
2015-07-17 16:06:49 +10:00
Rohan Mitchell
5de9a5eb54
Add config setting to enable/disable stats on home page
2015-07-17 16:06:49 +10:00
Rohan Mitchell
1f72e4001c
Use site name config for hero title
2015-07-17 16:06:49 +10:00
Rohan Mitchell
bd83dde89d
Content manage group signup page
2015-07-17 16:06:49 +10:00
Rohan Mitchell
a490d9696b
Content manage hub signup page
2015-07-17 16:06:49 +10:00
Rohan Mitchell
d353906bb8
Content manage producer signup page
2015-07-17 16:06:49 +10:00
Continuous Integration
858a613ba2
Auto-merge from CI [skip ci]
2015-07-17 11:48:16 +10:00
Rohan Mitchell
2ef0196200
Merge branch 'add-to-cart-robustness' into combined/vo-on-demand-stock-control_add-to-cart-robustness
2015-07-16 10:06:34 +10:00
Rohan Mitchell
f3ae812f2b
Update cart when max_quantity value changes, not just quantity
2015-07-16 10:05:19 +10:00
Rohan Mitchell
904a3a5bd4
When add to cart fails, retry every 3 seconds, with no limit of the number of retries
2015-07-16 10:05:19 +10:00
Rohan Mitchell
de7f3a9e5c
When an on-demand variant has overridden stock levels, make it not on-demand
2015-07-16 10:05:07 +10:00
Rohan Mitchell
7424e93133
Merge branch 'proximity-search'
2015-07-15 17:31:22 +10:00
Lynne Davis
f21f57a42c
Additions for packing reports, sans refactoring
2015-07-15 14:44:49 +10:00
Lynne Davis
dc95167f15
Adding bits missed from the last commit.
...
Conflicts:
app/controllers/spree/admin/reports_controller_decorator.rb
2015-07-15 14:44:49 +10:00
Lynne Davis
c168dec14b
Adding packing reports as required by the UK contingent
2015-07-15 14:44:49 +10:00
Rohan Mitchell
28b8e0b0c8
Update distance matches when filter settings change
2015-07-10 17:45:17 +10:00
Rohan Mitchell
0ab75fe2ea
Take the first name match from the post-filter results to avoid matching off a result the user can't see
2015-07-10 17:45:17 +10:00
Rohan Mitchell
669c9911fe
Fix profile display
2015-07-10 17:45:17 +10:00
Rohan Mitchell
6e6d2566d9
Do not show distance when zero
2015-07-10 17:45:16 +10:00
Rohan Mitchell
6816df5f72
Do not show 'Closest to...' heading when no query entered
2015-07-10 17:45:16 +10:00
Rohan Mitchell
5b93ac2ae1
Remove unneeded injections, consistent spacing
2015-07-10 17:45:16 +10:00
Rohan Mitchell
dcf98ee29f
Fix enterprises no results for producers
2015-07-10 17:45:16 +10:00
Rohan Mitchell
7d340d5084
Update taxon search to only display taxons from enterprises on the page
2015-07-10 17:45:16 +10:00
Rohan Mitchell
0eb6d9aaed
Disable animate-repeat on shops listing entirely - previous fix was not 100% successful
2015-07-10 17:45:16 +10:00
Rohan Mitchell
d8dfb5b5ee
Move most filters back out into view - they now respond to filter preference changes
2015-07-10 17:45:16 +10:00
Rohan Mitchell
07e6a204f3
Do not bindonce ng-repeat, remove translateZ(0) optimisation - address dangling DOM nodes after ng-repeat finishes.
...
https://github.com/angular/angular.js/issues/4490
2015-07-10 17:45:16 +10:00
Rohan Mitchell
06c5ffb427
Wrap geocode callback in ., fixing inconsistent updates
2015-07-10 17:45:16 +10:00
Rohan Mitchell
673635fdcb
Show no results message at correct times
2015-07-10 17:45:16 +10:00
Rohan Mitchell
64bc7404dc
Region-bias geocoder results
2015-07-10 17:45:16 +10:00
Rohan Mitchell
651afc34cb
Notify enterprise change by broadcast
2015-07-10 17:45:16 +10:00
Rohan Mitchell
e5c42c0e54
Tidyup
2015-07-10 17:45:16 +10:00
Rohan Mitchell
5f8826533d
Limit distance matches to those within 50 km
2015-07-10 17:45:16 +10:00
Rohan Mitchell
f154a02c86
Add filter for enterprises within a radius
2015-07-10 17:45:16 +10:00
Rohan Mitchell
46792a4111
Style results tables
2015-07-10 17:45:16 +10:00
Rohan Mitchell
5b5c56064e
Hide distance matches when there are name matches. Show with a link.
2015-07-10 17:45:16 +10:00
Rohan Mitchell
794c9558bb
Show name matches only when at least one is present. Show accurate closest-to target.
2015-07-10 17:45:15 +10:00
Rohan Mitchell
eba0a12d29
Extract filtering into controller
2015-07-10 17:45:15 +10:00
Rohan Mitchell
7fd4815904
Split results into name matches and distance matches
2015-07-10 17:45:15 +10:00
Rohan Mitchell
97c9504344
Extract hubs table into partial
2015-07-10 17:45:15 +10:00
Rohan Mitchell
7f2508eeaa
When a name match is found, calculate distances from that enterprise, rather than from the geocoded lookup
2015-07-10 17:45:15 +10:00
Rohan Mitchell
6e3ca3f90f
Make Geo.distanceBetween take either a LatLng or a locatable at either parameter
2015-07-10 17:45:15 +10:00
Rohan Mitchell
744beaa26a
Perform shops search by proximity instead of plain string match
2015-07-10 17:45:15 +10:00
Rohan Mitchell
d0d9e9e367
Flag enterprises whose name matches a query
2015-07-10 17:45:15 +10:00
Rohan Mitchell
befcc37456
Fix bug in distanceBetween, update docs, deal with null queries
2015-07-10 17:45:15 +10:00
Rohan Mitchell
9fb7c47c73
Enterprises can calculate their distances from a location via geocode lookup
2015-07-10 17:45:15 +10:00
Rohan Mitchell
80bb6c36e3
Rename file
2015-07-10 17:45:15 +10:00
Rohan Mitchell
a61e96c316
Generalise Geocoder service to Geo, add distanceBetween method
2015-07-10 17:45:15 +10:00
Rohan Mitchell
ddf1bb90ea
Add geocoder service
2015-07-10 17:45:15 +10:00
Rohan Mitchell
a509747ba7
Do not show double-ups of places to shop
2015-07-10 15:51:57 +10:00
Rohan Mitchell
3527ae6ea2
Update comment
2015-07-10 15:51:57 +10:00
Rohan Mitchell
e679f1175c
Add shop-for-products-at to map producer modals
2015-07-10 15:51:57 +10:00
Rohan Mitchell
197c99349d
Add error checking to client-side permalink service
2015-07-10 09:42:09 +10:00
Rohan Mitchell
73b90dba10
Shift legacy redirect further down routes to avoid stomping /enterprises/check_permalink
2015-07-10 09:42:09 +10:00
Rohan Mitchell
4cc8eb90fc
Refactor code for brevity
2015-07-10 09:42:09 +10:00
Rohan Mitchell
8deb4ef9d4
When encountering StaleObjectError when checking out, retry
2015-07-10 09:42:09 +10:00
Rohan Mitchell
d0b7a0795d
Fix 500 when bulk updating order cycles with no data
2015-07-10 09:42:09 +10:00
Rohan Mitchell
d67b34c2bd
Remove deprecated about_us page and add redirect
2015-07-10 09:42:09 +10:00
Rohan Mitchell
3f8235593a
When enterprise is deleted, delete relationships
2015-07-10 09:42:09 +10:00
Rohan Mitchell
c5c3051f98
Re-enable future spec
2015-07-10 09:42:09 +10:00
Rohan Mitchell
4f2389e257
Remove legacy enterprises views - index, suppliers, distributors, show
2015-07-10 09:42:09 +10:00
Rohan Mitchell
fc4cd517fd
Redirect legacy enterprise path to home #571
2015-07-10 09:42:09 +10:00
Rohan Mitchell
361f7e3432
Remove double-output on push to production. Add script to archive old branches.
2015-07-02 09:39:49 +10:00
Rohan Mitchell
213242627e
Merge branch 'master' into redesign-phase-2
...
Conflicts:
app/views/home/_hubs.html.haml
2015-07-01 15:44:36 +10:00
Rohan Mitchell
960e4d3015
Scale logo down when display is very short (ie. iPhone 4)
2015-07-01 15:38:50 +10:00
Continuous Integration
c3097cac70
Auto-merge from CI [skip ci]
2015-07-01 10:57:01 +10:00
Rohan Mitchell
b991f6c228
Add angular-slideables to js test include
2015-06-26 16:07:23 +10:00
Rohan Mitchell
918889a572
Make subject more friendly for groups enquiry email
2015-06-26 15:54:26 +10:00
Rohan Mitchell
7e685b646f
Fine-tune header sizes on home page and cutover point for page_alert responsiveness
2015-06-26 15:54:26 +10:00
Rohan Mitchell
eef302635b
Fix alert overflow on mobile
2015-06-26 15:54:26 +10:00
Rohan Mitchell
6105d008df
Show CTA above the fold on iPhone 5
2015-06-26 15:54:26 +10:00
Rohan Mitchell
dd04afe8f8
Make alert box more legible
2015-06-26 15:54:25 +10:00
Rohan Mitchell
5a9101e303
Display HTML special chars correctly in title
2015-06-26 15:54:25 +10:00
Rohan Mitchell
c97ed026d0
Make room in menu for shopping@ text
2015-06-26 15:54:25 +10:00
Rohan Mitchell
ce46cb0956
Add subject to group enquiries
2015-06-26 15:54:25 +10:00
Rohan Mitchell
9f8fa575b3
Scroll past header on shops page if user is logged in
2015-06-26 15:54:25 +10:00
Rohan Mitchell
4da367a94b
Put OFN logo in top bar of mobile site
2015-06-26 15:54:25 +10:00
Rohan Mitchell
6197dfe403
Make brand story animate slide down/up
2015-06-26 15:54:25 +10:00
Rohan Mitchell
1363daae3c
When fetching ofn commit, if it is not found, return a sentinal value to avoid a wayward git push
2015-06-26 11:22:19 +10:00
Rohan Mitchell
d9f4a92648
Do not use with_products_require_tax_category in around filters - Spree::Config has caching which isn't shared between contexts
2015-06-24 14:52:17 +10:00
Rohan Mitchell
bc11140a40
Make config reset for all tests more robust. Add cache isolation for parallel specs.
2015-06-24 14:02:45 +10:00
Rohan Mitchell
7a36e92592
Merge branch 'unique-enterprise-names' into combined/unique-enterprise-names_parallel-fuubars_rob-github-fixes_optimise-shopfront
2015-06-24 10:09:35 +10:00
Rohan Mitchell
2d79177bb5
When a registering an enterprise with a non-unique name, display an error message.
2015-06-24 10:08:34 +10:00
Rohan Mitchell
f51a9679f2
Merge branch 'optimise-shopfront' into combined/unique-enterprise-names_parallel-fuubars_rob-github-fixes
2015-06-19 11:34:41 +10:00
Rohan Mitchell
173f4c0f03
Merge branch 'rob-github-fixes' into combined/unique-enterprise-names_parallel-fuubars_rob-github-fixes
2015-06-19 11:32:55 +10:00
Rohan Mitchell
116565fa0f
Merge branch 'parallel-fuubars' into combined/unique-enterprise-names_parallel-fuubars_rob-github-fixes
2015-06-19 11:32:44 +10:00
Rohan Mitchell
52887dc699
Merge branch 'unique-enterprise-names' into combined/unique-enterprise-names_parallel-fuubars_rob-github-fixes
2015-06-19 11:32:25 +10:00
Rohan Mitchell
89a571d497
Fix spec coupled to variant overrides
2015-06-18 16:05:35 +10:00
Rohan Mitchell
ff4ee16f06
Fix currency issues, changed logo path
2015-06-18 15:38:46 +10:00
Rohan Mitchell
ae3a69c1af
Put in debugging for failing push-to-prod step (sigh)
2015-06-18 15:29:05 +10:00
Continuous Integration
6d423ac990
Auto-merge from CI [skip ci]
2015-06-18 15:20:12 +10:00
Rohan Mitchell
aa0a031fa0
Fetch indexed variant overrides in one go
2015-06-18 15:03:24 +10:00
Rohan Mitchell
dd2f6d6430
Extract VariantOverride fetching into ScopeVariantToHub#scope
2015-06-18 14:45:40 +10:00
Rohan Mitchell
ce0de6e1dc
Fix push to production - needs includes for get_ofn_commit
2015-06-18 14:25:48 +10:00
Rohan Mitchell
7cc2bc4fde
Perform variant override scoping on product/variant by external class. Centralise this so we can load everything in one go.
2015-06-18 13:11:11 +10:00
Rohan Mitchell
6ed9a2620c
Use indexed_fees_for for product price
2015-06-18 13:07:52 +10:00
Rohan Mitchell
860183e675
Do not double-display deployment output
2015-06-18 12:41:47 +10:00
Rohan Mitchell
1cd9ee399f
Cloak shops page
2015-06-18 10:19:18 +10:00
Rohan Mitchell
b5d841562d
Getting OFN commit should retrieve from meta-data
2015-06-18 10:02:15 +10:00
Rohan Mitchell
9f883db25b
Really show deploy output in real time
2015-06-18 09:57:21 +10:00
Rohan Mitchell
389ac07bd7
Store commit at start of build process and use it throughout
2015-06-17 16:25:34 +10:00
Rohan Mitchell
4da69f78cb
Use fuubar with parallel specs for advance notice of failures
2015-06-17 15:22:08 +10:00
Rohan Mitchell
c5526c78d9
Make enterprise name unique
2015-06-17 15:01:46 +10:00
Rohan Mitchell
470f10a828
Merge branch 'master' into rob-github-fixes
2015-06-16 19:00:54 +10:00
Rohan Mitchell
bf953f8987
Undo last change, it broke asset precompilation. Rename style.css to scss for inclusion and force recompilation of all assets.
2015-06-16 18:25:44 +10:00
Rohan Mitchell
0ade5ee3a8
Import style.css file also (not included by default by @import)
2015-06-16 18:00:35 +10:00
Rohan Mitchell
0dbecce65d
Optimise relatives including self - minor improvement
2015-06-16 17:43:13 +10:00
Rohan Mitchell
faee88c404
Merge branch 'master' into redesign
2015-06-16 16:57:09 +10:00
Rohan Mitchell
bf2a7f12e0
Fix interaction between alert and mobile menu. A bit hack-ish, needs some more love.
2015-06-16 16:28:45 +10:00
Rohan Mitchell
02d68c662b
Add titles to all darkswarm pages
2015-06-16 15:31:35 +10:00
Rohan Mitchell
387021929e
Merge branch 'master' into rob-github-fixes
2015-06-16 15:05:01 +10:00
Rohan Mitchell
301a3ac090
Rename Blog link to News for consistency with global site
2015-06-16 14:53:54 +10:00
Rohan Mitchell
fd41003fb7
Change all global links to www
2015-06-16 14:47:40 +10:00
Continuous Integration
c76021462c
Auto-merge from CI [skip ci]
2015-06-16 14:12:16 +10:00
Rohan Mitchell
846f4bb4b1
Tweak menu responsiveness: Fix items covering country name, fix ul.right dropping down to next line
2015-06-16 13:02:43 +10:00
Rohan Mitchell
b540f645c3
Split CSS to overcome IE9's 4096 rule limit
2015-06-16 11:57:50 +10:00
Rob Harrington
30af5d4278
Enterprise relatives include self where appropriate for serialized injection data
2015-06-15 19:45:29 +08:00
Rob Harrington
92082ce95c
Adding filter back on producers page
2015-06-15 16:35:41 +08:00
Rob Harrington
1558ddb1eb
Fixing index enterprise serializer so that payment methods issue displays when no payment methods are present
2015-06-15 16:15:06 +08:00
Rob Harrington
0038ebaa1f
Fix styling issue for full sixteen column enterprise index panel
2015-06-15 16:10:33 +08:00
Rob Harrington
943c702e88
Hiding 'more' list if there are no overflow filter selectors
2015-06-15 15:54:55 +08:00
Rob Harrington
fb19feb357
Adding filters back to the hub page
2015-06-15 15:43:43 +08:00
Rob Harrington
e09431fa20
Styling tweaks
2015-06-15 15:43:19 +08:00
Rob Harrington
fb11c93943
Making ul element the root of filter_selectors directive, so resolve issue with using ng-repeat element as root of a replacement directive
2015-06-15 15:43:01 +08:00
Rob Harrington
727e8a81d6
Making sure enterprise serializer serializes no taxons as an empty array
2015-06-15 15:41:25 +08:00
Rob Harrington
0e96a23a52
Fixing filters selector directive to that an allSelector watcher isn't required for generation on selectors to work
2015-06-15 12:06:23 +08:00
Maikel Linke
80bf6e61ad
redirect /t/products/:id to /
2015-06-13 11:59:52 +10:00
Maikel Linke
c6d01055d6
updating relationship spec
2015-06-12 19:32:56 +10:00
Rob Harrington
82d31b908f
More styling tweaks
2015-06-12 16:09:53 +08:00
Rob Harrington
066c8876ff
Only serializing unresolved enterprise issues, styling tweaks and fixes for index
2015-06-12 15:49:01 +08:00
Maikel Linke
de1971072e
update relationship js spec
2015-06-12 17:09:04 +10:00
Maikel Linke
f44ac5b27b
Merge branch 'url-redirects' into e2e-links
2015-06-12 17:03:31 +10:00
Maikel Linke
d717c38f6d
Filter relationships by permission
2015-06-12 17:03:17 +10:00
Maikel Linke
61effc03c1
add "Enterprise Relationships" tab for non-admins
2015-06-12 17:03:17 +10:00
Maikel Linke
f2bc98e812
E2E: select all permissions
2015-06-12 17:03:17 +10:00
Rob Harrington
795b2700b4
Merge branch 'master' into enterprise-index-revamp
2015-06-12 12:47:58 +08:00
Rob Harrington
6ab5efbe02
Last minute styling adjustments
2015-06-12 12:40:24 +08:00
Rob Harrington
59d5ebe9d4
Changes to copy
2015-06-12 12:32:17 +08:00
Rob Harrington
1fb1733644
Adding link to user guide to enterprises index and dashboard
2015-06-12 12:31:57 +08:00
Rob Harrington
775718c776
Adding status panel on enterprise index
2015-06-12 12:09:00 +08:00
Rohan Mitchell
2b763271a7
Merge branch 'master' into optimise-shopfront
2015-06-12 12:15:20 +10:00
Maikel Linke
d61073f08d
redirect /enterprises to /
2015-06-12 10:47:50 +10:00
Maikel Linke
2fb8f9f8a3
Redirect /products to /
...
GitHub issue #571
2015-06-12 10:47:50 +10:00
Rohan Mitchell
4f311543ae
Merge branch 'master' into enterprise-index-revamp
2015-06-12 10:26:11 +10:00
Rob Harrington
eed27ceb31
Shipping Method feature specs work with new enteprise user enterprise index
2015-06-12 03:10:50 +08:00
Rob Harrington
77432ffc41
Payment Method feature specs work with new enteprise user enterprise index
2015-06-12 03:10:37 +08:00
Rob Harrington
5d2b36c667
Enterprise Fee feature specs work with new enteprise user enterprise index
2015-06-12 03:10:14 +08:00
Rob Harrington
61beb38e9c
Bringing back delayed_job on enterprise emails - acctidentally took it out earlier
2015-06-12 03:09:40 +08:00
Rob Harrington
efca4dde10
Fixing enterprises feature spec
2015-06-12 01:49:39 +08:00
Rob Harrington
d0b7550629
Removing screenshot from spec
2015-06-12 01:49:39 +08:00
Rob Harrington
6f975593fe
Splitting enterprise index feature specs into their own file, reinstating old enterprise index for super admin users
2015-06-12 01:49:39 +08:00
Rob Harrington
64ed80f845
Enterprise index action load enterprise_set for super admin
2015-06-12 01:49:39 +08:00
Rob Harrington
f80a5fe558
Fixing reference to change_type_form partial from single enterprise dashboard
2015-06-12 01:49:38 +08:00
Rob Harrington
1b52564d58
Rerouting welcome page to be an enterprise action, updates to copy for package selection
2015-06-12 01:49:38 +08:00
Rob Harrington
1cd6866879
Fixing issue with auto-creation of new contact user for enterprises caused by delayed-job
2015-06-12 01:49:37 +08:00
Rob Harrington
1c1f82f4ee
Using events to update index row text on save, adding alert icons for enterprises without producer or package selected
2015-06-12 01:49:37 +08:00
Rob Harrington
95073f6fe7
Adding actual link to the manage link on enterprises index
2015-06-12 01:49:37 +08:00
Rob Harrington
e575b0e490
Switching enterprise index to its own dedicated serializer, so we can spit out ownership
2015-06-12 01:49:37 +08:00
Rob Harrington
5a08344812
Changing 'shop' column and panel to 'package'
2015-06-12 01:49:37 +08:00
Rob Harrington
e3d7c00c8e
Removing option of 'producer profile only' from enterprise shop panel
2015-06-12 01:49:36 +08:00
Rob Harrington
8aa55088ab
Adding a parent directive to coorindate styling of panel tabs
2015-06-12 01:49:36 +08:00
Rob Harrington
a90cd0f8e0
Owners can update sells on enterprises they own
2015-06-12 01:49:36 +08:00
Rob Harrington
6b35e993bd
WIP: More work on panel content, styling and data submission logic
2015-06-12 01:49:36 +08:00
Rob Harrington
a586a52c23
Shortcutting around existing Enterprise service, so that we can use it for something more useful
2015-06-12 01:49:36 +08:00
Rob Harrington
b84f5a26a1
WIP: Splitting type panel into separate producer and shop panels, playing with styling
2015-06-12 01:49:35 +08:00
Rob Harrington
451ba1c01b
panel rows adjust to span the number of visible columns
2015-06-12 01:49:35 +08:00
Rob Harrington
c441c8c6cb
Columns service holds a column count and notifies rootscope when it changes
2015-06-12 01:49:35 +08:00
Rob Harrington
0c36738472
Adding basic generalised panel row infrastructure to indexUtils
2015-06-12 01:49:35 +08:00
Rob Harrington
ff3d9e27ec
Upgrade angular-rails-templates
2015-06-12 01:49:35 +08:00
Rob Harrington
d5f9b40707
WIP: Basic version of revamped enterprise index
2015-06-12 01:49:34 +08:00
Rob Harrington
02d3d34826
Adding basic angular infrastructure for enterprises
2015-06-12 01:49:34 +08:00
Rob Harrington
5215623864
Adding bindonce to admin
2015-06-12 01:49:34 +08:00
Rob Harrington
ed7a53968c
Using clearer json_request? method for customers controller
2015-06-12 01:49:34 +08:00
Rob Harrington
c311bcdca7
Overriding enterprises index action to use AMS for json requests, and prevent collection loading for html requests
2015-06-12 01:49:33 +08:00
Rohan Mitchell
d908701b59
Merge branch 'master' into folklabs-producer-emails
...
Conflicts:
Gemfile
2015-06-11 17:02:34 +10:00
Rohan Mitchell
ecbf3c8fa7
Ensure we start with consistent config settings
2015-06-11 16:16:36 +10:00
Rohan Mitchell
5ae88dbd6c
Fix content overlapping alert
2015-06-11 14:29:49 +10:00
Rohan Mitchell
bfeb63c8d7
Ensure that changes to Spree::Config.products_require_tax_category do not leak out of the relevant spec
2015-06-11 14:16:18 +10:00
Rohan Mitchell
6dea3fa19d
Merge branch 'fix-duplicate-fees' into combined/ginerr_bugfixes_fix-duplicate-fees
2015-06-11 12:56:32 +10:00
Rohan Mitchell
075e9edbf6
Merge branch 'ginerr_bugfixes' into combined/ginerr_bugfixes_fix-duplicate-fees
2015-06-11 12:56:27 +10:00
Rohan Mitchell
5175fe9a03
Make stats more accurate by excluding invisible, inactivated enterprises and incomplete orders
2015-06-11 12:53:23 +10:00
Rohan Mitchell
662330b222
Alert appears at top of page. It slides in on page load and slides out on close.
2015-06-11 12:10:50 +10:00
Maikel Linke
a8b6f2942a
Releasing Assets Version 1.1
...
The uglifier update affects only re-compiled assets. In order to replace
the broken assets (e.g. #396 ) with re-compiled assets, we change the
assets version number.
2015-06-11 10:54:30 +10:00
Rohan Mitchell
f4e0baa56a
Basic click-to-close for sell-food alert
2015-06-10 19:03:40 +10:00
Rohan Mitchell
686a54c121
Make 'selling food' alert visible, basic styling
2015-06-10 19:03:25 +10:00
Rohan Mitchell
b37f21dce1
Remove load_active_distributors call missed by merge
2015-06-10 18:38:32 +10:00
Rohan Mitchell
610a4c03fe
Merge branch 'master' into redesign
...
Conflicts:
app/controllers/home_controller.rb
app/views/producers/index.html.haml
app/views/shared/menu/_mobile_menu.html.haml
app/views/shop/products/_form.html.haml
config/routes.rb
spec/controllers/shops_controller_spec.rb
2015-06-10 18:27:50 +10:00
Rohan Mitchell
604360034b
Make filter method private
2015-06-10 17:04:09 +10:00
Rohan Mitchell
a0fd91dc57
Do not preload_app with unicorn, update newrelic agent so that it doesn't require this setting.
2015-06-10 17:03:56 +10:00
Rohan Mitchell
d79129880e
Put lock around adjustment clear/re-create to avoid race condition resulting in duplicate fees
2015-06-10 17:02:30 +10:00
Rohan Mitchell
7412e92665
Merge branch 'master' into optimise-shopfront
2015-06-10 16:39:02 +10:00
Rohan Mitchell
ee01113fe1
Fix duplicate factory value spec error
2015-06-10 15:31:53 +10:00
Maikel Linke
5a7231579c
update uglifier to 2.7.1
2015-06-10 13:58:52 +10:00
Maikel Linke
3c38c8e504
Merge branch 'adjustment-metadata-deletion' into combined/session-store_adjustment-metadata_uglifier
...
Conflicts:
db/schema.rb
2015-06-10 13:56:36 +10:00
Maikel Linke
6c0238deac
scoping down large request spec
2015-06-10 13:50:55 +10:00
Maikel Linke
f88f42283a
Session stored in ActiveRecored instead of Cookies
...
The cookie store is not big enough in some cases. In order to solve a
CookieOverflow error and maybe track down the underlying issue this
patch uses the database instead of cookies to store session data.
2015-06-10 13:49:24 +10:00
Maikel Linke
88872b4b49
add spec_helper to customers_controller_spec
2015-06-06 11:49:49 +10:00
Maikel Linke
153360d17b
Let the database delete adjustment metadata
...
GitHub issue #582
We encountered a foreign key violation on adjustment metadata even
though rails should handle that.
Action: order.adjustments.where(originator_type: 'EnterpriseFee').destroy_all
Adjustment: has_one :metadata, class_name: 'AdjustmentMetadata' dependent: :destroy
So we update the foreign key to cause a delete in the database.
2015-06-05 16:10:58 +10:00
Rohan Mitchell
80834a0c27
Merge branch 'master' into ginerr_bugfixes
2015-06-05 15:49:43 +10:00
Maikel Linke
d6c630dad9
add spec_helper to customers_controller_spec
2015-06-05 14:25:45 +10:00
Maikel Linke
7461009c3b
Merge branch 'handle-invalid-referer-urls' into combined/xero-report_analytics-bugfixes
2015-06-05 14:23:58 +10:00
Maikel Linke
252e9be016
Merge branch 'remove-old-bugsnag-notification' into combined/xero-report_analytics-bugfixes
2015-06-05 14:23:03 +10:00
Maikel Linke
f324471495
Merge branch 'index_enterprise_permalink' into combined/xero-report_analytics-bugfixes
2015-06-05 14:20:13 +10:00
Maikel Linke
f438a44f26
Merge remote-tracking branch 'origin/analytics' into combined/xero-report_analytics-bugfixes
...
Conflicts:
app/controllers/spree/admin/orders_controller_decorator.rb
2015-06-05 14:19:54 +10:00
Maikel Linke
1b91082c1c
Merge branch 'show-order-without-current-distributor' into combined/xero-report_show-order-without-distributor
2015-06-05 13:48:47 +10:00
Maikel Linke
ffa960b02e
Merge remote-tracking branch 'origin/xero-report' into combined/xero-report_show-order-without-distributor
2015-06-05 13:48:24 +10:00
Maikel Linke
41dafce0db
Remove obsolete Bugsnag notification
2015-06-05 13:46:15 +10:00
Maikel Linke
e35b39c7cf
Handle invalid referer URLs
...
Rescues URI::InvalidURIError of URL(request.referer).
2015-06-05 12:43:49 +10:00
Maikel Linke
552bbf221c
Delete obsolete paragraph in registration #595
2015-06-05 11:01:40 +10:00
Rohan Mitchell
f09fad464e
Merge branch 'master' into optimise-shopfront
2015-06-05 07:28:05 +10:00
Rohan Mitchell
fc7e33d706
Fall back on individual calculations when pre-prepared values are not present
2015-06-04 16:43:19 +10:00
Rohan Mitchell
ef3155a16a
Pull product listing fee calculations out of serializer loop
2015-06-04 16:27:32 +10:00
Rohan Mitchell
3846d16822
Add methods to load fees for a number of variants in one go
2015-06-04 16:22:06 +10:00
Continuous Integration
6051c81959
Auto-merge from CI [skip ci]
2015-06-04 15:39:43 +10:00
Rohan Mitchell
486c2f9b42
WIP: Skip EnterpriseFeeApplicator step when computing fees
2015-06-04 12:13:04 +10:00
Rohan Mitchell
27bc28ffa4
Index variants by id
2015-06-04 12:09:34 +10:00
Rohan Mitchell
cf0031d9a5
WIP: Optimise enterprise fee calculation
2015-06-04 11:53:09 +10:00
Rohan Mitchell
85d1d67dac
Sort orders as required by spec, fixes intermittent fail
2015-06-04 09:43:36 +10:00
Continuous Integration
a1425c5e07
Auto-merge from CI [skip ci]
2015-06-04 07:22:43 +10:00
Maikel Linke
5d77a48ef3
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into show-order-without-current-distributor
2015-06-03 20:36:12 +10:00
Rob Harrington
e93736b123
Ordering managed orders by id to fix spec
2015-06-03 18:16:07 +08:00
Maikel Linke
aea6277b77
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into index_enterprise_permalink
2015-06-03 19:54:29 +10:00
Rob Harrington
3855ae1337
Fixing bug on OC interface that prevented hubs from pulling their own products through
2015-06-03 16:18:44 +08:00
Rob Harrington
359328a96e
Producers and distributors lists include self where appropriate
2015-06-03 16:18:44 +08:00
Rob Harrington
dbd81e60a1
Fixing customer index feature spec, only checking shop when something has been selected
2015-06-03 16:18:09 +08:00
Rob Harrington
7c9b4dbc3e
Resolving unmerged section in bulk order management template
2015-06-03 15:33:04 +08:00
Rob Harrington
09160c8ea6
Fixing customers controller spec
2015-06-03 15:23:55 +08:00
Rob Harrington
439d122e93
Merge branch 'master' into customers
...
Conflicts:
app/assets/javascripts/admin/bulk_order_management.js.coffee
app/assets/javascripts/admin/bulk_product_update.js.coffee
app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
app/views/spree/admin/orders/bulk_management.html.haml
db/schema.rb
spec/javascripts/unit/bulk_order_management_spec.js.coffee
2015-06-03 15:19:40 +08:00
Rohan Mitchell
f1019e9221
Upgrade unicorn
2015-06-03 16:53:46 +10:00
Rohan Mitchell
2c0da5e350
Output parallel spec runtime log -> evenly split spec grouping
2015-06-03 16:38:47 +10:00
Maikel Linke
d2a61dc096
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into registration-wizard-text
2015-06-03 16:37:25 +10:00
Rohan Mitchell
0569ef0505
Only record analytics in production. Also record them in admin backend.
2015-06-03 16:36:31 +10:00
Rohan Mitchell
17d123db63
ng-cloak producers page
2015-06-03 16:28:43 +10:00
Rohan Mitchell
4d789b70ed
Merge branch 'products-and-inventory-report' into combined/bulk-product-edit-and-ng-cloak
2015-06-03 15:12:29 +10:00
Maikel Linke
7302963605
inventory report: filter was broken because filter_to_order_cycle returned nil
...
[skip ci]
2015-06-03 15:11:32 +10:00
Rohan Mitchell
ad4e17b77a
Merge branch 'master' into combined/bulk-product-edit-and-ng-cloak
2015-06-03 15:10:12 +10:00
Rohan Mitchell
cd8084ae3f
Merge branch 'master' into parallel-tests
...
Conflicts:
script/ci/run_tests.sh
2015-06-03 15:08:15 +10:00
Rohan Mitchell
41b348f594
Merge branch 'master' into combined/bulk-product-edit-and-ng-cloak
2015-06-03 15:05:51 +10:00
Rohan Mitchell
2b3689fd93
Run CI specs in parallel
2015-06-03 14:29:38 +10:00
Rohan Mitchell
db47c01784
Initial config for parallel spec running
2015-06-03 14:29:38 +10:00
Rohan Mitchell
769a04d2e0
Merge branch 'master' into optimise-shopfront
2015-06-03 13:02:58 +10:00
Rohan Mitchell
36dc0d5ccd
Do not run performance specs in CI
2015-06-03 13:00:07 +10:00
Rohan Mitchell
b3878b126b
Decouple generic injection spec from EnterpriseSerializer
2015-06-03 12:53:46 +10:00
Rohan Mitchell
c6f6c11a43
Add wait between clicks to fix race condition
2015-06-03 12:51:15 +10:00
Rohan Mitchell
473322c7e6
CI: Add more robust merge-to-master script
2015-06-03 12:25:28 +10:00
Rohan Mitchell
8afffdae9a
Fix error when product does not have a master variant
2015-06-03 12:13:42 +10:00
Maikel Linke
4b6222bbe2
Updating spec using new button label
2015-06-03 12:08:47 +10:00
Maikel Linke
96177b7cd7
Add unique index to enterprise permalink
2015-06-03 11:57:22 +10:00
Maikel Linke
cb2adea59f
Remove executable bit from a migration file
2015-06-03 10:16:29 +10:00
Rohan Mitchell
22230294ab
Merge branch 'master' into optimise-shopfront
2015-06-03 10:07:42 +10:00
Maikel Linke
2853885f26
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into registration-wizard-text
2015-06-03 09:47:37 +10:00
Liv Galendez
db19303f1a
Added asterisk to new field Owner since it seems to be required also
2015-06-02 18:23:41 +10:00
Liv Galendez
2c22d4e774
Merge https://github.com/openfoodfoundation/openfoodnetwork into indicate-required-fields-for-new-enterprise-form
2015-06-02 18:11:17 +10:00
Liv Galendez
5fe31e6333
Added asterisks to required fields in new enterprise creation form.
2015-06-02 18:03:16 +10:00
Rohan Mitchell
fee854a3f8
Merge branch 'master' into redesign
2015-05-29 17:37:18 +10:00
Rohan Mitchell
e3085d9224
Merge branch 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails
2015-05-29 17:36:56 +10:00
Rohan Mitchell
3dbc2e0382
Merge branch 'master' into folklabs-producer-emails
2015-05-29 17:36:11 +10:00
Rohan Mitchell
a22da1ae51
Merge branch 'ng-cloak' into combined/bulk-product-edit-and-ng-cloak
2015-05-29 16:54:01 +10:00
Maikel Linke
159b33e2db
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit
2015-05-29 16:52:18 +10:00
Maikel Linke
0d3cdb9c69
Expand All button to show all variants in BPE
2015-05-29 16:51:55 +10:00
Rohan Mitchell
5c3a59acab
ng-cloak order cycles selector, tabs and shopfront
2015-05-29 16:39:41 +10:00
Rohan Mitchell
50ae331d94
ng-cloak mobile menu
2015-05-29 16:03:16 +10:00
Maikel Linke
fe27b1d446
text changes to the registration wizard
2015-05-29 15:24:17 +10:00
Maikel Linke
bf935623dc
changing default mailer url in development from test.com to 0.0.0.0:3000
2015-05-29 15:24:17 +10:00
Maikel Linke
678b591c18
Explain how to disable delayed jobs to send emails again
2015-05-29 15:24:16 +10:00
Rohan Mitchell
6f513fee77
Merge branch 'master' into redesign
2015-05-29 15:20:21 +10:00
Rohan Mitchell
7f73a4cc9b
Fix column/row mixup
2015-05-29 15:19:35 +10:00
Maikel Linke
503b687ed1
Display distributor banner only if current_distributor is present
2015-05-29 15:19:05 +10:00
Rohan Mitchell
952353da8c
Merge branch 'bulk-product-edit' into combined/single-order-patches-and-bulk-product-edit
...
Conflicts:
spec/features/admin/bulk_product_update_spec.rb
2015-05-29 15:08:30 +10:00
Rohan Mitchell
e5b3736e86
Merge branch 'single-order-patches' into combined/single-order-patches-and-bulk-product-edit
2015-05-29 14:36:51 +10:00
Continuous Integration
c14de4e97f
Auto-merge from CI [skip ci]
2015-05-29 14:29:23 +10:00
Rohan Mitchell
d478cc1f69
Serialize taxons and relatives in expected format
2015-05-29 14:03:44 +10:00
Continuous Integration
dccc9fb479
Auto-merge from CI [skip ci]
2015-05-29 12:44:44 +10:00
Rohan Mitchell
3f4f8afacd
EnterpriseRelationship.relatives does not show duplicates
2015-05-29 12:19:38 +10:00
Rohan Mitchell
69c54e1d70
Only load activated relatives for EnterpriseInjectionData
2015-05-29 12:08:21 +10:00
Rohan Mitchell
cdbf02ca20
EnterpriseRelationship.relatives can find activated enterprises only
2015-05-29 12:07:43 +10:00
Rohan Mitchell
4ce9ea05f0
Merge branch 'master' into require_standard_variant
2015-05-29 10:12:14 +10:00
Rohan Mitchell
c75e14b383
Small edits
2015-05-29 09:55:40 +10:00
Rohan Mitchell
32b140ac88
Revert "Update group signup header copy"
...
This reverts commit 0a8bfdb872 .
2015-05-29 09:54:09 +10:00
Rohan Mitchell
835b56b222
Attempt to fix intermittent failures in spec/features/consumer/authentication_spec.rb
2015-05-29 09:44:57 +10:00
Rohan Mitchell
7486daa2a3
Merge branch 'master' into require_standard_variant
...
Conflicts:
spec/controllers/spree/admin/variants_controller_spec.rb
spec/lib/open_food_network/permissions_spec.rb
spec/lib/open_food_network/products_and_inventory_report_spec.rb
spec/models/enterprise_spec.rb
2015-05-28 15:08:13 +10:00
Rohan Mitchell
8a79741c0e
Update pricing tables and detail formatting
2015-05-28 14:58:46 +10:00
Continuous Integration
1d08ae89da
Auto-merge from CI [skip ci]
2015-05-28 14:31:25 +10:00
Rohan Mitchell
1cf62e01e9
Edit case study text
2015-05-28 14:27:36 +10:00
Rohan Mitchell
0a8bfdb872
Update group signup header copy
2015-05-28 14:08:58 +10:00
Rohan Mitchell
92d67327dd
Add groups case studies
2015-05-28 14:07:17 +10:00
Rohan Mitchell
acc976f44a
Add hub case studies
2015-05-28 14:00:04 +10:00
Maikel Linke
bf9addfa42
Merge branch 'group-custom-url' into group-pages
2015-05-28 13:27:48 +10:00
Rohan Mitchell
31caf278d7
Add producer case studies
2015-05-28 12:39:40 +10:00
Rohan Mitchell
e81a955827
Add detail to hubs and producers signup pages
2015-05-28 12:21:25 +10:00
Rohan Mitchell
eb0e8dcd9c
Copy changes to home page and link fix in footer
2015-05-28 12:21:08 +10:00
Maikel Linke
ff2eed7760
Using permalink in URLs pointing to groups
2015-05-28 11:27:40 +10:00
Maikel Linke
e4f93863fd
Finding unique permalink before validation.
2015-05-28 11:27:40 +10:00
Maikel Linke
aef128f2c9
permalink editable
2015-05-28 11:27:40 +10:00
Maikel Linke
19448a182e
Add permalink field to enterprise groups
2015-05-28 11:27:39 +10:00
Continuous Integration
a01a53caea
Auto-merge from CI [skip ci]
2015-05-28 11:05:07 +10:00
Rohan Mitchell
7f43dbf9bb
Fix further intermittent failures in permissions spec
2015-05-28 10:58:12 +10:00
Rohan Mitchell
97e49c2bdb
Replace 'array.sort.should == expected.sort' pattern with match_array
2015-05-28 10:46:08 +10:00
Rohan Mitchell
ccf1e2951c
Fix intermittent failure in permissions spec
2015-05-28 10:45:47 +10:00
Rohan Mitchell
3ab7df88e6
Allow serialization of nil enterprise
2015-05-27 16:32:15 +10:00
Rohan Mitchell
75f1f673ad
Update spec for EnterpriseSerializer
2015-05-27 16:26:31 +10:00
Rohan Mitchell
e74390a013
Remove controller specs for @active_distributors, now set via helper
2015-05-27 16:26:08 +10:00
Rohan Mitchell
41bc67e2d8
Add benchmark for product serialisation
2015-05-27 15:44:02 +10:00
Rohan Mitchell
e1b4c3b1e4
Add benchmarking test for inject_enterprises
2015-05-27 15:44:02 +10:00
Rohan Mitchell
31b726613d
Avoid loading enterprise injection data when it's not be needed due to caching
2015-05-27 15:44:01 +10:00
Rohan Mitchell
dd761719ee
Fix undefined Api::IdSerializer error
2015-05-27 15:44:01 +10:00
Rohan Mitchell
1a887df412
Pull taxon computation out of the serialization loop
2015-05-27 15:44:01 +10:00
Rohan Mitchell
2c92b5a751
Find all supplied and distributed taxons
2015-05-27 15:44:01 +10:00
Rohan Mitchell
3afd636577
Pull relatives computation out of the serialization loop
2015-05-27 15:44:01 +10:00
Rohan Mitchell
cf79b90044
Load relatives of all enterprises in one go
2015-05-27 15:44:01 +10:00
Rohan Mitchell
4a59c85b3e
Inject current hub from AMS rather than RABL
2015-05-27 15:44:01 +10:00
Rohan Mitchell
704955a185
Load active distributors where they're needed rather than in most controllers
2015-05-27 15:44:01 +10:00
Rohan Mitchell
ee8db23fd9
Pull shipping method service computations out of the serialization loop
2015-05-27 15:44:01 +10:00
Rohan Mitchell
f0e909c92b
Look up the shipping services (pickup, delivery) that different hubs provide
2015-05-27 15:44:01 +10:00
Rohan Mitchell
f940984ca3
Pull earliest closing time computations out of the serialization loop
2015-05-27 15:44:01 +10:00
Rohan Mitchell
769edbe9d5
Find the earliest closing times for each distributor in an active order cycle
2015-05-27 15:44:01 +10:00
Rohan Mitchell
c5f00d87bd
When loading products for shopfront, load all master variants in one go
2015-05-27 15:44:01 +10:00
Rohan Mitchell
99cb09c6f7
When loading products for shopfront, load all variants in one go
2015-05-27 15:44:01 +10:00
Rohan Mitchell
c8f14f1ee9
Fetch fonts through https, fixes mixed-security error that prevents fonts loading
2015-05-26 10:29:20 +10:00
Paul Mackay
baaa192967
#275 : Code cleanup.
2015-05-24 10:44:39 +01:00
Paul Mackay
2f05fc3824
#275 : Insert receival time and instructions into email.
2015-05-24 10:38:49 +01:00
Continuous Integration
5377af9cf9
Auto-merge from CI [skip ci]
2015-05-24 09:52:53 +10:00
Rick Giner
a5482c269f
#541 Fixed issue of showing negative 'more' numbers, and only working for current Hub
2015-05-24 09:52:34 +10:00
Maikel Linke
5a43ed2046
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit
2015-05-22 18:17:20 +10:00
Maikel Linke
28dae3c6c6
Enterprises cannot add themselves to Groups
2015-05-22 15:23:59 +10:00
Rob Harrington
5d47dc2fdb
Sort array so that order doesn't cause spec fail
2015-05-22 15:03:21 +10:00
Rob Harrington
5b65f67737
Amending spec expect after_create when we want after_save
2015-05-22 15:02:49 +10:00
Rob Harrington
e931f4b31f
Merge branch 'master' into require_standard_variant
2015-05-22 12:22:54 +10:00
Rob Harrington
63f3ede766
Prepare master variants for duplication as standard variant by ensuring they have a unit value and that the product has a variant unit
2015-05-22 12:22:05 +10:00
Rob Harrington
d43df86201
Moving conditional logic into ensure_standard_variant
2015-05-22 12:20:31 +10:00
Maikel Linke
9c137ccf0f
provide tax_categories in spec
2015-05-22 11:03:21 +10:00
Maikel Linke
7e4751cb3a
updating bulk product js spec
2015-05-21 22:30:23 +10:00
Maikel Linke
e6b6303f5e
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit
2015-05-21 18:03:11 +10:00
Maikel Linke
9c884b31a3
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into single-order-patches
2015-05-21 18:01:16 +10:00
Maikel Linke
f017197221
orders list: filter by distributor and order cycle
2015-05-21 18:00:14 +10:00
Rob Harrington
cd44d43b3e
Adding price to line_item serializer (oops, forgot to include when merging in master)
2015-05-21 17:48:35 +10:00
Rob Harrington
903ed7e507
Merge branch 'master' into variable_weights
...
Conflicts:
app/assets/javascripts/admin/bulk_order_management.js.coffee
app/views/spree/admin/orders/bulk_management.html.haml
app/views/spree/api/line_items/bulk_show.v1.rabl
spec/features/admin/bulk_order_management_spec.rb
2015-05-21 17:31:33 +10:00
Rob Harrington
79a59e2e81
Add order_with_distributor factory
2015-05-21 13:34:32 +10:00
Maikel Linke
73884d4f01
BPE: Display notice about variant overrides
2015-05-21 13:01:28 +10:00
Maikel Linke
2ed519ef50
on_demand checkbox for variants
2015-05-21 12:37:10 +10:00
Maikel Linke
1936767084
BPE: new col for tax category
2015-05-21 11:06:08 +10:00
Rob Harrington
0b28771364
Removing unrequired specs for variant/product 'units_show'
2015-05-20 21:06:20 +10:00
Rob Harrington
1aca4657d9
Oops, switch managed_products to editable_products for Api::ProductsController
2015-05-20 20:59:06 +10:00
Rob Harrington
3431c687b8
Making sure every created by factories has a distributor
2015-05-20 20:54:27 +10:00
Rob Harrington
65a6329132
Products and inventory reports scopes products to visible in permissions
2015-05-20 16:19:08 +10:00
Rob Harrington
8132f07d88
Adding visible products method to permissions
2015-05-20 15:53:10 +10:00
Maikel Linke
1e26466d11
bulk product edit: "on demand" for new product
2015-05-20 15:29:35 +10:00
Maikel Linke
6953f61939
bulk product edit: new col "on demand"
2015-05-20 15:07:22 +10:00
Rob Harrington
01d4cf6ecf
Renaming managed_products permissions method to editable_products
2015-05-20 15:02:36 +10:00
Rob Harrington
05131de1ad
Use full_name on BOM instead of options_text
2015-05-20 14:11:31 +10:00
Maikel Linke
0a0bb67277
No SKU for cloned products. Community topic 175
2015-05-20 14:05:14 +10:00
Rob Harrington
8d73b2f532
involving... order cycle scopes return distinct OCs
2015-05-20 13:47:01 +10:00
Rob Harrington
c56efabfbe
Removing obsolete rabl templates
2015-05-20 11:52:49 +10:00
Rob Harrington
0ad2978926
Removing old managed route from api orders controller and switching BOM over to use new controller action
2015-05-20 11:48:48 +10:00
Rob Harrington
fc55a000b8
Adding managed controller action which uses new order serializer to render json
2015-05-20 11:48:13 +10:00
Rob Harrington
823adf3272
Translating existing order-related rabl templates accross to AMS
2015-05-20 11:45:48 +10:00
Rob Harrington
7f80c02c0e
Adding route for managed route for admin orders
2015-05-20 11:45:05 +10:00
Maikel Linke
828456118b
Remove forgotten binding.pry
2015-05-20 11:15:18 +10:00
Maikel Linke
fa87c53777
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into group-pages
2015-05-20 10:22:28 +10:00
Maikel Linke
6b956a8a38
Updating product clone spec
2015-05-20 10:19:37 +10:00
Maikel Linke
0c46f963ce
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit
2015-05-20 10:19:03 +10:00
Rob Harrington
312a6299a8
Making where clause unambiguous
2015-05-15 21:19:16 +10:00
Rohan Mitchell
f1899a7558
Merge branch 'master' into xero-report
2015-05-15 16:57:11 +10:00
Rohan Mitchell
70b5ac4785
Add column for whether the order has been paid for
2015-05-15 16:55:52 +10:00
Rohan Mitchell
f7642b2a1b
When blank values are submitted, do not override defaults
2015-05-15 16:51:04 +10:00
Rohan Mitchell
a467d3c379
Add filtering to xero invoices report - order date range, hub and order cycle
2015-05-15 16:20:56 +10:00
Rohan Mitchell
3d4a0f8407
Xero invoices report: Preserve form fields on submit, do not show rows with no cost
2015-05-15 15:27:46 +10:00
Rohan Mitchell
3640a71ab8
Reorder methods
2015-05-15 15:05:18 +10:00
Rohan Mitchell
ca37efdd26
Display whether there is tax included in shipping
2015-05-15 12:44:48 +10:00
Rohan Mitchell
dc8270ed72
Display amounts on xero invoice report
2015-05-15 12:35:20 +10:00
Rohan Mitchell
0dcd8eb8cc
Find adjustments with and without tax
2015-05-15 12:35:19 +10:00
Rohan Mitchell
ca1d88d8b1
Find line items with and without tax
2015-05-15 12:35:19 +10:00
Rohan Mitchell
5660e3737e
Extract order rows generation to method
2015-05-15 12:35:19 +10:00
Rohan Mitchell
c5b618b1f4
Admin can customise some fields on Xero invoices report
...
Add require for xero invoices report spec
2015-05-15 12:35:14 +10:00
Rohan Mitchell
0737ac8da0
Write an rspec table matcher that gives informative error messages
2015-05-15 12:35:14 +10:00
Rohan Mitchell
0a2f2e0fba
Output summary data without customisation
...
Add route for xero invoices report
Add require for reports controller decorator
2015-05-15 12:35:05 +10:00
Rohan Mitchell
38e1bd4139
Fix indentation
2015-05-15 12:17:16 +10:00
Rohan Mitchell
ef064819f9
Add spec for order_cycle_management report access
2015-05-15 10:41:29 +10:00
Rohan Mitchell
924492ec5b
Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2
2015-05-15 10:37:34 +10:00
Continuous Integration
e3723da65a
Auto-merge from CI [skip ci]
2015-05-14 14:32:07 +10:00
Rob Harrington
c8502747be
Fixing layout of customers index
2015-05-14 12:37:55 +10:00
Rob Harrington
78fc3e376b
Fixing styling of inputs for with pending/success/error status
2015-05-14 11:39:37 +10:00
Rob Harrington
50d0d04994
Removing obsolete dataSubmitter service
2015-05-14 11:38:55 +10:00
Rohan Mitchell
b4755c37dc
Merge branch 'analytics' into combined/fix-delayed-job-loop-and-analytics
2015-05-14 11:03:27 +10:00
Rohan Mitchell
7da403808c
Style mobile menu [skip ci]
2015-05-13 16:56:49 +10:00
Rob Harrington
640c02570d
Splitting out specs for switchClass service
2015-05-13 16:41:28 +10:00
Rob Harrington
3849b39d3e
Splitting out specs for pending changes service
2015-05-13 16:39:43 +10:00
Rob Harrington
ffac0e4ceb
Adding ngTagsInput to angular spec manifest
2015-05-13 16:06:38 +10:00
Rohan Mitchell
ec1290d687
Style home page for mobile
2015-05-13 15:59:36 +10:00
Rob Harrington
a473d0ed11
Checking in db version change
2015-05-13 15:58:03 +10:00
Rohan Mitchell
7946340dad
Allow more phantomjs timeout to avoid the first-spec-timeout issue
2015-05-13 15:34:27 +10:00
Rohan Mitchell
b86872095a
Add google analytics
2015-05-13 14:52:17 +10:00
Rohan Mitchell
5e5628d0c3
Fix shops path for spec
2015-05-13 14:31:40 +10:00
Rohan Mitchell
0ac7dbf23b
Update spec references to removed file logo.jpg
2015-05-13 14:27:43 +10:00
Rohan Mitchell
14fdc7d3ae
Move home spec to shops spec
2015-05-13 14:27:18 +10:00
Rohan Mitchell
238adc5354
Do not couple editable content to frequently-changing home page format
2015-05-13 14:18:00 +10:00
Rohan Mitchell
75e0c1d99e
Conclusively remove cta1
2015-05-13 14:13:10 +10:00
Rohan Mitchell
ff44636040
Home controller functionality moved to shops controller
2015-05-13 14:10:21 +10:00
Rohan Mitchell
76e41e6c1e
Basic consistency styling for groups signup page [skip ci]
2015-05-13 12:51:34 +10:00
Rohan Mitchell
92805b5442
Style producers signup page CTA pane
2015-05-13 12:46:11 +10:00
Rob Harrington
34f5cfb6b5
Completed orders require a customer, add association logic
2015-05-13 12:44:38 +10:00
Rob Harrington
1559b4e30a
Adding customer reference to orders
2015-05-13 12:44:37 +10:00
Rob Harrington
ed941e211d
Don't require a code on customer
2015-05-13 12:44:37 +10:00
Rob Harrington
dd9c192d48
Shuffling layout a little on customer index
2015-05-13 12:44:37 +10:00
Rob Harrington
b364994cc8
Adding tags input to customer index using ngTagsInput
2015-05-13 12:44:37 +10:00
Rob Harrington
3bc69242ce
Style tweaks
2015-05-13 12:44:37 +10:00
Rob Harrington
d2e8b23dd4
Creating association between enterprise and customers
2015-05-13 12:44:37 +10:00
Rob Harrington
5b3c9842e4
Adding acts_as_taggable to customer model
2015-05-13 12:44:36 +10:00
Rob Harrington
a03c7a5f22
Adding ngTagsInput to admin assets
2015-05-13 12:44:36 +10:00
Rob Harrington
a60fd3d388
Installing ngTagInput
2015-05-13 12:44:36 +10:00
Rob Harrington
4c5e75c3f9
Adding acts-as-taggable-on gem
2015-05-13 12:44:36 +10:00
Rob Harrington
5b49e64bf2
Hiding bulk checkboxes on customer interface (for now)
2015-05-13 12:44:36 +10:00
Rob Harrington
9add073b17
User can update customer code from customer index page
2015-05-13 12:44:36 +10:00
Rob Harrington
734ad21e82
Customers controller responds with json
2015-05-13 12:44:35 +10:00
Rob Harrington
dcde2d88ad
Adding Customer resource to resources service
2015-05-13 12:44:35 +10:00
Rob Harrington
4545e0ff95
Adding request defaults to index utils module
2015-05-13 12:44:35 +10:00
Rob Harrington
3890ba9a11
Wrapping pending changes service in a class
2015-05-13 12:44:35 +10:00
Rob Harrington
8f94390363
Moving a bunch of index related services from general admin module into indexUtils
2015-05-13 12:44:35 +10:00
Rob Harrington
a873278881
Moving line-item-upd-attr to indexUtils module, renaming to obj-for-update
2015-05-13 12:44:35 +10:00
Rob Harrington
2afd501af3
Wiring up update action for customers controller
2015-05-13 12:44:34 +10:00
Rob Harrington
8f35ccf007
Adding quick search and column dropdown to customers index
2015-05-13 12:44:34 +10:00
Rob Harrington
79d50a64ae
BPE uses columns controller from intex utils
2015-05-13 12:44:34 +10:00
Rob Harrington
3e7d331892
BOM uses columns controller from index utils module
2015-05-13 12:44:34 +10:00
Rob Harrington
3b7ab086c9
Fix module name
2015-05-13 12:44:34 +10:00
Rob Harrington
69ba8540c1
Moving toggle_column directive to index_utils
2015-05-13 12:44:33 +10:00
Rob Harrington
5bd842fe1a
Moving toggle_column directive to dropdown module
2015-05-13 12:44:33 +10:00
Rob Harrington
f5c0ae0f41
Moving dropdown to its own module folder and renaming
2015-05-13 12:44:33 +10:00
Rob Harrington
1c03e27686
Moving dropdown to its own folder
2015-05-13 12:44:33 +10:00
Rob Harrington
7a4f0e214c
Adding customers index view
2015-05-13 12:44:33 +10:00
Rob Harrington
307302038a
Adding customers controller, service and resource
2015-05-13 12:44:33 +10:00
Rob Harrington
c00c93816c
Renaming spec file
2015-05-13 12:44:32 +10:00
Rob Harrington
b3d314cfdb
Adding require line for index_utils module to all.js
2015-05-13 12:44:32 +10:00
Rob Harrington
b6d63d40c6
Pulling columns logic out into its own services/controller in a new indexUtils module
2015-05-13 12:44:32 +10:00
Rob Harrington
220f42fcf2
Customers controller serializes data for json requests, just renders view without data for html
2015-05-13 12:44:32 +10:00
Rob Harrington
37ff61d663
Adding basic routing to display customer index page
2015-05-13 12:44:32 +10:00
Rob Harrington
57dbc33a7b
Adding resource service to determine submission request based on object type
2015-05-13 12:44:31 +10:00
Rob Harrington
b16fa9cdc1
Generalising datasubmitter pendingChanges and watcher directive
2015-05-13 12:44:31 +10:00
Rob Harrington
30bb948d35
Making ofn-line-item-upd-attr work without ng-model
...
Conflicts:
app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
app/views/spree/admin/orders/bulk_management.html.haml
2015-05-13 12:44:31 +10:00
Rohan Mitchell
cbe715087c
Make producers signup table same colours as hubs table
2015-05-13 12:37:07 +10:00
Rohan Mitchell
1f75974e1c
Unify case studies styling
2015-05-13 12:26:37 +10:00
Rohan Mitchell
71f3a450c6
Move signup-related styles from home_panes into signup.css.sass
2015-05-13 12:03:46 +10:00
Rohan Mitchell
fb400df662
Update basic copy and layout on producers signup page
2015-05-13 11:45:25 +10:00
Rohan Mitchell
3520127c41
Fix infinite job loop
2015-05-13 11:06:42 +10:00
Rohan Mitchell
eac22df200
Merge branch 'master' into redesign
...
Conflicts:
app/assets/javascripts/templates/product_modal.html.haml
2015-05-13 09:53:20 +10:00
Rohan Mitchell
845509b0c0
Style shops signup page
2015-05-12 13:51:31 +10:00
Rohan Mitchell
5a43c80231
Convert tabs to spaces
2015-05-12 12:26:35 +10:00
Rohan Mitchell
4e0478bbe9
Update copy and spacing on hubs page
2015-05-12 11:59:51 +10:00
Rohan Mitchell
d261ea617a
A little more space between header and button
2015-05-12 11:50:40 +10:00
Rohan Mitchell
f416503bde
Tighten up footer lock
2015-05-12 11:49:45 +10:00
Rohan Mitchell
0184925ac8
Switch out footer logo for logo with no text
2015-05-12 11:41:49 +10:00
Rohan Mitchell
ebc452b1e2
Style home page stats pane
2015-05-12 11:33:07 +10:00
Rohan Mitchell
7b36f9dbf8
Add friendly icons for home systems pane
2015-05-12 10:45:42 +10:00
Rohan Mitchell
b2f687cd11
Style home panes (all except stats)
2015-05-12 10:21:52 +10:00
Rohan Mitchell
5a63353004
Extract transparent button style, use on home tagline and CTA2
2015-05-12 10:14:47 +10:00
Rohan Mitchell
7c37b4783a
Avoid adding top padding on mobile menu
2015-05-12 10:10:52 +10:00
Rohan Mitchell
8178076dd2
Use more subtle background for tile image
2015-05-12 10:09:14 +10:00
Rohan Mitchell
25aede1bdf
Brighten landscape home hero image
2015-05-12 10:08:39 +10:00
Rick Giner
e801d6199a
Passing in $event in other views that call toggle()
2015-05-11 20:33:35 +10:00
Rick Giner
62ae38372e
#541 add "show more" link to producers lists in hub on home page
2015-05-11 20:31:24 +10:00
Paul Mackay
955f41633a
Merge remote-tracking branch 'refs/remotes/origin/master' into producer-emails
2015-05-11 08:36:09 +01:00
Rohan Mitchell
b2d8d9fdfd
Make nav menu centered, logo a little larger
2015-05-11 17:32:02 +10:00
Rohan Mitchell
fec375fbea
Decrease padding on brand story
2015-05-11 16:52:39 +10:00
Rohan Mitchell
5498d03660
Add zoomed-in tile
2015-05-11 16:52:01 +10:00
Rohan Mitchell
82334036d1
Orange-styled tile
2015-05-11 16:43:53 +10:00
Rohan Mitchell
fa6b0fac3f
Add landscape hero image
2015-05-11 16:36:26 +10:00
Rohan Mitchell
f99333dbd5
Remove trailing whitespace
2015-05-11 16:35:50 +10:00
Rohan Mitchell
9ee6ef06da
Return logo to smaller size
...
This reverts commit 460d0c9907 .
2015-05-11 16:14:30 +10:00
Rohan Mitchell
460d0c9907
Increase size of logo to fill page above the fold. Remove cta1 pane.
2015-05-11 15:53:46 +10:00
Rohan Mitchell
14afe932c1
Resize menu logo, make it always fully opaque
2015-05-11 14:39:53 +10:00
Rohan Mitchell
978c176cf6
Remove filter on hero image, set up superimposed logo and shop now CTA
2015-05-11 14:37:28 +10:00
Rohan Mitchell
3e82deb1f5
Add new home hero images
2015-05-11 14:32:07 +10:00
Rick Giner
b7c1a43125
Issue #540 Fix up hub list navigation
2015-05-10 18:13:30 +10:00
Rick Giner
98c1a95bd1
Issue #531 remove Google map road markers
2015-05-10 16:51:56 +10:00
Rick Giner
9c3ec950fc
Revert "ginerr_#531_remove Google map road markers"
...
This reverts commit 3e2117134f .
2015-05-10 16:50:58 +10:00
Rick Giner
3e2117134f
ginerr_#531_remove Google map road markers
2015-05-10 16:50:00 +10:00
Lynne
90dd1ea4a2
Merge pull request #1 from openfoodfoundation/variable_weights
...
Merging
2015-05-09 19:25:30 +01:00
Lynne Davis
26ee5c49b2
Fixing merge conflicts
2015-05-09 19:14:50 +01:00
Lynne Davis
3179887842
Do not allow line_item.unit_value to be updated if the variant.unit_value is zero
2015-05-09 19:12:24 +01:00
Lynne Davis
4d025ee7a9
Updating the spec based on @Robs suggestions, hoping for his insights. Still doesn't work.
2015-05-09 19:10:55 +01:00
Lynne Davis
521834bd76
Populate the line item unit value, when line_item created and update old data in migration
2015-05-09 19:10:55 +01:00
Lynne Davis
662c7fe368
Removing notes to myself from this file
2015-05-09 19:10:55 +01:00
Lynne Davis
54da7ae241
Adding additional logic for if the line_item unit_value is nil
2015-05-09 19:10:55 +01:00
Lynne Davis
2a991ad130
Variable Weights: Adding ability to update the weight/volume of a line_item after checkout. The price of the line_item is automatically updated to reflect the value of the new weight.
2015-05-09 19:10:55 +01:00
Lynne Davis
2f463474fb
Adding specs for variable weight adjustment via builk order management
2015-05-09 19:10:55 +01:00
Lynne Davis
f7ade48e86
Update DB schema to store updatable weight on items sold
2015-05-09 19:10:55 +01:00
Paul Mackay
fd37324359
#536 : Add permissions checking for Notify producers action.
2015-05-09 11:02:25 +01:00
Continuous Integration
3d0880857a
Auto-merge from CI [skip ci]
2015-05-08 16:24:39 +10:00
Rohan Mitchell
8cb8aacefe
Switch logo for white menu
2015-05-08 16:07:59 +10:00
Rohan Mitchell
6fc9789477
Invert colours on top menu
2015-05-08 15:11:54 +10:00
Rohan Mitchell
6322fdc1f0
Disable top alert
2015-05-08 15:03:37 +10:00
Continuous Integration
df14c10608
Auto-merge from CI [skip ci]
2015-05-08 13:45:56 +10:00
Rohan Mitchell
1531c476e3
Merge branch 'master' into require_standard_variant
...
Conflicts:
spec/controllers/spree/admin/variants_controller_spec.rb
2015-05-08 13:45:31 +10:00
Rohan Mitchell
e8c8d8885c
Merge branch 'master' into single-order-patches
2015-05-08 12:42:56 +10:00
Rohan Mitchell
768c9f24a2
Make topbar height configurable
2015-05-08 11:22:55 +10:00
Rohan Mitchell
a450d3af81
Variables can now be used to override foundation vars
2015-05-08 11:15:27 +10:00
Rohan Mitchell
f6c1be97a8
WIP: Fix apostrophes, add TODO
2015-05-07 15:03:27 +10:00
Rohan Mitchell
6fb3fa55a1
Allow extended time for all parts of this spec to fix intermittent fails
2015-05-07 14:23:58 +10:00
Rob Harrington
f3f0766279
Adding a distributor to order cycle to fix broken feature spec
2015-05-07 12:50:57 +10:00
Rob Harrington
0d5ce5ff57
Fixing issues with reports controller spec
2015-05-07 12:50:57 +10:00
Rob Harrington
68b4cb59be
Fixing bulk management specs broken by making order_cycles filter update dates
2015-05-07 12:50:57 +10:00
Rob Harrington
f88fdac710
Adding module - doh!
2015-05-07 12:50:56 +10:00
Rob Harrington
a7019e7e78
Adding permissions method for order report enterprises
2015-05-07 12:50:56 +10:00
Rob Harrington
bd66091d75
Push logic for checking of user super admin status down into private method
2015-05-07 12:50:56 +10:00
Rob Harrington
d8f5669fbb
Renaming granted > related_enterprises_granted
2015-05-07 12:50:56 +10:00
Rob Harrington
5806f50a84
Renaming granting > related_enterprises_granting
2015-05-07 12:50:56 +10:00
Rob Harrington
5cd528a87d
Removing obsolete related_enterprises_with permission method
2015-05-07 12:50:56 +10:00
Rob Harrington
f0f7e0ee2f
Making permissions method managed_and_related_enterprise_with method more specific
2015-05-07 12:50:56 +10:00
Rob Harrington
7ffe0f042e
Moving accessible_by scope on Enterprise to permissions
2015-05-07 12:50:55 +10:00
Rob Harrington
f79fba52be
Hiding personal details of customers, where the user does not manage the distributor of the order or the coordinator of the order cycle
2015-05-07 12:50:55 +10:00
Rob Harrington
4259b466f5
Using new order and line item permissions to fetch items to display in Orders and Fullfillment reports
2015-05-07 12:50:55 +10:00
Rob Harrington
0a03483e36
Adding permissions methods for visible and editable orders and line_items
2015-05-07 12:50:55 +10:00
Rob Harrington
28bf7037db
Updating methods for retrieving allowed producers, distributors and order cycles for order and fulfillment reports
2015-05-07 12:50:55 +10:00
Rob Harrington
ed9bbe2c45
Sorting Hub and Producer filter selectors by name
2015-05-07 12:50:55 +10:00
Rob Harrington
b5c7607d67
Order cycle filter resets date filters on BOM
2015-05-07 12:50:55 +10:00
Rob Harrington
e640376d63
Don't load cancelled orders into bulk order management
2015-05-07 12:50:54 +10:00
Rob Harrington
9ab16d8cec
Allowing calls to Api::OrderCyclesController#accessible to specify :as => 'distributor' or 'producer'
2015-05-07 12:50:54 +10:00
Rob Harrington
d8c23d37ac
Update accessible_by scope on enterprise, to read from permissions
2015-05-07 12:50:54 +10:00
Rob Harrington
89b153dc2c
Update AJAX request to use sells instead of deprecated is_distributor attribute
2015-05-07 12:50:54 +10:00
Rohan Mitchell
bd6bac8874
Display deployment output in real time
...
This reverts commit 485eee4bdd .
2015-05-06 20:02:22 +10:00
Rohan Mitchell
50d2ddc05f
Add progress comments
2015-05-06 20:00:50 +10:00
Rohan Mitchell
10b7a86745
Add debugging to merge script
2015-05-06 19:50:06 +10:00
Rohan Mitchell
6d33dc5070
Add script to merge master into the current branch if required before running specs
2015-05-06 19:41:36 +10:00
Rohan Mitchell
d109e898d2
Preserve newlines when displaying deploy script output
2015-05-06 19:38:20 +10:00
Rohan Mitchell
3dee29cd12
Remove build badge - master branch is always green
2015-05-06 19:37:21 +10:00
Rohan Mitchell
0921cd2dfa
Merge branch 'master' into single-order-patches
2015-05-06 18:13:55 +10:00
Rohan Mitchell
7b4130972b
Fix first feature spec sometimes timing out
2015-05-06 18:12:17 +10:00
Rohan Mitchell
485eee4bdd
Deploy scripts display their output
2015-05-06 18:07:50 +10:00
Rohan Mitchell
f84e704d99
Retry simple push-to-master script
2015-05-06 17:59:36 +10:00
Rohan Mitchell
ad7e5a45bb
Add updated merge script
2015-05-06 17:58:36 +10:00
Rohan Mitchell
d9404d3332
Merge branch 'master' into single-order-patches
2015-05-06 17:29:23 +10:00
Rohan Mitchell
f024f62970
Content-manage footer fields
2015-05-06 16:36:10 +10:00
Rohan Mitchell
bf435a8f3d
Make home page what's happening text and about URL configurable
2015-05-06 15:17:28 +10:00
Rohan Mitchell
01d1e84f85
Update global links
2015-05-06 15:15:09 +10:00
Rohan Mitchell
e43d726b97
Merge branch 'master' into payments-report-fix
2015-05-06 14:55:10 +10:00
Rohan Mitchell
b5a6f9c1bc
Add infrastructure so admin can configure content. Make homepage tagline CTA configurable.
2015-05-06 14:54:16 +10:00
Rohan Mitchell
1ffba674b3
Show real stats on home page
2015-05-06 14:54:16 +10:00
Rohan Mitchell
e662aab004
Brand story can be expanded and contracted
2015-05-06 14:54:16 +10:00
Rohan Mitchell
abee9c8198
Update security text and licensing
2015-05-06 14:54:15 +10:00
summerscope
3bca1f2070
Tweaks to homepage styling
2015-05-06 11:32:47 +10:00
Rob Harrington
8788322492
Alllowing payments in payment reports to access soft-deleted payment methods
2015-05-06 11:10:50 +10:00
summerscope
808979a8e0
Add a to do note for Rohan in css
2015-05-06 09:44:45 +10:00
summerscope
b0f76330b7
Changing order of events on homepage to make shopping the most obvious thing on homepage.
2015-05-06 09:38:49 +10:00
summerscope
216f99d1c7
New link for footer - updated URL
2015-05-05 16:14:18 +10:00
summerscope
31c4af154e
Applying Jay's copy to homepage
2015-05-05 15:44:36 +10:00
summerscope
e7d09f1b55
Change copy as supplied by Jay
2015-05-05 15:32:04 +10:00
summerscope
62a39af975
Make assets for home even smaller
2015-05-05 15:11:52 +10:00
summerscope
c0b12e39a8
Tweaking styling on shopfront header
2015-05-05 14:59:37 +10:00
summerscope
75055300e3
Adding comments into Footer for CMS implementation stuff with Rohan
2015-05-05 14:56:11 +10:00
summerscope
af4fe27f31
Adding comments for CMS implementation stuff with Rohan
2015-05-05 14:53:25 +10:00
summerscope
faa490b093
Reslice to optimise for web & reduce file size
2015-05-05 14:53:07 +10:00
summerscope
4da6bef639
Removing unused assets. Adding some todo notes. Optimising PNG assets to reduce file size.
2015-05-05 13:35:51 +10:00
Rohan Mitchell
63ec0d7dcf
Merge branch 'master' into folklabs-producer-emails
2015-05-05 11:48:31 +10:00
summerscope
ae221f0416
Remove clashing padding classes
2015-05-04 23:02:33 +10:00
summerscope
924efec49c
Add animation class to make consistent with Hubs and Producers.
...
Remove class .animate-repeat
2015-05-04 22:59:48 +10:00
summerscope
9082da6d5e
Remove animation from search field, add to group nodes
2015-05-04 22:57:07 +10:00
summerscope
eabe0e43e2
Fix the big input styling to work better with new typography
2015-05-04 22:55:57 +10:00
summerscope
91afbaca4b
Fixing name-space clash in footer
2015-05-04 22:49:10 +10:00
summerscope
2736421460
First cut at Groups landing page for sign up.
2015-05-04 22:42:14 +10:00
summerscope
84c2faddd5
Adding new link to footer
2015-05-04 22:19:33 +10:00
Rob Harrington
9ebbdd8dc7
Adding route for groups/signup
...
Conflicts:
config/routes.rb
2015-05-04 22:14:43 +10:00
summerscope
0510fa27e6
More design tweaks for homepage and conversion pages
2015-05-04 18:23:04 +10:00
summerscope
b483afe7f7
Styling Producers page - simpler and to be more in-line with Shops page
2015-05-04 14:36:12 +10:00
summerscope
41fb44c19b
More styling on pricing table
...
Remove middle column
2015-05-04 14:33:03 +10:00
summerscope
938358007a
> More styling for landing pages for signup
...
> Add signup page for groups / food systems partners
> Change link in footer
2015-05-04 13:44:35 +10:00
summerscope
503c483acd
Tweak language
2015-05-04 13:16:18 +10:00
summerscope
3091b365ec
Adding in logos for case studies
...
More styling on signup pages
2015-05-04 13:15:18 +10:00
Rick Giner
368402f115
Changed selectors' ng-repeat. Using existing variable instead of method call
2015-05-03 15:24:16 +10:00
Rick Giner
9e70c80d1d
bind-once in product modal
2015-05-03 14:48:27 +10:00
Rick Giner
8fb11defdb
bind-once in groups home page
2015-05-03 14:41:34 +10:00
Rick Giner
9c26b3ebb2
bind-once in partials
2015-05-03 14:34:42 +10:00
Rick Giner
3fc616cdff
bind-once on hubs
2015-05-03 14:11:09 +10:00
Rick Giner
16e9f0545b
bind-once in products
2015-05-03 14:02:33 +10:00
Rick Giner
a3664d4448
Added bindonce and ng-if improvements to Producers templates
2015-05-03 12:51:59 +10:00
summerscope
36838ed457
Hubs signup page WIP styling
2015-05-02 21:49:01 +10:00
summerscope
9a0e9145ef
Adding more logic to force padding for shopfront page whether populated with products or not.
2015-05-02 20:25:23 +10:00
summerscope
572ab14c0b
Removing BG image from producers page. This isn't part of changing design per instance (for the moment at least)
2015-05-02 20:18:07 +10:00
summerscope
1090328a3c
Adding padding class and apply to templates to have required padding for new footer.
2015-05-02 20:12:33 +10:00
summerscope
89a537c3f7
Image assets - removing old brand. Adding new versions for new look & feel.
2015-05-02 18:25:46 +10:00
summerscope
e6d00e00c4
WIP button tweaks for new look & feel
2015-05-02 18:25:38 +10:00
summerscope
ddde4e9dcb
WIP producers signup page markup
2015-05-02 18:25:23 +10:00
summerscope
3dbe45172d
Registration markup tweak with new icons
2015-05-02 18:24:55 +10:00
summerscope
2db6d5fe65
Registration styling tweak for new look & feel
2015-05-02 18:24:40 +10:00
summerscope
6d904b4700
Adding in styling for signup panes for Producers and Hubs
2015-05-02 18:24:18 +10:00
summerscope
4cb0158b21
Add in link for Regional founders user types - to send back to global site
2015-05-02 18:23:42 +10:00
summerscope
4f145104d2
Update mailer to new logo - should be instance specific (e.g. UK, AUS, etc.)
2015-05-02 17:58:35 +10:00
summerscope
fd90da6868
Shops landing page - adding info pane and copy with Jay.
2015-05-02 16:02:18 +10:00
summerscope
330d23c606
Move alert for 'join now' off global template onto homepage template only.
2015-05-02 15:23:12 +10:00
summerscope
5f193bc9ae
More styling for homepage panes.
2015-05-02 15:20:51 +10:00
summerscope
0086066ea5
WIP on How does it work pane on homepage
2015-05-02 13:58:57 +10:00
summerscope
5198d52f0d
Design assets for new UI
2015-05-02 13:58:47 +10:00
summerscope
7b8b53854e
More WIP on homepage layout etc.
2015-05-01 18:46:39 +10:00
summerscope
03508f98d8
Homepage tagline styling for mobile / responsive
2015-05-01 18:24:07 +10:00
summerscope
53e2bc823d
WIP styling and content for homepage
...
> footer
> alert @ top
> call to action buttons
2015-05-01 18:19:51 +10:00
Maikel Linke
11acb3ba59
Allow to remove adjustments
...
Managers of an order cycle and the distributor of an order are allowed
to remove an adjustment from the order.
2015-05-01 15:59:46 +10:00
Maikel Linke
2edf5aeccd
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit
2015-05-01 15:05:14 +10:00
Maikel Linke
993183f2f5
updating js spec: cloning product calls insertProductAfter now
2015-05-01 15:04:12 +10:00
Rohan Mitchell
e91de69d5a
Merge branch 'master' into pin-refunds
2015-05-01 14:58:19 +10:00
Rohan Mitchell
03ae740cd6
Revert "Display header for Xero invoices report"
...
This reverts commit a6cecdcc25 .
2015-05-01 14:55:26 +10:00
summerscope
d9fd0b284d
WIP on home panes and layout
2015-05-01 14:52:17 +10:00
Maikel Linke
7c55285708
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into single-order-patches
2015-05-01 14:50:51 +10:00
Maikel Linke
e6e063670c
Allow managers to remove line items from order
...
Managers of an order cycle and the distributor of an order are allowed to
remove a line item from the order.
2015-05-01 14:49:34 +10:00
summerscope
e1beae98ab
WIP on redesign / layout job
...
> adding in new design assets
> copy and layout for homepage partials
> more global styling updates
2015-05-01 14:41:48 +10:00
Rohan Mitchell
153604dd64
Merge branch 'single-order-patches'
2015-05-01 14:39:17 +10:00
Maikel Linke
b7bac326bd
admin order edit: re-label update button to "update and recalculate fees"
2015-05-01 12:05:43 +10:00
Rohan Mitchell
a6cecdcc25
Display header for Xero invoices report
2015-05-01 11:59:52 +10:00
Maikel Linke
baabb5c07f
fixing BPE feature spec
2015-05-01 11:30:26 +10:00
Rohan Mitchell
91ca5f0213
Fix specs for receival_time / instructions
2015-05-01 10:08:24 +10:00
Rohan Mitchell
f5b45fa0ba
Merge branch 'master' into folklabs-producer-emails
2015-05-01 09:51:01 +10:00
summerscope
427f535026
Redesign big chunk of work:
...
> setting up pages for Shops, and shops signup, producers signup
> setting up routes for new pages
> changing fonts to Google Oswald & Roboto
> setting up homepage partials and removing partials no longer required
> changing menu links and labels
2015-04-30 18:20:17 +10:00
summerscope
ae16589717
New version of logo sliced for OFN Australia
2015-04-30 17:55:18 +10:00
Maikel Linke
66f847f673
showing save button at the bottom as well
2015-04-30 17:22:54 +10:00
Maikel Linke
af78859db6
Merge remote-tracking branch 'origin/master' into single-order-patches
2015-04-30 17:18:02 +10:00
Maikel Linke
295da25dd2
insert clone after cloned product
2015-04-30 17:17:28 +10:00
Maikel Linke
5efc0a5110
quick fix: update fees after updating order
2015-04-30 16:29:51 +10:00
Rohan Mitchell
2c7a5c0656
Update Spree - fixes bug where Payment#method_missing depends on #provider already called.
2015-04-30 15:49:48 +10:00
Rohan Mitchell
0b652a2113
Add refund icon
2015-04-30 15:49:48 +10:00
Rohan Mitchell
b498c28632
Payments can be refunded
2015-04-30 15:49:48 +10:00
Rohan Mitchell
8184a7c7b2
Pin payments can't void or credit, but they can refund
2015-04-30 15:49:48 +10:00
Rohan Mitchell
b09ae550c8
Add spec for payment actions
2015-04-30 15:49:48 +10:00
Rohan Mitchell
f4df227ef0
Buildkite should now support Fuubar
2015-04-30 13:54:27 +10:00
Rohan Mitchell
a207f50aeb
Merge branch 'master' into delay-devise-emails
...
Conflicts:
script/run_tests.sh
2015-04-30 12:29:06 +10:00
Rohan Mitchell
73376b30e2
Convention
2015-04-29 15:56:27 +10:00
Rohan Mitchell
3565548e91
Extract data preparation into private methods
2015-04-29 15:50:42 +10:00
Rohan Mitchell
6999bcfd4e
Only include complete orders in producer mailer report
2015-04-29 15:43:50 +10:00
Rohan Mitchell
2fe5d7c73f
Remove commented code, use neater syntax for accessing Spree config var
2015-04-29 15:33:39 +10:00
Rohan Mitchell
3a3bf19cf8
Clean up duplication
2015-04-29 15:31:42 +10:00
Rohan Mitchell
30e04b509d
Clean up routes
2015-04-29 15:31:13 +10:00
Rohan Mitchell
4279742de5
Avoid serialising entire order cycle when enqueuing OrderCycleNotificationJob
2015-04-29 15:21:05 +10:00
Rohan Mitchell
713c93a570
Fix OrderCycleFormApplicator specs
2015-04-29 15:00:22 +10:00
Rohan Mitchell
36584f0177
Remove puts from specs, fix failing controller spec
2015-04-29 14:46:20 +10:00
Rohan Mitchell
6b1c125b03
Merge branch 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails
...
Conflicts:
Gemfile.lock
app/controllers/admin/order_cycles_controller.rb
app/views/admin/order_cycles/edit.html.haml
app/views/admin/order_cycles/show.rep
db/schema.rb
spec/controllers/admin/order_cycles_controller_spec.rb
2015-04-29 14:42:17 +10:00
Maikel Linke
ecf635e080
handle missing bill_address on admin order page
2015-04-29 14:32:13 +10:00
Maikel Linke
2e66a082eb
add customer notes to admin order index page
2015-04-29 14:31:59 +10:00
Rob Harrington
992fb2347d
Merging master branch into require_standard_variant
2015-04-29 14:30:49 +10:00
Rohan Mitchell
3b61d7a1e0
Add ref for country ISO codoes
2015-04-29 14:12:08 +10:00
Rohan Mitchell
c3f99d7540
Merge branch '441-default-country' of https://github.com/folklabs/openfoodnetwork into folklabs-441-default-country
2015-04-29 14:07:58 +10:00
Maikel Linke
f6d87eee87
Merge remote-tracking branch 'origin/master' into single-order-patches
2015-04-29 13:20:44 +10:00
Maikel Linke
e82a3a9d82
add ship button to admin order index page
2015-04-29 12:30:05 +10:00
Maikel Linke
8511bd19ce
add ship button to order edit page
2015-04-29 12:03:49 +10:00
Maikel Linke
1268108877
handle ship event on order
2015-04-29 12:03:11 +10:00
Maikel Linke
2b0f867ed8
new order method ready_to_ship?
2015-04-29 11:42:35 +10:00
Rob Harrington
a253b88525
Fixing line item controller spec
2015-04-29 10:42:38 +10:00
Paul Mackay
0f1ec17698
#275 : Use better path variable in test.
2015-04-28 16:08:26 +01:00
Lynne Davis
9e61a7d083
Adding report type drop down to order_cycle_management_report
2015-04-26 11:03:32 +01:00
Lynne Davis
6bbd3f7c13
Added auth for order_cycle_management_report. This report was breaking supplier enterprises reports due to incorrect authorization.
2015-04-26 11:02:06 +01:00
Lynne Davis
d344c3dec8
Updating the spec based on @Robs suggestions, hoping for his insights. Still doesn't work.
2015-04-24 16:22:17 +01:00
Lynne Davis
6045283549
Populate the line item unit value, when line_item created and update old data in migration
2015-04-24 16:17:00 +01:00
Lynne Davis
162a565140
Removing notes to myself from this file
2015-04-24 16:14:24 +01:00
Rob Harrington
6a4de7c7e2
Hiding filters on list views because styling is broken
2015-04-24 19:35:18 +10:00
Rob Harrington
505fd8ff96
Merge branch 'properties' of github.com:openfoodfoundation/openfoodnetwork into properties
2015-04-24 17:20:41 +10:00
Rob Harrington
b1b1bfd8f6
Resolve conflict for overflow dropdown between multiple single-line-selectors on the one page
2015-04-24 16:05:39 +10:00
Maikel Linke
f94a5a975a
Edit Order: resend button uses new pretty template.
2015-04-24 15:31:45 +10:00
Rohan Mitchell
29faa5f3c6
Merge branch 'master' into properties
2015-04-24 15:14:52 +10:00
Rohan Mitchell
8e2c224d4d
cd before sourcing includes
2015-04-24 15:00:49 +10:00
Rohan Mitchell
bb2f2a6f54
Also stop delayed job before loading staging baseline
2015-04-24 15:00:38 +10:00
Rob Harrington
dab3b59f6a
Merge branch 'master' into properties
2015-04-24 14:00:08 +10:00
Rob Harrington
bdf462926d
Ensure that producer properties have a position
2015-04-24 13:05:01 +10:00
Maikel Linke
355221a273
Adding customer name to order edit page heading
2015-04-24 12:33:25 +10:00
Rob Harrington
ad2df56bf1
Merge branch 'require_standard_variant' of github.com:openfoodfoundation/openfoodnetwork into require_standard_variant
2015-04-24 12:19:27 +10:00
Rohan Mitchell
9149276048
Kill any postgres connections before dropping and recreating database
2015-04-24 12:17:39 +10:00
Rob Harrington
ed7b763ecf
UnitsCtrl can interpret unit_value_with_description without a separating space
2015-04-24 12:15:35 +10:00
Rob Harrington
05c350b5ff
Refactoring unitsCtrl
2015-04-24 11:27:47 +10:00
Rob Harrington
c66a7e44b6
Updating product model specs to reflect changes to properties
2015-04-23 15:37:41 +10:00
Rob Harrington
9eb99d1c4a
Merge branch 'master' into properties
2015-04-23 14:18:30 +10:00
Rob Harrington
57be445bd4
Merge branch 'master' into require_standard_variant
2015-04-23 14:18:11 +10:00
Rob Harrington
6cde1f7732
Add tooltip with value for selectors
2015-04-23 14:11:50 +10:00
Rob Harrington
7b83438b5e
Pulling property values into the shopfront
2015-04-23 13:51:49 +10:00
Rob Harrington
e6a98747b4
correction in read only logic for filter selectors
2015-04-23 13:32:56 +10:00
Rob Harrington
ed15b95de0
Adding properties and taxons to producer modal
2015-04-23 12:31:20 +10:00
Rob Harrington
3df2720b31
Making filter selectors more flexible, allowing no active-selectors to be passed in, ie. read-only
2015-04-23 12:31:06 +10:00
Maikel Linke
eff8681d9b
Merge branch 'master' into single-order-patches
2015-04-23 12:11:44 +10:00
Maikel Linke
a937fd3c61
Using variant overrides in variant seach on order edit page
2015-04-23 11:37:10 +10:00
Maikel Linke
3412bc25bf
Edit Orders: more variant info in variant search
...
Displaying variant's full name and the producer's name.
2015-04-23 10:17:01 +10:00
Maikel Linke
f1a8011e13
Documentation of Variant.full_name
...
The code was confusing for all developers here. Maybe a bit of doco
helps.
2015-04-23 10:02:32 +10:00
Rohan Mitchell
f70bfee481
Merge branch 'master' into require_standard_variant
2015-04-23 09:56:41 +10:00
Rohan Mitchell
92e03e208f
Extract load_environment method
2015-04-23 07:23:34 +10:00
Rob Harrington
76d6345ab5
Merge remote-tracking branch 'origin/master' into require_standard_variant
2015-04-22 21:02:47 +10:00
Rob Harrington
0251d8962d
Adding sku to BPE
2015-04-22 21:02:07 +10:00
Rob Harrington
1c617994fc
User can toggle property inheritence from product property page, and checking the box shows a list of producer properties that will be inherited from
2015-04-22 21:02:07 +10:00
Rob Harrington
4a4b3da551
Using properties_including_inherited for product properties on the shop page
2015-04-22 21:02:07 +10:00
Rob Harrington
e546388784
Rename properties_h to properties_including_inherited
2015-04-22 21:02:07 +10:00
Rob Harrington
976c24cf4c
properties_h uses inherit_properties flag, and returns property id rather than presentation
2015-04-22 21:02:07 +10:00
Rob Harrington
f610a709e1
Adding inherits_properties to BPE
2015-04-22 21:02:06 +10:00
Rob Harrington
5d6f265c0a
Moving spree namespaced serializers into admin
2015-04-22 21:02:06 +10:00
Rob Harrington
1f293bb787
Adding inherits properties flag to products
2015-04-22 21:02:06 +10:00
Rob Harrington
a4a41ae26a
Refactor properties_h
2015-04-22 21:02:06 +10:00
Rohan Mitchell
7aeeb6d18f
Add script to run JS specs in CI
2015-04-22 16:36:31 +10:00
Rohan Mitchell
7a78f4870a
Use phantomjs for js specs, so we can run them in CI
2015-04-22 16:33:44 +10:00
Rohan Mitchell
28c79cdb50
Use db:test:load instead of db:test:prepare in CI to avoid conflicts between branches
2015-04-22 15:01:22 +10:00
Rohan Mitchell
b9e3ff54b8
Add build script to merge to master
2015-04-22 14:47:54 +10:00
Rohan Mitchell
0c0be0112e
Update paths to include ci
2015-04-22 14:31:30 +10:00
Rohan Mitchell
883a2e0a0e
WIP: Move CI scripts to their own folder
2015-04-22 14:29:59 +10:00
Rohan Mitchell
6c81109b17
Local branch isn't checked out, so we need to test remote branch
2015-04-22 14:17:07 +10:00
Rohan Mitchell
1c9a95b3d6
Set execute bit
2015-04-22 13:19:17 +10:00
Rohan Mitchell
53c4c8b5b7
Push to staging fails unless master has been merged into current branch
2015-04-22 13:16:39 +10:00
Rohan Mitchell
d406f9ccdf
Tests fail unless master has been merged into current branch
2015-04-22 13:14:51 +10:00
Rohan Mitchell
7d4a4f8f9d
Pushing to staging first loads staging baseline data
2015-04-22 12:55:36 +10:00
Rohan Mitchell
35536a629c
Set execute bit
2015-04-22 12:55:36 +10:00
Rob Harrington
699a28e14c
Merge branch 'master' into require_standard_variant
2015-04-22 10:58:43 +10:00
Rohan Mitchell
7b8938b5f6
Run password reset job for spec that requires it
2015-04-22 07:32:22 +10:00
Rohan Mitchell
b2717ffca0
Use db:test:load instead of db:test:prepare in CI to avoid conflicts between branches
2015-04-21 16:40:45 +10:00
Rohan Mitchell
700cb73b8f
Send enterprise confirmation emails asynchronously
2015-04-21 16:19:02 +10:00
Rohan Mitchell
9d225142c8
Send password reset instructions asynchronously
2015-04-21 16:10:40 +10:00
Rohan Mitchell
998288e21f
Keep failed jobs around for debugging. Limit max runtime to 15 mins (we're only sending emails at present). Notify bugsnag of errors in jobs.
2015-04-21 15:37:36 +10:00
Rohan Mitchell
9f93c9f221
Swap Jenkins build badge out for Buildkite
2015-04-21 15:17:34 +10:00
Rohan Mitchell
22127b2d18
Use progress formatter for less verbose CI output. I miss Fuubar formatter, though.
2015-04-21 15:17:34 +10:00
Rohan Mitchell
692e58e8f7
Output spec-by-spec results to track specs-hanging-at-90-percent issue
2015-04-21 10:52:14 +10:00
Rohan Mitchell
4158663e9a
Pushing to production saves staging baseline data
2015-04-21 10:47:36 +10:00
Rob Harrington
a75a76840d
Merging master into require_standard_variant
2015-04-17 21:18:24 +10:00
Rob Harrington
ff2e6d9ca4
Test deletion rather than destruction on variant model spec
2015-04-17 17:25:13 +10:00
Maikel Linke
893b743973
tidy (rm comment)
2015-04-17 17:00:18 +10:00
Maikel Linke
03fd148f41
showing profile modals on groups/hubs
2015-04-17 16:58:49 +10:00
Rob Harrington
72d553ef0c
Test actual deletion of variants
2015-04-17 16:51:02 +10:00
Rob Harrington
63353ebace
Don't try and delete the only variant, that will never work!
2015-04-17 16:49:14 +10:00
Rohan Mitchell
a1673afff0
Allow more time for phantomjs, required by first admin spec where assets are compiled
2015-04-17 15:46:51 +10:00
Rohan Mitchell
0d4dbd23fd
Remove redundant spec line, test that sells is not changed
2015-04-17 15:42:42 +10:00
Rohan Mitchell
0d9ba4257d
Merge branch 'properties'
2015-04-17 15:25:51 +10:00
Rob Harrington
c43eb9ef72
Merge branch 'email_user' into properties
2015-04-17 15:17:37 +10:00
Rob Harrington
46690faffb
Fixing Darkswarm Angular Product Controller spec
2015-04-17 15:14:19 +10:00
Rob Harrington
32f14bca00
Preventing fitting of selectors when there are none
2015-04-17 15:10:41 +10:00
Rohan Mitchell
042e076b58
Fix tax-related spec failures
2015-04-17 14:46:32 +10:00
Rob Harrington
6d96a7a60b
Specifiy that allSelectors attribute on filterSelectors directive is optional
2015-04-17 14:43:09 +10:00
Rob Harrington
c8bf207187
Fixing trial expiry test
2015-04-17 14:33:47 +10:00
Rohan Mitchell
9e8483348f
Fix spec - enterprise needs to charge sales tax for tax to be charged
2015-04-17 13:41:38 +10:00
Rohan Mitchell
81324f3cc4
Do not charge tax on shipments when distributor does not charge sales tax
2015-04-17 13:41:38 +10:00
Rohan Mitchell
0b8a619274
When the order does not have a hub, all tax rates apply
2015-04-17 13:41:38 +10:00
Rohan Mitchell
048c6a8ee8
Include only the bare minimum of helpers into JS template context to avoid intermittent SASS @include issues
2015-04-17 13:41:38 +10:00
Rohan Mitchell
3e8801b12b
Do not charge sales tax on items or on enterprise fees when the distributor of the order does not charge sales tax
2015-04-17 13:41:38 +10:00
Rohan Mitchell
a6a5fdfb3b
Require that the user selects whether their enterprise charges sales tax
2015-04-17 13:41:38 +10:00
Rohan Mitchell
0bdb8f7241
User can set whether an enterprise charges sales tax when registering
2015-04-17 13:41:38 +10:00
Rohan Mitchell
05551aa2a9
Make helpers available to javascript templates
2015-04-17 13:41:38 +10:00
Rohan Mitchell
9bbc151cae
Admin can set enterprises to charge or not charge sales tax
2015-04-17 13:41:38 +10:00
Rohan Mitchell
08fef890ec
Do not show tax lines if there is no tax on the order
2015-04-17 13:41:14 +10:00
Rohan Mitchell
a93633a626
Show tax on order confirmation emails
2015-04-17 13:41:14 +10:00
Rohan Mitchell
4bd1ff2011
Extract the bulk of the confirmation emails into partials, eliminating a lot of duplication
2015-04-17 13:40:08 +10:00
Rohan Mitchell
2914990444
Add save_and_open spec helper method to open HTML emails in the browser
2015-04-17 13:40:08 +10:00
Rohan Mitchell
3ce2c5b84f
Show tax on order confirmation page
2015-04-17 13:40:08 +10:00
Rohan Mitchell
77d7255243
Use short syntax for rendering partials
2015-04-17 13:39:10 +10:00
Rohan Mitchell
6bb926f811
Do not show tax in checkout
2015-04-17 13:39:09 +10:00
Rohan Mitchell
829d11d4b2
Deliver a warning if attempting to create an invalid taxed_product from factory
2015-04-17 13:39:09 +10:00
Rohan Mitchell
beec910445
Display tax in cart
2015-04-17 13:39:09 +10:00
Rohan Mitchell
68f0e51c02
Change add_product_to_cart spec helper to use OrderPopulator, reducing inconsistencies in order adjustments, tax etc.
2015-04-17 13:39:09 +10:00
Rohan Mitchell
210c76eddc
Checkout won't load without payment and shipping methods; move spec to context where it can test the checkout
2015-04-17 13:39:09 +10:00
Rohan Mitchell
e75c6a8e1d
Add helper to display total tax on an order
2015-04-17 13:39:09 +10:00
Rob Harrington
b44f2bcdf5
Fixing trial expiry test
2015-04-17 13:30:36 +10:00
Rob Harrington
f13b52411d
Merge branch master into properties
2015-04-17 13:23:33 +10:00
Rob Harrington
0cf8b017b9
Pulling out taxons and properties placeholders from producer and product modals
2015-04-17 13:20:01 +10:00
Rob Harrington
b9f19d5777
Fixing broken specs
2015-04-17 13:00:20 +10:00
Rob Harrington
9ee25c4e42
Making spec better
2015-04-17 11:25:18 +10:00
Rob Harrington
2d7fb3fd67
Updating name of spec
2015-04-17 11:25:18 +10:00
Rob Harrington
7596270154
A few more changes to tidy up standard variant migration
2015-04-17 11:25:18 +10:00
Rob Harrington
5d9e861ee4
Working migration to complete deprecation of master variants
2015-04-17 11:25:18 +10:00
Rob Harrington
447a5481a3
WIP: Building migration to duplicate master variants
2015-04-17 11:25:18 +10:00
Rob Harrington
8248e382f3
Greying out disabled action button
2015-04-17 11:25:18 +10:00
Rob Harrington
4b182f9248
Can't delete final variant on a product from BPE
2015-04-17 11:25:18 +10:00
Rob Harrington
2b47c9145a
Cannot delete last variant of product
2015-04-17 11:25:17 +10:00
Rob Harrington
fcb3bc894b
Cleanup
2015-04-17 11:25:17 +10:00
Rob Harrington
a223a2d662
Cannot remove all variants from a product
2015-04-17 11:25:17 +10:00
Rob Harrington
5e2fe56c22
Cleanup
2015-04-17 11:25:17 +10:00
Rob Harrington
89afbc80a6
Set initial on_hand to 0
2015-04-17 11:25:17 +10:00
Rob Harrington
971723964e
Update outdated spec
2015-04-17 11:25:17 +10:00
Rob Harrington
28486f9e76
Only adds standard variant on create
2015-04-17 11:25:17 +10:00
Rob Harrington
869551a17c
Adding a standard variant again
2015-04-17 11:25:17 +10:00
Rob Harrington
13a910c372
Replace validates_associated on master with current spree method for error reporting master saves
2015-04-17 11:25:17 +10:00
Rob Harrington
0a7b01ff07
Product requires variant_unit and master requires unit_value and/or unit_desc
2015-04-17 11:25:16 +10:00
Rob Harrington
dfb513cce7
Use after_create callback to duplicate master variant
2015-04-17 11:25:16 +10:00
Rob Harrington
3f01a459ac
Adding a standard variant upon initialisation of a new instance of Spree::Product
2015-04-17 11:25:16 +10:00
Rohan Mitchell
2b5fc656fe
Configure delayed job logging, add startup script for monit
2015-04-17 10:40:25 +10:00
Rob Harrington
524f02717b
Don't redirect to root when closing login window on checkout page
2015-04-17 10:25:38 +10:00
Rob Harrington
456a6f94f5
On enterprise confirmation: create a new user based on enterprise contact email if one does not already exist, and add it as a manager
2015-04-17 10:24:37 +10:00
Rob Harrington
afe77925ba
Allow request to specify a return value when calling user_passwords#edit
2015-04-17 10:21:25 +10:00
Rob Harrington
5940ff2b2c
Don't override devise's after_sign_in_path_for, use specific before filters for user sessions and registrations controllers instead
2015-04-16 16:56:27 +10:00
Rohan Mitchell
d1ab2d9dac
Add daemons gem for Delayed::Job
2015-04-16 16:54:43 +10:00
Rohan Mitchell
ccc1f3df40
Feature specs test email sending through delayed jobs
2015-04-16 16:54:43 +10:00
Rohan Mitchell
e9fbd74e88
Send emails via jobs instead of synchronously
2015-04-16 16:54:43 +10:00
Rohan Mitchell
bb3bdf37cd
Add jobs for user, order and enterprise emails
2015-04-16 16:54:43 +10:00
Rohan Mitchell
af4baabb50
Include DelayedJobHelper for specs
2015-04-16 16:54:43 +10:00
Rohan Mitchell
3bbf42c3e7
WIP: Rename delayed job support to delayed job helper
2015-04-16 16:54:43 +10:00
Rohan Mitchell
530740158c
Tolerate no jobs previously in queue
2015-04-16 16:54:43 +10:00
Rohan Mitchell
771b9e0df5
Improve syntax: take job class as a separate argument
2015-04-16 16:54:43 +10:00
Rohan Mitchell
1d5a4c93e4
Add delayed job testing support, original credit Mat Holroyd and Rohan Mitchell, from CERES Fairfood project
2015-04-16 16:54:43 +10:00
Rohan Mitchell
61cb2514cd
Add Delayed::Job
2015-04-16 16:54:43 +10:00
Rohan Mitchell
aef3fdf4b4
Merge branch 'group-pages'
2015-04-16 16:53:49 +10:00
Rohan Mitchell
a384f5e3d4
Merge branch 'buildkite' into customer-totals-report-and-perms-fix
2015-04-16 14:08:39 +10:00
Rohan Mitchell
318957551f
Freeze time to make spec repeatable
2015-04-16 14:07:38 +10:00
Rohan Mitchell
e017c30ab7
Do not double-run db:test:prepare
2015-04-16 14:07:37 +10:00
Rohan Mitchell
23888b7576
chmod +x
2015-04-16 14:07:37 +10:00
Rohan Mitchell
ff07707af7
Symlink it right
2015-04-16 14:07:37 +10:00
Rohan Mitchell
78bf87614a
Buildkite: Symlink config/application.yml if not present
2015-04-16 14:07:37 +10:00
Rohan Mitchell
2b50f993de
Load environment before attempting build
2015-04-16 14:07:37 +10:00
Rohan Mitchell
4672cc4863
Add buildkite scripts
2015-04-16 14:07:37 +10:00
Rohan Mitchell
768cfab591
Change field text at checkout
2015-04-16 10:59:15 +10:00
Rohan Mitchell
7f973604e5
Add columns to customer totals report: order cycle, payment method, customer code, tags, billing address
2015-04-16 10:59:15 +10:00
Rohan Mitchell
7f6c02ca29
Add User#customer_of to look up customers
2015-04-16 10:59:15 +10:00
Rohan Mitchell
34d1841d22
Make Variant#full_name resilient to regex chars
2015-04-16 10:59:15 +10:00
Rohan Mitchell
e570352a1b
Grant fewer permissions on enterprise creation
2015-04-16 10:59:15 +10:00
Rohan Mitchell
2e021941d1
Fix bug where new enterprises should be created as hubs, but aren't
2015-04-16 10:59:15 +10:00
Rohan Mitchell
48bf87ec73
Perpetually updating copyright year
2015-04-16 10:59:15 +10:00
Maikel Linke
548e3576b9
textAngular editor for group description
2015-04-15 17:13:10 +10:00
Maikel Linke
201bcb133a
show profiles checkbox on groups hubs page
2015-04-15 16:15:21 +10:00
Rob Harrington
0c155e6e3a
Display message when email has not been confirmed for new enterprise
2015-04-15 15:32:17 +10:00
Lynne Davis
83981fbb15
Adding additional logic for if the line_item unit_value is nil
2015-04-14 17:29:56 +01:00
Rob Harrington
2072744870
User can enter the number of months back to search for order cycles from which to build relationships
2015-04-12 11:38:18 +10:00
Rob Harrington
0f9fbe6e8c
Preventing relationships from being created with self
2015-04-12 10:53:22 +10:00
Paul Mackay
9103e83ce2
#275 : spec test for controller method. Other small fixes.
2015-04-11 18:28:31 +01:00
Rob Harrington
b24cad7aeb
Providing access to order_cycle_permissions in order cycles controller
2015-04-11 23:25:30 +10:00
Rob Harrington
bc89018ee1
Refer to the right variable doofus
2015-04-11 23:24:50 +10:00
Rob Harrington
88bae32971
Adding method: user_manages_coordinator_or(enterprise) to make code a bit more terse
2015-04-11 23:00:34 +10:00
Rob Harrington
6f81a9ba18
Save common permission method results as instance variables
2015-04-11 22:53:57 +10:00
Rob Harrington
22a37cdc8a
Rename managed_producers_in as managed_participating_producers
2015-04-11 22:44:32 +10:00
Rob Harrington
9c376f0b00
Rename managed_hubs_in as managed_participating_hubs
2015-04-11 22:32:15 +10:00
Rob Harrington
59a2c84857
Rename managed_enterprises_in as managed_participating_enterprises
2015-04-11 22:30:21 +10:00
Rob Harrington
6ac45f3dc8
Renaming order_cycle_exchanges as visible_exchanges
2015-04-11 22:26:55 +10:00
Rob Harrington
e3138c3cd2
Renaming order_cycle_enterprises_for as visible_enterprises
2015-04-11 22:25:23 +10:00
Paul Mackay
99709b53ed
Change controller action to 'notify_producers'.
...
Add flash message on completion.
Simplify job variables.
Improve mailer query.
Spec for job.
2015-04-11 13:19:48 +01:00
Rob Harrington
26d55baa35
Moving order cycle permissions to their own permissions class
2015-04-11 21:11:10 +10:00
Rob Harrington
02f8f293da
Only allow managers or coordinator to add/remove fees from exchanges
2015-04-11 18:32:04 +10:00
Maikel Linke
2fd25f6cc4
Injecting all enterprises into group page
...
The enterprises have related producers and hubs that need to be
dereferenced. Therefore, we need a bigger set of enterprises to be
loaded. Injecting all enterprises is simple and doesn't require changes
if the set of needed enterprise data is growing in future.
2015-04-10 17:42:54 +10:00
Rob Harrington
24e3c9a9e1
Adding bugsnag notify block for catching naughty phantom fees
2015-04-10 16:41:10 +10:00
Rob Harrington
8b7d321dfe
Changing delete time to ensure not_deleted scope works
2015-04-10 16:40:33 +10:00
Rob Harrington
72403fd021
Fixing broken enterprise controller spec
2015-04-10 13:16:21 +10:00
Maikel Linke
1e168afd71
giving the enterprise serializer the active_distributors
2015-04-10 12:55:20 +10:00
Rob Harrington
1e6fd94663
Adding rake task to create E2E relationships with P-OC based on past order_cycles
2015-04-10 12:51:15 +10:00
Rob Harrington
96c173414b
Adding has_permission method to enterprise_relationship
2015-04-10 12:48:27 +10:00
Rob Harrington
226e2f0e2c
Fixing error caused by order show template doing a lookup based on current distributor rather than order distributor
2015-04-10 09:26:20 +10:00
Rob Harrington
2280a71b23
Replace for_order_cycle rabl template with a serializer
2015-04-10 09:25:40 +10:00
Rob Harrington
6f24e969ce
Removing stupid unusable spec
2015-04-09 17:20:31 +10:00
Maikel Linke
e26ebf4239
Serialize only activated hubs and producers of an enterprise
2015-04-09 17:15:57 +10:00
Rob Harrington
81a745420e
Only check editable status of variants when actually selecting
2015-04-09 15:24:45 +10:00
Rob Harrington
c28ebf63ab
As participating Hub, I cannot edit incoming exchanges despite being granted P-OC by the producer
2015-04-09 13:41:43 +10:00
Rob Harrington
69004ac477
Select all box only selects variants I have permission to edit
2015-04-09 13:29:25 +10:00
Rob Harrington
430320e3f9
Oopsie!
2015-04-09 13:28:41 +10:00
Rob Harrington
60a3d8e0d1
Restrict bulk updating order cycles at controller level
2015-04-09 12:27:43 +10:00
Rob Harrington
8a3126f117
Using helper to disable form elements on order cycle index page
2015-04-09 11:11:46 +10:00
Rob Harrington
c7157ce7bd
Applying new helper to order cycle name and timing partial
2015-04-09 11:11:06 +10:00
Rob Harrington
133f7e4ec7
Add viewing_as_coodinator_of? helper method
2015-04-09 11:10:56 +10:00
Rob Harrington
fbcfe9b2a4
Add viewing_as_coordiantor flag to serialized order cycles and a managed flag to serialized enterprises for_order_cycle(s)
2015-04-09 10:31:17 +10:00
Rob Harrington
adc1b639bc
Merge remote-tracking branch 'origin/master' into complex_oc
2015-04-08 14:38:27 +10:00
Rob Harrington
61a9e2f7cc
Add a referer for all admin enterprise controller specs
2015-04-08 14:36:56 +10:00
Rob Harrington
f6e635466b
Rearranging elements on the order cycle form a little bit
2015-04-08 14:31:18 +10:00
Rob Harrington
32cc17745a
Non-coordinating user cannot alter important attributes of order cycle
2015-04-08 14:12:49 +10:00
Rob Harrington
b1624a733e
Editable variants for incoming exchanges for hubs include those for producers that have granted my hub P-OC
2015-04-08 13:38:37 +10:00
Rob Harrington
b8ce6ed0fc
Coordinator can see any enterprises that are already in the order cycle
2015-04-08 13:28:49 +10:00
Rob Harrington
104a8ddecf
Refactor order_cycle_enterpises_for permission method, now requires an order cycle
2015-04-08 13:00:17 +10:00
Rob Harrington
4dcfec1de9
make enterprises_for_order_cycle permissions more correct
2015-04-08 12:12:02 +10:00
Rob Harrington
8859aa27ee
Slight refactor of order cycle enterprises
2015-04-08 10:33:32 +10:00
Rob Harrington
24062e5585
Adding permissions for outgoing hubs to see producers whose variants they are distributing, despite P-OC not existing
2015-04-08 10:15:50 +10:00
Rob Harrington
4a87798bb4
Variants belonging to a producer I manager that are already in an outgoing an exchange need not be editable
2015-04-06 23:30:43 +10:00
Rob Harrington
ae1681b790
Not 1! Zero!
2015-04-06 23:29:15 +10:00
Rob Harrington
36c5cdf556
Only show enterprises with fees in order cycle edit page
2015-04-06 14:08:10 +10:00
Rob Harrington
d516795774
Fetching Enterprise Fees for order cycle, using new enterprisefee serializer
2015-04-06 13:06:21 +10:00
Rob Harrington
7eb735f87e
Adding for_enterprises scope on enterprise fee
2015-04-06 10:24:40 +10:00
Rob Harrington
7448d41b27
Adding abilities for new for_order_cycle action
2015-04-06 10:23:39 +10:00
Rob Harrington
7ebea23fda
Adding route for now for_order_cycle action on enterprise fees
2015-04-06 10:23:08 +10:00
Rob Harrington
b7de8353bc
Renaming existing enterprise fee serializer as basic...
2015-04-06 09:47:37 +10:00
Rob Harrington
52dc313e70
Implementing editable variant scopes in order_cycle_applicator
2015-04-06 09:20:39 +10:00
Rob Harrington
a4b80b1f33
Implement editable scope for variants on order cycles page
2015-04-06 09:15:14 +10:00
Rob Harrington
f20844c2a0
Adding editable scope for variants in outgoing exchanges
2015-04-05 15:25:44 +10:00
Rob Harrington
136d361134
Fixing comment
2015-04-05 14:14:47 +10:00
Rob Harrington
009b25a491
Adding an editable variants scope for incoming exchanges
2015-04-05 13:59:00 +10:00
Rob Harrington
bf87394a76
Fixing order cycle feature spec
2015-04-05 10:58:06 +10:00
Lynne Davis
ff935af18b
Variable Weights: Adding ability to update the weight/volume of a line_item after checkout. The price of the line_item is automatically updated to reflect the value of the new weight.
2015-04-04 19:20:56 +01:00
Lynne Davis
ffd850c761
Adding specs for variable weight adjustment via builk order management
2015-04-04 19:20:41 +01:00
Lynne Davis
bf44a1c862
Update DB schema to store updatable weight on items sold
2015-04-04 19:20:27 +01:00
Rob Harrington
d28fc7e42d
Hubs can see incoming exchanges of producers who have given them P-OC or whose variants they are actively distributing
2015-04-03 14:58:01 +11:00
Rob Harrington
a10de68430
only load permissions once in serializer
2015-04-02 15:55:03 +11:00
Rob Harrington
3b9824171a
Adding with_order_cycles_as_supplier_outer scope to Enterprise
2015-04-02 15:53:32 +11:00
Rob Harrington
5d7659aa3c
Fixing product spec, using have_select2 instead of have_field
2015-04-02 14:36:19 +11:00
Rob Harrington
1e1d52cc47
Adding 'selected' option to have_select2 matcher
2015-04-02 14:35:39 +11:00
Rob Harrington
76648b97b0
Update spec, properties must exist for enterprise users before they can be assigned
2015-04-02 14:15:00 +11:00
Rob Harrington
5020eb4e32
And again: override redirect to index page when editing properties from edit page
2015-04-02 14:14:16 +11:00
Rob Harrington
cb376602f2
Override redirect to index page when editing properties from edit page
2015-04-02 14:03:51 +11:00
Rob Harrington
3aa5f6e023
Adding properties tab to admin enterprise edit form
2015-04-02 11:30:32 +11:00
Rob Harrington
8926e3765e
Replace free text with with select dropdown for product property names when not super admin
2015-04-02 08:57:15 +11:00
Rob Harrington
5b235f356e
Replace free text with with select dropdown for property names when not super admin
2015-04-02 08:56:36 +11:00
Rob Harrington
8ed6653dc4
Ignoring any new product properties submitted by a non-admin user
2015-04-02 08:55:20 +11:00
Rob Harrington
ca1a5b5f8d
Ignoring any new producer properties submitted by the user
2015-04-02 08:54:35 +11:00
Rob Harrington
8d95ba2c69
Display full name of variant on order cycle edit form
2015-04-01 15:46:19 +11:00
Rob Harrington
94a88278a9
Ignore the unit_to_display when it is wholly contained within display_name or vice versa
2015-04-01 15:46:11 +11:00
Rob Harrington
588e036c1d
Adding SKU to customer totals report
2015-04-01 14:45:23 +11:00
Rob Harrington
aa7ddbcba4
Renaming Dist. column to Admin & Handling
2015-04-01 14:38:15 +11:00
Rob Harrington
54af6886c2
Line items with a quantity of zero return price_with_adjustments of 0.0
2015-04-01 12:34:22 +11:00
Rob Harrington
d49dd62124
Replace unused bugsnag notification with one to test for line items with a quantity of zero
2015-04-01 11:38:06 +11:00
Paul Mackay
d4cf44a6dd
Use COUNTRY_CODE instead of COUNTRY in application.yml.
2015-03-29 17:06:05 +01:00
Rob Harrington
6e77a5eebc
Using the correct method name duh
2015-03-27 16:47:12 +11:00
Rob Harrington
2d5118290b
Fixing broken order cycle feature specs
2015-03-27 16:19:52 +11:00
Rob Harrington
74b7feda53
coordinator of a simple order cycle has permission to add their own variants to outgoing exchanges
2015-03-27 16:16:13 +11:00
Rob Harrington
f5bacf71b7
Permissions for OrderCycleFormApplicator are determined internally
2015-03-27 16:16:13 +11:00
Rob Harrington
3817ef202c
Enterprises in simple OC create controller only load after OC initialises
2015-03-27 16:16:12 +11:00
Rob Harrington
aa170ef5f6
Order cycle simple create controller uses 'new' method on OC service to initialise
2015-03-27 16:16:12 +11:00
Rob Harrington
4d14acb64d
Don't send non-attributes of js order_cycle object to server
2015-03-27 16:16:12 +11:00
Rob Harrington
43d2eb4d22
Adding 'new' method to admin order cycle service, for loading data from serializer for new OCs
2015-03-27 16:16:12 +11:00
Rob Harrington
887579ecb8
Use managed_by scope on Enterprise instead of user.enterprises
2015-03-27 16:16:12 +11:00
Rob Harrington
9430999540
Filtering exchange variants, for outgoing exchange variant count
2015-03-27 16:16:12 +11:00
Rob Harrington
193a061c44
Order cycle form applicator only updates visible variants, should add an 'editable variants' scope to permissions
2015-03-27 16:16:11 +11:00
Rob Harrington
540ac845da
Fixing broken js spec
2015-03-27 16:16:11 +11:00
Rob Harrington
5e015f0611
Rename visibleVariants filter to visibleProductVariants
2015-03-27 16:16:11 +11:00
Rob Harrington
681dada5df
Simple OC form loads coordinator into JS
2015-03-27 16:16:11 +11:00
Rob Harrington
99bd6244ed
Filtering the list of variants visible within each exchange based on permissions
2015-03-27 16:16:11 +11:00
Rob Harrington
63e345f819
Exchange serializer cuts down list of variants visible to the current user, based on permissions
2015-03-27 16:16:11 +11:00
Rob Harrington
524645aff4
Replacing visible_variants_for(exchange) with more general methods for determining visbility based on the enterprises involced and the current order cyclegs
2015-03-27 16:16:11 +11:00
Rob Harrington
d115ef5f7e
Scoping old generalised order cycle helper methods to a specific order cycle
2015-03-27 16:16:10 +11:00
Rob Harrington
35b27fcfd2
Delegating responsibility for returning an empty scope when no options are passed to order_cycle_enterprises_for
2015-03-27 16:16:10 +11:00
Rob Harrington
b747f61eb1
P-OC permissions don't apply when determining which enterprises are loaded for order cycle interface
2015-03-27 16:16:10 +11:00
Rob Harrington
45f6042d3d
Enterprises etched by for_order_cycle action now use permissions scoped using an order cycle or coordinator
2015-03-27 16:16:10 +11:00
Rob Harrington
a1aa9512a8
Fixing angular order_cycle controller spec
2015-03-27 16:16:10 +11:00
Rob Harrington
7e24e6743e
enterprises_for is now order_cycle_enterprises_for, and can be passed an order_cycle or a coordinator (for new order_cycles)
2015-03-27 16:16:09 +11:00
Rob Harrington
c9f343f680
Swapping over scoping method for displayed enterprises in OC index page from order_cycle_enterprises to enterprises_for(order_cycle)
2015-03-27 16:15:28 +11:00
Rob Harrington
d8c4e292c8
Adding method for determining variant override hubs
2015-03-27 16:09:45 +11:00
Rob Harrington
81765de7a7
Building a permission method to determine which enterprises are visible to the user for a given OC
2015-03-27 16:07:38 +11:00
Rob Harrington
4dff3fe79c
Removing unused distributable action from products api
2015-03-27 16:07:38 +11:00
Rob Harrington
1927bc55d0
Load actual variants in the exchange, wrong behaviour was implemented in previous two commits
2015-03-27 16:07:38 +11:00
Rob Harrington
e9f2e743ce
Replacing old representative template for OCs with active model serializers
2015-03-27 16:07:38 +11:00
Rob Harrington
1c09b8b76f
Limiting variants loaded into representative template to those a visible to the current user
2015-03-27 16:07:38 +11:00
Rob Harrington
00821a60cc
More specific references to enterprise id in permissions querying methods
2015-03-27 16:07:37 +11:00
Rob Harrington
252ddf9beb
Adding method to permissions library for scoping the list of visible variants in a given exchange to a particular user
2015-03-27 16:07:37 +11:00
Rob Harrington
22161bfd6e
rewriting permissions query functions in permissions library, to make scoping easier
2015-03-27 16:07:37 +11:00
Rob Harrington
6c4db7fc22
Adding permission to view outgoing exchanges to producers who have granted P-OC to the relevant outgoing hub
2015-03-27 16:07:37 +11:00
Rob Harrington
df4437ecfe
Altering permissions for exchanges, so the exchange is visible to managers of at least one of the enterprises invloved
2015-03-27 16:07:37 +11:00
Rob Harrington
2310a6a7db
Splitting out order cycle abilities from general order management abilities
2015-03-27 16:07:37 +11:00
Rob Harrington
85e4b3970c
Adding an 'involved' scope to exchanges
2015-03-27 15:56:07 +11:00
Rob Harrington
75a37e16e3
Remove elements of order cycle form that coordinators cannot edit
2015-03-27 15:56:07 +11:00
Rob Harrington
f8a9652333
Moving SASS comments to thier own lines
2015-03-27 15:56:07 +11:00
Rob Harrington
75ed259554
Conditionally show input for coordinator
...
Conflicts:
app/views/admin/order_cycles/_form.html.haml
2015-03-27 15:56:07 +11:00
Rob Harrington
a9c7e4b716
Order cycles index shows all OrderCycles I am involved in
2015-03-27 15:56:06 +11:00
Rob Harrington
0b082c964b
Restricting which enterprises can coordinate an order cycle
2015-03-27 15:51:27 +11:00
Rohan Mitchell
8037811735
Only make new enterprises as hubs when current user *owns*, not just manages a hub.
2015-03-27 14:38:21 +11:00
Rohan Mitchell
0ed1eeffd6
When registering a new enterprise, if user is signed in, owns a hub and is not making a producer, the new enterprise becomes a hub
2015-03-27 14:05:58 +11:00
Rohan Mitchell
d471368412
Spacing
2015-03-27 13:09:25 +11:00
Rohan Mitchell
09a102bd8b
When an enterprise user with a hub creates a new producer, it does not default to sells any #453
2015-03-27 12:02:20 +11:00
Rohan Mitchell
d8656a36c6
Consistency in tax calculations, remove some unneeded local vars
2015-03-25 16:31:15 +11:00
Rohan Mitchell
89d4a59e9d
Extract order total tax calculations to model
2015-03-25 16:27:29 +11:00
Rohan Mitchell
84f3097217
Calculate total tax from the tax included in all the adjustments on the order
2015-03-25 16:27:29 +11:00
Rohan Mitchell
333a4ecf2f
Include enterprise fee tax on sales tax report
2015-03-25 16:27:29 +11:00
Rohan Mitchell
40b4edeca1
Replace zoned_order factory with zone_with_member. In practice, former had issues with circular dependencies.
2015-03-25 16:27:29 +11:00
Rohan Mitchell
9650692699
Calculate total tax on enterprise fees for an order
2015-03-25 16:27:29 +11:00
Rohan Mitchell
69dc92dec1
Create factories zoned_order and taxed_product
2015-03-25 16:27:29 +11:00
Rohan Mitchell
d489e06009
Retrieve line item sales tax from included_tax rather than tax amount
2015-03-25 16:27:29 +11:00
Rohan Mitchell
daa30ed518
Retrieve the shipping tax on the order instead of calculating it from scratch
2015-03-25 16:27:29 +11:00
Rohan Mitchell
7fb8370c36
Look up shipping tax on an order
2015-03-25 16:27:29 +11:00
Rohan Mitchell
e2a4b9a898
Fix specs that relied on the old login page which we now redirect to the new page
2015-03-25 12:11:06 +11:00
Rohan Mitchell
2a7a106ad8
Merge branch 'folklabs-currency-config'
2015-03-25 11:54:06 +11:00
Rohan Mitchell
1005a06583
Merge branch 'currency-config' of https://github.com/folklabs/openfoodnetwork into folklabs-currency-config
2015-03-25 11:39:43 +11:00
Rohan Mitchell
c36272ead6
Switch to update_column, which will not run geocoding callback of Enterprise
2015-03-25 11:37:10 +11:00
Rohan Mitchell
c6ddf36856
Make migration reversible
2015-03-25 11:35:59 +11:00
Rohan Mitchell
ebb3688add
Merge branch 'migrations' of https://github.com/folklabs/openfoodnetwork into folklabs-migrations
2015-03-25 11:30:00 +11:00
Rohan Mitchell
5da9bdc614
Merge branch 'victornava-legacy-login-fix'
2015-03-25 10:37:14 +11:00
Paul Mackay
af9a7a2ed4
#443 : Support currency configuration. Fix LOCALE variable name.
2015-03-24 15:34:45 +00:00
Paul Mackay
fcfb1aeb87
#440 : Try removing validation from update (to prevent geocoding).
2015-03-23 14:24:16 +00:00
Paul Mackay
e39d2eb113
#440 : Reset Enterprise columns before querying them.
2015-03-23 13:47:44 +00:00
summerscope
7090bb518b
Tweaking logic for alert bar to make messages more human readable for all use cases.
2015-03-20 14:24:59 +11:00
summerscope
0b1857771e
Finally got this slide animation working. stupid angular documentation!
...
ref: http://www.yearofmoo.com/2013/08/remastered-animation-in-angularjs-1-2.html
2015-03-20 13:09:45 +11:00
summerscope
938eff8482
More layout tweaks to enterprise modal template
2015-03-19 16:13:47 +11:00
summerscope
b99e94cecf
WIP on producer and product modals
2015-03-19 16:02:52 +11:00
summerscope
1f97052954
Add a min height to modals so they are not quite so stupidly small when not enough content suppied by users
2015-03-19 15:05:14 +11:00
summerscope
c76aa1d1c2
WIP on product modal
2015-03-19 14:52:09 +11:00
summerscope
cdd41ad651
change animation class
2015-03-19 14:52:00 +11:00
summerscope
3c61bf9cc4
Styling for no image available on product modal overlay
2015-03-19 14:51:41 +11:00
summerscope
8a0bbb374c
Animation WIP
2015-03-19 14:51:23 +11:00
summerscope
4e54a3c48e
Updating no image all grey, large version larger
2015-03-19 14:50:50 +11:00
Rohan Mitchell
ab9bc7b1dc
Output debugging information to help investigate bogus changes to the sells field through the enterprises bulk edit action
2015-03-18 12:50:25 +11:00
Rob Harrington
bfe7f49033
Show and hide search box
2015-03-18 12:01:53 +11:00
Rohan Mitchell
cf4ccc268a
Admin may set no tax category on product unless tax category is required
2015-03-18 10:12:32 +11:00
Rohan Mitchell
7af17242f9
EnterpriseFee admin interface allows selecting no fee
2015-03-16 14:05:04 +11:00
Rohan Mitchell
eb5e411a8e
Update zeus
2015-03-16 14:00:55 +11:00
Rohan Mitchell
a6f0d8f69a
Show a nice error message instead of 500 error when deleting a referenced order cycle
2015-03-16 12:42:35 +11:00
Rohan Mitchell
95c09315f5
Change class delete-product -> delete-order-cycle
2015-03-16 12:42:05 +11:00
Rohan Mitchell
e38772ada0
Enterprise user can delete unreferenced order cycles
2015-03-16 12:41:06 +11:00
Rohan Mitchell
e125bcf451
Add column header for extra action column
2015-03-16 12:15:43 +11:00
Rohan Mitchell
4491d3cc73
Merge branch 'legacy-login-fix' of https://github.com/victornava/openfoodnetwork into victornava-legacy-login-fix
...
Conflicts:
app/views/admin/order_cycles/_row.html.haml
spec/features/admin/order_cycles_spec.rb
2015-03-16 12:14:54 +11:00
Rob Harrington
2b32252aff
Filtering between selector lists
2015-03-15 13:25:04 +11:00
Rob Harrington
29c9f70a1c
Rename single line selectors
2015-03-15 12:29:05 +11:00
Rob Harrington
2c1ef4c8c1
Refactoring single line selectors to remove flicker
2015-03-15 12:27:40 +11:00
Rob Harrington
bdeca54377
Reloading stale enterprise object in test
2015-03-14 16:17:16 +11:00
Rob Harrington
20d59cf5a5
Fixing authentication spec to work with altered user factory
2015-03-14 11:40:21 +11:00
Rob Harrington
8b241f058b
Login to consumer section in a way that ensures user is not an admin
2015-03-14 11:02:45 +11:00
Rob Harrington
cb28843af1
Reload manager before ensuring owner is a manager
2015-03-14 10:41:49 +11:00
Rob Harrington
d684a88697
Merge branch 'order-confirmation' into ready-to-merge
2015-03-13 18:11:53 +11:00
summerscope
d0f66a6053
Fixing label for cart popover to make it write name of product variant without page load
2015-03-13 18:10:59 +11:00
summerscope
d2fbf9f14d
Fixing logic for instance where collection instructions are not entered
2015-03-13 18:00:36 +11:00
Rohan Mitchell
8d3f25bb39
Fix intermittent 500 error when updating the cart
2015-03-13 17:50:01 +11:00
summerscope
7b1901253c
More work on filters for shopfront rewriting as compared to the rest of filter button styles
2015-03-13 17:32:33 +11:00
Rohan Mitchell
abaaf05631
Merge branch 'user-menu'
2015-03-13 17:00:37 +11:00
Rob Harrington
dd8c769ea9
Hiding fee breakdown on cart page for now
2015-03-13 16:50:57 +11:00
summerscope
864c9ec1da
This changes the user menu labels to show Account next to user email.
...
Small tweak to user account page to make it less awful.
2015-03-13 16:49:26 +11:00
Rob Harrington
b0cfa6a17c
Shipping method prices displayed next to options in checkout
2015-03-13 16:18:49 +11:00
Rob Harrington
51258b242c
Merge remote-tracking branch 'origin/order-confirmation' into order-confirmation
2015-03-13 16:07:17 +11:00
summerscope
dc1dd2e243
Changing the class .filter-box for shopfront to .filter-shopfront
...
This prevents the issue with inheritance / styling crossover
2015-03-13 16:06:46 +11:00
Rohan Mitchell
1a44e74a9d
When enterprise user creates an enterprise, make it a hub if they have other hubs
2015-03-13 16:06:42 +11:00
summerscope
e3bc7cf894
Styling for search alert on shopfront page
2015-03-13 15:36:06 +11:00
summerscope
e5cc9063e8
Changing the medium input styling to make it same height as taxon filters, and no animation to get big as we want the next row space for tags eventually
2015-03-13 15:35:45 +11:00
summerscope
88edaceee0
Adding a new color to brand colors - yellow light
2015-03-13 15:34:38 +11:00
summerscope
bce64a1ead
WIP product modals for shopfront
2015-03-13 15:34:11 +11:00
summerscope
c8c07ed700
Adding position fixed to modals - got lost somehow with upgrading foundation zurb
2015-03-13 12:59:26 +11:00
Rohan Mitchell
efbf2c7ffa
Display extended variant name in quick cart
2015-03-13 12:58:53 +11:00
summerscope
0258fc24f3
Moving comments to own line. New version of SASS does not like comments on same line as declarations.
2015-03-13 12:58:45 +11:00
Rohan Mitchell
6365434a94
Merge branch 'lin-d-hop-ordercyclemanagementreports2'
2015-03-13 10:53:03 +11:00
Rohan Mitchell
d9f90be38a
Fix indentation
2015-03-13 10:52:44 +11:00
Rohan Mitchell
008b43b1fc
Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2
2015-03-13 10:47:49 +11:00
Rohan Mitchell
5609354136
Fix bug: When there are variant overrides not owned by the current user, user is unable to make any changes to VOs
2015-03-13 10:45:38 +11:00
Lynne Davis
d9e8ce2f0e
Fix bug in report that selecting multiple payment methods didn't work. Added spec as well
2015-03-12 17:16:51 +11:00
Rob Harrington
cce65aa462
Merge remote-tracking branch 'origin/master' into order-confirmation
2015-03-12 16:20:21 +11:00
Rob Harrington
44511b8b61
Only display shipping description if it exists
2015-03-12 16:18:30 +11:00
Rob Harrington
eb413ccc84
Committing schema changes
2015-03-12 16:18:07 +11:00
Rob Harrington
6cd6b751c8
Merge branch 'master' into order-confirmation
2015-03-12 15:34:49 +11:00
Rohan Mitchell
af95181245
Merge branch 'lin-d-hop-ordercyclemanagementreports2'
2015-03-12 12:30:49 +11:00
Rohan Mitchell
36fa4896ed
Syntax
2015-03-12 12:28:35 +11:00
Rohan Mitchell
7c723c04b6
Show yes/no instead of true/false
2015-03-12 12:23:02 +11:00
Rohan Mitchell
c85d5b86eb
Fix temperature_controlled migration - NOT NULL requires default value
2015-03-12 12:22:51 +11:00
Rohan Mitchell
1a97df1d21
Fix whitespace issues
2015-03-12 12:17:15 +11:00
Rohan Mitchell
a5716cf2c2
Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2
2015-03-12 12:15:22 +11:00
Rohan Mitchell
b4e990a081
Merge branch 'reduce-supplier-list-in-order-cycles'
2015-03-12 11:55:46 +11:00
Rohan Mitchell
eccd97fc28
Merge branch 'master' into reduce-supplier-list-in-order-cycles
2015-03-12 11:55:14 +11:00
Rohan Mitchell
c4d4d10873
Reuse supplier/distributor list
2015-03-12 11:53:13 +11:00
Rohan Mitchell
1e5e009735
Spree init works when database has not been created, remove duplicate FK from db/schema.rb
2015-03-12 11:29:01 +11:00
Rob Harrington
274a7a3c73
Fixing up the one liner filter styling a bit
2015-03-12 09:56:06 +11:00
Victor Nava
f90f7565fb
Allow admins to delete Order Cycles
2015-03-11 18:08:09 +11:00
Victor Nava
208fa02ec0
Create a 'Show More' button at the top of the page, next to New Order on on admin order cycles index page
2015-03-11 13:14:45 +11:00
Victor Nava
2c89573441
Shave off a few seconds when showing order_cycles#index by loading order_cycle_enterprises only once.
2015-03-11 11:59:25 +11:00
Paul Mackay
717b3b6494
#275 : Fixes for testing aggregated orders.
2015-03-10 19:19:57 +00:00
summerscope
ea96759306
Take styling out of template into SASS
2015-03-10 14:59:46 +11:00
summerscope
d967905b83
Tweaking copy styles and removing references to Open Sans which not using. Silly laura mixing up repos
2015-03-10 14:59:26 +11:00
summerscope
f698408d40
Logic for delivery vs collection - making template
2015-03-10 14:58:58 +11:00
summerscope
75b0b290ae
More WIP trying to work on the cart template logic with Rohan
2015-03-10 14:12:43 +11:00
summerscope
21b18a8cc5
WIP commit so i can see what i messed up.
2015-03-10 12:31:53 +11:00
summerscope
91bf588bcc
Order details page add in mini thumbnail for product image
2015-03-10 12:03:21 +11:00
summerscope
a8de4dc039
WIP checkout page and order confirmation page. Working on making these pages more consistent to each other, to email confirmation, and to shopping experience.
2015-03-10 11:35:53 +11:00
summerscope
c7cf9695bc
WIP on cart menu trying to add the master name back in where a product has variante
2015-03-10 11:35:35 +11:00
summerscope
b9a0579397
Add styling for image thumbnail - hide for small, show small thumbnail for big screens.
2015-03-10 11:35:03 +11:00
summerscope
de6abc3464
Turning off z-index this causes problems on shopping cart page. Needs testing to confirm does not break elsewhere.
2015-03-10 11:34:31 +11:00
Rob Harrington
0a300d1802
Rewriting small cart, so that it doesn't break all of the dropdowns on the page (can't use .row within li elements it seems...)
2015-03-06 19:03:46 +11:00
Rob Harrington
12c6878cbe
Using vanilla foundation
2015-03-06 19:02:15 +11:00
Rob Harrington
4c4490a9b7
Upgrading foundation-rails and sass
2015-03-06 19:01:39 +11:00
Rob Harrington
578475a403
Filter products list on shop by active properties
2015-03-06 16:14:11 +11:00
summerscope
881313edf9
Changing the logic on Shipping accordion on checkout to try to show shipping price against option. Not working.
2015-03-06 16:05:42 +11:00
Rohan Mitchell
381bfd383b
Allow enterprise fee with no tax category
2015-03-06 12:12:33 +11:00
Liv Galendez
266d6ef834
Fixed handling of distributors field
2015-03-06 11:55:35 +11:00
Victor Nava
3e2142c3cf
Remove the hover / pop-up over the # variants on admin order cycles index page
2015-03-06 11:33:03 +11:00
Rob Harrington
e948bf1591
Only render selector icons if the icon exists
2015-03-06 11:32:01 +11:00
Rob Harrington
06f10398da
Adding product property filter to shop page
2015-03-06 11:22:52 +11:00
Rohan Mitchell
1e18f773f5
Switch context -> describe, clarify test grammar
2015-03-06 11:15:07 +11:00
Rohan Mitchell
41792395aa
Record the tax included in per-item EnterpriseFees
2015-03-06 11:13:47 +11:00
Rohan Mitchell
98ff895f5f
Record the tax included in per-order EnterpriseFees
2015-03-06 10:38:55 +11:00
summerscope
c3c1573f54
Adding a comment
2015-03-05 23:22:31 +11:00
Rob Harrington
55b8918ea1
Updating comment
2015-03-05 18:38:01 +11:00
Rob Harrington
067b814daa
Making legacy filters work properly with filter-selector directive
2015-03-05 18:29:12 +11:00
Rob Harrington
c992937608
Moving taxon-selector directive to correct location
2015-03-05 18:28:49 +11:00
Rob Harrington
cb623b75c1
Generalising taxons-selector -> filter-selector
2015-03-05 18:15:14 +11:00
Victor Nava
3fe1fc3f67
Use dates way into the future so that test that depend on OrderSycles#recently_closed don't break.
2015-03-05 17:32:55 +11:00
Victor Nava
d6c30ae1ef
OrderCycle#recently_closed doesn't return orders that are open
2015-03-05 17:28:24 +11:00
summerscope
a0af22350d
Order conf page WIP
2015-03-05 17:21:25 +11:00
summerscope
e3b660abb9
Shopping cart page update to simplify, improve and expose fees
2015-03-05 17:21:13 +11:00
summerscope
9a86e41942
Adding more helper classes
2015-03-05 17:20:02 +11:00
Rob Harrington
e7854bcd8e
Moving single line selectors to template, making sure other users of taxons-selector still work
2015-03-05 16:38:21 +11:00
Victor Nava
a21bfc909a
Remove the suppliers column on admin order cycles index page
2015-03-05 16:12:31 +11:00
Victor Nava
1b709a3e03
Do not load Order Cycles that closed more than a month a go
2015-03-05 16:04:36 +11:00
Rob Harrington
0142f9467a
Improve display of overflow selectors
2015-03-05 16:00:53 +11:00
Rob Harrington
24b40182b5
clearAll for product page also clears any text search filter
2015-03-05 15:34:27 +11:00
Rob Harrington
ed94cf57d3
Adding the 'more' box for single-line-selectors
2015-03-05 15:10:42 +11:00
Rohan Mitchell
b5ce056d06
Fix tax calculations for determining tax included in an amount
2015-03-05 13:03:53 +11:00
Rob Harrington
5bddada013
Removing unnecessary setter
2015-03-05 12:18:34 +11:00
Rob Harrington
4afef8215a
Basic implementation of single line selectors
2015-03-05 12:12:36 +11:00
summerscope
574a215525
Order Confirmation Page WIP
2015-03-05 11:26:29 +11:00
summerscope
2cdab7af25
More label tweaks and logic tweaks to templates
2015-03-05 11:26:15 +11:00
summerscope
235bb009e8
Tweaking styling for order confirmation page
2015-03-05 11:25:57 +11:00
Victor Nava
4e1eb33ff5
Redirect users to proper login page when they type /login
2015-03-05 11:25:35 +11:00
Rohan Mitchell
dfb855bd14
Record the tax included in shipping.
2015-03-05 10:44:27 +11:00
Rohan Mitchell
9395f6c808
Record the tax included in adjustments. TaxRate adjustments consist of 100% tax.
2015-03-05 10:44:26 +11:00
Rohan Mitchell
53fa71d1f3
Admin can set enterprise fee's tax category
2015-03-05 10:44:25 +11:00
Rohan Mitchell
61c08997a1
EnterpriseFee has a TaxCategory
2015-03-05 10:44:22 +11:00
Rohan Mitchell
dd61034908
Fix fractional cents appearing on sales tax report totals
2015-03-05 10:43:57 +11:00
Rohan Mitchell
ec22f4c09f
Sales tax report pulls sales tax from adjustments instead of recalculating it at report-time
2015-03-05 10:43:57 +11:00
Rohan Mitchell
54894fb222
Update spec with correct tax amounts
2015-03-05 10:43:56 +11:00
Rohan Mitchell
11f59c9f59
Add spec for calculating shipping tax. Fix incorrect formula.
2015-03-05 10:43:56 +11:00
Rohan Mitchell
27a730ef6c
Add spec for sales tax report totals calcs
2015-03-05 10:43:56 +11:00
Rohan Mitchell
10e5d09416
Use ReportsHelper for currency_symbol
2015-03-05 10:43:56 +11:00
Rohan Mitchell
3b4d73760b
Break up sales tax report into methods
2015-03-05 10:43:55 +11:00
Rohan Mitchell
89199ef30a
Use map instead of each and var
2015-03-05 10:43:55 +11:00
Rohan Mitchell
67c77cea81
Tidy up haml
2015-03-05 10:43:54 +11:00
Rohan Mitchell
cc7d6cde1d
Shorter syntax
2015-03-05 10:43:54 +11:00
Rohan Mitchell
0b636c1d89
Combine spec cases for faster runtime
2015-03-05 10:43:54 +11:00
Rohan Mitchell
2b9fef6aec
Convert to Ruby 1.9 hash syntax
2015-03-05 10:43:53 +11:00
Rohan Mitchell
3aa30af199
Remove unneeded objects from spec setup
2015-03-05 10:43:53 +11:00
Rohan Mitchell
0212351d32
Tighten test
2015-03-05 10:43:53 +11:00
Rohan Mitchell
29653a5595
Fix spec infinite recursion issue
2015-03-05 10:43:52 +11:00
Matt-Yorkley
e6368af757
Update reports_spec.rb
2015-03-05 10:43:52 +11:00
Matt-Yorkley
2c80be7e9e
Update
2015-03-05 10:43:52 +11:00
Matt-Yorkley
d194e74eda
Rohan's suggested changes
2015-03-05 10:43:51 +11:00
Matt-Yorkley
3f61a5412c
Spec file attempt...
2015-03-05 10:43:51 +11:00
Matt-Yorkley
0f3723a923
Added currency symbols to sales tax report
2015-03-05 10:43:51 +11:00
Matt-Yorkley
bbca674937
Update reports_spec.rb
2015-03-05 10:43:51 +11:00
Matt-Yorkley
623882a2a1
Config option for tax rate on shipping
2015-03-05 10:43:50 +11:00
Matt-Yorkley
371f966f63
sales tax view
2015-03-05 10:43:50 +11:00
Matt-Yorkley
be55f461d0
Report: sales tax on orders
2015-03-05 10:43:50 +11:00
Paul Mackay
ca665dc6bc
Merge master into producer-emails.
2015-03-04 19:09:43 +00:00
summerscope
e6591be55c
More tweaking for email templates for use case of Collection from hub. Need to tweak logic on Order confiramtion page.
2015-03-04 17:34:24 +11:00
summerscope
5b6bff1691
Removing bad nasty overrides which are confusing and bad. and nasty.
2015-03-04 17:20:05 +11:00
summerscope
db2e5e7558
Add an extra class helper
2015-03-04 17:19:57 +11:00
summerscope
4867f45ee1
Add an extra style
2015-03-04 17:19:37 +11:00
summerscope
47b08269d6
Order confirmation page changes for responsive layout, adding in more content from the checkout page to match the emails.
2015-03-04 17:19:24 +11:00
summerscope
76f234ee4d
Order confirmation top page working on header label
2015-03-04 17:18:55 +11:00
summerscope
163035dcad
Tweaking email template to be more like order confirmation
2015-03-04 17:18:37 +11:00
Rohan Mitchell
503bd8f5dd
Merge pull request #400 from victornava/admin-account-link
...
Change admin account link to point to account page instead of edit user.
2015-03-04 16:08:26 +11:00
Victor Nava
6e800341c3
Fixes issue #362 Change admin account link to point to account page instead of edit user.
2015-03-04 16:00:46 +11:00
summerscope
b097a62c7a
WIP adding variant name logic to the email templates
2015-03-04 12:37:57 +11:00
Lynne Davis
cfa281478a
Adding ability to edit ShippingCategory.temperature_controlled from admin interface
2015-03-04 12:02:07 +11:00
summerscope
f64684dc48
Tweak responsive heading columns now that container is a bit smaller
2015-03-04 11:14:29 +11:00
summerscope
397697d17c
Tweak layout. Remove unnecessary row which was messing up the responsive layout for left column on checkout.
2015-03-04 11:13:58 +11:00
Liv Galendez
c940a34ec9
Created order_cycle_permitted_in helper
2015-03-03 21:03:01 +11:00
Liv Galendez
fc63d8719c
Used order_cycle_permitted_enterprises helper in order cycles row
2015-03-03 20:53:39 +11:00
Liv Galendez
7ba366e2a6
Added select for coordinator since there are 2 now
2015-03-03 20:46:25 +11:00
Lynne Davis
b26c46d7db
Removing default false from temp_controlled - shipping categories
2015-03-03 16:39:55 +11:00
Lynne Davis
72a568ffad
Adding not null to temp_controlled field of shipping_categories
2015-03-03 16:33:49 +11:00
Lynne Davis
3ea7ff766a
Removing additional merge conflicts
2015-03-03 16:29:17 +11:00
Lynne Davis
3d491d7b5e
LD: Adding additional functionality for order cycle management reports - adding hub code model, adding temp_controlled bool, adding delivery report
...
Conflicts:
app/models/customer.rb
db/migrate/20150122145607_create_customers.rb
db/schema.rb
lib/open_food_network/order_cycle_management_report.rb
2015-03-03 16:21:17 +11:00
Lynne Davis
1710c8726e
Fixing conflict on attempting to rebase and pull
2015-03-03 16:13:44 +11:00
Lynne Davis
2a8ba0bf42
Fixing merge conflicts after rebase
2015-03-03 16:12:07 +11:00
Lynne Davis
3279003fd3
Updating logic on temperature_controlled lookup
2015-03-03 16:01:42 +11:00
Lynne Davis
f2a35e219e
Updating migration on customers table with extra validation
2015-03-03 16:01:42 +11:00
Lynne Davis
39c5f8febe
Updating Customer model with validations
2015-03-03 16:01:42 +11:00
Lynne Davis
87b1ab9a1a
LD: Adding additional functionality for order cycle management reports - adding hub code model, adding temp_controlled bool, adding delivery report
2015-03-03 16:01:42 +11:00
Rob Harrington
85b8adb1aa
call to order_cycle_hub_enterprises has no arguments
2015-03-01 15:33:16 +11:00
Rob Harrington
e8818c5191
Adding a ship address to order in spec
2015-03-01 12:22:06 +11:00
Rob Harrington
c91699a11e
Using @order_cycle.coordinator instead of @coordinator
2015-02-27 17:24:37 +11:00
Rob Harrington
8d6c8791bb
Only hubs (sells any) are available for selection as outgoing enterprises
2015-02-27 17:24:36 +11:00
Rob Harrington
31054c7bf4
Split order_cycle_simple_view logic into index and form scopings
2015-02-27 17:24:36 +11:00
Rob Harrington
5563d23beb
Rename set_coordinator method to require_coordinator
2015-02-27 17:24:36 +11:00
Rob Harrington
8de6f983a2
User must set the coordinator first when creating an order cycle
2015-02-27 17:24:36 +11:00
Rob Harrington
53594b3a0f
Cannot add unconfirmed enterprises to order cycles
2015-02-27 17:24:36 +11:00
summerscope
f8619092bd
Merge branch 'order-confirmation' into master.
...
Global email tweak - light header, black logo.
This updates the order confirmation emails for better content and styling.
2015-02-27 17:16:35 +11:00
summerscope
2c2352cd4e
Final tweaks to different layout use cases for these emails.
2015-02-27 17:14:33 +11:00
summerscope
12bfb9301a
More updates dealing with pick up instructions.
2015-02-27 17:09:59 +11:00
summerscope
ba0d4c2111
More order confirmation email updates. Making language correct for hub vs user.
2015-02-27 16:55:36 +11:00
summerscope
4eee86a240
Tweak label
2015-02-27 16:09:14 +11:00
summerscope
587e4ae86d
WIP getting all the confirmation details right for collection, delivery, etc.
2015-02-27 16:08:20 +11:00
Maikel Linke
60c246f104
fixing side menu ng-show of items
2015-02-27 15:21:23 +11:00
summerscope
87842ecaf5
More WIP confirmation email for customer and shopfront. fixing up the order summary table. overall design improvements.
2015-02-27 14:00:49 +11:00
summerscope
2ba632456f
WIP email mailer updates for customer email confirmation etc.
2015-02-27 12:40:13 +11:00
Maikel Linke
3beff77164
Merge remote-tracking branch 'origin/master' into group-pages
2015-02-26 17:22:13 +11:00
Maikel Linke
69fd3f0b60
Fix link to group pages if someone enters "/groups/" instead of "/group"
2015-02-26 16:41:51 +11:00
Maikel Linke
ff4bd449a2
Setting default_country_id by application.yml
...
The spree default_country_id was set using ENV["DEFAULT_COUNTRY"] for
production environment, but not for tests and development. Since tests
reset the default_country_id in specs/support/seeds.rb, only the
development environment had a fix id set to 12. This is removed now.
This fixes creating enterprises and enterprise groups without sample
data (12 is Australia).
2015-02-26 16:29:46 +11:00
Maikel Linke
379b702b9b
spec: testing array of owned groups without order
2015-02-26 16:22:15 +11:00
Rohan Mitchell
fa4741eb65
Update auto-creation of E2E links: more specific and restricted link creation
2015-02-26 13:49:15 +11:00
Maikel Linke
1f7aec0c1d
group owner select box in own tab
2015-02-26 13:09:46 +11:00
summerscope
fc7abd5d02
Changing order of tabs at top of shopfront, leaving more room for long shopfront names in about tab
2015-02-25 16:20:10 +11:00
summerscope
469b383781
Properties and shopfront filters with taxons WIP.
2015-02-25 16:04:32 +11:00
summerscope
15144bdddd
WIP search input on shopfront page.
2015-02-25 13:18:45 +11:00
summerscope
d43f367f30
Shopfront Properties - WIP layout work
2015-02-25 11:11:09 +11:00
summerscope
304bde3b9e
Working on the filters for shopfront properties and updates.
2015-02-25 10:46:51 +11:00
summerscope
e9fca885db
WIP layout changes for shopfront top
2015-02-25 10:46:43 +11:00
summerscope
122cf6c065
Groups index page styling for responsive use cases.
2015-02-25 10:22:33 +11:00
summerscope
9daf7e3955
Removing spans on follow icons as these show up as blank spaces when no data to fill.
2015-02-25 09:38:07 +11:00
Lynne Davis
a3df4bf026
LD: Adding additional functionality for order cycle management reports - adding hub code model, adding temp_controlled bool, adding delivery report
2015-02-24 13:43:00 +10:00
Rohan Mitchell
fdde55f631
Add spec for ext_url filter, refactor
2015-02-23 10:06:42 +11:00
Maikel Linke
f8153c07b1
moving email from "web" to "contact" on group edit page
2015-02-22 16:20:11 +11:00
Maikel Linke
eade689070
linkToService directive to generate external links
2015-02-22 16:15:04 +11:00
Maikel Linke
a522242e7a
dealing with invalid live data in migration
2015-02-21 18:43:03 +11:00
summerscope
e05d64a0b4
WIP on groups index page. Needs work from Maikel or Rohan.
2015-02-20 16:43:36 +11:00
summerscope
985887334f
Tweak the padding between header and tabs.
2015-02-20 16:43:03 +11:00
summerscope
3aa06ee1e4
Tabs styling for groups page - making it pretty.
2015-02-20 16:14:50 +11:00
summerscope
3ab961a7e2
New mixin for gradients
2015-02-20 16:14:40 +11:00
summerscope
60b7a571c5
Tweak styling and markup for contact info in right column.
2015-02-20 15:35:07 +11:00
Rohan Mitchell
f8ca24c5cd
Index enterprise_groups address_id
2015-02-20 14:56:16 +11:00
Rohan Mitchell
f58219eb3d
Split inputs into separate partials for each fieldset
2015-02-20 11:36:30 +11:00
Rohan Mitchell
4554c0555d
Change locking to use postgres syntax, fixes 'must be first statement in transaction' error
2015-02-20 11:31:39 +11:00
Rohan Mitchell
176db78e64
Extract data fetching from views
2015-02-20 11:17:01 +11:00
Maikel Linke
98063dae60
setting default country by id in groups controller
2015-02-19 16:57:19 +11:00
Maikel Linke
c01d45e3af
Serialize move_up and move_down methods of groups
...
There have been race conditions in other projects using the acts_as_list
gem which could be solved by serializing.
2015-02-19 16:51:58 +11:00
Maikel Linke
d5c2abdd7e
stripping "undefined" in after_find and after_save callbacks instead of overriding getters
2015-02-19 16:33:43 +11:00
Maikel Linke
a7b723af93
owner index for enterprise groups
2015-02-19 13:23:50 +11:00
Maikel Linke
6a29b830c2
commenting changes in overridden adaptivemenu.js
2015-02-19 11:35:06 +11:00
Maikel Linke
8e83c6679a
extended test of owned groups
2015-02-19 11:25:31 +11:00
Maikel Linke
a0f0b3c93b
display only activated enterprises to add to groups
2015-02-19 11:14:25 +11:00
Maikel Linke
ecd7b16ef5
revert setting default country by name in enterprise controller
2015-02-19 11:09:43 +11:00
Maikel Linke
718a5911a3
code style and cleanup
2015-02-19 10:48:39 +11:00
Maikel Linke
bbac5aa803
Using pure css for styling odd and even menu items
2015-02-19 10:22:37 +11:00
Maikel Linke
346a4e71d0
side menu partial does not require showItem defined
2015-02-19 10:17:58 +11:00
Rohan Mitchell
f83ceae5d1
Fix feature: Enterprises list is shortened when error in bulk update
2015-02-18 15:32:56 +11:00
Maikel Linke
08afcac1e5
exposing more group attributes to angular
2015-02-18 14:55:42 +11:00
Maikel Linke
9496987da6
Fix display of admin group side menu
2015-02-18 12:04:17 +11:00
Rohan Mitchell
224864a8d8
Merge pull request #385 from openfoodfoundation/empty-cart-typo
...
Fixed typo in empty cart error message
2015-02-18 10:59:17 +11:00
Liv Galendez
b9248d3e2c
Fixed typo in empty cart error message
2015-02-18 10:47:09 +11:00
Maikel Linke
903bd21577
Merge remote-tracking branch 'origin/master' into group-pages-merge
...
Conflicts:
README.markdown
db/schema.rb
2015-02-13 15:42:36 +11:00
Maikel Linke
87686848bc
make group contact fields not null
2015-02-13 15:39:44 +11:00
Rohan Mitchell
32a898b6a2
Remove unnecessary db:schema:load db:seed, these are performed by db:setup
2015-02-13 09:26:34 +11:00
Rohan Mitchell
636ed2ad0d
Make bi-directional relationships
2015-02-13 09:24:48 +11:00
Rohan Mitchell
1d61e91afd
When enterprise created, grant permission to all co-owned enterprises, not just hubs
2015-02-13 09:24:48 +11:00
Maikel Linke
6b5a1255f8
fixing a bunch of tests
2015-02-12 16:36:18 +11:00
Rob Harrington
12dc0b93aa
Scoping users correctly for realz this time
2015-02-12 16:20:46 +11:00
Rob Harrington
5503760ce3
Scoping users correctly
2015-02-12 13:45:25 +11:00
Rob Harrington
9fa5a9e766
Fix before_filter load order for enterprises#shop
2015-02-12 11:34:58 +11:00
Rob Harrington
a62f48441d
Restrict ability to change managers of enterprises using update action
2015-02-12 11:34:58 +11:00
Rob Harrington
5c09ebf138
Adding manager managment to enterprise edit form
2015-02-12 11:34:58 +11:00
Rob Harrington
ee5ab22501
Moving interface for changing owner to new 'Users' tab
2015-02-12 11:34:58 +11:00
Rob Harrington
ad1f837c44
Admin users can access all users through known_users
2015-02-12 11:34:58 +11:00
Rob Harrington
dcb24cf06c
Controller method to allow enterprise users to search for other users which share management of their enterprises
2015-02-12 11:34:58 +11:00
Rob Harrington
b73619d168
Adding known_users method to Spree::User
2015-02-12 11:34:58 +11:00
Rob Harrington
dde1a27d3a
Adding ability to search for known users
2015-02-12 11:34:57 +11:00
Maikel Linke
57e838898f
Update documentation of database setup
...
db:setup is doing db:schema and db:seed already
2015-02-12 11:05:21 +11:00
Maikel Linke
773a5480e9
Activate search input for groups again
2015-02-12 10:44:20 +11:00
Maikel Linke
0fdf313424
Fixing img display of producers if no logo present
2015-02-12 10:31:13 +11:00
Rohan Mitchell
46aee6f77c
Upgrade Rails to 3.2.21
2015-02-11 14:30:49 +11:00
Rohan Mitchell
ca558a4ecc
Fix admin tab to check correct permission
2015-02-11 11:55:48 +11:00
Maikel Linke
edcef02017
link_to_service helper deals with nil
2015-02-07 19:40:59 +11:00
Maikel Linke
211e9c33a7
Fixing link to group website
2015-02-07 19:31:16 +11:00
Maikel Linke
2293623d2c
Display default group logo if no logo was uploaded
2015-02-07 19:24:36 +11:00
Maikel Linke
9e51b19f98
right mapping of contributer's names in git
2015-02-07 18:12:34 +11:00
summerscope
90ba1d2198
Updating the groups header to behave better with a square thumbnail logo image.
...
Intention is for a square image constrained by PaperClip as per enterprise logos (later down the track)
2015-02-06 17:15:40 +11:00
summerscope
78877f591b
Fix template so website links work to push to external pages
2015-02-06 13:58:04 +11:00
summerscope
f292be8c92
Making styling of underlines for contact same color as HRs, bit lighter and brigher
2015-02-06 13:50:34 +11:00
summerscope
755adf4287
Index page stop-gap improvements until we get more variables to display in this list. Commented out search field not working
2015-02-06 13:41:58 +11:00
summerscope
9547f91f46
Groups page rejig the layout to make contact column skinnier in most use cases. Obscure email and website with CTA words for fixed width on content. Styling for anchor fix global issue
2015-02-06 13:31:33 +11:00
Maikel Linke
30601b9203
tidy up group contact with helpers
2015-02-05 20:20:28 +11:00
Maikel Linke
504a053693
link_to_ext helper for group pages
2015-02-05 17:21:41 +11:00
summerscope
148333467f
Groups styling and markup - finishing up contact info partial etc
2015-02-05 17:14:56 +11:00
Maikel Linke
242fb49276
checking for undefined phone number in model
2015-02-05 16:17:29 +11:00
Maikel Linke
37dbd376e9
fixing indent
2015-02-05 15:54:53 +11:00
Maikel Linke
b641de6ec9
Merge branch 'group-pages' of github.com:openfoodfoundation/openfoodnetwork into group-pages
...
Conflicts:
app/views/groups/show.html.haml
2015-02-05 15:52:00 +11:00
Maikel Linke
313843d798
moving contact partial and giving example code
2015-02-05 15:50:33 +11:00
summerscope
1b51ea0e3a
Groups logo default image
2015-02-05 15:42:24 +11:00
summerscope
f2e3d298fa
More styling for responsive sizes groups header
2015-02-05 15:17:50 +11:00
summerscope
e19aaf6be8
Styling tabs for responsive design, improving groups page layout
2015-02-05 14:53:09 +11:00
summerscope
28b2dd40dd
Kill the pad top for Producers tab content too
2015-02-05 12:31:38 +11:00
summerscope
c9bbe80738
Remove padding class to producers tab content
2015-02-05 12:28:24 +11:00
Maikel Linke
0f7b880409
restoring groups hubs tab
2015-02-05 12:23:08 +11:00
Maikel Linke
78a8f8c1bb
Merge remote-tracking branch 'origin/group-pages' into group-pages
2015-02-05 12:07:52 +11:00
summerscope
b1b1aa5b1e
Groups page WIP with mikael and rob
2015-02-05 12:07:11 +11:00
Maikel Linke
a7c2a73fa8
make groups editable by group owners
2015-02-05 12:05:39 +11:00
Rohan Mitchell
fce7714994
Load correct set of variant override producers, use variant_override_enterprises_per_hub, tighten specs
2015-02-04 11:20:08 +11:00
Rohan Mitchell
7ca9670073
Admin can access variant override only when it can add hub to order cycle and it can create variant overrides for the producer of the variant
2015-02-04 11:09:48 +11:00
Rohan Mitchell
22f6ece83f
When fetching products for variant overrides admin, fetch all overridable products
2015-02-04 10:16:34 +11:00
Rohan Mitchell
a7bb04b890
Find all producers for which we can create variant overrides
2015-02-04 10:13:35 +11:00
Rohan Mitchell
4c586d1b7e
Fetching enterprises for which hubs can create variant overrides: allow all hubs that we can add to order cycle, find producers via create_variant_overrides permission
2015-02-04 10:04:57 +11:00
Rohan Mitchell
7ea143d19a
Provide AR relation instead of array in stub
2015-02-04 09:42:04 +11:00
Rohan Mitchell
25189d190b
Shift method
2015-02-04 09:30:01 +11:00
Maikel Linke
91b35d068c
Adding owner to groups
...
Groups have owners and users own groups. The owners are displayed and
changable on the group's page by admin users.
2015-02-02 15:58:34 +11:00
Maikel Linke
8d9f8beff3
creating facebook url
2015-02-02 10:33:13 +11:00
Rohan Mitchell
c0a7d22a50
Add permitted_by scope to EnterpriseRelationship
2015-01-30 16:36:45 +11:00
Rohan Mitchell
fafbfe8735
Simplify, simplify
2015-01-30 15:56:10 +11:00
summerscope
6fddb491db
New partial for groups contact
2015-01-30 14:07:55 +11:00
summerscope
5ea3733c8a
Groups page styling WIP
2015-01-30 14:07:38 +11:00
Rohan Mitchell
7ac888ae00
Admin can grant create_variant_overrides permission
2015-01-30 11:56:05 +11:00
Rohan Mitchell
ed4d78bca8
Decorators can't be in same file name as original file, otherwise the original file is ignored
2015-01-30 11:23:49 +11:00
summerscope
d99a54accf
WIP groups individual page template markup - still needs alot of love.
2015-01-29 17:43:36 +11:00
summerscope
fd363ff6c2
WIP Groups individual page styling
2015-01-29 17:43:10 +11:00
summerscope
fcd9653a79
Add padding to groups homepage
2015-01-29 15:52:40 +11:00
summerscope
8e42f29bde
WIP groups page styling and markup updates
2015-01-29 15:52:20 +11:00
Rohan Mitchell
a25bf32156
Show extended variant name/unit info for admin variant overrides
2015-01-29 15:15:28 +11:00
Rohan Mitchell
7a5c56cbca
Do not show out of stock lines on order confirmation page
2015-01-29 13:19:04 +11:00
Rob Harrington
cbae7dcc8e
Adding visible to user and enterprises report, and sorting by confirmation date
2015-01-29 10:46:44 +11:00
Rob Harrington
9163b0c1ad
Adding missing equals sign to test for equality in permalink migration
2015-01-28 11:37:02 +11:00
Rob Harrington
fd9f65f1b6
Merge branch 'shopfront-filters' into shop-url
2015-01-28 10:57:11 +11:00
Rob Harrington
713999c1d8
Merge branch 'master' into shop-url
2015-01-28 10:53:42 +11:00
Rob Harrington
21db56ce6c
Rollback angularjs upgrade
2015-01-28 08:41:14 +11:00
Rob Harrington
adbe127e76
Revert "Update bindonce"
...
This reverts commit 48dc85cfc2 .
2015-01-25 14:08:29 +11:00
Lynne Davis
3c4ad4121f
LD adding whitespace to get my master version back in line with origin
2015-01-22 14:00:48 +00:00
Lynne Davis
8e8f38e484
app/controllers/spree/admin/reports_controller_decorator.rb
2015-01-22 12:01:20 +00:00
Maikel Linke
d93a8b6428
Enterprise and Group controllers use default country instead of default country id
2015-01-22 16:22:34 +11:00
Maikel Linke
7a48d7fe22
Updating feature spec for groups
2015-01-22 16:04:46 +11:00
Rob Harrington
b429be707c
Split out payment and shipping methods from admin enterprises controller as services
2015-01-22 12:19:41 +11:00
Maikel Linke
87b092fdf7
Adding addresses to existing groups and make them changable
2015-01-22 12:10:54 +11:00
Rob Harrington
4829e59663
Fixing checkout controller spec
2015-01-22 10:46:31 +11:00
Rob Harrington
d12fdd23fb
Fixing navcheck callback
2015-01-22 10:46:01 +11:00
Rob Harrington
b0a29801b6
Making spec controller product request spec a little bit more robust
2015-01-22 10:20:03 +11:00
Rob Harrington
6ebd58b67d
Updating home spec to reflect new shopfront url
2015-01-22 10:19:47 +11:00
Rob Harrington
0791cc3c2a
Making sure that we have a .path() in HashNavigation
2015-01-22 10:19:47 +11:00
Rob Harrington
76acbb6159
Empty arrays are no longer considered falsy by angular.js parser (see bdfc9c02d0)
2015-01-22 10:19:47 +11:00
Rob Harrington
d7ea81e821
Prevent default form action from submitting ordercycle forms
2015-01-22 10:19:47 +11:00
Rob Harrington
9245af6a8f
Producer properties routes use enterprise permalink
2015-01-22 10:19:47 +11:00
Rob Harrington
36430d3bad
Enterprise permalink generator handles blank permalink case
2015-01-22 10:19:46 +11:00
Rob Harrington
7520552fd7
Removing spec for testing empty permalink, since we now force permalink to be created when empty
2015-01-22 10:19:46 +11:00
Rob Harrington
6991e5e6b1
Finally got all callbacks available to all action that need them
2015-01-22 10:19:46 +11:00
Rob Harrington
42d6695264
Fix permalink migration to handle blank auto-generated permalinks and fixed down migration
2015-01-22 10:19:45 +11:00
Rob Harrington
4d26b3d648
Make unused cart_controller happy
2015-01-22 10:19:45 +11:00
Rob Harrington
177181cd75
CurrentUser always returns a factory
2015-01-22 10:19:45 +11:00
Rob Harrington
4baa205cf9
before_filters for enterprise controller are run in the correct order, and put inside the shop action
2015-01-22 10:19:45 +11:00
Rob Harrington
60313f7a6a
Replace delete with parameterize
2015-01-22 10:19:45 +11:00
Rob Harrington
3e5ea3fe63
Adding automatic permalink generation on enterprise creation
2015-01-22 10:19:45 +11:00
Rob Harrington
b98c01b280
Updating permalink controller specs
2015-01-22 10:19:44 +11:00
Rob Harrington
ff624e83eb
Require distributor in enterprise controller, so that everything actually works
2015-01-22 10:19:44 +11:00
Rob Harrington
48dc85cfc2
Update bindonce
2015-01-22 10:19:44 +11:00
Rob Harrington
a0990c107f
Moving navigation check to controller
2015-01-22 10:19:44 +11:00
Rob Harrington
585c061fb0
Upgrade angularjs
2015-01-22 10:19:44 +11:00
Rob Harrington
83726eba63
Refactoring permalink checker to handle multiple requests elegantly
2015-01-22 10:19:43 +11:00
Rob Harrington
7ad9fdf0be
Cleaning permalink before checking
2015-01-22 10:19:43 +11:00
Rob Harrington
6b10a4a775
Restoring enterprise permalinks when they cause errors
2015-01-22 10:19:43 +11:00
Rob Harrington
4088bdc236
Clean up permalink checker
2015-01-22 10:19:43 +11:00
Rob Harrington
9b78963d5a
Adding a javascript interface for checking permalinks and user input on enterprise console
2015-01-22 10:19:43 +11:00
Rob Harrington
3ec3441cfa
Replacing all uses of the old enterprise shop url helper
2015-01-22 10:19:43 +11:00
Rob Harrington
39889390ef
Altering shop page routing so that shop url is copy-and-pastable
2015-01-22 10:19:42 +11:00
Rob Harrington
c3659612ed
enterprise routes use permalink
2015-01-22 10:19:42 +11:00
Rob Harrington
7a6cd98646
Fixing failing spec, missing permalink
2015-01-22 10:19:42 +11:00
Rob Harrington
9286c82b43
Removing obsolete methods
2015-01-22 10:19:42 +11:00
Rob Harrington
c330e49a7f
Moving permalink check action to enterprise controller
2015-01-22 10:19:42 +11:00
Rob Harrington
e2268e53bb
Adding action to check uniquness of enterprise permalink against existing routes
2015-01-22 10:19:41 +11:00
Rob Harrington
9f0aeb5adf
Adding unique permalink to enterprises
2015-01-22 10:19:41 +11:00
Maikel Linke
0d9a0919e5
show contact a group's contact footer
2015-01-21 16:39:41 +11:00
Maikel Linke
c1aa2f9b33
Display contact information in the front end
2015-01-21 16:12:28 +11:00
Maikel Linke
650e35c13e
Adding contact information to groups backend
2015-01-21 16:11:55 +11:00
Maikel Linke
71de15b3e4
Contact address for enterprise group
2015-01-21 12:32:07 +11:00
Rohan Mitchell
41e42c78c4
Update spec link name
2015-01-16 17:25:38 +11:00
summerscope
1753432f36
Adding new loading animation to replace ugly and large gif
2015-01-16 17:06:40 +11:00
summerscope
0f8809abfc
Merge branch 'master' into shopfront-filters
2015-01-16 16:12:34 +11:00
Rob Harrington
1d80bee595
Cart item total reflects total number of items in the cart
2015-01-16 16:06:51 +11:00
summerscope
d04e843315
kill unused line
2015-01-16 16:01:17 +11:00
summerscope
c0eb902eef
Turn off text shadow for buttons on popover for top nav
2015-01-16 16:00:18 +11:00
Rob Harrington
2c307f09c3
Changing edit cart button to link
2015-01-16 15:47:56 +11:00
summerscope
23fc428d95
Move spinner icon to left of text
2015-01-16 14:57:30 +11:00
summerscope
3bd77c74a5
Improve logic on shopping cart button to add meaningful labels for various states
2015-01-16 14:57:09 +11:00
summerscope
8334ff736b
Styling for shopping cart buttons and spinner
2015-01-16 13:27:34 +11:00
summerscope
51687b5c2c
Tweak language and styling for the CTA buttons taking users to shopping cart and checkout pages
2015-01-16 13:27:16 +11:00
summerscope
21108b34b6
Add new animation for spinning
2015-01-16 13:26:40 +11:00
summerscope
2a21889216
Remove border on product thumbnail to clean up UI
2015-01-16 13:06:30 +11:00
summerscope
b451b94fd1
Improving styling on large thumbnail view of product images
2015-01-16 13:06:02 +11:00
summerscope
d2d3a577ea
Merging master into this branch to make it easy to pull for staging push
2015-01-15 17:38:35 +11:00
Rob Harrington
b3e67fa164
Take two on disabled logic
2015-01-15 17:34:04 +11:00
Rob Harrington
ac34da4f24
Altering logic around disabled state for 'Your Shopping Cart' button
2015-01-15 17:19:48 +11:00
summerscope
d2277999cc
Undo change of logic on disabled state on Shopping cart button
2015-01-15 17:13:10 +11:00
summerscope
cdd6c2daf2
Styling product summary row to allow for hiding product thumb at a larger break point
2015-01-15 16:46:55 +11:00
summerscope
4a881a5aa5
Turn off product thumb at a larger break point
2015-01-15 16:46:18 +11:00
summerscope
d5d218c450
Make taxon flag smaller for smallest device breakpoint
2015-01-15 16:45:54 +11:00
summerscope
f8622be21d
Adding in new color variable
2015-01-15 16:45:29 +11:00
summerscope
676e7cb4d6
Make taxon flag 2 cols for small devices
2015-01-15 16:45:09 +11:00
summerscope
1dfbc88813
Change logic on disabled class on Your shopping cart button as this was swapped the wrong way around
2015-01-15 16:16:01 +11:00
summerscope
9db1c4c708
Adding in new color variable
2015-01-15 16:15:23 +11:00
Rohan Mitchell
25a734b208
When creating enterprise, establish relationships with the owner's hubs
2015-01-15 16:08:03 +11:00
summerscope
47a8731b8e
Styling for price column to distinguish between product added vs null
2015-01-15 16:01:49 +11:00
summerscope
932604bd69
Add in logic to style price column differently if nul vs has value
2015-01-15 16:01:00 +11:00
summerscope
4d7871a0bb
New grey color variable
2015-01-15 16:00:21 +11:00
summerscope
51c8891fac
Add animation to product title hover
2015-01-15 15:24:01 +11:00
summerscope
9b258e075b
Add styling and animation to img thumbnail
2015-01-15 15:23:36 +11:00
summerscope
891a9b06a8
Add expand icon on top of image thumbnail
2015-01-15 15:23:10 +11:00
Maikel Linke
4dc0701213
Side menu for enterprise group page
2015-01-15 15:04:21 +11:00
summerscope
b5879d51ac
Merging master into shopfront-filters branch
2015-01-15 14:15:25 +11:00
Rohan Mitchell
dcc04ea538
On enterprise edit page, do not show side menu links we don't have permission to
2015-01-15 13:43:39 +11:00
Rohan Mitchell
83754a01ef
Make side menu item visibility declarative
2015-01-15 13:43:39 +11:00
Rohan Mitchell
2d82f76a43
Fix changed var in ability spec
2015-01-15 13:43:39 +11:00
Rohan Mitchell
d5437e1508
edit_profile permission no longer shows links to manage shipping methods, payment methods and enterprise fees for an enterprise
2015-01-15 13:43:39 +11:00
Rohan Mitchell
f0bd9c1065
Fix failing specs due to addition of another enterprise
2015-01-15 13:43:39 +11:00
Rohan Mitchell
642de2f65f
Only show delete enterprise link when user has permission
2015-01-15 13:43:39 +11:00
Rohan Mitchell
f6e9c9494c
Enterprise user can edit profiles it has permission to
2015-01-15 13:43:39 +11:00
Rohan Mitchell
90ad2e2b7d
Allow enterprises with 'edit profile' permission to edit enterprises
2015-01-15 13:43:39 +11:00
Rohan Mitchell
cfb69ae7d2
Add Permissions#editable_enterprises
2015-01-15 13:43:38 +11:00
Rohan Mitchell
a93a824b83
Admin can grant permission for an enterprise to edit the profile of another
2015-01-15 13:43:38 +11:00
Rohan Mitchell
2170c7ede1
Fix broken JS spec
2015-01-15 13:43:38 +11:00
Rob Harrington
06cf914119
Hopefully resolving order populator strangeness related to concurrency by ensuring a fresh list of line items
2015-01-15 12:10:05 +11:00
Maikel Linke
3e5dfda324
Removing old link to enterprise groups from configuration menu
2015-01-15 10:53:11 +11:00
Maikel Linke
13cbbcef40
Admin Tab Menu: converting .rb to .html.haml.deface
...
Plus a new menu item for enterprise groups.
2015-01-15 10:26:27 +11:00
Maikel Linke
949808e839
Customising AdaptiveMenu for the admin tab panel
...
The AdaptiveMenu was design for a menu filling the screen width. Our
menu is in a skeleton structure. The new file overwrites the spree
version and takes the container width as reference.
2015-01-14 18:03:08 +11:00
Maikel Linke
02a276b9c9
Producer and hub lists with search
...
Fixing map display as well.
2015-01-14 15:18:46 +11:00
Maikel Linke
9f1a773a58
MapController: copy default config instead of referencing
...
Copying makes it possible to have multiple independent maps.
2015-01-14 14:34:31 +11:00
Maikel Linke
0e510998a4
Handling missing options in shipping filter call
2015-01-14 14:33:37 +11:00
Rohan Mitchell
307cc313df
Stub scope_to_hub in spec that wasn't expecting it
2015-01-13 11:46:41 +11:00
Rohan Mitchell
0431e0048c
Merge branch 'master' into variant-overrides-frontend
...
Conflicts:
app/controllers/shop_controller.rb
app/views/shop/products/_form.html.haml
spec/controllers/shop_controller_spec.rb
2015-01-12 16:48:51 +11:00
Rohan Mitchell
20bde803c8
Display overridden prices when products are in the cart
2015-01-12 14:58:35 +11:00
Rohan Mitchell
6b43354386
Restructure spec
2015-01-12 14:37:43 +11:00
Rohan Mitchell
494bb1f3b4
Fix auto-reload nerfing scope_xx_to_hub
2015-01-12 14:24:15 +11:00
Rohan Mitchell
d52b6b34e3
Spec: do not subtract stock from overrides that do not override count_on_hand
2015-01-12 11:33:53 +11:00
Rohan Mitchell
4583e29ae3
When order is placed, subtract stock from variant override
2015-01-12 11:23:53 +11:00
Rohan Mitchell
a4d4622521
Add VariantOverride.decrement_stock
2015-01-12 10:39:23 +11:00
Rohan Mitchell
20f650b472
Add VariantOverride.stock_overriden?
2015-01-12 09:32:02 +11:00
Rohan Mitchell
e013e1fe00
Don't show rspec profile by default
2015-01-09 15:30:49 +11:00
Rohan Mitchell
d40ffeef52
Remove old sidebar
2015-01-09 13:10:17 +11:00
Rohan Mitchell
6200390369
Merge branch 'lin-d-hop-add_shipping_category'
2015-01-09 12:49:09 +11:00
Rohan Mitchell
e9f32f5329
Spec that shipping category can be set when creating new products
2015-01-09 12:46:36 +11:00
Rohan Mitchell
27bc845b0b
Add correct markup for tax category required asterisk
2015-01-09 12:45:35 +11:00
Rohan Mitchell
22cb8b7a71
Two-space indentation, change 'Shipping categories' to 'Shipping category'
2015-01-09 12:33:26 +11:00
Rohan Mitchell
c6db1d440c
Merge branch 'add_shipping_category' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-add_shipping_category
...
Conflicts:
app/overrides/spree/admin/products/new/replace_form.html.haml.deface
app/views/spree/order_mailer/confirm_email.text.haml
2015-01-09 12:30:19 +11:00
Rohan Mitchell
bc448e5156
Merge branch 'lin-d-hop-report_download_namechange'
2015-01-09 11:51:46 +11:00
Rohan Mitchell
6a42f62eb2
Fix filename on order cycle management report csv, add timestamp to it and also users and enterprises report
2015-01-09 11:49:59 +11:00
Rohan Mitchell
8db09d9590
Merge branch 'report_download_namechange' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-report_download_namechange
...
Conflicts:
app/controllers/spree/admin/reports_controller_decorator.rb
2015-01-09 11:48:23 +11:00
Rohan Mitchell
7e55262ce9
Extract most everything to private methods - neatly groups concerns together
2015-01-09 11:28:39 +11:00
Rohan Mitchell
bbc887a692
Test the exact value, not the truncated value
2015-01-09 11:26:25 +11:00
Rohan Mitchell
6f36c0463c
Separate data preparation from test conditions
2015-01-09 11:26:25 +11:00
Rohan Mitchell
592ac7856a
Variable naming
2015-01-09 11:26:25 +11:00
Rohan Mitchell
261dea37e9
Spec formatting
2015-01-09 11:26:25 +11:00
Rohan Mitchell
80c507cc66
Formatting
2015-01-09 11:26:25 +11:00
Lynne Davis
1ad13f0359
Cleanup of git to remove unnecessary commits from pull request
2015-01-09 11:26:24 +11:00
Rohan Mitchell
532041c07b
Use Fuubar formatter for rspec - displays fails as they happen
2015-01-08 12:12:15 +11:00
Rohan Mitchell
05bd0c4168
Merge branch 'Matt-Yorkley-reports_2'
2015-01-08 10:50:27 +11:00
Rohan Mitchell
51b0d7e0eb
Move private method to helper
2015-01-08 10:48:02 +11:00
Rohan Mitchell
d2e0d4f44a
Fix grammar
2015-01-08 10:39:51 +11:00
Rohan Mitchell
ab26902e4e
Move money decorator to lib dir, as it's a decorator for a lib class, not a model
2015-01-08 10:39:14 +11:00
Rohan Mitchell
6adb4194c2
Extract date range form to partial
2015-01-08 10:31:51 +11:00
Rohan Mitchell
b6f29c778e
Use haml syntax for defining divs
2015-01-08 10:23:37 +11:00
Rohan Mitchell
4839c00d62
Retrieve currency_symbol via private method rather than before_filter + instance var - cleaner syntax
2015-01-08 10:12:32 +11:00
Rohan Mitchell
a438216189
Merge branch 'reports_2' of https://github.com/Matt-Yorkley/openfoodnetwork into Matt-Yorkley-reports_2
...
Conflicts:
app/controllers/spree/admin/reports_controller_decorator.rb
2015-01-08 10:08:12 +11:00
Rohan Mitchell
29f9b3bbd7
Merge branch 'Matt-Yorkley-tax_cat_dropdown'
2015-01-08 09:51:27 +11:00
Rohan Mitchell
ac59665e3c
Test validations without creating models in database
2015-01-08 09:48:33 +11:00
Rohan Mitchell
e4efda2f96
Move model spec into validations block
2015-01-08 09:37:35 +11:00
Rohan Mitchell
a9b91bc52a
Tighten spec: setting tax category should succeed
2015-01-08 09:35:18 +11:00
Rohan Mitchell
f90ee33c89
Use the tax category factory provided by Spree
2015-01-08 09:27:29 +11:00
Rohan Mitchell
087ccb52f9
Merge branch 'tax_cat_dropdown' of https://github.com/Matt-Yorkley/openfoodnetwork into Matt-Yorkley-tax_cat_dropdown
2015-01-08 09:09:20 +11:00
Rohan Mitchell
4bf8716786
Extract complete_checkout to method
2015-01-07 16:29:15 +11:00
Rohan Mitchell
c0030ddb13
use_short_wait can now take a flexible wait time
2015-01-07 16:28:03 +11:00
Rohan Mitchell
370133b875
Fix minor spec issues
2015-01-07 16:06:23 +11:00
Maikel Linke
3b9657eb17
show map of a group's enterprises
2015-01-07 12:00:55 +11:00
Maikel Linke
9956b967f0
Fixing link to group's page
2015-01-07 10:27:08 +11:00
Maikel Linke
9310bc902a
first draft of group page, a lot of TODOs
2015-01-06 22:39:15 +11:00
Maikel Linke
9798b05a24
TabsCtrl can show tabs that don't toggle
...
toggle: tabs show on first click and hide on second click
select: tabs show on every click, one tab is always active
2015-01-06 22:39:15 +11:00
Maikel Linke
586753015b
Reducing the groups page to a oneline list of groups
2015-01-06 22:39:15 +11:00
Paul Mackay
67b17de695
#275 : Add receival time and instructions to order cycle for incoming exchanges. Fix issues from feedback.
2014-12-30 11:33:13 +00:00
summerscope
6863dd75ef
Restyling button for price breakdown to make it more clear that users press again to close the pop over
2014-12-19 17:05:13 +11:00
summerscope
fafdb29fcb
Regenerated icon font, smaller file size and updated graph icon
2014-12-19 17:04:26 +11:00
Rohan Mitchell
85882a73ff
Merge branch 'lin-d-hop-266reportsbranch'
2014-12-19 16:51:38 +11:00
Rohan Mitchell
2bad590ef4
Order confirmation and order objects use overridden prices
2014-12-19 16:51:11 +11:00
Rohan Mitchell
c3995ee4d5
Checkout shows overridden prices
2014-12-19 16:51:11 +11:00
Rohan Mitchell
94684e9963
Show overridden price in shopping cart
2014-12-19 16:51:11 +11:00
Rohan Mitchell
1e1a070b2b
Scope Variant#price_in
2014-12-19 16:51:10 +11:00
Rob Harrington
6f95fa8546
Merge remote-tracking branch 'origin/shopfront-filters'
2014-12-19 15:40:01 +11:00
Rob Harrington
170b14d0f5
Tightening up expectations in shop controller spec
2014-12-19 15:39:13 +11:00
summerscope
d50f8dcd01
Tweak styling shopfront page to allow for new icons and hover state
2014-12-19 14:53:46 +11:00
summerscope
813ef463a2
Tweak markup shopfront page to add icon
2014-12-19 14:53:25 +11:00
Rob Harrington
a810fc88ac
Dedicated new enterprise form
2014-12-19 14:05:24 +11:00
Rob Harrington
24cf3dee74
Hiding Shop Preferences in enterprise form
2014-12-19 14:05:24 +11:00
Rob Harrington
21e4f40616
Implementing primary taxon ordering on the shopfront
2014-12-19 14:05:23 +11:00
Rob Harrington
0fa289a443
Changing shopfront message into an alert box
2014-12-19 14:04:02 +11:00
Rob Harrington
fcb14f32d2
Validating user input for shopfront taxon order
2014-12-19 14:04:02 +11:00
Rob Harrington
f145a7ed65
Moving taxons into its own module, adding preferred shopfront taxon order to enterprise
2014-12-19 14:04:02 +11:00
Rob Harrington
a38e27e504
Adapting taxon autocompleter to allow multiple selection of taxons
2014-12-19 14:04:02 +11:00
Rob Harrington
4b353fa27b
Ammending comments to make slightly more clear
2014-12-19 14:04:01 +11:00
Rob Harrington
9f086facdb
Hiding link to shopfront for non-distributors
2014-12-19 14:04:01 +11:00
Rob Harrington
2efd905227
Fixing specs to work with text-angular
2014-12-19 14:04:01 +11:00
Rob Harrington
c5bf228cb9
Removing hashes from side menu links
2014-12-19 14:04:01 +11:00
Rob Harrington
b18163bfaf
Remove separate long description injection, use full enterprise serializer instead
2014-12-19 14:04:01 +11:00
Rob Harrington
3fa1832e7b
Adding shop closed message preference
2014-12-19 14:04:01 +11:00
Rob Harrington
d5df73c6a2
Duplicate create basic version of enterprise serializer for lists, make shopfront_message input use textangular
2014-12-19 14:04:01 +11:00
Rob Harrington
5a24f2c0e2
WIP: adding shopfront message to shop
2014-12-19 14:04:00 +11:00
Rob Harrington
435bc177f8
Hiding side menu elements by filtering rather than by making invisible
2014-12-19 14:04:00 +11:00
Rob Harrington
a489aa7ad9
Fixing enterprise feature spec, adding first shop preference
2014-12-19 14:04:00 +11:00
Rob Harrington
88d49148d4
Adding border to text-angular form element
2014-12-19 14:04:00 +11:00
Rob Harrington
33d4f03a99
Adding shop preferences pane, fiddling with icons
2014-12-19 14:04:00 +11:00
Rob Harrington
612c8a95b2
Adding icons to enterprise edit side menu
2014-12-19 14:04:00 +11:00
Rob Harrington
abdcdea1a2
Adding payment methods partial to new enterprirse edit screen
2014-12-19 14:04:00 +11:00
Rob Harrington
412b431f36
Fixing up tbody positions
2014-12-19 14:03:59 +11:00
Rob Harrington
25e608d9fb
Adding shipping methods partial to redone enterprise form
2014-12-19 14:03:59 +11:00
Rob Harrington
bc32a053f7
Adding global styling class for aligning text to the right
2014-12-19 14:03:59 +11:00
Rob Harrington
0ea1adfdff
Adding a partial for enterprise fees to enterprise form
2014-12-19 14:03:59 +11:00
Rob Harrington
468e83cef7
Adding global centering css class
2014-12-19 14:03:59 +11:00
Rob Harrington
76acd706ea
Adding ability to show and hide menu items
2014-12-19 14:03:59 +11:00
Rob Harrington
eb2a6f0ef5
Splitting contact and social into two separate partials
2014-12-19 14:03:59 +11:00
Rob Harrington
b10d623f26
Rearrange columns for action buttons on enterprise form
2014-12-19 14:03:58 +11:00
Rob Harrington
f86d4a1996
Pulling headings out of enterprise form partials, displaying each conditionally
2014-12-19 14:03:24 +11:00
Rob Harrington
d8349bc037
menu refers to SideMenu object
2014-12-19 13:52:02 +11:00
Rob Harrington
39ca0ce3dc
WIP: Adding a side_menu to the enterprise form
2014-12-19 13:52:01 +11:00
Rob Harrington
b0c86f83ee
Splitting enterprise edit page into partials
2014-12-19 13:52:01 +11:00
summerscope
b944030994
Add some logic for small screen layout
2014-12-19 13:11:35 +11:00
summerscope
e9cb7f9565
Styling for clear filters row
2014-12-19 13:02:17 +11:00
summerscope
f36c881f52
Add clear filters feature to Producers page
2014-12-19 13:02:07 +11:00
summerscope
e8c5af004f
Add another class so we can see which row is clear filters
2014-12-19 13:01:49 +11:00
summerscope
b55bced488
Put show hide animation back in for clear button
2014-12-19 12:53:48 +11:00
summerscope
ebe2d99299
Change markup because the boolean variable now works correctly
2014-12-19 12:53:26 +11:00
summerscope
515348a8fb
Change the filtersActive variable for this page only
2014-12-19 12:52:57 +11:00
summerscope
08d37b955a
Refactoring filter feature for shopfront page - show by default, hide on click. WIP.
2014-12-19 12:22:04 +11:00
Rohan Mitchell
72118f4e2e
Fix syntax error, spec for removed column
2014-12-19 10:01:46 +11:00
Rohan Mitchell
e9f04c3c15
Clean up whitespace
2014-12-19 10:01:21 +11:00
Rohan Mitchell
6e0576235d
Use create\! instead of build - more concise, raises exception on error
2014-12-19 09:51:32 +11:00
Rohan Mitchell
27d646c0e8
Tweak indentation, remove some blank lines
2014-12-19 09:51:32 +11:00
Rohan Mitchell
0151ecbb32
Add additional rows to payment method selection
2014-12-19 09:51:32 +11:00
Rohan Mitchell
d548515684
Remove unused header column
2014-12-19 09:51:13 +11:00
Rohan Mitchell
343af1f1e0
Rename report_shipping_options to report_shipping_method_options for symmetry with report_payment_method_options
2014-12-19 09:51:07 +11:00
Rohan Mitchell
3b58d99abc
Fix spec failure
2014-12-19 09:51:02 +11:00
Rohan Mitchell
4a30f27b3d
Merge branch '266reportsbranch' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-266reportsbranch
...
Conflicts:
app/controllers/spree/admin/reports_controller_decorator.rb
spec/models/spree/order_spec.rb
2014-12-19 09:38:02 +11:00
Rohan Mitchell
c4b45bdbbf
Fix line items returning prices with fractional cents
2014-12-18 16:24:59 +11:00
Rohan Mitchell
b0f5d0170c
Spec that overridden price with fees appears in quick cart
2014-12-18 13:32:28 +11:00
Rohan Mitchell
5fcb2982fa
Fees are calculated correctly for items with variant overrides
2014-12-18 11:53:17 +11:00
Rohan Mitchell
ead84aa9ff
Add ids to product listing products and variants
2014-12-18 11:00:45 +11:00
Rohan Mitchell
1d3800696e
Variant overrides can override stock levels
2014-12-18 10:46:47 +11:00
Rohan Mitchell
f5ee9ba2f3
VariantOverride looks up count_on_hand
2014-12-18 10:21:07 +11:00
Rohan Mitchell
e6eecd3ae2
Replace proxies with modules
2014-12-18 10:20:31 +11:00
Rohan Mitchell
0832a8f63d
Viewing products shows overridden prices
2014-12-17 16:00:25 +11:00
Rohan Mitchell
23c7715929
Cosmetic change
2014-12-17 14:03:54 +11:00
Rohan Mitchell
2ea7bdbec6
Move controller spec to serializer spec
2014-12-17 14:01:59 +11:00
Rohan Mitchell
6c300431d2
Move Product#variants_for to Variant.for_distribution scope
2014-12-17 13:42:30 +11:00
Rohan Mitchell
91c500417b
Swap param order
2014-12-17 08:55:27 +11:00
Lynne Davis
7e49bd634e
Updated the specs with Rohans suggestions
2014-12-12 18:23:43 +00:00
Lynne Davis
eeae72352b
Renamed methods and vars to better fit naming conventions
2014-12-12 10:11:33 +00:00
Rob Harrington
66669e66ab
Shaving some seconds from BOM spec by using simple order cycles and splitting specs up into more logical contexts
2014-12-12 15:43:05 +11:00
Rohan Mitchell
99dce6e8d6
Merge branch 'enterprise-form-confirmation'
2014-12-12 15:29:59 +11:00
Rohan Mitchell
27b0052e2b
Merge branch 'product-category-required'
2014-12-12 15:29:31 +11:00
Rohan Mitchell
0b3dfa7278
Merge branch 'product-reports-without-deleted'
2014-12-12 15:29:03 +11:00
Rohan Mitchell
84b607433c
Creating and then updating the new override updates the same override instead of creating a duplicate
2014-12-12 13:33:14 +11:00
Rohan Mitchell
31823f2dbd
Setting both values to blank deletes override
2014-12-12 13:33:14 +11:00
Rohan Mitchell
ca1c116a5d
Swap param order
2014-12-12 13:33:14 +11:00
Rohan Mitchell
d177f3ff73
Variant overrides table styling
2014-12-12 13:33:14 +11:00
Rohan Mitchell
d83ff4ef33
Remove short wait, show variant overrides tab in admin
2014-12-12 13:33:14 +11:00
Rohan Mitchell
fb980981fb
Display variant override errors
2014-12-12 13:33:14 +11:00
Rohan Mitchell
45e709b2cc
VariantOverrides require hub and variant
2014-12-12 13:33:14 +11:00
Rohan Mitchell
0393007ba5
Update variant overrides
2014-12-12 13:33:14 +11:00
Rohan Mitchell
c38686c820
Create new variant overrides
2014-12-12 13:33:14 +11:00
Rohan Mitchell
27444c6589
Extract variant overrides to own controller - permissions
2014-12-12 13:33:14 +11:00
Rohan Mitchell
531b35bbc6
WIP: Extract variant overrides to own controller - route, controller, views
2014-12-12 13:33:14 +11:00
Rohan Mitchell
9ee44e9aef
WIP: Extract variant overrides to own controller - move views
2014-12-12 13:33:14 +11:00
Rohan Mitchell
91434fe12a
Rename override_variants to variant_overrides - JS file names
2014-12-12 13:33:13 +11:00
Rohan Mitchell
a6f116aa09
WIP: Rename override_variants to variant_overrides - JS
2014-12-12 13:33:13 +11:00
Rohan Mitchell
d02511bf1d
WIP: Rename override_variants to variant_overrides - file and dir name changes
2014-12-12 13:33:13 +11:00
Rohan Mitchell
51d2805de9
WIP: Rename override_variants to variant_overrides
2014-12-12 13:33:13 +11:00
Rohan Mitchell
a1906a71fa
Return promise directly
2014-12-12 13:33:13 +11:00
Rohan Mitchell
47592cdbd8
Submit variant overrides to server
2014-12-12 13:33:13 +11:00
Rohan Mitchell
d67e614947
Remove extracted method
2014-12-12 13:33:13 +11:00
Rohan Mitchell
0a984b9041
Remove duplicate status message on BPE
2014-12-12 13:33:13 +11:00
Rohan Mitchell
c62ce57e0f
Display count of dirty variant overrides
2014-12-12 13:33:13 +11:00
Rohan Mitchell
a1fc4dec43
Updating variant overrides stores dirty values
2014-12-12 13:33:13 +11:00
Rohan Mitchell
7255520471
Display success message on save variant overrides (stub)
2014-12-12 13:33:13 +11:00
Rohan Mitchell
9d4b8ae949
Rename div update-status-message to status-message
2014-12-12 13:33:13 +11:00
Rohan Mitchell
0938debafc
Extract status message markup into partial
2014-12-12 13:33:13 +11:00
Rohan Mitchell
a8e1265a58
Swap parameter ordering - follows convention Rails.logger.error 'foo'
2014-12-12 13:33:13 +11:00
Rohan Mitchell
9c4c0f87e3
Rename methods to reduce naming duplication
2014-12-12 13:33:13 +11:00
Rohan Mitchell
bcc3815f6b
Extract status message to a service
2014-12-12 13:33:13 +11:00
Rohan Mitchell
abf58c0e02
Provide blank values for all variant overrides
2014-12-12 13:33:13 +11:00
Rohan Mitchell
d3e639aa03
Index variant overrides by hub_id x variant_id
2014-12-12 13:33:12 +11:00
Rohan Mitchell
5cf3579b26
Extract variant overrides to service
2014-12-12 13:33:12 +11:00
Rohan Mitchell
5df4f1b7fe
Convert text to form fields
2014-12-12 13:33:12 +11:00
Rohan Mitchell
3aedbb6c48
Display variant overrides
2014-12-12 13:33:12 +11:00
Rohan Mitchell
8baed4429c
Indexer accepts arbitrary key to index by. Fix bug: Return an object instead of an array.
2014-12-12 13:33:12 +11:00
Rohan Mitchell
47b479c6c9
Show variants in override variants interface, not just products
2014-12-12 13:33:12 +11:00
Rohan Mitchell
42481e9691
Provide hub permissions to specs
2014-12-12 13:33:12 +11:00
Rohan Mitchell
efae9265c1
Inject variant overrides
2014-12-12 13:33:12 +11:00
Rohan Mitchell
ff28da345d
Find variant overrides for some hubs
2014-12-12 13:33:12 +11:00
Rohan Mitchell
91b386003a
Add VariantOverrideSerializer
2014-12-12 13:33:12 +11:00
Rohan Mitchell
a3a3832c8d
Only show products that the chosen hub can add to an order cycle
2014-12-12 13:33:12 +11:00
Rohan Mitchell
500b5ce347
Enterprise managers can access override variants
2014-12-12 13:33:12 +11:00
Rohan Mitchell
b1ba519a73
When finding per hub order cycle enterprises, also return managed producers
2014-12-12 13:33:12 +11:00
Rohan Mitchell
5b82fcaca7
Inject hub permissions - which producers each hub can add to order cycle
2014-12-12 13:33:12 +11:00
Rob Harrington
3a9c4e0826
Adding a price without fees column to the order cycle customer report
2014-12-12 12:00:15 +11:00
Rob Harrington
6a226e4f92
Fixing typos and changing delivery address display in order confirmation email
2014-12-12 12:00:15 +11:00
Rohan Mitchell
086f69ccfb
Default payment method server/test_mode to live
2014-12-12 11:35:18 +11:00
Rohan Mitchell
e607c9855f
Add Pin Payments gateway
2014-12-12 10:59:23 +11:00
Lynne Davis
079781576b
Adding new specs and a couple updates the lib/report
2014-12-11 12:47:56 +00:00
Rob Harrington
b9011d9abe
Remove obsolete spree checkout views
2014-12-11 16:17:15 +11:00
Rob Harrington
b7810df346
Revert "Removing obsolete checkout views"
...
This reverts commit d0e013c1a5 .
2014-12-11 16:09:17 +11:00
Rob Harrington
dfb9e5bde5
Order reports now present the price of line items with adjustments included
2014-12-11 15:48:29 +11:00
Rohan Mitchell
eab2e5de2a
Use scope
2014-12-11 15:00:44 +11:00
Rob Harrington
3be437485a
Redirecting any spree checkout_state redirects to our checkout controller
2014-12-11 14:53:11 +11:00
Rob Harrington
d0e013c1a5
Removing obsolete checkout views
2014-12-11 14:50:29 +11:00
Maikel Linke
440044372b
Leave-page-warning only after changing inputs
...
The enterprise form is now set 'dirty' whenever an input changes. The
navigation callback confirms to leave the page only if the form is
dirty.
2014-12-11 14:27:08 +11:00
Maikel Linke
76739a4746
Unify nav-check and nav-callback attributes in nav-check-callback
...
The value of nav-check was not used and nav-callback was only important
if nav-check was given. So we need only one attribute, now named
nav-check-callback.
2014-12-11 12:14:51 +11:00
Maikel Linke
11f1261dd3
Navigation Callbacks for WebKit
2014-12-11 12:07:48 +11:00
Maikel Linke
27896534f0
Navigation Callbacks (confirmation to leave) refs
...
A navigation callback could give only a fixed value at load time. Now it
can act depending on the site's state just before the page is unloaded.
2014-12-11 12:05:59 +11:00
Rob Harrington
2f83d71931
Adding mail/all.css to assets precompile list
2014-12-10 09:56:33 +11:00
Lynne Davis
f878e18037
Update that works better with the specs
2014-12-08 16:25:18 +00:00
Maikel Linke
3cc79d0036
Filter deleted products in products report
...
BugHerd 484: Remove deleted products from Product / Inventory reports
2014-12-05 15:52:10 +11:00
Maikel Linke
7b41d4c5d4
Denoting the product category as required
...
Using common style: span.required *
2014-12-05 14:56:32 +11:00
Rohan Mitchell
ec08ab4cc9
Merge pull request #307 from openfoodfoundation/replace-fixtures
...
Replacing fixtures with minimal seeding
2014-12-04 16:31:30 +11:00
Maikel Linke
5c191bcc7f
Moving test seeding into spec/support/seeds.rb
2014-12-04 15:38:59 +11:00
Rohan Mitchell
19667f31fa
Add missing translation for welcome_to
2014-12-03 15:19:25 +11:00
Rohan Mitchell
95f8334370
Reinstate style
2014-12-03 12:28:22 +11:00
Rohan Mitchell
50e26ed96f
Remove old required partial
2014-12-03 12:22:43 +11:00
Rohan Mitchell
e30021537a
Merge branch 'master' into enterprise-form-required-fields
...
Conflicts:
app/views/admin/enterprises/_form.html.haml
app/views/admin/enterprises/_ng_form.html.haml
2014-12-03 12:20:52 +11:00
Rohan Mitchell
bd7253bdda
Merge branch 'using-simple-order-cycle'
2014-12-03 12:08:25 +11:00
Rohan Mitchell
fbef139fc5
Merge branch 'master' into using-simple-order-cycle
2014-12-03 11:57:59 +11:00
Lynne Davis
633a8a49e2
updating spec based on the wise advice of Rohan
2014-12-03 00:35:53 +00:00
Rohan Mitchell
3358fb3d73
Name based on meaning instead of context
2014-12-03 09:39:36 +11:00
Paul Mackay
26bca0faf8
Localize more strings on home page.
2014-12-03 09:39:36 +11:00
Paul Mackay
73ece4075c
Add rails-i18n gem.
2014-12-03 09:39:35 +11:00
Lynne Davis
a5ae1c490c
Fixing typo in report found through testing
2014-12-02 17:48:04 +00:00
Lynne Davis
c2c51a5531
Fixing typo in feature spec
2014-12-02 12:24:34 +00:00
Maikel Linke
8e280919ac
Using simple_order_cycle in clone spec
...
Creating a coordinator fee and two exchanges in the spec instead of
using a full order_cycle. Timing of this single test:
Before: 15.32 seconds
After: 6.26 seconds
2014-11-28 15:36:34 +11:00
Maikel Linke
e240933b29
Using simple_order_cycle in spec
...
Before: 4 minutes 6.9 seconds
After: 3 minutes 27.4 seconds
2014-11-28 14:45:35 +11:00
Maikel Linke
349b7de11a
Using simple_order_cycle
...
Before: 2 minutes 58.3 seconds
After: 35.04 seconds
2014-11-28 14:02:55 +11:00
Maikel Linke
73b8f37d77
Using simple_order_cycle
...
Before: 2 minutes 8.7 seconds
After: 16.11 seconds
2014-11-28 13:55:06 +11:00
Maikel Linke
aa2cefb88c
Using simple_order_cycle where applicable
...
Before: 3 minutes 0 seconds
After: 1 minute 21.02 seconds
2014-11-28 13:45:25 +11:00
Maikel Linke
ccd03bfa84
Using simple_order_cycle
...
Test timings were not accurate. Output:
4 order_cycles: 9.94 seconds
2 order_cycles: 9.87 seconds
0 order_cycles: 9.9 seconds
Felt execution was much higher
2014-11-28 13:20:05 +11:00
Maikel Linke
7f764db4d7
Using simple_order_cycle
...
order_cycle: 1 minute 56.88 seconds
simple_order_cycle: 1 minute 8.05 seconds
2014-11-28 12:39:05 +11:00
Maikel Linke
082a3cd9ab
Creating simple_order_cycle instead of order_cycle
...
Speedup on my machine:
1 minute 44.52 seconds
21.9 seconds
2014-11-28 12:29:47 +11:00
Lynne Davis
35c27bf516
First specs for additional scope to order model. Not liking the repeated code so would appreciate feedback to get rid of it. Thanks!
2014-11-27 20:36:41 +00:00
Rob Harrington
699c9a62a5
Removing pretty_inspect so that bugsnag alert work on production
2014-11-27 16:39:14 +11:00
Maikel Linke
ef0b0a9a94
Replacing fixtures with minimal seeding
...
Seeding:
1 country: Australia
2 states: Vic, NSW
2014-11-27 16:38:39 +11:00
Rob Harrington
9782a9d3d6
Hopefully fixing Poltergeist Timeout error due to long long time for first admin spec
2014-11-27 14:42:02 +11:00
Rob Harrington
45bcee16ef
Pulling out obsolete setup in BOM spec to make it more like BPE spec, see if that helps with intermittent fails
2014-11-27 09:44:13 +11:00
Rob Harrington
5799f09caf
Merge branch 'master' into pretty-emails
2014-11-27 00:02:44 +11:00
Rob Harrington
38440dd70a
Ammending checkout specs for two emails on placement of order
2014-11-26 23:16:11 +11:00
Rob Harrington
258573f5a6
Remove obsolete text version of user signup_confirmation
2014-11-26 18:58:26 +11:00
Rob Harrington
0cf2df8358
Remove obsolete text version of order confirm_email
2014-11-26 18:54:50 +11:00
Rob Harrington
8a3bffb37d
Cart page conforms to convention in rest of checkout, adjusting helpers through checkout
2014-11-26 18:53:29 +11:00
Rob Harrington
8f27c643f1
Move override for cart line item into existing view replacement
2014-11-26 16:08:53 +11:00
Rob Harrington
a8dde3bbb9
Moving shopfront trial progress bar logic into enterprises helper and dealing with expiry
2014-11-26 15:16:53 +11:00
Rob Harrington
f5acf36771
Hiding enterprise shop url in ent welcome email, as that may bot actually make sense
2014-11-26 14:50:19 +11:00
Rob Harrington
17a2e37eda
Fixing broken category lookup on BPE
2014-11-26 13:16:29 +11:00
Rob Harrington
f6b0863279
Make cost breakdowns consistent throughout checkout
2014-11-26 13:07:40 +11:00
Rob Harrington
c4961d2502
Whitespace crusader
2014-11-26 11:59:22 +11:00
Paul Mackay
8d5a0aea9f
Setup daemon and delayed job table.
2014-11-24 21:25:58 +00:00
Paul Mackay
803d790b7a
Remove nokigiri warning.
...
Tweak email subject.
2014-11-24 21:00:36 +00:00
Matt-Yorkley
e4d1ae7548
Refactored currency symbol display
2014-11-24 18:20:10 +00:00
Matt-Yorkley
4f153714a8
Reports pages improvements and i18n
2014-11-23 17:26:26 +00:00
Matt-Yorkley
451dd3966f
form partial
2014-11-23 15:22:56 +00:00
Matt-Yorkley
c3829ae64f
Tax category dropdown on create product form
2014-11-23 15:18:16 +00:00
Rob Harrington
9bd3909449
Merge master into pretty-emails
2014-11-21 14:43:01 +11:00
Rob Harrington
2f28312f7e
Removing incorrectly placed directive in profile shops skinny view
2014-11-21 14:18:22 +11:00
Rohan Mitchell
49d5cb2f05
Do not show Override Variants tab - hide this until feature is ready
2014-11-21 13:49:09 +11:00
Rohan Mitchell
0b030a85ff
Incrementally load products
2014-11-21 13:49:09 +11:00
Rohan Mitchell
001bf999d0
Extract Spree API authorisation to service
2014-11-21 13:49:09 +11:00
Rohan Mitchell
824b00743e
Extract fetch-by-page from BPE to service
2014-11-21 13:49:09 +11:00
Rohan Mitchell
58fdc48b9f
Display products in table
2014-11-21 13:49:09 +11:00
Rohan Mitchell
7069b30e71
Add indexer service (equivalent of Dereferencer, but named more accurately)
2014-11-21 13:49:09 +11:00
Rohan Mitchell
680ba379c1
User can select a hub
2014-11-21 13:49:09 +11:00
Rohan Mitchell
912c60f720
Do not show producers in hubs list
2014-11-21 13:49:09 +11:00
Rohan Mitchell
4c9aa96b17
have_select2 can test for an exact set of options
2014-11-21 13:49:09 +11:00
Rohan Mitchell
2c74a94e31
Show list of hubs to select for managing variant overrides
2014-11-21 13:49:09 +11:00
Rohan Mitchell
d810388248
Add have_select2 capybara matcher
2014-11-21 13:49:09 +11:00
Rohan Mitchell
bad5d798bf
Comment proxy classes
2014-11-21 13:49:09 +11:00
Rohan Mitchell
2b0f6b7865
Add ProductProxy which wraps the product's variants in VariantProxys
2014-11-21 13:49:09 +11:00
Rohan Mitchell
f3fa5edb9d
Add simple variant proxy
2014-11-21 13:49:09 +11:00
Rohan Mitchell
f9b4c07219
Add initial VariantOverride model with price lookup
2014-11-21 13:49:09 +11:00
Rob Harrington
5e3f1e4a3b
Adding bugsnag notifier to work out what is happening with bug when adding variants to order
2014-11-21 12:37:56 +11:00
Rob Harrington
2c4b8d779c
Make application.yml available to travis
2014-11-21 10:17:43 +11:00
Rob Harrington
04b065e28a
Orders page doesn't crash when orders have no distributor
2014-11-21 10:15:40 +11:00
Rohan Mitchell
bf6d0a2beb
Port remaining specs to BulkProducts service specs
2014-11-21 08:41:41 +11:00
Rohan Mitchell
5eb40261a8
Port clone products specs to BulkProducts service specs
2014-11-21 08:41:41 +11:00
Rohan Mitchell
221e9344fd
Port fetch products specs to BulkProducts service specs
2014-11-21 08:41:41 +11:00
Rohan Mitchell
387d25b8f2
WIP: More extracting BulkProducts-specific specs to their own file
2014-11-21 08:41:41 +11:00
Rohan Mitchell
7e2c979c96
WIP: Extracting BulkProducts-specific specs to their own file
2014-11-21 08:41:41 +11:00
Rohan Mitchell
7e4d337773
Extract DisplayProperties to a service
...
Conflicts:
app/assets/javascripts/admin/bulk_product_update.js.coffee
2014-11-21 08:41:41 +11:00
Rohan Mitchell
356a03ac4e
WIP: Extract bulk product edit product management to BulkProducts service
...
Conflicts:
app/assets/javascripts/admin/bulk_product_update.js.coffee
2014-11-21 08:41:41 +11:00
Rohan Mitchell
f117c0cd24
Make spree_current_user available to serializers as 'scope'
2014-11-21 08:41:41 +11:00
Rohan Mitchell
29e49b67cc
In BPE, rename producer and category JSON attrs to producer_id and category_id
...
Conflicts:
spec/features/admin/bulk_product_update_spec.rb
2014-11-21 08:41:41 +11:00
Rohan Mitchell
021cca4fca
Stylistic changes
2014-11-21 08:41:41 +11:00
Rob Harrington
ebaaf2a136
Display line items in confirmation email with fees included in item totals
2014-11-20 20:17:18 +11:00
Rob Harrington
b64b48f26e
Removing obsolete MailerHelper reference
2014-11-20 20:16:34 +11:00
Rob Harrington
c310a3bdaa
Don't use svg for email header
2014-11-20 20:14:57 +11:00
Rob Harrington
46462a1abb
Format fiddling in user signup confirm email
2014-11-20 20:13:54 +11:00
Rohan Mitchell
b941ffabeb
Update README for Figaro config, add Maikel to credits
2014-11-20 16:20:07 +11:00
Rohan Mitchell
76c300283b
Remove CONTACT_STRING config - Rob has an admin-managable override for this coming soon
2014-11-20 15:59:06 +11:00
Rob Harrington
3d98ec6eef
Stripping out inline styles from enterprise email templates
2014-11-20 15:51:28 +11:00
Rob Harrington
4dd5e51ed5
Stripping out inline styles from user signup email template
2014-11-20 15:48:36 +11:00
Rob Harrington
1f42d32151
Remove naughty pry
2014-11-20 15:45:50 +11:00
Rob Harrington
f5a5b93c22
Can use relative paths for assets in emails because roadie
2014-11-20 15:45:12 +11:00
Rob Harrington
15d157abc0
Stripping out inline styles from email templates
2014-11-20 15:42:03 +11:00
Rohan Mitchell
8096ca2519
Merge remote-tracking branch 'origin/config' into config
2014-11-20 15:41:15 +11:00
Rob Harrington
2e84a8f626
Pull layout and roadie style inlining out into spree's base mailer so it applies to all mailers
2014-11-20 15:05:19 +11:00
Rob Harrington
ac6a043f40
Add roadie-rails to help with inlining styles for emails
2014-11-20 14:56:35 +11:00
Rob Harrington
fe0bb49baf
WIP: Adding templates for different order confirmation emails
2014-11-20 12:06:53 +11:00
Rob Harrington
20341ecbc1
Send bugsnag notification when order confirmation email fails
2014-11-20 12:04:51 +11:00
Rob Harrington
dd6a5ecd0b
Adding helper for assets in mailer views, fixing links in mailer layout
2014-11-19 16:42:31 +11:00
Rob Harrington
c9d0721acd
Rewire order confirmation email so that two separate emails are sent, one for customers and one for shop owners
2014-11-19 11:03:00 +11:00
Lynne Davis
b81bf60dc2
267: Cont. Didn't realise commit -a doesn't add a file
2014-11-18 19:30:44 +00:00
Lynne Davis
cc0da142b7
267: Adding to new product form ability to add shipping category to record frozen/chilled
2014-11-18 19:28:49 +00:00
Paul Mackay
375bdc0586
#275 : Change report format. Improved mailer.
2014-11-16 07:14:29 +00:00
Lynne Davis
03b59eae75
266: Updating with rohans suggestions to tidy up and 'rubify' the code. Thanks for the tips Rohan!
2014-11-14 15:56:07 +00:00
Lynne Davis
e89184de02
286: Last sneaky dollar sign. Updated to use spree_number_to_currency
2014-11-14 14:24:22 +00:00
Rob Harrington
8d1facb7c3
Adding revamp of enterprise welcome email by @summerscope
2014-11-14 18:42:16 +11:00
Rob Harrington
0907e2d886
A few alterations to the enterprise email confirmation email
2014-11-14 18:10:40 +11:00
Rob Harrington
d182bb7bf7
Add signoff partial for mailer templates
2014-11-14 18:09:48 +11:00
Rob Harrington
b320f71771
Adding revamp for signup confirmation by @summerscope
2014-11-14 17:59:56 +11:00
Rob Harrington
27d1886d53
Fix mailto link
2014-11-14 17:58:13 +11:00
Rob Harrington
15559b2388
Merge branch 'master' into pretty-emails
2014-11-14 16:54:50 +11:00
Rob Harrington
ffb915ccc5
Orders page doesn't crash when orders have no distributor
2014-11-14 16:48:33 +11:00
Rob Harrington
d9d6b7bee4
Adding filtering to Users and Enterprises report
2014-11-14 16:36:22 +11:00
Rob Harrington
79a83ee206
Adding users and enterprises report, controller action and template
2014-11-14 16:36:22 +11:00
Rob Harrington
66a3410087
WIP: Adding new report to ability spec
2014-11-14 16:36:22 +11:00
Rob Harrington
65a5960fcc
WIP: Add route for User and Enterprise report
2014-11-14 16:36:22 +11:00
Lynne Davis
cc3959467d
285: Report downlaod naming - Updating to the cleaner suggestions of Rohan. Note to self, don't be lazy :-)
2014-11-13 10:30:00 +00:00
Rohan Mitchell
43bac4079f
Show hubs that are not ready for checkout so that we can view SEFH - Sample :/
2014-11-13 15:21:02 +11:00
Lynne Davis
15f29f4c8e
266: Adding ability to search by distribution
2014-11-12 18:52:25 +00:00
Lynne Davis
932d571d2c
266: Updating to incorporate Rohans suggestions. Searching on payment method name rather than id
2014-11-12 11:47:26 +00:00
Rohan Mitchell
43ddac84b0
I like nice code
2014-11-12 16:25:45 +11:00
Rohan Mitchell
2ca2d53273
Do not include perftools gem by default - it breaks Travis
2014-11-12 16:25:45 +11:00
Rohan Mitchell
4e655d7866
Uncouple migrations from models
2014-11-12 16:25:45 +11:00
Rob Harrington
7282c7174f
Moving alert box to top of section
2014-11-12 15:55:48 +11:00
Rob Harrington
7a719952fc
Adding informative messages about email confirmations to enterprise form
2014-11-12 15:20:52 +11:00
Rob Harrington
2c67066366
Add alert to enterprise edit page to remind user that confirmation email has been sent
2014-11-12 15:20:52 +11:00
Rob Harrington
6b21bbdf74
Reconfirmation email sends to the right address
2014-11-12 15:20:51 +11:00
Rob Harrington
ee2ee5dba7
Adding an enterprise welcome email
2014-11-12 15:20:51 +11:00
Rohan Mitchell
6953449d28
Merge pull request #288 from folklabs/doc-improvements
...
Small doc tweak to add db:setup command.
2014-11-12 14:40:33 +11:00
Lynne Davis
9a5ee81431
Changing report download titles in include download date
2014-11-11 17:49:08 +00:00
Rohan Mitchell
bb9b244d18
Upgrade paperclip to 3.x, fixes incorrect cropping of EXIF-rotated JPGs
2014-11-10 14:54:49 +11:00
Paul Mackay
1d0dab5cc6
Small doc tweak to add db:setup command.
2014-11-09 12:08:40 +00:00
Paul Mackay
9b7fd1c16b
#275 : small tweaks.
2014-11-09 11:19:26 +00:00
Paul Mackay
05437e2a56
#275 : start on producer email.
2014-11-09 11:17:46 +00:00
Rob Harrington
0432fe229b
Add bottom margin to loading gif
2014-11-07 16:53:15 +11:00
Rob Harrington
66bbaabf79
Adding loading gif to shop page
2014-11-07 16:50:31 +11:00
summerscope
2addb1c472
Tweak producer register pane styling for lightweight view
2014-11-07 13:56:56 +11:00
summerscope
791cc9b301
Hide pricing table until language is sorted
2014-11-07 13:56:28 +11:00
summerscope
2166fbc8a0
Tweak wording for kirsten
2014-11-07 13:56:07 +11:00
summerscope
9f74e8ff03
Add caret to right on register buttons, kill commented out text
2014-11-07 12:05:35 +11:00
summerscope
4795de5ab0
Adding new partial into homepage
2014-11-07 08:49:09 +11:00
summerscope
039b94aa47
Styling for Producers Register pane and pricing table
2014-11-07 08:48:54 +11:00
summerscope
9a2e510f2c
Add Producers register link to footer
2014-11-07 08:48:37 +11:00
summerscope
cd34aedbb9
New partial for producer register pricing table
2014-11-07 08:48:24 +11:00
Rob Harrington
e1823212d6
Reconfirmation email not required when we already know about new email address for enterprise
2014-11-06 21:19:22 +11:00
Rob Harrington
898af0a55e
Enterprise confirmation emails can be resent, and sensible things happen if confirmation link is clicked twice
2014-11-06 21:19:21 +11:00
Rob Harrington
e6f5811a60
Only send confirmation instructions to the enterprise email address
2014-11-06 21:19:21 +11:00
Rob Harrington
70c4b7082d
Split ent confirmation email out into layout and partial
2014-11-06 21:19:21 +11:00
Rob Harrington
74642c3825
Update checkout helper spec to reflect Rohan's changes
2014-11-06 21:18:20 +11:00
Rohan Mitchell
3e151c40f5
WIP: Smooth scroll to checkout errors
2014-11-06 18:29:49 +11:00
Rohan Mitchell
57e7bc9504
Checkout: When error, open offending accordion section
2014-11-06 18:29:49 +11:00
Rohan Mitchell
4389389d44
Checkout: Display error when shipping or payment method is not selected
2014-11-06 18:29:49 +11:00
Rohan Mitchell
ca9da15ba4
Checkout: Fix shipping and payment method summary display when none selected
2014-11-06 18:29:48 +11:00
Rohan Mitchell
f2c6ee87d3
Extract duplicated checkout accordion heading to partial
2014-11-06 18:29:48 +11:00
Rohan Mitchell
519aea2d9b
Extract checkout shipping ship address to partial
2014-11-06 18:29:48 +11:00
Rohan Mitchell
433cf9dd9b
Checkout: Use validated_select for shipping address fields
2014-11-06 18:29:48 +11:00
Rohan Mitchell
7a0c291fc1
Checkout: Use validated_select for country
2014-11-06 18:29:48 +11:00
Rohan Mitchell
06a9110e95
Extract checkout select options to helpers
2014-11-06 18:29:48 +11:00
Rohan Mitchell
900a98b4bb
Display errors on checkout State field
2014-11-06 18:29:48 +11:00
Rohan Mitchell
e50d2a6a37
Remove unused directive
2014-11-06 18:29:48 +11:00
Rohan Mitchell
cbb968d87f
Pass checkout form to controller method
2014-11-06 18:29:48 +11:00
Rohan Mitchell
75b250d3fe
When submitting checkout, if field is invalid, show errors
2014-11-06 18:29:48 +11:00
Rohan Mitchell
e8e5f7033c
Improve all the syntax
2014-11-06 18:29:48 +11:00
Rob Harrington
51e768e722
Refactor EnterpriseSet to accept a collection as an argument
2014-11-06 16:29:09 +11:00
Rob Harrington
b27a0986b7
Ensure collection is locked down before we start asssigning attributes to model set
2014-11-06 16:28:24 +11:00
Rob Harrington
be042af751
Add explicit select statement to prevent scope being read only
2014-11-06 15:54:59 +11:00
Rob Harrington
93e3d87fcb
Errors on bulk update for enterprise index do not allow user to list all enterprises
2014-11-06 11:01:44 +11:00
Rohan Mitchell
1506b10d8f
Fix brittle spec
2014-11-05 16:08:45 +11:00
Rohan Mitchell
fdbb274667
Allow browsing products (but not cart/checkout) for hubs that are not ready for checkout
2014-11-05 14:29:36 +11:00
Rohan Mitchell
a2f4732547
Merge branch 'folklabs-i18n'
2014-11-05 12:01:27 +11:00
Rohan Mitchell
98f434dad3
Merge branch 'i18n' of https://github.com/folklabs/openfoodnetwork into folklabs-i18n
2014-11-05 11:54:42 +11:00
Lynne Davis
6f6ae309c6
266 UK: Adding first UK report - Payment Methods Report - to find balances per ordercycle for multiple payment method options. Working, but not complete to spec yet
2014-11-02 11:26:39 +00:00
Rohan Mitchell
8c2adb2a05
Fix specs: feature specs requiring payment and shipping methods, race condition, double flash message issue
2014-11-01 12:11:50 +11:00
Rohan Mitchell
15b05de7f2
Fix specs: Distributors require shipping and payment method
2014-11-01 10:42:38 +11:00
Rohan Mitchell
0cf4e01dde
Fix specs: Expect proper query chain
2014-11-01 10:39:29 +11:00
Paul Mackay
543368169f
#254 : Localisation of home page and welcome email.
2014-10-31 06:59:43 +00:00
Rohan Mitchell
0d05c7163d
Use factory shortcut for creating shipping and payment methods
2014-10-31 16:26:13 +11:00
Rohan Mitchell
f5b20b7afc
Give distributors a payment and shipping method where required
2014-10-31 16:02:43 +11:00
Rohan Mitchell
e2d88e615b
Fix broken spec
2014-10-31 16:00:28 +11:00
Rohan Mitchell
8488b8e469
When user has selected a hub that is not ready for checkout, unselect it
2014-10-31 15:02:58 +11:00
Rohan Mitchell
7aefa05efd
Fix specs broken by requirement for valid shipping and payment method
2014-10-31 14:48:08 +11:00
Rohan Mitchell
abeabd5b1c
Add Enterprise#ready_for_checkout?
2014-10-31 14:04:43 +11:00
Rohan Mitchell
94d50f220f
Display an error message to admin when there are hubs in order cycles that are not ready for checkout
2014-10-31 12:22:02 +11:00
Rohan Mitchell
9f43146e47
Payment methods need to be available, too
2014-10-31 12:22:02 +11:00
Rohan Mitchell
f0d3b987d4
Show hubs as unavailable when they do not have available payment and shipping methods
2014-10-31 12:22:02 +11:00
Rohan Mitchell
1d9a3f33e0
Order cycle distributors must have shipping and payment methods
2014-10-31 12:22:02 +11:00
Rohan Mitchell
fc1c3abb9f
Remove duplicate data injection (duplicated in darkswarm layout)
2014-10-31 12:22:02 +11:00
Rohan Mitchell
433806aca8
Remove unused helpers and standardise naming
2014-10-31 12:22:02 +11:00
summerscope
34f47cedae
Fix markup for better layout and getting column padding sitting where it should
2014-10-30 17:03:09 +11:00
summerscope
733b249b12
making tabs break down better for responsive and small devices
2014-10-30 17:03:09 +11:00
summerscope
d8933deee0
Styling shopfront tabs make things better and more responsive
2014-10-30 17:03:09 +11:00
summerscope
a27a805478
Tweak styling so the accordion hover colors dont fight the validation colors
2014-10-30 17:03:08 +11:00
summerscope
38e6575781
Move first and last name fields to top of shipping address accordion
2014-10-30 17:03:08 +11:00
summerscope
799c894bd3
Tweak logo embedding to use new version, and use srcset with src as a fallback
2014-10-30 17:03:08 +11:00
summerscope
32daa1745c
Tweak logo for high density screens, make pretty and easier to read
2014-10-30 17:03:08 +11:00
summerscope
6329db23d7
Remove styling for capitalisation for shopfront page
2014-10-30 17:03:08 +11:00
Rob Harrington
6596e14e5d
Use shared partial for errors on EnterpriseFeeSet
2014-10-30 13:02:16 +11:00
Rob Harrington
65d13e0490
Show error messages on enterprise index page
2014-10-30 13:02:16 +11:00
Rob Harrington
977c508833
Make enterprise limit error messages more specific
2014-10-30 13:02:16 +11:00
summerscope
fd8eecf745
Remove unnecessary partial import
2014-10-30 11:30:21 +11:00
summerscope
64f2d1b34e
Remove unnecessary partial import
2014-10-30 11:30:03 +11:00
summerscope
f1e27a3ac3
No need to import typography into this file, add note for future devs
2014-10-30 11:29:42 +11:00
Rafael Schouten
2b0757e96f
Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork
2014-10-25 20:23:25 +11:00
Rafael Schouten
68073d7239
revome config sidebar from index
2014-10-25 19:03:56 +11:00
Rafael Schouten
095dd28505
Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork
2014-10-25 18:53:46 +11:00
Rafael Schouten
feff4fd46f
fix reports taxons and specs
2014-10-25 18:51:03 +11:00
Rafael Schouten
6f1c90ea25
add toxons to prodcut reports
2014-10-25 17:09:23 +11:00
Rafael Schouten
098afacce3
Merge branch 'config' of https://github.com/openfoodfoundation/openfoodnetwork into config
2014-10-25 15:32:16 +11:00
Rafael Schouten
8395dbb3e9
Merge branch 'master' into config
...
Conflicts:
.gitignore
Gemfile
2014-10-25 15:29:53 +11:00
Rafael Schouten
33fc7e0fc9
Merge branch 'master' into checkout
2014-10-25 15:12:24 +11:00
Rafael Schouten
3ad7165fd6
add checkout subbmission directive
2014-10-10 17:53:28 +11:00
Rafael Schouten
01aa8cb761
Use serialiser instead of rabl for current order injection
2014-10-10 15:30:53 +11:00
Rafael Schouten
b68754d634
put payment description in panel
2014-10-10 15:22:21 +11:00
Rafael Schouten
a5680e611e
add example yml
2014-09-17 12:05:28 +10:00
Rafael Schouten
15bfe75313
ifnore figaro
2014-09-16 00:21:10 +10:00
Rafael Schouten
9448e1cbe4
add figaro env config
2014-09-16 00:13:43 +10:00
Maikel Linke
ef639b9535
Adjusting columns for 16 column layout.
...
Removed the 1col spacer column and extended the fieldsets to 12col.
2014-08-28 17:06:26 +10:00
Maikel Linke
a379f88add
making asterisk 10% bigger
2014-08-28 16:41:10 +10:00
Maikel Linke
a0d6ec988e
make asterisk red
2014-08-28 16:38:44 +10:00
Maikel Linke
8da98ce19c
Adding asterisks to required fields.
...
Addressing BugHerd #454 .
2014-08-28 16:26:30 +10:00