Compare commits

...

10846 Commits
v1.0 ... v3.2.2

Author SHA1 Message Date
Matt-Yorkley
3940337d8e Bump paypal gem to patched version 2020-08-07 10:46:22 +01:00
Matt-Yorkley
665f88ebdd Update all locales with the latest Transifex translations
(cherry picked from commit 766b7449d8)
2020-08-07 10:44:25 +01:00
Luis Ramos
327d6c43d9 Merge pull request #4084 from openfoodfoundation/dependabot/bundler/devise-3.5.10
[Security] Bump devise from 2.2.8 to 3.5.10
2020-08-01 15:55:19 +01:00
Luis Ramos
cc7363d9e7 Merge pull request #5824 from luisramos0/improve_checkout
Reset order state to cart in case the stripe SCA authorization step fails
2020-08-01 15:53:41 +01:00
Luis Ramos
b025d5a600 Merge pull request #5822 from luisramos0/improve_ocs_perf
Performance improvement of the outgoing products page when editing OCs
2020-07-31 16:07:16 +01:00
Luis Ramos
2aa6c70dc6 Remove select from relation
This relation is only used above for a call to empty? so we don't need to worry about the select part of the query, specially not introducing an expensive DISTINCT
2020-07-31 09:26:04 +01:00
Luis Ramos
d052a7b796 Verify the user is confirmed before returning a reset password token
Co-authored-by: Maikel <maikel@email.org.au>
2020-07-31 09:14:07 +01:00
Luis Ramos
7c498a573c Make shopfront redirect work when logging out by storing it outside session data 2020-07-31 09:05:42 +01:00
Luis Ramos
86afa6f413 Adapt to devise 3.2 and use after_confirmation callback to send welcome email 2020-07-31 09:05:42 +01:00
Luis Ramos
ca9898839a Confirm! is deprecated and only redirects to confirm now in devise 3.5 2020-07-31 09:05:42 +01:00
Luis Ramos
f31d790714 Add auth spec to cover case where user tries to reset password before confirming their email 2020-07-31 09:05:42 +01:00
Luis Ramos
0f29806198 Adapt code to devise 3.2 where the reset_password_token stored in the db is a encrypted version of the token sent in the email
In this particular case, the user confirmations controller is redirecting to the reset password page but it doesnt know what is the raw reset_password_token

So we regenerate the reset password token so that it can know what's the raw value for the redirect

The method User#regenerate_reset_password_token is a proxy to the protected method in Devise::Recoverable
2020-07-31 09:05:42 +01:00
Luis Ramos
c0f9f8c8bf Remove comment refering to old spree upgrade 2020-07-31 09:05:42 +01:00
Luis Ramos
a2ae78bde9 Replay commit from spree_auth_devise that upgrades to devise 3
fe7941f674
2020-07-31 09:05:42 +01:00
Luis Ramos
26ca374a76 Adpat user mailer to devise v3 2020-07-31 09:05:42 +01:00
Luis Ramos
40e065eada Add gem for Devise::TokenAuthenticatable and configure it 2020-07-31 09:05:42 +01:00
dependabot-preview[bot]
f7ee6ce6c5 [Security] Bump devise from 2.2.8 to 3.5.10
Bumps [devise](https://github.com/plataformatec/devise) from 2.2.8 to 3.5.10. **This update includes a security fix.**
- [Release notes](https://github.com/plataformatec/devise/releases)
- [Changelog](https://github.com/plataformatec/devise/blob/v3.5.10/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/devise/compare/v2.2.8...v3.5.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-31 09:05:42 +01:00
Maikel Linke
bee7990c60 Update translations 2020-07-31 15:58:04 +10:00
Luis Ramos
1e9b11d209 Merge pull request #5807 from romale/patch-5
Add Russian to list of momentJS locales
2020-07-30 19:01:38 +01:00
Luis Ramos
df465cf45b Merge pull request #5698 from rmklaus12/5575-backofficepay-missing-translation
Added translation key to locale/en.yml for backoffice admin payment
2020-07-30 19:01:11 +01:00
Luis Ramos
f524560624 Merge pull request #5800 from romale/patch-4
Missing translation key for "permalink" and "shipping_categories"
2020-07-30 18:00:45 +01:00
Luis Ramos
7af47df570 Merge pull request #5843 from andrewpbrett/master
Update Docker instructions to recommend creating your own fork
2020-07-30 17:57:33 +01:00
Luis Ramos
354b76205e Merge pull request #5839 from openfoodfoundation/dependabot/bundler/oj-3.10.8
Bump oj from 3.10.7 to 3.10.8
2020-07-30 17:54:12 +01:00
Luis Ramos
fbc7eea1a5 Merge pull request #5811 from jttyeung/master
Fix #5730 content header overlap with long product names
2020-07-30 17:53:09 +01:00
Luis Ramos
0359d103b2 Improve code comments on dodgy and/but critical checkout process method 2020-07-30 17:18:34 +01:00
Luis Ramos
1400b3667b Merge pull request #5788 from romale/patch-2
Missing translation key for shipping_method and new_order
2020-07-30 16:54:07 +01:00
Luis Ramos
e739c5185e Add specs to verify that Spree::Core::Gateway exceptions are handled correctly 2020-07-29 23:56:52 +01:00
Luis Ramos
2136eecd09 Avoid reloading the payment every time, so that in-memory data is not wiped out
When checkout fails and the payment states dont match (inside the if), in-memory data of the failed payment can be lost but updating the payment state is the fundamental part here so that further checkout attempts work. We may improve this update statement so that all the data of the failed payment is persisted
2020-07-29 22:50:30 +01:00
Luis Ramos
9e9e0d0bd8 Remove rescue_from and just add the rescue to the edit action, the update action has a different logic where there is a generic rescue StandardError after the GatewayError rescue 2020-07-29 22:50:25 +01:00
Luis Ramos
da4abf6617 Add a comment to explain the necessity of the first rescue in the update action 2020-07-29 22:50:20 +01:00
Luis Ramos
ad00971ca8 Improve readability and add bugsnag error (now in the checkout_failed method) when checkout_fails while handling stripe redirect 2020-07-29 22:50:18 +01:00
Andy Brett
54cb479fa1 Update Docker instructions to mention the recommendation to create one's own fork 2020-07-29 13:04:34 -07:00
Pau Pérez Fabregat
e9787552c8 Merge pull request #5713 from Matt-Yorkley/taxon-icons
Remove taxon icons
2020-07-29 18:43:06 +02:00
Luis Ramos
bea472623d Merge pull request #5834 from openfoodfoundation/dependabot/bundler/unicorn-5.6.0
Bump unicorn from 5.5.5 to 5.6.0
2020-07-29 14:33:04 +01:00
Pau Perez
84178c637e Add missing momentjs languages to back-office 2020-07-29 13:02:46 +02:00
Pau Perez
9bf58a8258 Add missing Catalan, Arabic & Turkish for momentjs 2020-07-29 12:53:34 +02:00
Pau Pérez Fabregat
bcaa308ac8 Merge pull request #5825 from openfoodfoundation/transifex
Transifex
2020-07-29 11:20:56 +02:00
Maikel Linke
fe0c04b650 Complete renaming of AdvanceOrderService to OrderWorkflow 2020-07-29 12:24:18 +10:00
Robin Klaus
4375a34ef8 Updated message to Paypal payments cannot be captured in the Backoffice 2020-07-29 10:18:25 +10:00
Luis Ramos
07005594ff Move payments persistence code to order workflow service 2020-07-28 23:56:43 +01:00
Luis Ramos
ac5882e3e6 Refactor OrderWorkflow 2020-07-28 23:55:36 +01:00
Luis Ramos
9cbcf14485 Move shipping method id setting code to OrderWorkflow service 2020-07-28 23:50:47 +01:00
Luis Ramos
c3f99050fd Move advance_order_state from checkout_controller to OrderWorkflow service 2020-07-28 23:43:07 +01:00
Luis Ramos
26eee4631f Rename AdvanceOrderService to OrderWorkflow 2020-07-28 23:40:49 +01:00
Luis Ramos
734fce5ce7 Add code to persist payments after failed payments. The state machine
rollbacks the transactions, with this we keep record of what went wrong.
2020-07-28 23:29:49 +01:00
Luis Ramos
e80337a458 Transpec checkout_spec 2020-07-28 23:29:49 +01:00
Luis Ramos
51de5269dc Fix specs in checkout_spec 2020-07-28 23:29:49 +01:00
Luis Ramos
e99f0dc6b7 Rubocop autocorrect and easy rubocop issues 2020-07-28 23:29:49 +01:00
Luis Ramos
d8a96c9d34 Bring order checkout workflow and some of its specs from spree_core 2020-07-28 23:29:49 +01:00
dependabot-preview[bot]
555a74c9e6 Bump oj from 3.10.7 to 3.10.8
Bumps [oj](https://github.com/ohler55/oj) from 3.10.7 to 3.10.8.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.7...v3.10.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-28 21:10:22 +00:00
Luis Ramos
275a864e51 Merge pull request #5815 from coopdevs/eager-load-option-values-line-items
Eager load spree_option_values_line_items
2020-07-28 17:21:02 +01:00
Luis Ramos
61453968dd Merge pull request #5833 from luisramos0/pend_payments
Add unit tests for order.charge_shipping_and_payment_fees!
2020-07-28 17:18:57 +01:00
Transifex-Openfoodnetwork
8263e2e373 Updating translations for config/locales/es.yml 2020-07-29 00:39:21 +10:00
Transifex-Openfoodnetwork
aff8933d25 Updating translations for config/locales/ca.yml 2020-07-29 00:36:57 +10:00
Pau Pérez Fabregat
d4570240ae Merge pull request #5826 from openfoodfoundation/luisramos0-patch-1
Update GETTING_STARTED.md
2020-07-28 15:59:38 +02:00
dependabot-preview[bot]
d0a7f8e1af Bump unicorn from 5.5.5 to 5.6.0
Bumps [unicorn](https://yhbt.net/unicorn/) from 5.5.5 to 5.6.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-27 23:44:40 +00:00
Luis Ramos
d673f278ce Add unit test to order.charge_shipping_and_payment_fees! 2020-07-27 21:27:23 +01:00
Transifex-Openfoodnetwork
79aadf5c86 Updating translations for config/locales/tr.yml 2020-07-27 03:23:28 +10:00
Luis Ramos
ec0d06af54 Reuse update_failed method as the code needed is exactly the same 2020-07-25 19:39:46 +01:00
Luis Ramos
b23b707b5d Notify bugsnag and execute post checkout actions (reset to cart state) whenever there's a payment gateway exceeption raised 2020-07-25 19:39:46 +01:00
Luis Ramos
1bf946d124 Reused code in checkout controller, the reponse for the case when there is a stripe exception anywhere is the same as when the update action fails 2020-07-25 19:39:46 +01:00
Luis Ramos
5266d95910 Move method closer to related/similar methods 2020-07-25 19:39:46 +01:00
Luis Ramos
df22ad46d6 Update GETTING_STARTED.md
Clarify users landing on this page that they should use ofn-install for server deployments.
2020-07-25 14:53:35 +01:00
Transifex-Openfoodnetwork
227892b629 Updating translations for config/locales/en_FR.yml 2020-07-25 23:36:58 +10:00
Transifex-Openfoodnetwork
ffc98c63fa Updating translations for config/locales/fr.yml 2020-07-25 23:36:48 +10:00
Luis Ramos
add7bb489f Update all locales with the latest Transifex translations 2020-07-25 13:13:35 +01:00
Luis Ramos
752d9e9bb8 Merge pull request #5806 from openfoodfoundation/bring-in-payment-model
Bring in payment model
2020-07-24 14:52:20 +01:00
Luis Ramos
d93c1684b9 Merge pull request #5780 from coopdevs/handle-credit-validation-errors
Handle credit validation errors
2020-07-24 14:49:52 +01:00
Luis Ramos
603991996f Merge pull request #5799 from luisramos0/calcs_bug
Add migration to fix calculator preferences
2020-07-24 14:22:55 +01:00
Luis Ramos
32d45f6fe5 Merge pull request #5747 from mbudm/issue/5434
Make keyboard UI close on iOS when done searching
2020-07-24 13:25:39 +01:00
Luis Ramos
8f4395a6ea We need to clear Rails cache after updating preferences so that the app picks the new values immediately 2020-07-24 13:17:43 +01:00
Luis Ramos
1b31b727c7 Add migration to fix calculator preferences 2020-07-24 13:17:43 +01:00
Pau Perez
97f551a2dd Replace literal with AR's 4 #not 2020-07-23 20:24:31 +02:00
Pau Perez
357037e429 Recalculate adjustments when invalidating payments
Switching from `#invalidate` to `#update_column` skipped both
validations and callbacks and thus, `#ensure_correct_adjustments` was no
longer called for older payments.
2020-07-23 20:24:31 +02:00
Pau Perez
e6943ce554 Fix simple Rubocop issues 2020-07-23 20:24:31 +02:00
Pau Perez
4d9fbb68d6 Add missing attribute to skip source validation 2020-07-23 20:24:31 +02:00
Pau Perez
813459ee38 Clarify method documentation 2020-07-23 20:24:31 +02:00
Pau Perez
c0f72f89f2 Handle #refund! as we do with #credit! 2020-07-23 20:24:31 +02:00
Pau Perez
0f0a704147 Skip source validation when applying credit
The original payment may not be valid because its credit card may be
expired. Stripe gives this as a valid scenario returning a success and
we should do too.

When creating the credit payment we end up validating all sources in
a chain as follows.

```
Payment being persisted -> source payment -> original credit card.
```

The source payment was valid when created (It would not be persisted
otherwise) but its source card may now be expired, and that's legit.

There was also an issue with the `#invalidate_old_payments` callback. It
was causing the original payment to be validated again and thus the
credit payment failed to be persisted due to the original credit card
being expired. Switching this callback to use `#update_column` skips
validations and so we don't validate the source payment. We only care
about the state there, so it should be fine.
2020-07-23 20:24:31 +02:00
Pau Perez
f2b28a198d Replace before_validation with custom validation
No reason to use a callback when custom validation methods can be
defined.
2020-07-23 20:24:31 +02:00
Pau Perez
f2fd426c4a Fix old Spree specs
Given the importance of this code, it doesn't bring me much confidence.
Apparently, this specs where using a non-existent state by mistake and
this went unnoticed because the payment creation was failing silently in
payment/processing.rb.

This unearthed the fact that our `#ensure_correct_adjustment` needs the
order to be persisted to succeed.
2020-07-23 20:24:31 +02:00
Pau Perez
1c026479f5 Replace spec's syntax to RSpec 3 2020-07-23 20:24:31 +02:00
Pau Perez
73b1b1f172 DRY specs and fix rubocop failures 2020-07-23 20:24:31 +02:00
Pau Perez
59da07de66 Handle all errors when dealing with payment event
This basically catches ActiveRecord::RecordInvalid caused by an invalid
credit record, for instance, but also other situations we haven't
forseen.
2020-07-23 20:24:31 +02:00
Pau Perez
26ed601996 Test the payment controller handles GatewayError
After that, we can TDD a second one that also handles validation errors.
2020-07-23 20:24:31 +02:00
Pau Perez
6ca6938df4 Merge branch 'master' into bring-in-payment-model
* master: (91 commits)
  Bump ddtrace from 0.37.0 to 0.38.0
  Add spec to cover SQL query issue with OCs where the only products from the coordinator inventory are renderer
  Remove unnecessary order statement, the relation will only be used for counting products
  Move select out of scope visible_for because it is breaking exchange_product queries and it's just not needed there. The only other use of this product's scope visible_for is the enterprise serializer so we add the select to it.
  Make OC advanced settings work by permitting the extra parameter
  Remove conflicting and duplicate route
  Bump bugsnag from 6.13.1 to 6.14.0
  Make charges update method update the first pending payment
  Move require_login_then_redirect_to to the only place where it is called
  Make broken spec fail reliably and set it pending
  Updating translations for config/locales/en_GB.yml
  Update all locales with the latest Transifex translations
  Doc defensive coding needed by pin payments
  Make method a little simple by extracting method
  Simplify spec, the 2 minutes wait is not necessary anylonger
  Make unauthorized in ControllerHelpers::Auth the same as in Spree::Admin::BaseController
  Move unauthorized view to HomeController only, all other calls to unauthorized will go through Auth which will redirect to the home controller IF the user is logged in or to login if user is not logged in
  Adapt specs to the move of unauthorized route from the spree routes to the main app routes
  Delete spree_user_signup which is from spree promotions code that we dont use
  Remove try_spree_current_user
  ...
2020-07-23 20:20:43 +02:00
Joanne Yeung
abc132d3db Remove trailing whitespace 2020-07-23 09:37:10 -06:00
Joanne Yeung
b16f486dcc Address missing semi-colon 2020-07-23 09:25:56 -06:00
Luis Ramos
6cc91d457e Merge pull request #5796 from coopdevs/remove-conlicting-spree-route
Remove conflicting and duplicate route
2020-07-23 14:29:12 +01:00
Luis Ramos
438aef1e7a Merge pull request #5798 from luisramos0/payment_fees_master
Make charges update method update the first pending payment
2020-07-23 14:23:03 +01:00
Pau Perez
c8b738cbd5 Eager load spree_option_values_line_items
For the BulkCoop report to speed up. We move from an output like

```
web_1     |   CACHE (0.3ms)  SELECT id FROM "spree_line_items" WHERE "spree_line_items"."order_id" IN (SELECT id FROM "spree_orders" WHERE (("spree_orders"."distributor_id" IN (SELECT enterprises.id FROM "enterprises") OR "spree_orders"."order_cycle_id" IN (SELECT id FROM "order_cycles"))))
web_1     |   CACHE (0.0ms)  SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc  [["line_item_id", 4]]
web_1     |   CACHE (0.0ms)  SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc  [["line_item_id", 6]]
web_1     |   CACHE (0.0ms)  SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc  [["line_item_id", 8]]
web_1     |   CACHE (0.0ms)  SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc  [["line_item_id", 5]]
web_1     |   CACHE (0.0ms)  SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc  [["line_item_id", 7]]
web_1     |   CACHE (0.0ms)  SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc  [["line_item_id", 4]]
web_1     |   CACHE (0.0ms)  SELECT "spree_option_values".* FROM "spree_option_values" INNER JOIN "spree_option_types" ON "spree_option_types"."id" = "spree_option_values"."option_type_id" INNER JOIN "spree_option_values_line_items" ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id" WHERE "spree_option_values_line_items"."line_item_id" = $1 ORDER BY spree_option_types.position asc  [["line_item_id", 5]]
web_1     |   Rendered engines/order_management/app/views/order_management/reports/_report.html.haml (158.5ms)
web_1     |   Rendered engines/order_management/app/views/order_management/reports/bulk_coop/create.html.haml within spree/layouts/admin (187.3ms)
```

to

```
web_1     |   CACHE (0.0ms)  SELECT id FROM "spree_line_items" WHERE "spree_line_items"."order_id" IN (SELECT id FROM "spree_orders" WHERE (("spree_orders"."distributor_id" IN (SELECT enterprises.id FROM "enterprises") OR "spree_orders"."order_cycle_id" IN (SELECT id FROM "order_cycles"))))
web_1     |   CACHE (0.0ms)  SELECT "spree_option_types".* FROM "spree_option_types" WHERE "spree_option_types"."id" = $1 ORDER BY spree_option_types.position LIMIT 1  [["id", 1]]
web_1     |   Rendered engines/order_management/app/views/order_management/reports/_report.html.haml (101.1ms)
web_1     |   Rendered engines/order_management/app/views/order_management/reports/bulk_coop/create.html.haml within spree/layouts/admin (107.9ms)
```
2020-07-23 12:34:39 +02:00
Joanne Yeung
6419036a26 Fix content header overlap with long product names 2020-07-22 15:53:44 -06:00
Luis Ramos
3dc9548fb3 Merge pull request #5775 from luisramos0/oc_inv_bug
Make OC advanced settings work by permitting the extra parameter and make the OC edit page work with that option activated
2020-07-22 22:23:28 +01:00
romale
daa3f00302 Update all.js.coffee 2020-07-22 20:30:21 +03:00
romale
77c920daab Update all.js 2020-07-22 20:29:15 +03:00
Pau Pérez Fabregat
d3296dd5ee Merge pull request #5801 from openfoodfoundation/dependabot/bundler/ddtrace-0.38.0
Bump ddtrace from 0.37.0 to 0.38.0
2020-07-22 17:42:15 +02:00
dependabot-preview[bot]
48efb42b1a Bump ddtrace from 0.37.0 to 0.38.0
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.37.0 to 0.38.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.37.0...v0.38.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-21 21:27:14 +00:00
Luis Ramos
e445fc33a1 Add spec to cover SQL query issue with OCs where the only products from the coordinator inventory are renderer 2020-07-21 20:48:16 +01:00
Luis Ramos
aadbc9ed5d Remove unnecessary order statement, the relation will only be used for counting products 2020-07-21 19:44:43 +01:00
Luis Ramos
9b5875a7d1 Move select out of scope visible_for because it is breaking exchange_product queries and it's just not needed there. The only other use of this product's scope visible_for is the enterprise serializer so we add the select to it. 2020-07-21 19:44:43 +01:00
Luis Ramos
7ba8c5ace1 Make OC advanced settings work by permitting the extra parameter 2020-07-21 19:44:41 +01:00
Luis Ramos
8d7b383b72 Merge pull request #5794 from openfoodfoundation/dependabot/bundler/bugsnag-6.14.0
Bump bugsnag from 6.13.1 to 6.14.0
2020-07-21 17:58:30 +01:00
romale
4d6920bd92 Missing translation key for "permalink" and "shipping_categories"
When edit product in path admin/products/PRODUCT_NAME/edit
2020-07-21 18:49:24 +03:00
Pau Pérez Fabregat
426c536750 Merge pull request #5677 from luisramos0/remove_spree_root_path
Bring ControllerHelpers from Spree and remove spree root path
2020-07-21 16:15:21 +02:00
Pau Perez
9be199a6cc Remove conflicting and duplicate route
This Spree route conflicts with the one we define:

```
get "/login", to: redirect("/#/login")
```

for whatever reason there are 7 users that managed to hit the Spree one
instead of ours when confirming their signup email. It's not clear to me
though when this `/login?validation=confirmed` is really hit. The
confirmation email link passes a token in the query params and this is
not the case.

The idea is that `GET /login` makes the login modal to show up instead
of Devise's default behaviour (through inheritance) of showing a login
form page. OFN was never prepared to handle this as this bug proofs.
2020-07-21 13:27:06 +02:00
dependabot-preview[bot]
bb178c71b2 Bump bugsnag from 6.13.1 to 6.14.0
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby) from 6.13.1 to 6.14.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases)
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.13.1...v6.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-20 23:35:34 +00:00
Luis Ramos
21227d7482 Make charges update method update the first pending payment
Updating the first overall payment could select a failed payment and ignore the pending payment that is about to be processed
2020-07-20 18:23:06 +01:00
Robin Klaus
d43a3ac65e Added translation key to locale/en.yml for backoffice admin payment and added lazy loading 2020-07-20 13:07:41 +10:00
romale
19c7d11df5 Missing translation key for new_order
admin/orders/new
2020-07-19 22:06:07 +03:00
romale
eb2e894802 Missing translation key for shipping_method
admin/orders
2020-07-19 21:55:37 +03:00
Luis Ramos
62a3b6b720 Merge pull request #5406 from kristinalim/fix/5300-optimistic_locking_in_stock_items
5300 Avoid race conditions in Spree::StockItem
2020-07-17 22:24:59 +01:00
Luis Ramos
152e432f78 Merge pull request #5749 from mbudm/issue/1253
Ensure the hero image doesn't pixelate on hamburger menu open
2020-07-17 22:15:46 +01:00
Pau Pérez Fabregat
89906f581d Merge pull request #5778 from openfoodfoundation/transifex
Transifex
2020-07-17 18:37:22 +02:00
Luis Ramos
001d40d691 Move require_login_then_redirect_to to the only place where it is called
This fixes a class loading issue where orders controllers was getting a undefined method require_login_then_redirect_to
2020-07-17 14:35:42 +01:00
Maikel
ea1e23abab Merge pull request #5756 from mkllnk/broken-spec
Make broken spec fail reliably and set it pending
2020-07-17 09:56:56 +10:00
Maikel Linke
b0ac188430 Make broken spec fail reliably and set it pending
This spec has been broken for a long time, at least eight months. But it
regularly passed because the search filter is applied with a delay and
in that time the content matches. And once the filter is applied, no
products are shown and the negative matchers pass.
2020-07-17 09:28:17 +10:00
Transifex-Openfoodnetwork
f31a1ff59c Updating translations for config/locales/en_GB.yml 2020-07-17 04:10:57 +10:00
Luis Ramos
2fe37b5237 Update all locales with the latest Transifex translations 2020-07-16 18:07:40 +01:00
Luis Ramos
981f1c0932 Merge pull request #5754 from openfoodfoundation/transifex
Transifex
2020-07-16 18:06:17 +01:00
Pau Perez
dd5e679f69 Address code review comments
Mostly styling issues.
2020-07-16 15:30:28 +02:00
Maikel
4e3502cce7 Merge pull request #5766 from mkllnk/5764-fix-pin-payments
5764 Provide credit card brand to Pin Payments
2020-07-16 10:28:18 +10:00
Matt-Yorkley
19b3041e1d Merge pull request #5768 from Matt-Yorkley/pin-payments-params
Update StrongParams for Pin Payments
2020-07-16 00:01:34 +02:00
Pau Perez
4e00c45782 Doc defensive coding needed by pin payments
[skip ci]
2020-07-15 16:46:09 +02:00
Luis Ramos
31e072179b Make method a little simple by extracting method 2020-07-15 15:23:16 +01:00
Luis Ramos
57fd1bdee2 Merge pull request #5744 from openfoodfoundation/dependabot/bundler/i18n-js-3.7.1
Bump i18n-js from 3.7.0 to 3.7.1
2020-07-15 15:04:55 +01:00
Luis Ramos
2605c4249b Simplify spec, the 2 minutes wait is not necessary anylonger 2020-07-15 14:54:53 +01:00
Luis Ramos
3599cb2047 Make unauthorized in ControllerHelpers::Auth the same as in Spree::Admin::BaseController
It adapts the method in ControllerHelpers::Auth to also use the after_login mechanism.

Ideally we would remove one of the two after_login mechanisms after_login and spree_user_return_to but they might still be in use.
2020-07-15 14:54:53 +01:00
Luis Ramos
8fac1bc9ca Move unauthorized view to HomeController only, all other calls to unauthorized will go through Auth which will redirect to the home controller IF the user is logged in or to login if user is not logged in 2020-07-15 14:54:52 +01:00
Luis Ramos
7f1797de58 Adapt specs to the move of unauthorized route from the spree routes to the main app routes 2020-07-15 14:54:52 +01:00
Luis Ramos
bf3150ddc8 Delete spree_user_signup which is from spree promotions code that we dont use 2020-07-15 14:53:35 +01:00
Luis Ramos
1666ffb191 Remove try_spree_current_user
This can be done because the method is defined in OFN's ApplicationController, so spree_current_user is available in all controllers
2020-07-15 14:53:35 +01:00
Luis Ramos
144811268e Adapt require statements to new undecorated classes 2020-07-15 14:53:35 +01:00
Luis Ramos
d2e52f3136 Update rubocop manual todo 2020-07-15 14:53:35 +01:00
Luis Ramos
046c5f6585 Fix easy rubocop issues 2020-07-15 14:53:08 +01:00
Luis Ramos
97f00153ad Bring controller_helpers/ssl.rb from spree 2020-07-15 14:53:08 +01:00
Luis Ramos
643a82c73c Fix easy rubocop issues, some early returns make the indentation changes 2020-07-15 14:53:08 +01:00
Luis Ramos
a3ea4b757d Merge decorator into the class brought from spree 2020-07-15 14:53:08 +01:00
Luis Ramos
1167a1a9bb Bring ControllerHelpers respond_with from spree 2020-07-15 14:53:08 +01:00
Luis Ramos
20f610fbee Merge controller_helpers/order with decorator 2020-07-15 14:53:08 +01:00
Luis Ramos
d5744572f7 Fix easy rubocop issues 2020-07-15 14:53:08 +01:00
Luis Ramos
23ff9d6fbb Bring controller_helpers/order to OFN 2020-07-15 14:53:08 +01:00
Luis Ramos
10849504c3 Fix easy rubocop issues 2020-07-15 14:53:08 +01:00
Luis Ramos
2452202e92 Move lib/spree/core/controller_helpers/common.rb from spree 2020-07-15 14:53:08 +01:00
Luis Ramos
96839a03aa Move lib/spree/core/controller_helpers.rb from spree 2020-07-15 14:53:08 +01:00
Luis Ramos
4ee30d7cac Remove spree.root route and respective controller. Also move
unauthorized route to main app.

This route is no longer used in OFN
2020-07-15 14:53:08 +01:00
Luis Ramos
7e75581da6 Merge class brought from spree with decorator 2020-07-15 14:53:08 +01:00
Luis Ramos
c8dd841c48 Fix some rubocop issues 2020-07-15 14:53:08 +01:00
Luis Ramos
2ea026ea31 Bring controller helper auth from spree 2020-07-15 14:53:08 +01:00
Pau Perez
70afcee3fc Fix Spree's spec clashing with a customization
`#save_requested_by_customer` is an accessor we added and thus, the
Spree's spec didn't consider.
2020-07-15 14:18:36 +02:00
Pau Perez
3a64cc426a Reuse #calculate_refund_amount method 2020-07-15 14:01:58 +02:00
Pau Perez
a8af3a27b1 Fix all but Metrics Rubocop cops in processing.rb 2020-07-15 14:01:58 +02:00
Pau Perez
42658b5255 Refactor #process! nested ifs to guard clauses
Following Rubocop's indications.
2020-07-15 14:01:58 +02:00
Pau Perez
66dbd85eb4 Run rubocop autocorrect on payment/processing.rb 2020-07-15 14:01:58 +02:00
Pau Perez
3435d5ac97 Fix Rubocop non-metrics issues in payment model 2020-07-15 14:01:30 +02:00
Matt-Yorkley
c009fed6be Update StrongParams for Pin Payments 2020-07-15 14:00:19 +02:00
dependabot-preview[bot]
5fae2c08c8 Bump i18n-js from 3.7.0 to 3.7.1
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.7.0 to 3.7.1.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-15 08:13:42 +00:00
Pau Pérez Fabregat
d4fea5223d Merge pull request #5762 from openfoodfoundation/dependabot/bundler/oj-3.10.7
Bump oj from 3.10.6 to 3.10.7
2020-07-15 10:13:19 +02:00
Maikel Linke
25155cab18 Provide credit card brand to Pin Payments
Spree replaced the Ruby code providing the credit card brand with a
jquery plugin providing it on the checkout screen.

I re-added Ruby code because it's easier and more robust than updating
the user interface with new Javascript.
2020-07-15 17:13:46 +10:00
Steve Roberts
dbc7632c4e Add inline comment to explain two height properties 2020-07-15 09:52:04 +10:00
Steve Roberts
c4d7899a99 Use vh units for new browsers and align tagline bg to top. 2020-07-14 19:26:12 +10:00
Transifex-Openfoodnetwork
f79269e96b Updating translations for config/locales/ca.yml 2020-07-14 17:46:12 +10:00
Steve Roberts
60870a1215 Fix linting errors 2020-07-14 12:58:48 +10:00
Steve Roberts
63a080266e Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into issue/1253 2020-07-14 12:45:14 +10:00
dependabot-preview[bot]
f4cb14ab1a Bump oj from 3.10.6 to 3.10.7
Bumps [oj](https://github.com/ohler55/oj) from 3.10.6 to 3.10.7.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.6...v3.10.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-14 00:10:40 +00:00
Luis Ramos
9c8318d828 Merge pull request #5613 from luisramos0/calculators
Move all Calculators from spree to OFN and out of the Spree namespace
2020-07-13 15:16:15 +01:00
Luis Ramos
d536cc8108 Merge pull request #5755 from Matt-Yorkley/groups-images
Fix StrongParameters for groups images
2020-07-13 14:50:24 +01:00
Matt-Yorkley
f450c21308 Merge pull request #5759 from luisramos0/vo_spec
Comment very flaky spec
2020-07-10 21:44:03 +02:00
Luis Ramos
eb4d648a23 Comment this very flaky spec for now 2020-07-10 19:27:31 +01:00
Pau Perez
cf64d3a290 Merge skipped callback from decorator into model
If we don't want that callback we can just as well remove it now that we
own that code.
2020-07-10 15:07:12 +02:00
Pau Perez
55d52b875f Run rubocop autocorrect on payment model 2020-07-10 15:04:29 +02:00
Transifex-Openfoodnetwork
50427472c4 Updating translations for config/locales/en_NZ.yml 2020-07-10 20:25:20 +10:00
Pau Perez
683794636b Rename spec file 2020-07-10 11:57:36 +02:00
Pau Perez
2f4648342f Merge decorator specs with Spree's ones
They are now isolated from each other.
2020-07-10 11:50:20 +02:00
Pau Perez
562f397b22 Isolate Spree's specs into their own context
This way we don't mix contexts while merging in our own decorator tests.
2020-07-10 11:46:59 +02:00
Pau Perez
8fbbb0bb64 Bring back our card factory modification
Merging Spree's an our factory didn't really work.
2020-07-10 11:42:56 +02:00
Pau Perez
d8b748a851 Merge alias_method method and its original version 2020-07-10 10:41:44 +02:00
Pau Perez
d49068ce66 Move method delegation from decorator to model 2020-07-10 10:41:44 +02:00
Pau Perez
cf6138da66 Replace model method with its decorated version 2020-07-10 10:41:44 +02:00
Pau Perez
3fb6193098 Move adjustments logic from decorator into model 2020-07-10 10:41:44 +02:00
Pau Perez
861726200c Move localize_number from decorator to model 2020-07-10 10:41:44 +02:00
Pau Perez
48910aeb77 Move #refund! to the processing.rb 2020-07-10 10:41:44 +02:00
Pau Perez
6d9a518616 Move method from decorator to model 2020-07-10 10:41:44 +02:00
Pau Perez
322c4d0f3f Move decorator's callbacks to model 2020-07-10 10:41:44 +02:00
Pau Perez
eafaa97b0e Temporarily skip spec
I'll move on to other easier issues and get back to it when we're in
a better position.
2020-07-10 10:41:44 +02:00
Pau Perez
31d0d4bcae Fix error "no parent is saved"
The exact error is

```
ActiveRecord::RecordNotSaved:
       You cannot call create unless the parent is saved
```

raised from app/models/spree/payment_decorator.rb:29:in `ensure_correct_adjustment'
2020-07-10 10:41:44 +02:00
Pau Perez
9935df9f2d Move Pin payment method from decorator into model 2020-07-10 10:41:44 +02:00
Pau Perez
0ad8dcc2c5 Fix payment log entries specs
The tight coupling between doesn't give other option but to check the
private method is called. The specs successfully stub
`log_entries#create` but for some reason the model instance that gets
evaluated it's not the stubbed one.
2020-07-10 10:41:44 +02:00
Pau Perez
a01f601363 Fix yet another spec 2020-07-10 10:41:44 +02:00
Pau Perez
34de219233 Bring in missing translation 2020-07-10 10:41:44 +02:00
Pau Perez
e1ea5dbcb3 Fix all but the 7 last payment specs 2020-07-10 10:41:44 +02:00
Pau Perez
abacd06f6b Fix credit card instance in specs 2020-07-10 10:41:44 +02:00
Pau Perez
06aa56164f Bring in Payment model from Spree 2020-07-10 10:41:44 +02:00
Maikel
c1d700196b Merge pull request #5739 from Matt-Yorkley/flaky-spec-complex-oc
Flaky spec order_cycles/complex_updating_specific_time
2020-07-10 14:59:59 +10:00
Luis Ramos
cc3361aaac Merge pull request #5659 from dmarcoux/issue-5555
Filter orders on inclusive dates in admin/orders
2020-07-09 20:40:45 +01:00
Luis Ramos
ed915006fa Merge pull request #5738 from openfoodfoundation/dependabot/bundler/wicked_pdf-2.1.0
Bump wicked_pdf from 1.4.0 to 2.1.0
2020-07-09 20:40:11 +01:00
Matt-Yorkley
1a132924d2 Fix StrongParameters for groups images 2020-07-09 10:00:02 +02:00
Transifex-Openfoodnetwork
e3980521ea Updating translations for config/locales/fr_CA.yml 2020-07-09 07:58:41 +10:00
Transifex-Openfoodnetwork
e6a2eb8af9 Updating translations for config/locales/en_CA.yml 2020-07-09 07:53:34 +10:00
Luis Ramos
fabddbd1c0 Merge pull request #5746 from coopdevs/remove-specs-dead-code
Remove dead specs helper method
2020-07-08 12:38:24 +01:00
Steve Roberts
2f562809c0 Ensure the hero image doesn't attempt to use the full height of all page content
Not sure exactly why this happens, but when the mobile nav is opened the hero image at #tagline:before uses the height of the full window - often around 4000px. Adding max-height of 100% to the nearest safe parent prevents this behaviour.
2020-07-08 21:31:52 +10:00
Matt-Yorkley
a763a5ee0b Update all locales with the latest Transifex translations 2020-07-08 12:49:20 +02:00
Matt-Yorkley
d718eb9a23 Merge pull request #5726 from openfoodfoundation/transifex
Transifex
2020-07-08 12:33:09 +02:00
Matt-Yorkley
d78db16abe Merge pull request #5718 from Matt-Yorkley/available-locales-bug
Available locales bug
2020-07-08 12:30:18 +02:00
Steve Roberts
eda9293619 Change to new directive that prevents enter default and blurs the input field 2020-07-08 19:19:46 +10:00
Matt-Yorkley
e742069959 Refactor UI interactions for opening exchange product tabs in OC edit 2020-07-08 11:11:39 +02:00
Matt-Yorkley
c8254b8338 Adjust exchange_row assertion to use slightly more specific criteria 2020-07-08 11:11:39 +02:00
Matt-Yorkley
be1e39f0cb Ensure next page has loaded before interacting with form elements 2020-07-08 11:11:39 +02:00
Pau Perez
a1e8c8ad03 Remove dead specs helper method
I found it while reviewing
https://github.com/openfoodfoundation/openfoodnetwork/pull/5718#discussion_r451390809.
2020-07-08 10:59:13 +02:00
Luis Ramos
312e78ba61 Merge pull request #5742 from Matt-Yorkley/flaky-spec-shopping
Fix flaky shopping_spec
2020-07-07 18:11:00 +01:00
Luis Ramos
207c6bc205 Merge pull request #5741 from Matt-Yorkley/flaky-spec-exchange-renderer
Re-enable and fix flaky exchange products renderer spec
2020-07-07 18:09:02 +01:00
Luis Ramos
f8f7b30095 Merge pull request #5716 from openfoodfoundation/dependabot/bundler/database_cleaner-1.8.5
Bump database_cleaner from 1.7.0 to 1.8.5
2020-07-07 17:29:10 +01:00
Luis Ramos
ebc1ab4469 Merge pull request #5710 from openfoodfoundation/dependabot/bundler/mini_racer-0.2.15
Bump mini_racer from 0.2.14 to 0.2.15
2020-07-07 17:28:33 +01:00
Luis Ramos
5e6739c9f7 Fix long lines in new spec 2020-07-07 17:26:24 +01:00
Luis Ramos
99e12b6f07 Convert calculators in new spec 2020-07-07 17:26:24 +01:00
Luis Ramos
0b79e7c48c Fix rubucop issue in enterprise_fee model 2020-07-07 17:26:24 +01:00
Luis Ramos
d92f97716a Extract compute_for and thus resolve the rubocop complexity issue 2020-07-07 17:26:24 +01:00
Luis Ramos
68359d4d1a Remove unnecessary variable (this sum and += come from the original
spree code and is not necessary here now)
2020-07-07 17:26:24 +01:00
Luis Ramos
70432e301d Early exit if max is zero to make method shorted 2020-07-07 17:26:24 +01:00
Luis Ramos
fbe0a3246d Extract applicable_rate? and thus resolve rubocop complexity issue 2020-07-07 17:26:24 +01:00
Luis Ramos
b096717172 Extract per_order_fees_total out of compute_order 2020-07-07 17:26:24 +01:00
Luis Ramos
21120dd6ab Extract per_item_fees_total out of compute_order 2020-07-07 17:26:24 +01:00
Luis Ramos
4b12a5f592 Extract line_items_total from compute_order 2020-07-07 17:26:24 +01:00
Luis Ramos
eedf31e449 Make migration a bit easier to read 2020-07-07 17:26:24 +01:00
Luis Ramos
e225c5ce3a Migrate calculators to outside spree namespace 2020-07-07 17:26:24 +01:00
Luis Ramos
f62546254f Define DefaultTax calculator outside of spree namespace the tax_rate to be used by the app and make spree specs use calculators outside the spree namespace 2020-07-07 17:26:24 +01:00
Luis Ramos
6a94168ee5 Remove Spree namespace from DefaultTax 2020-07-07 17:26:24 +01:00
Luis Ramos
9c7cb23262 Move calculator specs out of the spree namespace 2020-07-07 17:26:24 +01:00
Luis Ramos
5e8438c446 Move all calculators outside the spree namespace 2020-07-07 17:26:23 +01:00
Luis Ramos
9c3eb3725e Remove dead code related to promotions, we dont have promotions in OFN 2020-07-07 17:20:22 +01:00
Luis Ramos
a544102b1b Fix some rubocop issues 2020-07-07 17:20:22 +01:00
Luis Ramos
f2a46d2cef Merge decorators into original classes brought from spree_core 2020-07-07 17:20:22 +01:00
Luis Ramos
6b04df0dea Fix indentation and extract Calculator as a separate module declaration 2020-07-07 17:20:22 +01:00
Luis Ramos
c2898ba389 Bring calculators from spree_core 2020-07-07 17:20:22 +01:00
Transifex-Openfoodnetwork
6be0ae543a Updating translations for config/locales/pt_BR.yml 2020-07-07 21:46:44 +10:00
Matt-Yorkley
f2e0b0f35a Ensure products list has loaded before interacting with product list UI elements 2020-07-07 13:14:11 +02:00
Matt-Yorkley
0f659d0f5e Merge pull request #5728 from luisramos0/ams_comment
Update ams dependency comment
2020-07-07 12:32:03 +02:00
Matt-Yorkley
30492157f9 Re-enable and fix flaky exchange products renderer spec
For some inexplicable reason `order_cycle.exchanges.incoming.first` and `order_cycle.exchanges.incoming.second` were returning the same exchange. Subsequently the inventory items being created were for the same variant, which throws an error due to a uniqueness validation in InventoryItem on variant_id. Changing from #first and #second to #first and #last results in the correct exchanges being assigned.
2020-07-07 11:21:18 +02:00
Luis Ramos
c1fa4fcc85 Merge pull request #5736 from Matt-Yorkley/flaky-spec-embedded
Fix flaky embedded shopping spec
2020-07-07 09:36:27 +01:00
dependabot-preview[bot]
4bee038109 Bump wicked_pdf from 1.4.0 to 2.1.0
Bumps [wicked_pdf](https://github.com/mileszs/wicked_pdf) from 1.4.0 to 2.1.0.
- [Release notes](https://github.com/mileszs/wicked_pdf/releases)
- [Changelog](https://github.com/mileszs/wicked_pdf/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mileszs/wicked_pdf/compare/1.4.0...2.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-06 23:50:22 +00:00
Matt-Yorkley
447a873e5c Fix flaky embedded spec
The new cart sidebar takes 300ms to animate in. If we try to click the button on the left during this time, we may click the button on the right as it slides in.
2020-07-07 00:23:43 +02:00
Matt-Yorkley
3d955a952c Merge pull request #5674 from mkllnk/caching_spec
Fix flaky caching spec
2020-07-06 21:56:02 +02:00
Luis Ramos
ce1114556d Merge pull request #5578 from mbudm/issue/3770-manual-update
Update orders swagger spec and fix api_key access to orders endpoint
2020-07-06 20:32:25 +01:00
Luis Ramos
761871c90e Merge pull request #5715 from luisramos0/ship_method
Fix issue in Spree 2.1 and bring Spree::Stock classes to OFN 🎉
2020-07-06 19:15:50 +01:00
Transifex-Openfoodnetwork
2a68e0fbba Updating translations for config/locales/tr.yml 2020-07-07 03:55:56 +10:00
Luis Ramos
ceac8a5d40 Merge pull request #5725 from Matt-Yorkley/admin-order-images
Fix default image display in admin order edit
2020-07-06 14:03:56 +01:00
Luis Ramos
b0dd83b773 Update ams dependency comment 2020-07-05 19:55:53 +01:00
Dany Marcoux
3dfabdc117 Filter orders on inclusive dates in admin/orders
Closes #5555

Co-authored-by: Luis Ramos <luisramos0@gmail.com>
2020-07-05 20:12:16 +02:00
Transifex-Openfoodnetwork
b951bcc379 Updating translations for config/locales/en_IN.yml 2020-07-05 04:34:29 +10:00
Transifex-Openfoodnetwork
6f6e8c0c92 Updating translations for config/locales/en_IN.yml 2020-07-05 04:29:50 +10:00
Transifex-Openfoodnetwork
787648eff2 Updating translations for config/locales/en_FR.yml 2020-07-04 23:52:01 +10:00
Transifex-Openfoodnetwork
7a4a673578 Updating translations for config/locales/fr.yml 2020-07-04 23:51:45 +10:00
Matt-Yorkley
96138e9129 Refactor UserLocaleSetter public methods 2020-07-04 10:15:35 +02:00
Matt-Yorkley
f08a530877 Make #valid_locale_for_user an instance method 2020-07-04 09:51:00 +02:00
Luis Ramos
d2adcd20e5 Merge pull request #5719 from coopdevs/index-state-changes
Index spree_state_changes.stateful_id column
2020-07-03 23:02:01 +01:00
Luis Ramos
ff9133b7aa Merge pull request #5699 from coopdevs/fix-order-button-radius
Make button border radius consistent
2020-07-03 23:01:14 +01:00
Luis Ramos
b917238d1e Merge pull request #5446 from luisramos0/sca_refunds
Make StripeSCA void action work
2020-07-03 22:45:35 +01:00
Transifex-Openfoodnetwork
45b960a7ee Updating translations for config/locales/pt_BR.yml 2020-07-04 07:39:50 +10:00
Matt-Yorkley
e2626a0c3b Add unit tests for UserLocaleSetter service 2020-07-03 23:14:38 +02:00
Matt-Yorkley
46c40bdf33 Fix default image display in admin order edit 2020-07-03 22:58:29 +02:00
Luis Ramos
a472b6525f Merge pull request #5707 from luisramos0/missing_spaces
Add space after translations so that translators dont have to guess a space is needed
2020-07-03 16:10:55 +01:00
Matt-Yorkley
05c1f093b2 Delete dead code
There's nothing done in this bit of code that isn't already done somewhere else, and more effectively.
2020-07-03 16:44:37 +02:00
Matt-Yorkley
0c2fd4bfd2 Fix ensure_valid_locale_persisted and change public interface of service 2020-07-03 16:39:24 +02:00
Matt-Yorkley
cc7b5e2df3 Add pending test for setting locale from cookies during login
This test currently fails
2020-07-03 16:39:23 +02:00
Luis Ramos
804450bcc5 Fix buggy spec
The different shipping method was in the page but only as an option in the dropdown, not as the final selected shipping method! That was the cause of bug #5694. We now check for the label Shipping which preceeds the final shipping method selection in the order page
2020-07-03 15:35:13 +01:00
Luis Ramos
b883a0eb75 Fix easy rubocop issues in shipment_spec 2020-07-03 13:48:12 +01:00
Luis Ramos
7b89b52ab8 Transpec shipment_spec brough from spree_core 2020-07-03 13:48:12 +01:00
Luis Ramos
07a44cfaf3 Update selected shipping rate if there is an original shipping method to keep and it is different from the one selected through the Estimator process
Make sure the shipment is saved (callbacks!) whenever the ship method has changed in the refresh_rates process
2020-07-03 13:48:12 +01:00
Luis Ramos
cd60ee2116 Use flat_map to make ship methods selection faster 2020-07-03 13:48:08 +01:00
Matt-Yorkley
ab63d2234c Guard against nils in conditions 2020-07-03 14:22:32 +02:00
Matt-Yorkley
078726dcca Add explanatory comment on saving selected locale in cookies 2020-07-03 14:21:45 +02:00
Matt-Yorkley
dab0add492 Make conditional more concise 2020-07-03 14:20:51 +02:00
Matt-Yorkley
ebffa381c6 Update cookies[:locale] logic 2020-07-03 14:06:05 +02:00
Matt-Yorkley
faa7c0a7c5 Extract save_cookies_from_locale comment-method 2020-07-03 14:03:52 +02:00
Matt-Yorkley
02549d1b0f Extract all locale-setting logic to a service 2020-07-03 13:44:13 +02:00
Matt-Yorkley
7a00a3ba1e Rename method and add explanatory comment 2020-07-03 11:52:21 +02:00
Matt-Yorkley
c726340ba3 Extract #save_locale_from_params comment-method 2020-07-03 11:48:39 +02:00
Luis Ramos
fcaa9d1b37 Remove extra space from base translations in closing and welcome to 2020-07-03 10:32:09 +01:00
Matt-Yorkley
d2db9b3a66 Merge pull request #5599 from luisramos0/submit_on_enteer
Make Enter submit the form on both products and orders admin
2020-07-03 11:14:57 +02:00
Luis Ramos
91026e6606 Merge pull request #5601 from jeduardo824/enhancement/5454-links-to-shops-in-new-tabs
Enhancement/5454 make links to shops under Groups > Producers open in new tab
2020-07-02 23:51:59 +01:00
Luis Ramos
d9ab7a8d49 Merge pull request #5667 from mkllnk/shopping-spec
Stabilise shopping specs and open them for change
2020-07-02 23:51:25 +01:00
Luis Ramos
758bb17142 Fix some easy rubocop issues and add some exceptions to to manual todo list 2020-07-02 21:24:15 +01:00
Luis Ramos
659de3d24d Replay spree commit a4622ee13a723f0dba2943967b445b9989f67fb2 to fix issue introduced in spree 2.1 2020-07-02 21:24:15 +01:00
Luis Ramos
21ec6ccf0d Remove unused sort packages from prioritizer 2020-07-02 21:24:15 +01:00
Luis Ramos
d323c5bdcb Simplify packer and coordinator baed on the fact that there's only one stock_location so there will only be one package per order 2020-07-02 21:24:15 +01:00
Luis Ramos
ff046f7a6c Remove conditionals related to Config.track_inventory_levels, this config is always true in OFN 2020-07-02 21:24:14 +01:00
Luis Ramos
ee937988e8 Fix easy rubocop issues 2020-07-02 21:24:14 +01:00
Luis Ramos
ee66e37521 Move adjuster, estimator, packer and prioritizer to order management engine 2020-07-02 21:24:14 +01:00
Luis Ramos
83974a832c Move Coordinator from Spree::Stock to OrderManagement::Stock 2020-07-02 21:24:14 +01:00
Luis Ramos
01b1abbd52 Bring method from Spree::Order so that we can move Coordiantor to the order management engine 2020-07-02 21:24:14 +01:00
Luis Ramos
b487185a65 Remove package factory, it is no longer needed, we can just call the Package class in the two places where it is used 2020-07-02 21:24:14 +01:00
Luis Ramos
f0b3ed0d79 Merge Spree::Stock::Package into OrderManagement::Stock::Package 2020-07-02 21:24:14 +01:00
Luis Ramos
943cb7bf05 Move Stock::Package to OrderManagement::Stock::Package 2020-07-02 21:24:14 +01:00
Luis Ramos
1b28592f58 Now that the stock code is on out side we can clean up!
Remove everything related to splitters (including bringing environment.rb so we remove the splitters variable from it
2020-07-02 21:24:14 +01:00
Luis Ramos
8e116dd58a Make ensure_correct_adjustment a public method because we call it in OFN 2020-07-02 21:24:14 +01:00
Luis Ramos
46cf106047 Fix shipment spec brought from spree 2020-07-02 21:24:14 +01:00
Luis Ramos
2e33e02d7f Remove dead code, this method was removed in spree 2.0.4 2020-07-02 21:24:14 +01:00
Luis Ramos
7a03f57da0 Merge shipment decorator with class brought from spree_core 2020-07-02 21:24:14 +01:00
Luis Ramos
494251b7cf Fix simple rubocop issues 2020-07-02 21:24:14 +01:00
Luis Ramos
4e5259f491 Bring shipment from spree_core 2020-07-02 21:24:14 +01:00
Luis Ramos
55a4021157 Convert to modern rspec syntax 2020-07-02 21:24:14 +01:00
Luis Ramos
bdb40d68e9 Fix easy rubocop issues 2020-07-02 21:24:14 +01:00
Luis Ramos
b7255130b6 Bring Package from spree_core 2020-07-02 21:24:14 +01:00
Luis Ramos
0ca8b6aab6 Fix easy rubocop issue 2020-07-02 21:24:14 +01:00
Luis Ramos
3e14c9777e Merge decorator with class brought from spree_core 2020-07-02 21:24:14 +01:00
Luis Ramos
d505fc2131 Bring availability validator from spree_core 2020-07-02 21:24:14 +01:00
Luis Ramos
720ad9de0e Convert specs to modern rsspec syntax 2020-07-02 21:24:14 +01:00
Luis Ramos
feadbb086f Adapt spec to OFN context 2020-07-02 21:24:14 +01:00
Luis Ramos
b16db2f40e Fix easy rubocop issues 2020-07-02 21:24:14 +01:00
Luis Ramos
8c3b8c4db5 Bring estimator from spree_core 2020-07-02 21:24:14 +01:00
Luis Ramos
4711a7469a Adapt coordinator spec to ofn and remove spec that is not applicable (multi stock locations) 2020-07-02 21:24:14 +01:00
Luis Ramos
69b9cfbad2 Make packer use BasicSplitter by default 2020-07-02 21:24:14 +01:00
Luis Ramos
fdc085f701 Convert to modern rspec and remove specs not applicable to ofn 2020-07-02 21:24:14 +01:00
Luis Ramos
ccf928df12 Fix simple rubocop issues 2020-07-02 21:24:14 +01:00
Luis Ramos
e0f9894b7a Bring packer from spree_core 2020-07-02 21:24:14 +01:00
Luis Ramos
ec50a788a6 Fix easy rubocop issues 2020-07-02 21:24:14 +01:00
Luis Ramos
c2ec34ab9f Bring coordinator from spree_core 2020-07-02 21:24:14 +01:00
Luis Ramos
a6d7acb6f1 Convert spec to modern rspec syntax 2020-07-02 21:24:14 +01:00
Luis Ramos
eb13595fd3 Fix simple rubocop issues 2020-07-02 21:24:14 +01:00
Luis Ramos
3ae2877d4e Bring adjuster and prioritizer from spree_core 2020-07-02 21:24:14 +01:00
Luis Ramos
d18fec7125 Move Base splitter from main app models to order management engine services 2020-07-02 21:24:14 +01:00
Luis Ramos
735ee1e7ed Fix simple rubocop issues 2020-07-02 21:24:14 +01:00
Luis Ramos
4fce506201 Bring splitter/base from spree 2020-07-02 21:24:14 +01:00
Luis Ramos
658c77f3f5 Merge pull request #5701 from Matt-Yorkley/noimage
Noimage
2020-07-02 20:17:04 +01:00
Luis Ramos
510449547f Merge pull request #5644 from coopdevs/manage-font-with-asset-pipeline
Manage OFN's font through the asset pipeline
2020-07-02 20:09:08 +01:00
Matt-Yorkley
8fc407a9d5 Extract repeated variant thumbnail code to a shared partial 2020-07-02 18:36:43 +02:00
Matt-Yorkley
eeb6c57f99 Update missing image paths in other order views 2020-07-02 18:36:27 +02:00
Matt-Yorkley
b10fd99a53 Update all locales with the latest Transifex translations 2020-07-02 16:46:53 +02:00
Matt-Yorkley
e328dc7657 Merge pull request #5717 from openfoodfoundation/transifex
Transifex
2020-07-02 16:43:58 +02:00
Pau Perez
dee61e8b82 Index spree_state_changes.stateful_id column
This speeds up a great deal one of the most awful queries our DB servers
execute. It's not rare to see traces above 20s in Datadog 😱.

In staging, with no traffic, we go from

```
EXPLAIN ANALYZE SELECT COUNT ( * )
FROM spree_state_changes
WHERE spree_state_changes . stateful_id = 2024
  AND spree_state_changes . stateful_type = 'Spree::Order';

Planning time: 0.142 ms
Execution time: 9.073 ms
```

to

```
EXPLAIN ANALYZE SELECT COUNT ( * )
FROM spree_state_changes
WHERE spree_state_changes . stateful_id = 2024
  AND spree_state_changes . stateful_type = 'Spree::Order';

Planning time: 0.284 ms
Execution time: 0.202 ms
```
2020-07-02 15:39:08 +02:00
Matt-Yorkley
4e08d2049f Ensure a valid locale is persisted during login
This action has to be performed here and not in I18nHelper, as spree_current_user is not initialized yet during the other checks / setting the selected locale value in the app
2020-07-02 15:33:19 +02:00
Matt-Yorkley
91880cdbec Make I18nHelper #available_locale? method public 2020-07-02 14:35:59 +02:00
Matt-Yorkley
d70d61439a Always return an available locale 2020-07-02 14:35:59 +02:00
Matt-Yorkley
aa6f4d4fb9 Don't set unavailable locales on the current user 2020-07-02 14:35:59 +02:00
Matt-Yorkley
8dfaea629b Refactor current_user_locale to a new method 2020-07-02 14:35:59 +02:00
Matt-Yorkley
3326366c6e Add specs for applying stored locales during login 2020-07-02 14:35:58 +02:00
dependabot-preview[bot]
cc34f126ec Bump mini_racer from 0.2.14 to 0.2.15
Bumps [mini_racer](https://github.com/discourse/mini_racer) from 0.2.14 to 0.2.15.
- [Release notes](https://github.com/discourse/mini_racer/releases)
- [Changelog](https://github.com/rubyjs/mini_racer/blob/master/CHANGELOG)
- [Commits](https://github.com/discourse/mini_racer/compare/v0.2.14...v0.2.15)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-02 11:22:57 +00:00
Pau Pérez Fabregat
4ced16c206 Merge pull request #5709 from luisramos0/empty
Replace empty? with blank? and replace unless empty? with if present?
2020-07-02 11:36:37 +02:00
Matt-Yorkley
26c511d47e Remove taxon icons
These icons are inconsistently used across instances and have already been removed in a few places in the app in the mobile UX redesign.
2020-07-02 11:25:17 +02:00
Transifex-Openfoodnetwork
1b8669bb0b Updating translations for config/locales/en_NZ.yml 2020-07-02 18:28:33 +10:00
Pau Pérez Fabregat
c1b635903c Merge pull request #5658 from openfoodfoundation/transifex
Transifex
2020-07-02 10:05:16 +02:00
dependabot-preview[bot]
eff9d6edd0 Bump database_cleaner from 1.7.0 to 1.8.5
Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner) from 1.7.0 to 1.8.5.
- [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases)
- [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/master/History.rdoc)
- [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v1.7.0...v1.8.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-07-02 00:06:17 +00:00
Luis Ramos
7dcc2bb27c Merge pull request #5703 from Matt-Yorkley/checkout-addresses
Checkout addresses
2020-07-01 19:06:29 +01:00
Luis Ramos
e8417b8be6 Remove specs testing filtering of master variants
Master variants are not used in the report
2020-07-01 18:13:30 +01:00
Luis Ramos
6555f8bfba Add specs to cover stripeSCA refunds
Duplication between stripe connect and stripeSCA is done on purpose so we can easily delete stripeConnect code when the migration is done
2020-07-01 18:13:27 +01:00
Pau Pérez Fabregat
66ddde1808 Merge pull request #5682 from Matt-Yorkley/in-digest-ion
Move default versions of Paperclip-managed images to /public
2020-07-01 18:02:15 +02:00
Pau Pérez Fabregat
28376b1056 Merge pull request #5561 from coopdevs/defend-from-invoice-without-bill-address
Do not print the bill addr. name when there's none
2020-07-01 17:50:09 +02:00
Luis Ramos
2d4326ded3 Replace empty? with blank? which is equivalent but a bit more resilient, returns false for nil
Present is not blank, so unless blank? becomes if present?
2020-07-01 14:08:07 +01:00
Luis Ramos
ce493866f9 Extract refunds specs from payments controller spec 2020-07-01 13:19:38 +01:00
Luis Ramos
ecb1920fa9 Move payment_controller_spec to specific folder so we can break it in more specific parts 2020-07-01 13:14:39 +01:00
Luis Ramos
9e4a793b24 Fix rubocop issues 2020-07-01 13:14:39 +01:00
Luis Ramos
2179cc7faf Make StripeSCA void action make a refund instead
StripeSCA does not support voiding confirmed payment intents so we need to make a refund instead
2020-07-01 13:10:56 +01:00
Luis Ramos
63934b7863 Add space after translation so that translators dont have to guess a space is needed after the translation 2020-07-01 11:56:37 +01:00
Pau Pérez Fabregat
819af03239 Merge pull request #5706 from luisramos0/ent
Fix admin enterprises controller spec
2020-07-01 12:28:19 +02:00
Pau Pérez Fabregat
5a72526107 Merge pull request #5692 from luisramos0/taxonomies
Fix taxonomies flaky spec
2020-07-01 12:26:56 +02:00
Pau Perez
8c371fd0d1 Do not print bill addr. in invoice2 either 2020-07-01 11:27:57 +02:00
Matt-Yorkley
49fb01a3bb Add assign default value of current time whilst altering NOT NULL constraint
This argument in #change_column_null assigns this value where any NULL values are found, but it doesn't alter the table's `:default` value
2020-07-01 10:00:21 +02:00
Luis Ramos
2dce10bec2 Fix admin enterprises controller spec, for some reason the correct controller is not being picked up in the test 2020-06-30 10:49:45 +01:00
Matt-Yorkley
11da385624 Enable pending checkout spec 2020-06-30 11:30:16 +02:00
Matt-Yorkley
3e7f5a4ea9 Update user address tests
I considered deleting these tests, as they're not very good and are testing Rails functionality. I decided to leave them in case something explodes in a future upgrade. For reference: there are issues in Rails 4 when using `object.clone.attributes`, and with assigning a hash containing `created_at` and `updated_at` values with `object.update(attributes_hash)`.
2020-06-30 11:30:16 +02:00
Matt-Yorkley
87cd936c94 Blacklist timestamp attributes when assigning for update
Doing #clone or #dup of an object's attributes then passing it to an #update/#update_attributes call means we are manually passing values for created_at and updated_at, which can cause problems, especially if the object being duped hasn't been persisted yet: in this case we would be manually attempting to save timestamps with nil values, which is not a good idea. Here they are blacklisted from the attributes hash.
2020-06-30 11:30:16 +02:00
Matt-Yorkley
ce8908f53b Use #dup when copying attributes hash
In Rails 4, #clone behaves differently. The attributes hash of the cloned object is shared with the original, it's not a separate object! https://github.com/rails/rails/blob/4-0-stable/activerecord/lib/active_record/core.rb#L217-L220
2020-06-30 11:30:16 +02:00
Matt-Yorkley
abe96c6f32 Add specs for updating existing default addresses during checkout
These specs fail with the "NULL values for created_at / updated_at" errors we've been seeing.
2020-06-30 11:30:14 +02:00
Pau Pérez Fabregat
e69d3e5e0c Merge pull request #5693 from luisramos0/knapsack
Reload knapsack report
2020-06-30 09:43:36 +02:00
Pau Pérez Fabregat
2a1fe3f05f Merge pull request #5684 from openfoodfoundation/dependabot/bundler/ddtrace-0.37.0
Bump ddtrace from 0.36.0 to 0.37.0
2020-06-30 09:41:48 +02:00
Matt-Yorkley
57ba2481c4 Require timestamps 2020-06-30 09:09:35 +02:00
Pau Perez
0c93de8298 Manage OFN's font through the asset pipeline 2020-06-30 09:02:36 +02:00
Pau Perez
23178763b0 Do not print the bill addr. name when there's none
The error

```
ActionView::Template::Error: undefined method `full_name' for nil:NilClass
```

happens a few times a day and raises exceptions we don't pay attention to.
They add unnecessary noise that hides other more relevant issues.

This, however, is a symptom of a deeper data integrity problem that needs
solving at some point. This is just a countermeasure.
2020-06-30 08:46:01 +02:00
Luis Ramos
de8b97b2e1 Merge pull request #5526 from cillian/drop-blockenspiel
Drop blockenspiel
2020-06-29 20:09:26 +01:00
Matt-Yorkley
be0131b94c Merge pull request #5645 from coopdevs/fix-scss-deprecation-warning
Rename *.css.scss to *.scss
2020-06-29 20:36:42 +02:00
Matt-Yorkley
bd0e4c75c4 Merge pull request #5636 from fatihorhan/make-user-guide-links-consistent
Update Sell page to use User Guide links from configuration
2020-06-29 20:33:00 +02:00
Matt-Yorkley
b441ac2644 Update paths to "noimage" images 2020-06-29 20:07:08 +02:00
Matt-Yorkley
5bec887f93 Move /assets/images/noimage/* to /public/noimage/* 2020-06-29 19:58:38 +02:00
Cillian O'Ruanaidh
a9664e103d Merge latest :master into :drop-blockenspiel branch and resolve conflicts related to Rubocop fixes. 2020-06-29 18:11:08 +01:00
Pau Perez
c892f9c69b Make button border radius consistent 2020-06-29 12:01:59 +02:00
Transifex-Openfoodnetwork
bb80c81097 Updating translations for config/locales/en_US.yml 2020-06-29 05:22:13 +10:00
Luis Ramos
6516037420 Reload knapsack report 2020-06-27 20:36:33 +01:00
Luis Ramos
10b8c2b789 Relax the assertion and dont check row number so that it passes even if order of elements is not the same 2020-06-27 15:54:58 +01:00
Matt-Yorkley
b325e48957 Update content config spec to use new default image paths 2020-06-27 10:32:38 +02:00
Matt-Yorkley
a5f541b59d Update admin logo path 2020-06-27 08:53:05 +02:00
Matt-Yorkley
ff8cb43717 Move default versions of Paperclip-managed images to /public
Image paths for these files are handled by Paperclip, which (with our current version) does not handle fingerprints on assets. Therefore we need to make these images available under /public
2020-06-27 08:45:59 +02:00
dependabot-preview[bot]
032a70fa7e Bump ddtrace from 0.36.0 to 0.37.0
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.36.0 to 0.37.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.36.0...v0.37.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-26 19:16:32 +00:00
Transifex-Openfoodnetwork
4f2d32b262 Updating translations for config/locales/tr.yml 2020-06-27 04:22:14 +10:00
Luis Ramos
5e3d7be545 Merge pull request #5630 from openfoodfoundation/dependabot/bundler/ransack-1.8.10
Bump ransack from 1.2.3 to 1.8.10
2020-06-26 13:37:03 +01:00
Transifex-Openfoodnetwork
0d5ad6fac3 Updating translations for config/locales/en_IE.yml 2020-06-26 21:04:54 +10:00
Transifex-Openfoodnetwork
a1227d93ae Updating translations for config/locales/en_GB.yml 2020-06-26 20:27:34 +10:00
Transifex-Openfoodnetwork
f47271ba98 Updating translations for config/locales/fr.yml 2020-06-26 16:59:37 +10:00
Transifex-Openfoodnetwork
1266bcde1b Updating translations for config/locales/en_FR.yml 2020-06-26 16:56:19 +10:00
Maikel Linke
e567348a69 Ensure that enough time passes for caching spec 2020-06-26 14:24:01 +10:00
Maikel Linke
4b25c2d49a Correct typo in file naming 2020-06-26 14:21:21 +10:00
Maikel Linke
d7c9bb2e5a Navigate more efficiently in spec
The spec is not supposed to test the navigation to the shop. Going
directly to the shop reduces the test execution time by 7%.
2020-06-26 09:55:57 +10:00
Maikel Linke
70347148a1 Stabilise shopping specs and open them for change
The way we add items to the cart will change. Encapsulating that code in
a common place will make the mobile ux work clearer and avoid merge
conflicts.

The waiting for background requests has also been improved and made more
consistent which should make these specs more reliable.
2020-06-26 09:55:57 +10:00
Maikel Linke
a0c7dc2ccb Remove leftover empty spec context 2020-06-26 09:55:57 +10:00
Luis Ramos
5929b9c1e5 Merge pull request #5627 from openfoodfoundation/dependabot/bundler/geocoder-1.6.3
[Security] Bump geocoder from 1.5.2 to 1.6.3
2020-06-25 20:34:19 +01:00
Luis Ramos
2ad2836ac6 Merge pull request #5563 from luchiago/fix-missing-closed-oc-info-i18n
add missing i18n key for closed OC
2020-06-25 20:33:55 +01:00
Luis Ramos
93a2e57bc6 Merge pull request #5538 from jeduardo824/bug/4592-payment-methods-table-in-dashboard
Fix Payment Methods table to show proper provider name
2020-06-25 20:32:04 +01:00
Luis Ramos
cb2ccf76d2 Merge pull request #5590 from rmklaus12/5558-shippingcategory-translation
Added translation key to config/locales/en.yml file for shipping_cat…
2020-06-25 20:31:48 +01:00
Luis Ramos
f44533bbd5 Merge pull request #5589 from rmklaus12/2617-mainmenu-translation
Added more key to en.yml to translate More dropdown text
2020-06-25 20:27:46 +01:00
Luis Ramos
bfc134c9e6 Merge pull request #5615 from openfoodfoundation/dependabot/bundler/acts-as-taggable-on-4.0.0
Bump acts-as-taggable-on from 3.5.0 to 4.0.0
2020-06-25 20:26:59 +01:00
Pau Pérez Fabregat
7338f196e9 Merge pull request #5663 from luisramos0/constraints
Make db timestamps nullable
2020-06-25 13:14:41 +02:00
Luis Ramos
68946a765e Make timestamps nullable 2020-06-25 08:47:18 +01:00
Transifex-Openfoodnetwork
0b48a53c2f Updating translations for config/locales/tr.yml 2020-06-25 16:02:01 +10:00
Transifex-Openfoodnetwork
54ce5d8c0f Updating translations for config/locales/en_CA.yml 2020-06-25 09:15:11 +10:00
Luis Ramos
ba50491c6d Restructure the spec a little 2020-06-24 16:16:58 +01:00
Luis Ramos
34207fc20f Bring changes to stock_item from spree 2.1, the previous version was from spree 2.0.4 2020-06-24 16:16:58 +01:00
Luis Ramos
e12e50aa84 Move rubocop exception to rubocop todo 2020-06-24 16:16:58 +01:00
Kristina Lim
20fd3c2642 Reset negative count on hand in existing non backorderable stock items 2020-06-24 16:16:58 +01:00
Kristina Lim
4694f1b21a Require count on hand in non backorderable StockItem to be positive or zero
Fix setting of count on hand in line item specs
2020-06-24 16:16:45 +01:00
Kristina Lim
e53913756c Add lock_version to Spree::StockItem 2020-06-24 16:15:37 +01:00
Kristina Lim
774b3720d5 Update stock item count on hand in Spree core specs 2020-06-24 16:15:09 +01:00
Kristina Lim
13ecf0ec73 Update specs for StockItem with transpec 2020-06-24 16:15:09 +01:00
Kristina Lim
fb20f220c0 Use break instead of return in StockItem#process_backorders
We are not using the return value of this method anywhere.
2020-06-24 16:15:09 +01:00
Kristina Lim
0a1cb71ee4 Ignore Rails/UniqueValidationWithoutIndex for unique index of StockItem#stock_location 2020-06-24 16:15:09 +01:00
Kristina Lim
bc530b92b5 Address violation of Rubocop Rails/Validation: 2020-06-24 16:15:09 +01:00
Kristina Lim
2acf61fd0f Address violation of Rubocop Rails/Delegate 2020-06-24 16:15:09 +01:00
Kristina Lim
1e8543dfe7 Address violation of Rubocop Rails/ReadWriteAttribute 2020-06-24 16:15:09 +01:00
Kristina Lim
22c0693beb Address violation of Rubocop Style/NumericPredicate 2020-06-24 16:15:09 +01:00
Kristina Lim
d1725014c4 Auto-correct violationso of Rubocop Layout/* 2020-06-24 16:15:09 +01:00
Kristina Lim
0fd66f9a55 Auto-correct violationso of Rubocop Style/* 2020-06-24 16:15:09 +01:00
Kristina Lim
b783118700 Auto-correct violationso of Rubocop Style/RedundantSelf 2020-06-24 16:15:09 +01:00
Kristina Lim
84d973d383 Specify RSpec.describe in StockItem spec file 2020-06-24 16:15:09 +01:00
Kristina Lim
0e711832fd Bring Spree::StockItem code from spree_core into the app 2020-06-24 16:15:09 +01:00
Transifex-Openfoodnetwork
8d4a9cba21 Updating translations for config/locales/nb.yml 2020-06-24 23:33:12 +10:00
Steve Roberts
3d2a0d4d67 Remove UI and API engine as we will not host the swagger spec right now 2020-06-24 15:51:08 +10:00
Steve Roberts
9541dbf495 Fix order api spec and add incomplete generated swagger.yml 2020-06-24 15:15:18 +10:00
Steve Roberts
b59dbebba6 Revert Gemfile change to specific version of rubocop
Turns out it wasn't necessary. I thought it was needed to install a compatible version of rswag
2020-06-24 13:21:49 +10:00
Steve Roberts
e619ae621c Add rswag and coverage for orders endpoint
Add coverage for core orders endpoint queries (WIP)
2020-06-24 13:21:49 +10:00
Steve Roberts
9e19d79337 Add more detail on the ransack based queries in the description 2020-06-24 13:21:49 +10:00
Steve Roberts
8b79d41b81 Update orders swagger spec and fix api_key access to orders endpoint 2020-06-24 13:21:49 +10:00
Luis Ramos
9e39d970ca Result of running db:migrate 2020-06-23 19:19:18 +01:00
Pau Pérez Fabregat
9e730e6445 Merge pull request #5660 from coopdevs/fix-spree-preferences
Migrate all spree pref. keys to the new format
2020-06-23 18:00:01 +02:00
Transifex-Openfoodnetwork
99096eee2d Updating translations for config/locales/ca.yml 2020-06-24 01:41:21 +10:00
Pau Perez
a81e17f23c Flush the cache
So all preferences are fetch from DB now that they have changed.
2020-06-23 17:23:22 +02:00
Pau Perez
190797717a Defend from the running the migration twice
We only migrate preferences if there are any to migrate.
2020-06-23 17:22:11 +02:00
Pau Perez
0ffa7b3734 Migrate all spree pref. keys to the new format
We realized in Spree v2.1 they follow this format instead and this is
what's causing issues to Katuma production.

This will remove the duplicate ones and convert the current preferences
to the new thus, keeping the values.
2020-06-23 16:21:20 +02:00
Transifex-Openfoodnetwork
923b905a9c Updating translations for config/locales/en_GB.yml 2020-06-23 22:30:53 +10:00
Pau Pérez Fabregat
973ea2ea2d Merge pull request #5641 from openfoodfoundation/transifex
Transifex
2020-06-23 10:43:26 +02:00
Pau Pérez Fabregat
3939febc2f Merge pull request #5653 from luisramos0/rubocop_refresher
Auto correct rubocop, refresh todo lists and fix some more rubocop issues
2020-06-23 10:25:59 +02:00
Luis Ramos
91fc0cd26f Adapt specs to new Ar method update that replaces update_attributes 2020-06-22 17:39:20 +01:00
Luis Ramos
f004b3d573 Fix rubocop issue 2020-06-22 17:39:20 +01:00
Luis Ramos
b49eef5fa9 Fix rubocop issue 2020-06-22 17:39:20 +01:00
Luis Ramos
1c550a594f Fix rubocop issue 2020-06-22 17:39:20 +01:00
Luis Ramos
0ba1642bd2 Fix rubocop issues 2020-06-22 17:39:20 +01:00
Luis Ramos
1e5975c6e2 Fix rubocop issues 2020-06-22 17:39:20 +01:00
Luis Ramos
aa14fd236c Fix rubocop issue 2020-06-22 17:39:20 +01:00
Luis Ramos
ab59ab45f5 Use auto correct to fix rubocop issues 2020-06-22 17:39:20 +01:00
Luis Ramos
f54abbd376 Fix rubocop issues 2020-06-22 17:39:20 +01:00
Luis Ramos
730959f85f Fix rubocop issue 2020-06-22 17:39:20 +01:00
Luis Ramos
8870dc4b06 Move rubocop exception to code 2020-06-22 17:39:20 +01:00
Luis Ramos
1b5f9f105a Fix block alignment 2020-06-22 17:39:20 +01:00
Luis Ramos
ed5fc29c44 Fix hash alignment issue 2020-06-22 17:39:20 +01:00
Luis Ramos
ff68303ef6 Fix long lines 2020-06-22 17:39:20 +01:00
Luis Ramos
0f2e07cc2d Fix long lines 2020-06-22 17:39:20 +01:00
Luis Ramos
0e3b5ad4c3 Revert rubocop auto correct because update! is a method in the adjustment model 2020-06-22 17:39:17 +01:00
Luis Ramos
41ff406e86 Fix rubocop issue by avoiding rails method name update_attributes 2020-06-22 16:51:46 +01:00
Luis Ramos
6a7ed6e0c9 Rebuild .rubocop_manual_todo.yml 2020-06-22 16:51:46 +01:00
Luis Ramos
4e9c21d525 Add new regenerated rubocop_todo 2020-06-22 16:51:46 +01:00
Luis Ramos
b879439d58 Use rubocop auto correct to fix Style/SafeNavigation issue 2020-06-22 16:51:46 +01:00
Luis Ramos
1b6e51c79e Fix rubocop issue 2020-06-22 16:51:46 +01:00
Luis Ramos
f848a89a00 Rename update_attributes to update #rails4 2020-06-22 16:51:43 +01:00
Luis Ramos
8a61257547 Rename all before_filter to before_action, it's the same function with a new name 2020-06-22 13:11:57 +01:00
Luis Ramos
46a1c1cf26 Fix rubocop issue 2020-06-22 13:08:54 +01:00
Luis Ramos
adfe1f89b6 Revert previous rubocop auto correct fix that breaks the cart spec 2020-06-22 13:08:38 +01:00
Luis Ramos
473fee19eb Fix rubocop issues 2020-06-22 13:03:18 +01:00
Luis Ramos
6eebb0e399 Use rubocop autocorrect to fix rubocop issue 2020-06-22 12:58:33 +01:00
Luis Ramos
e574e254db Use rubocop autocorrect to fix rubocop issue 2020-06-22 12:57:12 +01:00
Luis Ramos
3b91dd9dea Use rubocop auto-correct to fix more issues 2020-06-22 12:51:47 +01:00
Luis Ramos
5d710f1e24 Use ruboccop autocorrect to fix issues 2020-06-22 12:46:07 +01:00
Luis Ramos
fb92745db4 Fix rubocop issues 2020-06-22 12:41:31 +01:00
Luis Ramos
8a9dae0ee2 Run rubocop autocorrect
This is the result of bundle exec rubocop --auto-correct
2020-06-22 12:23:10 +01:00
Luis Ramos
15babd8bc4 Merge pull request #5651 from luisramos0/xhr
[Rails 4.1] Change for xhr rquest to avoid csrf during testing
2020-06-22 12:20:41 +01:00
Luis Ramos
57d925a7de Add new rubocop rules and fix the single offence 2020-06-22 12:19:19 +01:00
Lucas Hiago
357c2c7b25 change for xhr to avoid csrf during testing 2020-06-21 20:22:33 +01:00
Transifex-Openfoodnetwork
eb55d00051 Updating translations for config/locales/en_US.yml 2020-06-20 03:34:37 +10:00
Transifex-Openfoodnetwork
c5d3156351 Updating translations for config/locales/fr.yml 2020-06-20 02:37:11 +10:00
Transifex-Openfoodnetwork
28a6f694de Updating translations for config/locales/en_FR.yml 2020-06-20 02:34:30 +10:00
Pau Pérez Fabregat
dd9d9e3316 Merge pull request #5639 from luchiago/fix-seeds-on-setup
FIx setup seed
2020-06-19 16:49:16 +02:00
Pau Perez
f36e08a163 Rename *.css.scss to *.scss
This fixes the following deprecation warning

```
DEPRECATION WARNING: Extra .css in SCSS file is unnecessary. Rename /usr/src/app/app/assets/stylesheets/darkswarm/variables.css.scss to /usr/src/app/app/assets/stylesheets/darkswar
m/variables.scss. (called from _app_views_layouts_darkswarm_html_haml___3990351141569700945_46957256630860 at /usr/src/app/app/views/layouts/darkswarm.html.haml:18)
(...)
```
2020-06-19 16:29:08 +02:00
Matt-Yorkley
66de0a4a71 Merge pull request #5642 from Matt-Yorkley/fix-table-width
Ensure cart page table is full-width
2020-06-19 14:27:00 +02:00
Matt-Yorkley
cda5a042b3 Ensure cart page table is full-width 2020-06-19 12:56:47 +02:00
Transifex-Openfoodnetwork
fd6cbe064d Updating translations for config/locales/tr.yml 2020-06-19 20:27:09 +10:00
Pau Pérez Fabregat
db80992326 Merge branch 'master' into drop-blockenspiel 2020-06-19 12:12:10 +02:00
Matt-Yorkley
444097c75f Merge pull request #5559 from luisramos0/display_only_shop
Make display only shops work again
2020-06-19 11:12:55 +02:00
Matt-Yorkley
be4a4c48d9 Merge pull request #5480 from Matt-Yorkley/mobile-cart-restyle
[Mobile] Cart Dropdown
2020-06-19 09:25:04 +02:00
Matt-Yorkley
b189d06eb7 Update shopping CTA logic
Shows "Take me shopping!" button on /shops page if a shop is selected
2020-06-19 08:59:43 +02:00
Lucas Hiago
52da896b03 Fix name when try to search on seed 2020-06-18 21:06:04 -03:00
Eduardo
573f7b1087 make shop links on the producers page open in new tab 2020-06-18 19:55:06 -03:00
Matt-Yorkley
ff6ba8819f Use image_tag helper with relative paths when loading static images in /app/assets/images folder
This seems to be needed for Rails 4
2020-06-18 22:22:31 +02:00
Matt-Yorkley
7c7ab322bb Ensure cart-header has the same height when the cart is empty
Fixes a minor visual bug
2020-06-18 22:21:55 +02:00
Matt-Yorkley
5a480439ca Remove test for items from previous orders looking in cart dropdown
This feature has been removed
2020-06-18 22:21:55 +02:00
Matt-Yorkley
a6edc1c973 Enable control over body scroll with BodyScroll service 2020-06-18 22:21:55 +02:00
Matt-Yorkley
ed086c2db5 Add character limit to product and variant names in cart sidebar 2020-06-18 22:21:55 +02:00
Matt-Yorkley
2cc02d9711 Make cart header stick to top of cart 2020-06-18 22:21:55 +02:00
Matt-Yorkley
886df0e87d Fix cart page button style regression 2020-06-18 22:21:55 +02:00
Matt-Yorkley
076ecfdb43 Adjust scrollbar visibility in sidebar 2020-06-18 22:21:55 +02:00
Matt-Yorkley
7093e0f7a3 Use plural or singular description in cart, depending on number of items 2020-06-18 22:21:55 +02:00
Matt-Yorkley
850e1b0364 Reduce specificity in cart css rules 2020-06-18 22:21:55 +02:00
Matt-Yorkley
b58ccc02ee Adjust shop.css.scss and remove indentation 2020-06-18 22:21:55 +02:00
Matt-Yorkley
234f0f94cf Change images in serializer to use product.images over variant.images 2020-06-18 22:21:55 +02:00
Matt-Yorkley
9c6dd1b324 Add comment on z-index 2020-06-18 22:21:55 +02:00
Matt-Yorkley
1eb9d11e27 Update colour variables 2020-06-18 22:21:55 +02:00
Matt-Yorkley
17c2721ab6 Remove unused translation keys 2020-06-18 22:21:55 +02:00
Matt-Yorkley
656c23f407 Replace previous min-width breakpoint.
This was mistakenly changed to use a max-width breakpoint in a previous commit.
2020-06-18 22:21:55 +02:00
Matt-Yorkley
1d8386bee8 Disable two SCSS-lint rules 2020-06-18 22:21:55 +02:00
Matt-Yorkley
c0282b57b6 Fix some linting warnings 2020-06-18 22:21:55 +02:00
Matt-Yorkley
042b4fc395 Remove tests for viewing previous order items in cart dropdown
This behavior has been removed
2020-06-18 22:21:55 +02:00
Matt-Yorkley
bd97939062 Move homepage "register here" CTA to bottom of screen.
The CTA breaks the layout when the new cart sidebar is open. I can't see a nice way to keep it at the top without making a mess.
2020-06-18 22:21:55 +02:00
Matt-Yorkley
2bcadd52e8 Hide "Take me shopping" button on /shop and /shops pages 2020-06-18 22:21:55 +02:00
Matt-Yorkley
387a5ec950 Implement "Take me shopping" button 2020-06-18 22:21:55 +02:00
Matt-Yorkley
10b8470e29 Set a fixed width for cart sidebar on tablet up 2020-06-18 22:21:55 +02:00
Matt-Yorkley
4acb08e52b Update hamburger menu icon 2020-06-18 22:21:55 +02:00
Matt-Yorkley
786348bc71 Remove colon from cart total text 2020-06-18 22:21:55 +02:00
Matt-Yorkley
8ac971651c Fix flaky spec 2020-06-18 22:21:55 +02:00
Matt-Yorkley
459e53f43d Adjust specs for new cart display 2020-06-18 22:21:55 +02:00
Matt-Yorkley
2f2ef28351 Use links instead of buttons and fix up styles 2020-06-18 22:21:55 +02:00
Matt-Yorkley
b74b9fbd1d Shift sidebar down vertically (below navigation) and bring navigation up (z-index) 2020-06-18 22:21:55 +02:00
Matt-Yorkley
4a0f43a831 Ensure cart item count is visible in header cart button (for screens smaller than desktop) 2020-06-18 22:21:55 +02:00
Matt-Yorkley
439674ad9c Make cart view fullwidth on mobile 2020-06-18 22:21:55 +02:00
Matt-Yorkley
8ca0119f5d Add empty cart feedback 2020-06-18 22:21:55 +02:00
Matt-Yorkley
95686eda78 Update translations 2020-06-18 22:21:54 +02:00
Matt-Yorkley
7efccac7bb Add close functionality to close button 2020-06-18 22:21:54 +02:00
Matt-Yorkley
4362b8b25b Improve line spacing on cart product list 2020-06-18 22:21:54 +02:00
Matt-Yorkley
be8c0f3600 Remove old cart dropdown view and directive 2020-06-18 22:21:54 +02:00
Matt-Yorkley
33a2dd100e Add new layout for cart sidebar 2020-06-18 22:21:54 +02:00
Matt-Yorkley
400fce8ef9 Separate cart page and cart dropdown styles 2020-06-18 22:21:54 +02:00
Matt-Yorkley
b4e5542e5f Extract re-usable sidebar styes 2020-06-18 22:21:54 +02:00
Matt-Yorkley
a8b981e9cd Add product thumbnais to serializer for cart dropdown images 2020-06-18 22:21:54 +02:00
Matt-Yorkley
b1ce7f2c15 Simplify product naming in cart 2020-06-18 22:21:54 +02:00
Matt-Yorkley
85abfd2056 Create Cart sidebar and controller 2020-06-18 22:21:54 +02:00
Matt-Yorkley
7290d68687 Update all locales with the latest Transifex translations 2020-06-18 20:46:41 +02:00
Fatih Orhan
27fb3f156c Update sell.html.haml 2020-06-18 20:36:50 +03:00
Luis Ramos
208623bb0a Merge pull request #5635 from Matt-Yorkley/map-icons
Ensure map icon URLs are correctly generated with fingerprints
2020-06-18 18:02:47 +01:00
Matt-Yorkley
130f639b61 Rename service and use #call 2020-06-18 17:14:50 +02:00
Pau Pérez Fabregat
63f8830eba Merge pull request #5530 from cillian/remove-spinjs
Remove spinjs-rails dependency and use spinning-circles.svg instead.
2020-06-18 16:47:09 +02:00
Matt-Yorkley
5338e782f8 Extract serializer helper method to service so the method isn't globally available 2020-06-18 16:44:15 +02:00
Luis Ramos
66f955f00d Merge pull request #5597 from luisramos0/bo_stripe_payments
[Spree 2.1] Make backoffice stripe payments work in rails 4
2020-06-18 14:50:27 +01:00
Matt-Yorkley
75e57e5c2c Call #image_path on map cluster icon 2020-06-18 14:14:41 +02:00
Matt-Yorkley
9a39cbbbc5 Convert MapConfiguration service to .js.erb.coffee 2020-06-18 14:14:41 +02:00
Matt-Yorkley
551daaadea Use #image_path correctly on map marker icons 2020-06-18 14:14:41 +02:00
Matt-Yorkley
2143122a30 Add helper method for correctly generating with fingerprints in Serializers 2020-06-18 14:14:39 +02:00
Pau Pérez Fabregat
e02191078d Merge pull request #5595 from coopdevs/improve-payments-report-performance
Remove N+1 fetching payments in report
2020-06-18 12:32:40 +02:00
Pau Pérez Fabregat
762b3a4a59 Merge pull request #5618 from openfoodfoundation/dependabot/bundler/httparty-0.18.1
Bump httparty from 0.17.3 to 0.18.1
2020-06-18 12:30:18 +02:00
Pau Pérez Fabregat
98490efbb3 Merge pull request #5600 from openfoodfoundation/transifex
Transifex
2020-06-18 12:29:10 +02:00
Matt-Yorkley
7cc47d652c Merge pull request #5624 from Matt-Yorkley/rails4-image-precompile
v3 image precompile
2020-06-18 12:01:23 +02:00
Luis Ramos
52dd7ce916 Improve comment about httparty 2020-06-18 10:12:37 +01:00
dependabot-preview[bot]
669330ee90 Bump httparty from 0.17.3 to 0.18.1
Bumps [httparty](https://github.com/jnunemaker/httparty) from 0.17.3 to 0.18.1.
- [Release notes](https://github.com/jnunemaker/httparty/releases)
- [Changelog](https://github.com/jnunemaker/httparty/blob/master/Changelog.md)
- [Commits](https://github.com/jnunemaker/httparty/compare/v0.17.3...v0.18.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-18 10:12:37 +01:00
Transifex-Openfoodnetwork
20c41ce69e Updating translations for config/locales/it.yml 2020-06-18 19:11:23 +10:00
Luis Ramos
f6e3e01a10 Extract permitted payment_source attributes from checkout to use them in the backoffice payments controller
Add spec to verify payment source attributes are passed
2020-06-18 09:54:34 +01:00
Transifex-Openfoodnetwork
b5a67e65c5 Updating translations for config/locales/es.yml 2020-06-18 17:42:06 +10:00
Transifex-Openfoodnetwork
da7d36cd0e Updating translations for config/locales/ca.yml 2020-06-18 17:41:48 +10:00
Pau Pérez Fabregat
8f885dd1c5 Merge pull request #5628 from Matt-Yorkley/flaky-caching-spec
Flaky caching spec
2020-06-18 09:37:45 +02:00
Transifex-Openfoodnetwork
fba5f96968 Updating translations for config/locales/nb.yml 2020-06-18 17:33:09 +10:00
Transifex-Openfoodnetwork
0c634c566c Updating translations for config/locales/fr.yml 2020-06-18 17:08:17 +10:00
Transifex-Openfoodnetwork
a9ed081488 Updating translations for config/locales/en_FR.yml 2020-06-18 17:01:02 +10:00
dependabot-preview[bot]
9c643447c2 Bump ransack from 1.2.3 to 1.8.10
Bumps [ransack](https://github.com/activerecord-hackery/ransack) from 1.2.3 to 1.8.10.
- [Release notes](https://github.com/activerecord-hackery/ransack/releases)
- [Changelog](https://github.com/activerecord-hackery/ransack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/activerecord-hackery/ransack/compare/v1.2.3...v1.8.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-17 19:15:45 +00:00
Luis Ramos
37cbcf4172 Merge pull request #5605 from luisramos0/spree_rev
Update spree revision and upgrade ransack to 1.2.3
2020-06-17 20:00:25 +01:00
Luis Ramos
06a37d8ff0 Merge pull request #5566 from rioug/5132-no-error-when-product-csv-malformed
Add handling of CSV::MalformedCSVError for product_importer
2020-06-17 19:58:35 +01:00
Luis Ramos
d0bb625c19 Merge pull request #5593 from coopdevs/fix-report-order-link
Fix link from report to order
2020-06-17 19:55:40 +01:00
Luis Ramos
5163317b10 Merge pull request #5623 from luisramos0/zones
Make Zones editable again
2020-06-17 19:41:20 +01:00
Luis Ramos
91489827a1 Merge pull request #5614 from openfoodfoundation/dependabot/bundler/coffee-rails-4.2.2
Bump coffee-rails from 4.0.1 to 4.2.2
2020-06-17 19:40:59 +01:00
Matt-Yorkley
64b5bde952 Wait for page to actually load after visit shops_path 2020-06-17 12:47:08 +02:00
Matt-Yorkley
86fe032cdb Update calls to #update_attributes! (Rails 4 Rubocop violation) 2020-06-17 12:37:20 +02:00
Matt-Yorkley
640c9e6d2b Re-enable flaky spec 2020-06-17 12:36:42 +02:00
dependabot-preview[bot]
d67fa6fa5a [Security] Bump geocoder from 1.5.2 to 1.6.3
Bumps [geocoder](https://github.com/alexreisner/geocoder) from 1.5.2 to 1.6.3. **This update includes a security fix.**
- [Release notes](https://github.com/alexreisner/geocoder/releases)
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md)
- [Commits](https://github.com/alexreisner/geocoder/compare/v.1.5.2...v1.6.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-16 23:49:32 +00:00
Lucas Hiago
419b3ef26e add missing i18n key for check hub ready for checkout 2020-06-16 19:49:43 -03:00
Lucas Hiago
e9e43c985f add missing i18n key for closed OC 2020-06-16 19:48:24 -03:00
Luis Ramos
01e27dd68c Merge pull request #5492 from pacodelaluna/include-negative-tax-adjustments-in-sales-report
Include adjustments with negative taxes on Sales Tax reports
2020-06-16 20:23:04 +01:00
Matt-Yorkley
add38bf550 Use #image_path helper correctly
Paths should be relative. For example an image under `/app/assets/images/home/banner.jpg` should be: `image_path("home/banner.jpg")`
2020-06-16 18:25:13 +02:00
Matt-Yorkley
c07476e22c Use new Rails 4 #image-url SCSS helper
Paths should be relative. For example an image under `/app/assets/images/home/banner.jpg` should be: `image-url("home/banner.jpg")`
2020-06-16 18:25:12 +02:00
Matt-Yorkley
c370ab04d7 Ensure images in /assets/images** are precompiled and moved correctly to /public/assets folder 2020-06-16 17:01:58 +02:00
Pau Pérez Fabregat
6a31c56601 Merge pull request #5598 from luisramos0/checkout_error
Make checkout js error handling a bit more defensive
2020-06-16 16:18:49 +02:00
François Turbelin
6672cfdaf5 Readd price_adustments after bad rebase 2020-06-16 16:13:56 +02:00
Luis Ramos
2fcafdcf45 Add spec to cover editing zones 2020-06-16 15:13:54 +01:00
Pau Pérez Fabregat
3cfec157ed Merge pull request #5621 from Matt-Yorkley/xit-caching-spec
Set flaky caching spec to pending
2020-06-16 16:11:34 +02:00
Luis Ramos
774b75b649 Make zones spec faster by going directly to zone list page withouth repeating the navigation through Configuration menu 2020-06-16 14:06:01 +01:00
Luis Ramos
3f7fb0ecc2 Add missing permitted attributes to zones 2020-06-16 13:56:39 +01:00
Pau Perez
ff4d7fbc45 Refactor with Arel to perform a single query 2020-06-16 14:01:27 +02:00
Pau Perez
00c9dd7ece Remove N+1 fetching order and li adjustments 2020-06-16 14:01:27 +02:00
François Turbelin
b4952dcbfb Cosmetics 2020-06-16 14:01:27 +02:00
François Turbelin
9abe41f6cb Use OrderTaxAdjustmentsFetcher service 2020-06-16 14:01:27 +02:00
François Turbelin
c729f64fcf Include adjustments without positive taxes 2020-06-16 14:01:27 +02:00
Matt-Yorkley
cf214251fa Set flaky caching spec to pending 2020-06-16 12:59:58 +02:00
dependabot-preview[bot]
f8c66cae81 Bump acts-as-taggable-on from 3.5.0 to 4.0.0
Bumps [acts-as-taggable-on](https://github.com/mbleigh/acts-as-taggable-on) from 3.5.0 to 4.0.0.
- [Release notes](https://github.com/mbleigh/acts-as-taggable-on/releases)
- [Changelog](https://github.com/mbleigh/acts-as-taggable-on/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.5.0...v4.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-16 02:30:03 +00:00
dependabot-preview[bot]
dfdf57746a Bump coffee-rails from 4.0.1 to 4.2.2
Bumps [coffee-rails](https://github.com/rails/coffee-rails) from 4.0.1 to 4.2.2.
- [Release notes](https://github.com/rails/coffee-rails/releases)
- [Changelog](https://github.com/rails/coffee-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/coffee-rails/compare/v4.0.1...v4.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-16 02:29:08 +00:00
Luis Ramos
7db519ab62 Merge pull request #5570 from luisramos0/ship_methods_form
[Spree 2.1] Make Shipping methods form save calculator details
2020-06-15 15:05:50 +01:00
Luis Ramos
0c97278d69 Upgrade ransack to 1.2.3 2020-06-15 14:20:34 +01:00
Luis Ramos
2c794c148b Update spree rev 2020-06-15 14:14:53 +01:00
Pau Pérez Fabregat
257b311e04 Merge pull request #5158 from openfoodfoundation/3-0-stable
Merge 3-0-stable to master
2020-06-15 13:35:58 +02:00
Pau Pérez Fabregat
62fe54d90d Merge pull request #5604 from luisramos0/xit_vo_flaky_2
Comment out flaky variant overrides spec
2020-06-15 13:11:24 +02:00
Luis Ramos
d5bdf306a9 Comment out flaky variant overrides spec 2020-06-15 11:43:30 +01:00
Luis Ramos
538d886c83 Merge pull request #5573 from Matt-Yorkley/payment-report-500
Fix fatal error in reports helper for orders without payments
2020-06-15 11:27:17 +01:00
Luis Ramos
c113ee92e6 Merge pull request #5603 from luisramos0/xit_exchange_prods
Comment out Exchange Products Renderer spec
2020-06-15 11:13:50 +01:00
Luis Ramos
d82a1c3bf1 Merge pull request #5602 from coopdevs/fix-style-issues
Fix outstanding Rubocop violations
2020-06-15 11:13:21 +01:00
Luis Ramos
ea8c5d2711 Comment out flaky spec 2020-06-15 11:01:35 +01:00
Pau Pérez Fabregat
e2e3b16250 Merge pull request #5549 from luisramos0/vo_flaky
[Spree 2.1] Make Variant Overrides spec less flaky and... comment it anyway
2020-06-15 12:00:16 +02:00
Pau Perez
456f369b76 Fix outstanding Rubocop violations 2020-06-15 10:17:34 +02:00
Pau Perez
df887b5576 Wrap long line
pick e84e0aebe Fix fatal error in reports helper for orders without payments
pick e725f3331 Defend from an order w/o payments when building table
2020-06-15 09:25:30 +02:00
Transifex-Openfoodnetwork
40dd9a8fda Updating translations for config/locales/en_NZ.yml 2020-06-14 08:11:27 +10:00
Eduardo
27c76cfae2 add view spec to replace feature spec 2020-06-13 14:24:17 -03:00
Cillian O'Ruanaidh
430e5ea9cc Permission to view :bulk_coop report is now added in the #add_bulk_coop_abilities method. 2020-06-13 16:57:43 +01:00
Cillian O'Ruanaidh
0ef3a7e24f Fix some more code climate violations for bulk coop specs which have been moved to the order management engine. 2020-06-13 16:23:11 +01:00
Cillian O'Ruanaidh
fdf0d92366 Move feature spec for bulk coop report to the order management engine. 2020-06-13 15:52:42 +01:00
Cillian O'Ruanaidh
ba126d5afc Move the bulk coop controller specs to the order management engine.
Also deleting old :bulk_coop_report action from the Spree::Admin::ReportsController.
2020-06-13 15:42:26 +01:00
Cillian O'Ruanaidh
c1e57fcc12 Adjust CanCan ability to reflect that the bulk coop report now runs from the order management engine. 2020-06-13 15:41:09 +01:00
Cillian O'Ruanaidh
3abcb5b23c Don't move the :parameter_not_allowed_error translation to a different scope yet.
It will make it harder to merge and deploy this PR if every translation locale file has to be updated too.
2020-06-13 15:37:44 +01:00
Cillian O'Ruanaidh
bcf79ef803 Fix code climate violations related to removing blockenspiel. 2020-06-13 13:27:44 +01:00
Cillian O'Ruanaidh
6dbb6f3f09 Add an underscore before unused method arguments rather than an empty splat operator so it's easier to understand what is being passed in. 2020-06-13 13:09:09 +01:00
Cillian O'Ruanaidh
293e8949a9 Remove unused AuthenticationWorkflow module from the BulkCoopReport specs. 2020-06-13 12:59:23 +01:00
Cillian O'Ruanaidh
bfc6daf076 Remove duplicate PackingReport tests from the BulkCoopReport spec.
These tests already exist in spec/lib/open_food_network/packing_report_spec.rb:72
2020-06-13 12:57:14 +01:00
Cillian O'Ruanaidh
ed82c7e3db BulkCoopReport has been moved to the engines/order_management so move it's spec there too. 2020-06-13 12:51:29 +01:00
Cillian O'Ruanaidh
e9ff84a746 Add a partial for the AJAX progress spinner so it can be reused in the spree admin and bare admin layouts. 2020-06-13 12:26:17 +01:00
Luis Ramos
e6e4b6f95c Add keypress events to text input fields on orders search page 2020-06-13 12:15:49 +01:00
Luis Ramos
1740879261 Revert directive and just use ng-kkeypress 2020-06-13 12:07:45 +01:00
Luis Ramos
f08b837115 Make enter submit the search form in products list 2020-06-13 11:51:00 +01:00
Eduardo
5ed5ed2873 fix payment methods table to show proper provider name 2020-06-12 18:26:54 -03:00
Luis Ramos
ed262a19a9 Make checkout js error handling a bit more defensive 2020-06-12 20:33:22 +01:00
Luis Ramos
02b351b9d5 Make display only shops work again, this will show the product list when the OC is open but ship and pay methods are not available
Add spec to cover display only shops, it's oficially a feature now :-)
2020-06-12 20:15:08 +01:00
Pau Perez
018772bbba Remove N+1 fetching payments in report 2020-06-12 16:42:40 +02:00
Pau Perez
29246c15fe Defend from order without billing address
This a data integrity issue that needs deeper investigation but while
this happens, our users can still render their reports.
2020-06-12 16:34:23 +02:00
Luis Ramos
6dcb2d4a3b Add xit, spec is still too flaky on semaphore
It's not the most important spec, this scenario should never happen as
the user will not be able to access the page.
2020-06-12 15:33:34 +01:00
Luis Ramos
f56e0ba0c0 Mock current_spree_user to return a user without permissions so that the controller does not use an already loaded version of current_spree_user that still has enough permissions 2020-06-12 14:23:45 +01:00
Luis Ramos
cf5af68438 Make spec less flaky by making it wait for the Saving text to go away 2020-06-12 13:04:33 +01:00
Luis Ramos
72870530ce Merge pull request #5594 from Matt-Yorkley/3-0-reports-subquery
[Spree 2.1] Fix "subquery has too many columns" in reports query
2020-06-12 12:42:04 +01:00
Matt-Yorkley
86db1b6d68 Fix "subquery has too many columns" in reports query 2020-06-12 12:55:50 +02:00
Pau Perez
6a7df0b165 Fix link from report to order 2020-06-12 12:26:56 +02:00
Pau Pérez Fabregat
034c3d9568 Merge pull request #5548 from luisramos0/3-0-stable-jun-2
[Spree 2.1] Merge master into 3-0-stable
2020-06-12 11:27:29 +02:00
Pau Pérez Fabregat
a91c81059f Merge pull request #5588 from openfoodfoundation/transifex
Transifex
2020-06-12 11:00:10 +02:00
Luis Ramos
7245a80f94 Merge branch 'master' into 3-0-stable-jun-2 2020-06-12 09:22:47 +01:00
Robin Klaus
f8ebe11728 Added translation keyt to config/locales/en.yml file for shipping_category 2020-06-12 13:19:15 +10:00
Transifex-Openfoodnetwork
10f0958819 Updating translations for config/locales/fr_CA.yml 2020-06-12 12:19:08 +10:00
Transifex-Openfoodnetwork
fce74bd008 Updating translations for config/locales/es.yml 2020-06-12 12:19:00 +10:00
Transifex-Openfoodnetwork
9908692da9 Updating translations for config/locales/en_FR.yml 2020-06-12 12:16:07 +10:00
Transifex-Openfoodnetwork
ff0e3ed379 Updating translations for config/locales/fr.yml 2020-06-12 12:16:00 +10:00
Transifex-Openfoodnetwork
2914500d5b Updating translations for config/locales/ca.yml 2020-06-12 12:15:53 +10:00
Robin Klaus
b8f228cc3d Added more key to en.yml to translate More dropdown text 2020-06-12 11:34:22 +10:00
Luis Ramos
898d525201 Merge pull request #5552 from coopdevs/remove-forgotten-photos
Remove unused stock photo
2020-06-11 20:41:01 +01:00
Luis Ramos
e2265dd165 Fix issue in product_spec 2020-06-11 20:26:57 +01:00
Luis Ramos
983bed3c4e Merge branch 'master' into 3-0-stable-jun-2 2020-06-11 19:50:56 +01:00
Transifex-Openfoodnetwork
17bf163378 Updating translations for config/locales/fr_CA.yml 2020-06-12 03:53:33 +10:00
Transifex-Openfoodnetwork
e371c5f788 Updating translations for config/locales/en_CA.yml 2020-06-12 03:48:39 +10:00
Pau Pérez Fabregat
5cca8693b3 Merge pull request #5540 from romale/patch-1
Missing translation key "return_authorizations"
2020-06-11 16:39:15 +02:00
Transifex-Openfoodnetwork
bfcf5f8ca0 Updating translations for config/locales/ca.yml 2020-06-12 00:38:46 +10:00
Transifex-Openfoodnetwork
ab76319861 Updating translations for config/locales/en_FR.yml 2020-06-12 00:35:51 +10:00
Transifex-Openfoodnetwork
30917c64f5 Updating translations for config/locales/fr.yml 2020-06-12 00:35:44 +10:00
Transifex-Openfoodnetwork
6d7c1b7933 Updating translations for config/locales/es.yml 2020-06-12 00:35:36 +10:00
Pau Perez
9d5c657ff9 Update all locales with the latest Transifex translations 2020-06-11 15:49:05 +02:00
Pau Pérez Fabregat
e0bcc71882 Merge pull request #5569 from rmklaus12/5204-inventory-translation
Add translation keys to en.yml file for variant_override error messag…
2020-06-11 15:35:30 +02:00
Pau Pérez Fabregat
06feae994d Merge pull request #5353 from pacodelaluna/sort-invoices-in-bulk-invoice-with-forced-order
Sort invoices in bulk invoice with completed_at desc order
2020-06-11 15:34:39 +02:00
Pau Pérez Fabregat
2052756169 Merge pull request #5556 from Matt-Yorkley/geocoding-service
Rename Angular Geo service
2020-06-11 15:19:08 +02:00
Pau Pérez Fabregat
bc8a10c6a0 Merge pull request #5541 from luisramos0/has_variants
Delete dead code related to products without variants
2020-06-11 15:18:13 +02:00
Pau Pérez Fabregat
01a9b33fc9 Merge pull request #5482 from rmklaus12/5094-new-order-translation
created partial for order page title to resolve French translation of…
2020-06-11 13:23:28 +02:00
Pau Pérez Fabregat
ab743c3af9 Merge pull request #5407 from luisramos0/oc_sweep
Order Cycle design sweep
2020-06-11 12:49:04 +02:00
Pau Pérez Fabregat
246a4995cb Merge pull request #5490 from luchiago/change-price-sack-amount-int-to-float
Change minimal amount in price sack calculator to float
2020-06-11 12:42:11 +02:00
Matt-Yorkley
e725f33318 Defend from an order w/o payments when building table 2020-06-11 12:37:51 +02:00
Matt-Yorkley
e84e0aebe6 Fix fatal error in reports helper for orders without payments 2020-06-11 11:22:07 +02:00
Pau Pérez Fabregat
75d24c19fc Merge pull request #5206 from chrishil1/clear_filters
Clear filters on admin/products page
2020-06-11 10:37:17 +02:00
Pau Pérez Fabregat
bdc4340034 Merge pull request #5582 from openfoodfoundation/transifex
Transifex
2020-06-11 10:30:13 +02:00
Pau Pérez Fabregat
961be38734 Merge pull request #5581 from openfoodfoundation/dependabot/bundler/test-unit-3.3.6
Bump test-unit from 3.3.5 to 3.3.6
2020-06-11 09:16:57 +02:00
Transifex-Openfoodnetwork
e76bc07d72 Updating translations for config/locales/es.yml 2020-06-11 17:11:55 +10:00
Transifex-Openfoodnetwork
6ef94febe5 Updating translations for config/locales/ca.yml 2020-06-11 17:10:49 +10:00
Gaetan Riou
359c0b9d85 fix typo 2020-06-11 16:54:00 +10:00
Gaetan Riou
d3943bc92a refactor error handling of CSV::MalformedCSVError and fix some typos 2020-06-11 16:47:58 +10:00
Transifex-Openfoodnetwork
472338b522 Updating translations for config/locales/fr.yml 2020-06-11 16:32:02 +10:00
Transifex-Openfoodnetwork
220c84075f Updating translations for config/locales/en_FR.yml 2020-06-11 16:25:36 +10:00
Luis Ramos
ccf6cbb003 Merge pull request #5483 from rmklaus12/5281-missing-translation-ordercreation
Changed translation syntax to normal t() call and lazy lookup.
2020-06-10 23:00:44 +01:00
Luis Ramos
13a4a3edbe Merge pull request #5532 from luchiago/fix-admin-config-separator-withou-highlight
Fix admin config separator without highlight
2020-06-10 23:00:30 +01:00
Luis Ramos
21746e72ce Merge pull request #5484 from rmklaus12/5336-errormsg-translation
Added translation keys to error messages partial and en.yml file to a…
2020-06-10 23:00:07 +01:00
Luis Ramos
1e248c1848 Merge pull request #5354 from jeduardo824/enhancement/5277-be-able-to-filter-orders-according-to-shipping-method
Enhancement/5277 be able to filter orders according to shipping method
2020-06-10 20:50:06 +01:00
Luis Ramos
28f126eed1 Merge pull request #5545 from mbudm/task/matomo-tag-manager
Add configuration to enable Matomo Tag Manager
2020-06-10 20:49:34 +01:00
dependabot-preview[bot]
1a700f870c Bump test-unit from 3.3.5 to 3.3.6
Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.3.5 to 3.3.6.
- [Release notes](https://github.com/test-unit/test-unit/releases)
- [Commits](https://github.com/test-unit/test-unit/compare/3.3.5...3.3.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-10 19:16:40 +00:00
Luis Ramos
113533e3b1 Merge pull request #5557 from Matt-Yorkley/reports-improvement
Improve performance in various reports
2020-06-10 18:54:51 +01:00
Pau Pérez Fabregat
a547aae770 Merge pull request #5562 from openfoodfoundation/transifex
Transifex
2020-06-10 17:57:07 +02:00
Transifex-Openfoodnetwork
1abbd7261e Updating translations for config/locales/es.yml 2020-06-11 01:13:33 +10:00
Transifex-Openfoodnetwork
9a2618cd39 Updating translations for config/locales/ca.yml 2020-06-11 01:09:41 +10:00
Steve Roberts
f8673fb575 Moved tag manager instructions to be directly below the field 2020-06-10 15:06:53 +10:00
Maikel Linke
7d53b12baf Preserve sorting by completion date 2020-06-10 10:19:15 +10:00
Maikel Linke
680ee3dc86 Check the bulk invoice rendering order
As it turns out, our performance optimisation with `find_each` overrides
or custom sorting.
2020-06-10 10:05:47 +10:00
Luis Ramos
89003aece7 Merge pull request #5414 from openfoodfoundation/dependabot/bundler/stripe-5.22.0
Bump stripe from 5.15.0 to 5.22.0
2020-06-09 17:41:20 +01:00
Pau Pérez Fabregat
86d59c4e86 Merge pull request #5564 from dmarcoux/improve-dockerfile
Improve Dockerfile
2020-06-09 16:17:37 +02:00
Luis Ramos
0c1ed1731d Add more specs to ship method controller 2020-06-09 12:33:55 +01:00
Luis Ramos
87292a8ce5 Refactor spec to add more similar specs 2020-06-09 12:15:52 +01:00
Luis Ramos
f05b0d1a57 Add missing fields to ship method controller permitted params list 2020-06-09 12:02:59 +01:00
Luis Ramos
fd5062429a Add context to delete specs so we can add other specs 2020-06-09 12:02:59 +01:00
Luis Ramos
7924330321 Fix problem with stub_const, we need auto load the controller before the const is stubbed otherwise the controller will be broken
See details here: https://github.com/rspec/rspec-mocks/issues/1079#issuecomment-215620243
2020-06-09 10:52:53 +01:00
Robin Klaus
c4fbce30c8 Add translation keys to en.yml file for variant_override error message translation 2020-06-09 19:20:29 +10:00
François Turbelin
795106aaa2 Use real orders inside spec to extend coverage 2020-06-09 10:11:11 +02:00
François Turbelin
6056c1699f Use batches in order to fetch orders 2020-06-09 10:10:34 +02:00
Steve Roberts
5fcc0dcd14 Add configuration to enable matomo tag manager
- Update embed codes and allow both scripts concurrently
- Add lines around blocks
- Update MTM copy based on PR feedback
- checked cookies unchanged
2020-06-09 10:21:11 +10:00
Luis Ramos
88896b7730 Merge branch 'master' into 3-0-stable-jun-2 2020-06-08 19:17:11 +01:00
jeffrey s hill md
c4e910a7c8 Make clear filters fetch products automatically without filters
The spec change is needed: fetchProducts() makes cleared filters values undefined in removeClearedValues.
2020-06-08 18:27:10 +01:00
Transifex-Openfoodnetwork
dceae2a98b Updating translations for config/locales/it.yml 2020-06-08 23:23:41 +10:00
Transifex-Openfoodnetwork
7515b9c86c Updating translations for config/locales/it.yml 2020-06-08 23:20:30 +10:00
Gaetan Riou
9b8a97aadd Add handling of CSV::MalformedCSVError for product_importer 2020-06-08 16:21:02 +10:00
Dany Marcoux
a751d24562 Run bundler install in parallel with the amount of available CPUs 2020-06-07 23:32:50 +02:00
Dany Marcoux
6c564dc7b2 Shallow clone specific release for rbenv and ruby-build
We don't need the whole git history, so doing a shallow clone is
favourable. Cloning a specific release (the latest at the time of
writing this) allows us to have reproducible results since we're not
cloning whatever is on master at the time of building the Docker image.
2020-06-07 23:29:17 +02:00
Transifex-Openfoodnetwork
e8f59ca80f Updating translations for config/locales/tr.yml 2020-06-06 20:02:55 +10:00
Cillian O'Ruanaidh
f90969134d Fix a couple of Rubocop violations. 2020-06-05 20:03:17 +01:00
Pau Perez
a287f370b5 Remove unused home photos 2020-06-05 18:05:58 +02:00
Cillian O'Ruanaidh
bafa8beab3 Use :parameter_not_allowed_error_message to from base Reports::Authorizer. 2020-06-05 17:05:26 +01:00
Cillian O'Ruanaidh
e58852289f Move the :require_valid_datetime_range method to OrderManagement::Reports::Parameters::Base so it can be reused on multiple reports. 2020-06-05 16:58:56 +01:00
Cillian O'Ruanaidh
9172606780 Allow the order management report partial to be reused on different reports. 2020-06-05 16:51:43 +01:00
Cillian O'Ruanaidh
406309c577 Move BulkCoop reports out of deprecated lib/ directory into OrderManagement engine.
The BulkCoop reports are not generated the same way as the EnterpriseFeeSummary report is generated yet so that may need to be updated.
2020-06-05 16:43:38 +01:00
Pau Pérez Fabregat
ca458018ca Merge pull request #5547 from luisramos0/ctrl_hacks
Bring the spree_get spec helpers from spree and move them together with the api_get spec helpers
2020-06-05 17:34:16 +02:00
Matt-Yorkley
9e278d5b2f Improve performance in various reports 2020-06-05 16:39:01 +02:00
Luis Ramos
e2e3ae68b7 Update all locales with the latest Transifex translations 2020-06-05 11:36:27 +01:00
Luis Ramos
8ba15931e3 Merge pull request #5521 from openfoodfoundation/transifex
Transifex
2020-06-05 11:34:13 +01:00
Cillian O'Ruanaidh
d436d18d19 Fix code climate violations in removal of Blockenspiel dependency. 2020-06-05 10:13:06 +01:00
Transifex-Openfoodnetwork
c317ae7bf3 Updating translations for config/locales/en_FR.yml 2020-06-05 17:51:47 +10:00
Transifex-Openfoodnetwork
76aded5fb5 Updating translations for config/locales/fr.yml 2020-06-05 17:51:06 +10:00
Matt-Yorkley
78fc6b7138 Rename "Geo" service to "GmapsGeo" for clarity.
This service directly calls methods in the google maps javascript included in the darkswarm layout. If we're moving away from it, we should clarify where it's used.
2020-06-05 08:35:15 +02:00
Robin Klaus
d5d6fbc01d created partial for order page title to resolve French translation of new order 2020-06-05 11:27:51 +10:00
Luis Ramos
82290bb5e1 Merge pull request #5448 from rmklaus12/5302-paypal-missingkey
Added translation keys for PayPalExpress payment method
2020-06-04 21:32:27 +01:00
Luis Ramos
3a20de1465 Merge pull request #5398 from cillian/open-street-map
Add support for using Open Street Map on the Map and Group pages.
2020-06-04 17:01:25 +01:00
Transifex-Openfoodnetwork
52323887b6 Updating translations for config/locales/en_FR.yml 2020-06-04 15:58:45 +10:00
Transifex-Openfoodnetwork
095d0f4ca8 Updating translations for config/locales/fr.yml 2020-06-04 15:58:22 +10:00
Luis Ramos
12000d2d44 Merge pull request #5425 from luisramos0/pay_method_warning
Add warning to payment method edit page
2020-06-03 21:03:56 +01:00
Luis Ramos
cce26cb453 Merge branch '3-0-stable' into 3-0-stable-jun-2 2020-06-03 19:51:43 +01:00
Pau Pérez Fabregat
93dd61c6fc Merge pull request #5456 from luisramos0/3-0-stable-with-spree-deps
[Spree 2.1] Move all spree_core dependencies to OFN so we can upgrade them later
2020-06-03 18:57:24 +02:00
Luis Ramos
0b76a25941 Add spree_core dependencies to OFN so we can upgrade them
This will enable us to upgrade these dependencies independently
2020-06-03 14:25:27 +01:00
Lucas Hiago
bfe17f54d7 Change minimal amount in price sack calculator to float 2020-06-03 08:51:41 -03:00
Pau Perez
7900cf9438 Style spinner SVG by inlining it
This way we can tweak the `fill` property of the SVG and style it with
CSS as the documented in the author's repo
(https://github.com/SamHerbert/SVG-Loaders)

> An icon's color can be manipulated by changing the fill attribute in
the SVG file.
2020-06-03 11:13:03 +02:00
Transifex-Openfoodnetwork
bbf381d130 Updating translations for config/locales/es.yml 2020-06-03 18:32:57 +10:00
Pau Pérez Fabregat
da3d51b500 Merge pull request #5539 from luisramos0/dev_docs
Improve Dev onboarding docs
2020-06-03 09:50:03 +02:00
Transifex-Openfoodnetwork
61d85eda61 Updating translations for config/locales/ca.yml 2020-06-03 17:40:19 +10:00
Pau Pérez Fabregat
8a62c8aeb5 Merge pull request #5544 from luisramos0/api_ctrl
[Spree 2.1] Fix specs in Api::EnterprisesController and Api::ShopsController
2020-06-03 09:34:43 +02:00
Pau Pérez Fabregat
833e2ff9c4 Merge pull request #5543 from luisramos0/product_stock
[Spree 2.1] Fix product_stock spec
2020-06-03 09:18:52 +02:00
Pau Pérez Fabregat
4935932e45 Merge pull request #5531 from openfoodfoundation/dependabot/bundler/i18n-js-3.7.0
Bump i18n-js from 3.6.0 to 3.7.0
2020-06-03 09:17:58 +02:00
Pau Pérez Fabregat
d9cf22fed5 Merge pull request #5528 from luisramos0/checkout_js
Make checkout JS code send bugsnag alert even if there's an error processing an error
2020-06-03 09:13:40 +02:00
Pau Pérez Fabregat
fb339d6a99 Merge pull request #5263 from luisramos0/pdp
[Mobile] Restyle product modal
2020-06-03 08:55:20 +02:00
Transifex-Openfoodnetwork
4e497d93b7 Updating translations for config/locales/en_CA.yml 2020-06-03 10:31:14 +10:00
romale
325cbbf3c7 formatting 2020-06-02 23:40:57 +03:00
Luis Ramos
f9d86eb7ed Join module and describe declaration so that rspec picks up correct controller under Api namespace and not the controller with the same name in the base namespace 2020-06-02 20:17:46 +01:00
Luis Ramos
251c04f2d9 Make all tests in enterprises_controller_spec use api_post instead of spree_post 2020-06-02 20:17:07 +01:00
Luis Ramos
ff0c93a76b Join module and describe declaration so that rspec picks up correct
controller under Api namespace and not the controller with the same name
in the base namespace
2020-06-02 20:15:25 +01:00
Luis Ramos
c68459f212 Make enterprises_controller_spec use api_post instead of spree_post 2020-06-02 20:06:52 +01:00
Luis Ramos
5fd0a6028f Merge pull request #5420 from luisramos0/pi_fix
[Spree 2.1] Product Import - Add variant_unit_name to the list of fields to be ignored when creating a variant
2020-06-02 18:13:48 +01:00
Luis Ramos
53a80de503 Improve method names and set use_route with reverse_merge so it can be overridden 2020-06-02 17:32:46 +01:00
Luis Ramos
4438f620e9 Merge pull request #5421 from luisramos0/more_strong_params
[Spree 2.1] Add missing strong params to less important controllers missed by specs
2020-06-02 16:59:27 +01:00
Luis Ramos
23b677f547 Merge pull request #5388 from luisramos0/reg_proc
[Spree 2.1] Fix enterprise package selection submit button
2020-06-02 16:23:52 +01:00
Luis Ramos
beb1b3f3bc Replay 02d46b7c51 lost in the last merge from master 2020-06-02 16:11:03 +01:00
Luis Ramos
c9a7a6e897 Merge branch 'master' into 3-0-stable-jun-2 2020-06-02 16:00:45 +01:00
Luis Ramos
8bb4310cba Merge pull request #5383 from luisramos0/admin_orders_bug
[Spree 2.1] Fix Update and Calculate Fees button
2020-06-02 15:30:16 +01:00
Luis Ramos
7b89f4d6c5 Switch controller helper calls routes from spree to main_app, this will include all routes all the time 2020-06-02 15:00:57 +01:00
Luis Ramos
13836a62bb Rename parameters to params and change default from nil to {} 2020-06-02 14:36:06 +01:00
Luis Ramos
3136aa5a8b Make api_process use process_spree_action 2020-06-02 14:00:24 +01:00
romale
9d56c180b2 formatting 2020-06-02 15:56:59 +03:00
Luis Ramos
2f76e0b15b Bring methods from Spree::TestingSupport::ControllerRequests to our ControllerRequestsHelper so we can merge them later 2020-06-02 13:54:33 +01:00
Luis Ramos
5d0856e5a3 Rename ControllerHacks to ControllerRequestsHelper and move it's configuration to spec_helper 2020-06-02 13:47:59 +01:00
Luis Ramos
cd3bc54c37 Remove resource_scoping to make things more simple 2020-06-02 13:43:33 +01:00
Luis Ramos
2c2263ab78 Fix rubocop issues in shipments_controller_spec 2020-06-02 13:41:50 +01:00
Luis Ramos
092e047b44 Remove resource_scoping from api/shipments_controller spec 2020-06-02 13:35:48 +01:00
Luis Ramos
a0aa42cd58 Remove resource_scoping from api/variants spec 2020-06-02 13:26:12 +01:00
romale
d16bfe3779 formatting 2020-06-02 14:44:16 +03:00
romale
9d3f010173 formating 2020-06-02 14:42:50 +03:00
Luis Ramos
89c461662f Merge pull request #5502 from Matt-Yorkley/dropshadow-regression
[mobile ux] Fix missing drop-shadow
2020-06-02 12:07:37 +01:00
romale
35648025df formating 2020-06-02 12:09:38 +03:00
romale
b21904ada1 moved to 2882 2020-06-02 10:38:36 +03:00
Robin Klaus
f4a64e89c2 Added translation keys to error messages partial and en.yml file to add translation to error messages 2020-06-02 15:41:01 +10:00
Luis Ramos
2d7f1ce283 Delete all variants from test product not just the first one 2020-06-01 21:21:26 +01:00
Luis Ramos
072da7316e Remove views code that tests for the existence of product variants
A product always has the standard variant, the only case where a product will not have variants is immediatly after creation and before being saved
2020-06-01 14:09:14 +01:00
Luis Ramos
e7828e107b Delete dead methods from product_decorator 2020-06-01 14:07:34 +01:00
Luis Ramos
a4a6431faf Fix strong params problem where order object is not sent to controller 2020-06-01 13:42:22 +01:00
Luis Ramos
48985bbcd1 Use patch instead of put, because it's rails 4
Extend the registration process spec to cover package selection
2020-06-01 13:41:37 +01:00
Luis Ramos
c6842ada7f Add variant_unit_name to the list of fields to be ignored when creating a variant, it's a product field 2020-06-01 13:41:15 +01:00
Luis Ramos
754b657f81 Move controller methods to protected to keeep consitency and isolation 2020-06-01 13:40:59 +01:00
Luis Ramos
bae128738b Add spec for return authorizations controller 2020-06-01 13:40:59 +01:00
Luis Ramos
583b4a1df7 Add spec to countries_controller 2020-06-01 13:40:59 +01:00
Luis Ramos
73f2844fe3 Add spec for shipping categories 2020-06-01 13:40:59 +01:00
Luis Ramos
e77d9aba7b Add missing strong params to less important controllers not tested in specs 2020-06-01 13:40:59 +01:00
romale
069241f307 Missing translation key "return_authorizations"
return_authorizations: Return Authorizations
2020-06-01 15:25:46 +03:00
Transifex-Openfoodnetwork
e5cc425662 Updating translations for config/locales/tr.yml 2020-06-01 16:39:17 +10:00
Luis Ramos
5d9e88a3bc Restructure GETTING STARTED to make it clear what the wiki pages are for 2020-05-31 23:00:32 +01:00
Luis Ramos
fb45cb602e Remove duplication from CONTRIBUTING 2020-05-31 21:07:52 +01:00
Matt-Yorkley
8e57f9d929 Adjust shared map partial 2020-05-31 19:21:20 +02:00
Cillian O'Ruanaidh
94b85fb9e3 Fix up Code Climate issues with Open Street Map code. 2020-05-31 18:42:55 +02:00
Cillian O'Ruanaidh
deafe32354 Add support for using Open Street Map on the Map and Group pages.
The map is displayed using https://leafletjs.com/

To enable Open Street Map go to the Admin -> Configuration -> Content section and click 'Open Street Map Enabled'.

The 'Open Street Map Provider Name' setting can be used to configure different tile providers thanks to the Leaflet-providers extension (https://github.com/leaflet-extras/leaflet-providers)

Some tile providers require an API key, this can provided in JSON format e.g. '{ apiKey: 123 }' in the 'Open Street Map Provider Options' setting.

Each tile provider has their own usage policy so this should be checked before enabling Open Street Map.

The search field for the Open Street Map works differently than searching on Google Maps. It matches producers by their name or address because it was easier to implement instead of matching place names all over the world.
2020-05-31 18:42:55 +02:00
Matt-Yorkley
1e3bf7fec4 Merge pull request #5487 from coopdevs/fix-schedule-factory
[Spree 2.1] Allow to create order_cycle_schedules
2020-05-30 13:49:47 +02:00
Luis Ramos
c01da01c70 Merge pull request #5518 from openfoodfoundation/dependabot/bundler/ddtrace-0.36.0
Bump ddtrace from 0.35.2 to 0.36.0
2020-05-30 11:05:40 +01:00
Lucas Hiago
528db54f36 Correct controller name for matching 2020-05-29 22:24:41 -03:00
Lucas Hiago
19ef66f3ad Change mail method config route 2020-05-29 21:51:57 -03:00
dependabot-preview[bot]
f773e57dee Bump i18n-js from 3.6.0 to 3.7.0
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.6.0 to 3.7.0.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.6.0...v3.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-29 19:20:40 +00:00
Cillian O'Ruanaidh
e6fa296d03 Remove spinjs-rails dependency and use spinning-circles.svg instead.
For https://github.com/openfoodfoundation/openfoodnetwork/issues/3491

The spinjs-rails gem provides a CSS3 a spinning activity indicator. This commit removes the gem so we don't have to keep the gem up-to-date and uses the spinning-circles.svg which is used already in other places.

The spinjs spinner can be seen when viewing or editing taxonomies in /admin/taxonomies. It is loaded from the .ajaxStart call in app/assets/javascripts/admin/spree/progress.coffee

To test or restyle this spinner you can change the display property of the #progress element in app/assets/stylesheets/admin/components/progress.scss to 'block'.
2020-05-29 18:04:49 +01:00
Pau Perez
24e897d145 Do not build OC with schedules at the same time
It's not possible when neither the OC nor the schedule has an id due to
the new join table order_cycle_schedules.
2020-05-29 17:00:52 +02:00
Pau Perez
538c53fe9e Improve code readability
Also removing an useless vars
2020-05-29 15:56:05 +02:00
Luis Ramos
6e842212ea Always throw back error even if there is an error loading the flash for example translating the error message 2020-05-29 14:45:22 +01:00
Luis Ramos
3e0839de73 Increase warning sign line height so that it renders correctly on smaller screens 2020-05-29 12:56:22 +01:00
Luis Ramos
2c55bef544 Remove unnecessary padding
This is looking broken in ipad mini 3
2020-05-29 12:56:22 +01:00
Luis Ramos
a376a17f64 Group related properties together 2020-05-29 12:56:20 +01:00
Cillian O'Ruanaidh
d02f64da06 Define bulk coop report summary row and columns with lists of method names instead of Procs. 2020-05-29 11:34:12 +01:00
Matt-Yorkley
c73defa8a1 Merge pull request #5494 from Matt-Yorkley/group-maps-fix
Fix group maps
2020-05-29 12:05:55 +02:00
Pau Pérez Fabregat
c0ad992352 Merge pull request #5465 from luisramos0/rename_accessible_by
[Rails 4.1] Rename order_cycle.accessible_by to remove name clash with active record
2020-05-29 12:04:19 +02:00
Pau Pérez Fabregat
8d1944d714 Merge pull request #5506 from Matt-Yorkley/3-0-dfc-specs
[Spree 2.1] DFC specs updates
2020-05-29 11:43:19 +02:00
Pau Perez
815cd73ff3 DRY specs 2020-05-29 11:15:47 +02:00
Pau Perez
032dce1a88 Move OC save within success block
This makes more evident there are two scenarios: schedule save success
or failure. We deal with OCs failures raising an exception.
2020-05-29 10:46:29 +02:00
Pau Perez
768568c75c Rename @object to @schedule
This level of abstraction makes sense in the framework-like code in
ResourceController but here it just makes things more difficult.
2020-05-29 10:44:43 +02:00
Pau Perez
4f3d01bd93 Remove unused HTML response format 2020-05-29 10:43:16 +02:00
Pau Perez
56b590a6f8 Extract #sync_subscription
This makes it far easier to spot what's the difference between create
and update regarding subs syncing without having to mess with `#update`
and its callbacks (for now).
2020-05-29 10:41:42 +02:00
Pau Perez
65c53df2ef Remove unnecessary callback invocations
There are no registered callback methods to execute.
2020-05-29 10:25:38 +02:00
Pau Perez
f25ee8c998 Extract #editable_order_cycles
This makes it far easier to spot what's the difference between create
and update regarding the editable order cycles.

I stop here before a slightly deeper refactor which would make the PR
quite hard to review. This will come an upcoming one.
2020-05-29 10:25:37 +02:00
Pau Perez
862364ebbb Fix schedule destroy spec 2020-05-29 10:24:50 +02:00
Pau Perez
4f635339e3 Fix schedule creation and subs syncing 2020-05-29 10:24:42 +02:00
Transifex-Openfoodnetwork
5e0e88bf2c Updating translations for config/locales/fr.yml 2020-05-29 17:24:01 +10:00
Transifex-Openfoodnetwork
9fbd8b4fe1 Updating translations for config/locales/en_FR.yml 2020-05-29 16:46:33 +10:00
Maikel
2f82a58055 Merge pull request #5365 from mbudm/task/orderCycleSpecSplit
Split order_cycle_spec into smaller specs grouped by theme
2020-05-29 13:46:42 +10:00
Transifex-Openfoodnetwork
11f33bd911 Updating translations for config/locales/pt_BR.yml 2020-05-29 08:12:24 +10:00
Luis Ramos
2203bca1ce Merge pull request #5489 from luisramos0/3-0-stable-may-22
[Spree 2.1] Merge master into 3-0-stable
2020-05-28 19:55:14 +01:00
Luis Ramos
bb8401a0fc Merge pull request #5444 from luisramos0/dead_js_code
Remove some dead JS code related to admin sub menus
2020-05-28 19:54:42 +01:00
Luis Ramos
bd5de9d82f Delete unused translations 2020-05-28 19:51:23 +01:00
Luis Ramos
bec798c6c9 Bring some spree translations to ofn in payment methods pages 2020-05-28 19:51:23 +01:00
Luis Ramos
fe6bcb5093 Add de-activation warning to payment methods edit page 2020-05-28 19:50:58 +01:00
Luis Ramos
26f1dfb080 Move payment_method display field translations to OFN and adapt them to changes on same field in shipping method 2020-05-28 19:50:58 +01:00
Luis Ramos
83edfbd1dd Merge pull request #5266 from luchiago/improve-order-cancellation-email
Improve order cancellation email
2020-05-28 19:48:26 +01:00
Cillian O'Ruanaidh
1fba998b9e Drop Blockenspiel and use :rules/:columns methods instead of :organise/:summary_columns DSL.
For https://github.com/openfoodfoundation/openfoodnetwork/issues/3231
2020-05-28 19:04:18 +01:00
Pau Perez
9a29e634fc Deal with Schedule creation in its own controller
This way it can assign the order cycles to the schedule when this is
persisted. An OrderCycleSchedule (the join table) can't be created until
both schedule and order_cycle got an id.

Also, we do not call `#adapt_params` when creating the Schedule as that
assigns `order_cycle_ids` to `@object.attributes` thus, attempting to
create the OrderCycleSchedule without a schedule_id.
2020-05-28 17:49:36 +02:00
Transifex-Openfoodnetwork
29f266d3a5 Updating translations for config/locales/tr.yml 2020-05-28 23:17:00 +10:00
Transifex-Openfoodnetwork
c428b2f133 Updating translations for config/locales/tr.yml 2020-05-28 23:07:06 +10:00
Pau Perez
06b7a95fb1 DRY duplicate subscription declaration 2020-05-28 14:00:53 +02:00
Matt-Yorkley
ea7a2c91ee Update all locales with the latest Transifex translations 2020-05-28 13:12:12 +02:00
Matt-Yorkley
2ae84ad710 Merge pull request #5491 from openfoodfoundation/transifex
Transifex
2020-05-28 13:08:36 +02:00
dependabot-preview[bot]
8632383e60 Bump ddtrace from 0.35.2 to 0.36.0
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.35.2 to 0.36.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.35.2...v0.36.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-27 20:23:11 +00:00
Luis Ramos
6f0106251e Move product-img css class to parent div so we can center align it and keep existing img styling 2020-05-27 19:16:31 +01:00
Pau Pérez Fabregat
3b4266cbc8 Merge pull request #5495 from luisramos0/byebug
Fix error in dependency requirement specification for byebug and pry-byebug
2020-05-27 08:54:32 +02:00
Pau Pérez Fabregat
22be41ebed Merge pull request #5498 from mbudm/task/local_db_port_config
Add support for an env var to override DB port
2020-05-27 08:53:29 +02:00
Pau Pérez Fabregat
127e48e579 Merge pull request #5413 from luisramos0/edit_orders_mobile
Show order edit link on mobile instead of the cancel link
2020-05-27 08:51:41 +02:00
Pau Pérez Fabregat
4d3ae8fa53 Merge pull request #5439 from coopdevs/fix-misplaced-paragraph
[mobile ux] Fix misplaced paragraph in shop tab
2020-05-27 08:51:13 +02:00
Luis Ramos
7313e3c096 Merge pull request #5501 from luisramos0/grumpy_cat_take_2
Enterprises Controller: reset_distributor must be called before any call to memoized current_distributor
2020-05-26 23:06:59 +01:00
Transifex-Openfoodnetwork
d2e46b8561 Updating translations for config/locales/ca.yml 2020-05-27 00:32:12 +10:00
Transifex-Openfoodnetwork
8d3c8c62fb Updating translations for config/locales/en_CA.yml 2020-05-27 00:02:52 +10:00
Transifex-Openfoodnetwork
daf9fab16d Updating translations for config/locales/en_CA.yml 2020-05-26 23:59:48 +10:00
Matt-Yorkley
89dd7ddb86 Update setting of request headers in DFC controller spec 2020-05-26 15:32:07 +02:00
Matt-Yorkley
bde4acd22f Update get calls in DFC controller spec 2020-05-26 15:21:02 +02:00
Matt-Yorkley
953e1f8ff4 Adjust z-index on overlapping elements to fix missing drop-shadow regression 2020-05-26 12:59:51 +02:00
Luis Ramos
52810b0f4a Make enterprises controller spec assert the corrrect state of current_distributor
This validates bug #5496 is fixed
2020-05-26 11:26:20 +01:00
Luis Ramos
4026e072d5 Break OrderCartReset in two steps so that memoized method current_customer (that uses memoized current_distributor) is called after reset_distributor 2020-05-26 11:13:16 +01:00
Luis Ramos
a582261d7a Merge pull request #5493 from luisramos0/display_on_4_managers
Make display_on attribute available for managers to change in shipping and payment methods
2020-05-26 09:57:56 +01:00
Pau Pérez Fabregat
c3f66203bb Merge pull request #5497 from openfoodfoundation/dependabot/bundler/rack-mini-profiler-2.0.2
Bump rack-mini-profiler from 2.0.1 to 2.0.2
2020-05-26 09:55:26 +02:00
Robin Klaus
50a63139e3 Changed translation syntax to normal t() call and lazy lookup. 2020-05-26 15:14:26 +10:00
Steve Roberts
d4a256fcca Add support for an env var to override DB port 2020-05-26 11:04:42 +10:00
Steve Roberts
2bb3cf1c54 Name checkbox element id var more informatively 2020-05-26 09:53:51 +10:00
dependabot-preview[bot]
fc186f5342 Bump rack-mini-profiler from 2.0.1 to 2.0.2
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases)
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v2.0.1...v2.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-25 21:24:42 +00:00
Luis Ramos
513ee6393a Make product modal display image on the right for medium screens like it was doing for large screens 2020-05-25 19:31:02 +01:00
Luis Ramos
1e0e3a063d Add margin right to product modal title so that the close button doesnt overlap with it 2020-05-25 19:14:40 +01:00
Luis Ramos
50e4896e32 Fix error in dependency requirement specification
~> 11.0 allows upgrades to 11.1, we want to lock it to 11.0.x so we need ~> 11.0.0

Same logic for pry-byebug
2020-05-25 18:15:47 +01:00
Matt-Yorkley
8095371304 Ensure OpenStreetMap credits are aways shown with map and fix credits positioning for /groups page map display 2020-05-25 14:12:12 +02:00
Matt-Yorkley
a3660dfe37 Extract repeated map code to new partial 2020-05-25 14:04:11 +02:00
Matt-Yorkley
e03005ed56 Fix maps and tidy up groups map code 2020-05-25 13:52:56 +02:00
Luis Ramos
cb0aefd29c Make display on attribute available for managers to change, not just super admins 2020-05-25 11:21:53 +01:00
Transifex-Openfoodnetwork
d9d221e4f3 Updating translations for config/locales/en_GB.yml 2020-05-25 18:46:48 +10:00
François Turbelin
b2b988b063 Apply new order directly inside service 2020-05-24 14:41:40 +02:00
Transifex-Openfoodnetwork
5de3fbba1e Updating translations for config/locales/en_FR.yml 2020-05-24 19:14:49 +10:00
Transifex-Openfoodnetwork
ed27ed32e3 Updating translations for config/locales/fr.yml 2020-05-24 19:14:25 +10:00
Luis Ramos
f34f693620 Merge branch 'master' into 3-0-stable-may-22 2020-05-22 22:54:19 +01:00
Kristina Lim
cf534237cd Update all locales with the latest Transifex translations 2020-05-23 01:51:23 +08:00
Pau Pérez Fabregat
da88399ca6 Merge pull request #5411 from Matt-Yorkley/orders-closed-fullwidth
Fix closed shop message not displaying full-width
2020-05-22 19:32:08 +02:00
Pau Pérez Fabregat
a5b4c5316c Merge pull request #5458 from Matt-Yorkley/oc-form-ui-bug
Fix display issue on order cycle edit form
2020-05-22 19:31:41 +02:00
Pau Pérez Fabregat
f1dbad1007 Merge pull request #5466 from Matt-Yorkley/shop-search-fix
Fix search bar in /shops and /groups
2020-05-22 18:40:27 +02:00
Pau Pérez Fabregat
17e77df14f Merge pull request #5451 from Matt-Yorkley/oc-selector-fix
Fix tab-buttons element overlapping order cycle selector
2020-05-22 18:39:10 +02:00
Pau Pérez Fabregat
3f593d6246 Merge pull request #5440 from luisramos0/grumpy_cat
Fix Grumpy Cat on shop page (cart with items from a closed OC)
2020-05-22 18:38:41 +02:00
Pau Pérez Fabregat
72399cb6df Merge pull request #5485 from luisramos0/byeby_phantom_js
Rename method refering to phantomjs
2020-05-22 18:37:28 +02:00
Pau Pérez Fabregat
ff0e85c877 Merge pull request #5486 from Matt-Yorkley/3-0-caching
[Spree 2.1] Caching
2020-05-22 18:36:49 +02:00
Pau Pérez Fabregat
b804036822 Merge pull request #5469 from openfoodfoundation/transifex
Transifex
2020-05-22 18:24:14 +02:00
Pau Perez
a33396984f Fix and DRY specs 2020-05-22 18:17:59 +02:00
Pau Perez
d9686d6982 Enable spec files to be executed alone
This fixes the annoying error

```
NameError:
  uninitialized constant OrderManagement::Subscriptions::Whatever
```

and let's you execute the spec file in isolation. It slows down way too
much having the run the entire engine test suite while developing. And
it makes me nervous too.
2020-05-22 15:55:03 +02:00
Transifex-Openfoodnetwork
88ab5c2dd7 Updating translations for config/locales/fr.yml 2020-05-22 23:31:48 +10:00
Transifex-Openfoodnetwork
466bbe52ae Updating translations for config/locales/en_FR.yml 2020-05-22 23:29:08 +10:00
Luis Ramos
9a71ffc093 Merge pull request #5438 from Matt-Yorkley/cart-stock-ux
Cart stock UX
2020-05-22 14:21:16 +01:00
Matt-Yorkley
f0525b861c Update expectations in API caching test
Rails 4 has slightly changed the format of the cache keys here, so the response was not as expected.
2020-05-22 14:54:57 +02:00
Pau Perez
e339a37cd5 Allow to create order_cycle_schedules
There's no way we can create an order_cycle_schedules if the schedule
doesn't have an id, which we can't get if to persist it we need an OC
first, which in turn, will create an order_cycle_schedules.
2020-05-22 14:22:31 +02:00
Matt-Yorkley
b00fbd69ae Update Fragment Caching for Rails 4
Rails 4 introduced "automagically" modified cache keys, that included a digest in the key on any cache entry related to views. This is not what we want at all, fixed here with the `skip_digest: true` option.
2020-05-22 14:22:21 +02:00
Matt-Yorkley
a9abe48ede Re-enable cache invalidation test 2020-05-22 14:21:45 +02:00
Matt-Yorkley
04ffe7b911 Fix expectations and mock responses for Rails 4
Mocking these objects is working differently in Rails 4, and utilising `#and_call_original` helped to ensure different parts of the codebase were receiving the correct response objects (AR relations, etc).
2020-05-22 14:21:45 +02:00
Pau Perez
be9fbae300 Fix misplaced paragraph in shop tab
By wrapping message within 12-cols container, keeping consistency with
the other shop tabs.
2020-05-22 12:37:07 +02:00
Luis Ramos
b7c601abcd Merge pull request #5424 from luisramos0/ship_method_warning
Add warning to enterprise Shipping Method list and to Shipping method edit page
2020-05-22 11:24:12 +01:00
Luis Ramos
639c1e1ccc Rename method, it's not phantomjs running underneath any more 2020-05-22 10:57:51 +01:00
Robin Klaus
53c0bcbd0b Changed translation syntax to normal t() call and lazy lookup. 2020-05-22 13:22:57 +10:00
Luis Ramos
6fcca0197c Merge pull request #5450 from rmklaus12/5095-ordercycle-amtqty-translations
Changed report_header fields for amount and quantity to reflect corre…
2020-05-21 21:21:14 +01:00
Luis Ramos
12f512e98b Move arrow on OC selector a little to the right so it's centered between end of text (if max length reached) and border 2020-05-21 15:41:26 +01:00
Luis Ramos
b2bfe28173 Remove extra right pad on OC selector, in mobile, this will make the selector be centered 2020-05-21 15:38:55 +01:00
Luis Ramos
ed14a92c7b Make OC selector wider to support more characters where there is enough space for that 2020-05-21 15:38:54 +01:00
Transifex-Openfoodnetwork
adb3c9e56f Updating translations for config/locales/en_NZ.yml 2020-05-22 00:22:33 +10:00
Pau Pérez Fabregat
c6c9dcc345 Merge pull request #5478 from luisramos0/bundler1-17-3
Upgrade bundler, byebug and pry-byebug
2020-05-21 16:10:38 +02:00
Pau Pérez Fabregat
16dfb3c7e9 Merge pull request #5408 from luisramos0/columns_params
[Spree 2.1] Add missing permitted param to Column Preferences controller
2020-05-21 14:41:30 +02:00
Luis Ramos
6e6dab8f72 Merge pull request #5474 from openfoodfoundation/dependabot/bundler/activerecord-import-1.0.5
Bump activerecord-import from 1.0.4 to 1.0.5
2020-05-21 13:17:51 +01:00
Luis Ramos
574e4a02c0 Force pry to 0.12 so that it works well with pry-byebug 3.7 2020-05-21 13:10:59 +01:00
Luis Ramos
01eda90a00 Upgrade bundler, byebug and pry-byebug 2020-05-21 12:59:57 +01:00
Pau Pérez Fabregat
050e83e745 Merge pull request #5410 from luisramos0/fix_some_specs
[Spree 2] Make api/enterprises_controller_spec less flaky
2020-05-21 13:45:39 +02:00
Pau Pérez Fabregat
6851921e9d Merge pull request #5443 from openfoodfoundation/dependabot/bundler/mini_racer-0.2.14
Bump mini_racer from 0.2.11 to 0.2.14
2020-05-21 13:32:30 +02:00
Luis Ramos
8cdc9b82df Merge pull request #5427 from luisramos0/jquery-ui-rails
Upgrade jquery-ui-rails to v4.2.1
2020-05-21 10:57:10 +01:00
Luis Ramos
2ae34d8df3 Merge pull request #5355 from jeduardo824/enhancement/make-shop-names-links-on-transactions-page
change shop name to be link to shop on transactions page
2020-05-21 10:56:19 +01:00
Luis Ramos
35b249f40d Merge pull request #5390 from rmklaus12/fix-enyml-keys
Fix translation keys in en.yml file from previous conflicting PRs
2020-05-21 10:56:01 +01:00
Luis Ramos
a6ea79d3a5 Add warning message to enterprise ship methods list and ship method edit page 2020-05-21 10:47:22 +01:00
Luis Ramos
d017c0b701 Change base translation from applies to active so the naming is consistent: ship methods can be active or inactive for an enterprises which means they can be linked or not to that enterprise 2020-05-21 10:45:58 +01:00
Luis Ramos
cf0ad179a1 Move hubs_sidebar to the last 4 columns at the top of the page 2020-05-21 10:45:58 +01:00
Transifex-Openfoodnetwork
8bb47ef467 Updating translations for config/locales/en_NZ.yml 2020-05-21 16:43:58 +10:00
Maikel
da55956a6e Merge pull request #5392 from luisramos0/ship_method_bo
Make "backoffice only" ship methods work and remove option "frontoffice only"
2020-05-21 10:16:15 +10:00
dependabot-preview[bot]
0e1ae03454 Bump activerecord-import from 1.0.4 to 1.0.5
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/zdennis/activerecord-import/releases)
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.4...v1.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-20 20:02:29 +00:00
Luis Ramos
e287680c1b Merge pull request #5429 from mkllnk/5400-orders-distributors-report
5400 List each order only once in Orders And Distributors report
2020-05-20 20:36:58 +01:00
Matt-Yorkley
6b3a7228ce Update flash message with instruction to update the quantities 2020-05-20 09:43:29 +02:00
Transifex-Openfoodnetwork
8387c71b6e Updating translations for config/locales/tr.yml 2020-05-20 15:55:52 +10:00
Robin Klaus
16f2c8d7d1 Removed 5 keys per change request in ref to pr5425 2020-05-20 14:13:42 +10:00
Luis Ramos
76b721b663 Merge pull request #5457 from Matt-Yorkley/cart-fix
Fix cart fields sharing same scope
2020-05-19 19:31:49 +01:00
Luis Ramos
942dde62ff Merge pull request #5464 from luisramos0/3-0-action-caching
[Spree 2.1] Add actionpack-action_caching gem to make action caching work again
2020-05-19 18:47:55 +01:00
Matt-Yorkley
3df2d4721b Fix search bar in /shops and /groups 2020-05-19 14:00:20 +02:00
Luis Ramos
758d7c82f7 Rename order_cycle.accessible_by to remove name clash with active record 2020-05-19 12:21:13 +01:00
Luis Ramos
2e9f911958 Add actionpack-action_caching to support action caching 2020-05-19 12:06:24 +01:00
Matt-Yorkley
4a837e8c07 Fix display issue on order cycle form
Some of the form elements on the first OC edit page were covered up by the save bar in some cases. this ensures they are always visible and clickable.
2020-05-19 11:56:41 +02:00
Matt-Yorkley
05e6f5792d Fix cart fields sharing same scope
All cart page quantity fields were displaying a single max quantity instead of a different value for each one.
2020-05-19 10:23:12 +02:00
Matt-Yorkley
e54fad9bfd Add spec for maximum quantities with multiple items in cart
This currently fails
2020-05-19 10:21:24 +02:00
Steve Roberts
446bf268b4 scroll_to substitute 2020-05-19 14:16:45 +10:00
Lucas Hiago
ba30f55e70 Add fullwidth for table selector 2020-05-18 22:53:46 -03:00
Maikel Linke
2d95e9ebc0 List each order only once in report 2020-05-19 10:38:28 +10:00
Maikel Linke
19f7f04816 Add spec for report bug 2020-05-19 10:38:28 +10:00
Maikel Linke
359fd1ac98 Improve readability of report spec 2020-05-19 10:38:28 +10:00
Steve Roberts
049b1b4638 Split up the specs again.
This now shows that there is one consistent spec erroring, spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb:
Capybara::ElementNotFound:
       Unable to find visible checkbox "order_cycle_incoming_exchange_0_select_all_variants" that is not disabled
2020-05-19 10:14:26 +10:00
Eduardo
6d54e6d4a0 change SearchOrders service to search with shipping_method 2020-05-18 20:44:55 -03:00
Eduardo
473b4c63c4 add Shipping Method filter to admin/orders page 2020-05-18 18:46:43 -03:00
Matt-Yorkley
e3c337ef7e Fix mixed error display issue 2020-05-18 16:41:57 +02:00
Matt-Yorkley
d70174becc Use fresh scope for each quantity field 2020-05-18 16:28:07 +02:00
Matt-Yorkley
f9f76f9082 Move reused available stock logic to service 2020-05-18 16:19:49 +02:00
Matt-Yorkley
111e700799 Update invalid input feedback 2020-05-18 16:14:14 +02:00
Luis Ramos
d1eebe1cfb Merge pull request #5426 from luisramos0/3-0-stable-may13
[Spree 2.1] Merge master into 3-0-stable
2020-05-18 15:05:11 +01:00
Matt-Yorkley
f7b4717f29 Improve validation code 2020-05-18 14:51:11 +02:00
Matt-Yorkley
fe27c8466e Add feature specs for full cart page stock correction process 2020-05-18 14:51:11 +02:00
Matt-Yorkley
63e4430ea4 Update cart page links to be disabled when changes are required and form is unsaved
See: https://stackoverflow.com/questions/23425254/enable-disable-anchor-tags-using-angularjs
2020-05-18 14:51:08 +02:00
Matt-Yorkley
5dd801b432 Fix tab-buttons element overlapping order cycle selector 2020-05-18 14:27:05 +02:00
Matt-Yorkley
3a46f32aa3 Merge pull request #5435 from openfoodfoundation/transifex
Transifex
2020-05-18 13:44:32 +02:00
Luis Ramos
ea8157a5c6 Merge pull request #5304 from dacook/5299-orders-filter-several-tags
5299 Impossible to filter orders with several tags
2020-05-18 11:25:54 +01:00
Luis Ramos
37350fcbb0 Add table name to condition so it doesnt cause trouble in the future if mixed with other tables in the same query 2020-05-18 10:55:03 +01:00
Luis Ramos
05136b51d1 Merge pull request #5356 from rmklaus12/4534-mobile-searchkey
Changed search input to inputmode to enable 'go' button on dynamic mo…
2020-05-18 10:30:56 +01:00
Robin Klaus
311bbd2aa2 Changed report_header fields for amount and quantity to reflect correct translation to French 2020-05-18 18:41:04 +10:00
Robin Klaus
a0334953db Added 14 translation keys for PayPalExpress payment method 2020-05-18 17:06:07 +10:00
Transifex-Openfoodnetwork
d2b8b5e888 Updating translations for config/locales/pt_BR.yml 2020-05-18 05:14:19 +10:00
Luis Ramos
6c81c19f00 Remove dead code 2020-05-16 14:19:25 +01:00
Robin Klaus
438c0ecde9 delete extra lines 2020-05-16 20:12:54 +10:00
Robin Klaus
ba8ecf19ac Added input code to two additional pages to cover shop tab search boxes 2020-05-16 12:56:06 +10:00
dependabot-preview[bot]
f4afc8ffcd Bump mini_racer from 0.2.11 to 0.2.14
Bumps [mini_racer](https://github.com/discourse/mini_racer) from 0.2.11 to 0.2.14.
- [Release notes](https://github.com/discourse/mini_racer/releases)
- [Changelog](https://github.com/rubyjs/mini_racer/blob/master/CHANGELOG)
- [Commits](https://github.com/discourse/mini_racer/compare/v0.2.11...v0.2.14)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-15 19:20:08 +00:00
Luis Ramos
ace73be4e2 Add unit tests to order_cart_reset 2020-05-15 20:05:45 +01:00
Luis Ramos
1c749a8029 Extract order_cycle_not_listed? method and rename order_cycles to listed_order_cycles 2020-05-15 19:36:59 +01:00
Luis Ramos
f22eae752d Adapt spec to validate issue #5340 2020-05-15 19:30:01 +01:00
Luis Ramos
a438317d69 Extract order_cart_reset service from enterprises_controller 2020-05-15 19:30:00 +01:00
Luis Ramos
35824c7aa1 Rename restartCheckout to order_checkout_restart to make it follow service naming convention 2020-05-15 19:29:37 +01:00
Luis Ramos
ba585064e1 Rename ResetOrderService to OrderCompletionReset to follow new service naming convention and also to make it more specific to completed orders 2020-05-15 19:29:37 +01:00
Luis Ramos
21d1a7bc04 Remove dead code 2020-05-15 19:29:37 +01:00
Luis Ramos
6827ce5c7f Refactor order.set_order_cycle, return early and remove indentation 2020-05-15 19:29:37 +01:00
Luis Ramos
493adc8b1f Fix problem in spec where wrong enterprise was being used 2020-05-15 19:29:37 +01:00
Luis Ramos
94bb95861b If selected OC is not in the available OCs, empty the order 2020-05-15 19:29:35 +01:00
Lucas Hiago
98cbe5762a Remove unused css property from image in cancel email 2020-05-15 10:59:56 -03:00
Lucas Hiago
0caa91d057 Remove second table of cancel email instructions style 2020-05-15 10:59:56 -03:00
Lucas Hiago
5d286cb349 Add i18n of new symbols for order cancel mail 2020-05-15 10:59:56 -03:00
Lucas Hiago
f72da4abe4 Add refund message in order cancel mail 2020-05-15 10:59:56 -03:00
Lucas Hiago
42012d6482 Add new order sumary in order cancel mail 2020-05-15 10:59:55 -03:00
Lucas Hiago
1c1200125e Add new greeting table in order cancel mail 2020-05-15 10:59:55 -03:00
Lucas Hiago
0b8771ccf0 Add connect with us footer to order cancelation email 2020-05-15 10:59:55 -03:00
Luis Ramos
52e7ca2417 Select first default OC only if no OC is already selected 2020-05-15 14:26:56 +01:00
Luis Ramos
c3f0c0ed7f Extract method to prepare work ahead 2020-05-15 14:25:20 +01:00
Transifex-Openfoodnetwork
4f14d7910a Updating translations for config/locales/en_IE.yml 2020-05-15 23:04:12 +10:00
Pau Pérez Fabregat
5c7541e63d Merge pull request #5415 from openfoodfoundation/dependabot/bundler/bugsnag-6.13.1
Bump bugsnag from 6.13.0 to 6.13.1
2020-05-15 13:47:46 +02:00
Matt-Yorkley
c2efa901c2 Don't highlight update button when form is invalid 2020-05-15 13:38:17 +02:00
Luis Ramos
4292636e70 Remove close button in product modal 2020-05-15 12:16:19 +01:00
Luis Ramos
d95b2a97b0 Add missing padding above close button (both for the case with image or just with text) and also below product image 2020-05-15 12:12:07 +01:00
Luis Ramos
edaf419857 Use rem instead of px or em 2020-05-15 12:12:07 +01:00
Luis Ramos
38bc076c77 Fix some rubocop issues 2020-05-15 12:12:07 +01:00
Luis Ramos
30fe457cb5 Make product modal show close button only if there is a scroll bar 2020-05-15 12:12:07 +01:00
Luis Ramos
e239bb33f8 Improve the mobile cookies policy modal with a margin 2020-05-15 12:12:07 +01:00
Luis Ramos
3a512478d6 Improve the mobile registration modal by adding a margin 2020-05-15 12:12:07 +01:00
Luis Ramos
4b63893377 Improve mobile login modal with a margin 2020-05-15 12:12:07 +01:00
Luis Ramos
50fa4fc93d Make modal close buttons a little darker with a white cross 2020-05-15 12:12:07 +01:00
Luis Ramos
cbfaaabb72 Adjust different paddings and margins to make mobile product modal contents similar to required design 2020-05-15 12:12:07 +01:00
Luis Ramos
0a378a897b Add close button to mobile product modal, this can be reused in other modals later 2020-05-15 12:12:07 +01:00
Luis Ramos
35ac5e093e Adapt modal size to leave some background visible so that user can click to disable modal 2020-05-15 12:12:07 +01:00
Luis Ramos
39e47998e1 Make the background opacity of modals in the FrontOffice a litle darker according to design 2020-05-15 12:12:07 +01:00
Luis Ramos
14478d5fc1 Style producer name and properties in product modal 2020-05-15 12:12:07 +01:00
Luis Ramos
59a13adff0 Remove product category from product modal 2020-05-15 12:11:32 +01:00
Luis Ramos
fee03c4101 Remove repeated/dead rules 2020-05-15 12:11:32 +01:00
Luis Ramos
9a115afd4f Remove bars around product description and border around product image 2020-05-15 12:11:32 +01:00
Matt-Yorkley
3ba1182661 Dynamically mark quantity field as invalid when stock is incorrect 2020-05-15 12:59:29 +02:00
Matt-Yorkley
42195b76d3 Highlight update button when cart page form is "dirty" 2020-05-15 12:59:29 +02:00
Matt-Yorkley
73b533690e Refactor cart update button syntax 2020-05-15 12:59:29 +02:00
Matt-Yorkley
78f736db45 Add red border on quantity field when it must be updated 2020-05-15 12:59:28 +02:00
Luis Ramos
367de87c61 Upgrade jquery-ui-rails to v4.2 2020-05-15 08:58:40 +01:00
Luis Ramos
4fe1135a33 Merge pull request #5376 from rmklaus12/5104-mobile-keyboard-inputs
Added inputmode attribute to show appropriate mobile keyboard for sel…
2020-05-15 08:49:42 +01:00
Transifex-Openfoodnetwork
78db7e0e5f Updating translations for config/locales/en_GB.yml 2020-05-15 17:36:21 +10:00
David Cook
b4228e8cdd 5299 Remove unnecessary comments 2020-05-15 15:11:26 +10:00
David Cook
f5629d59b0 5299: Add trailing square brackets for array parameters (distributor and order_cycle) 2020-05-15 15:04:01 +10:00
David Cook
8a2c65b6bb Remove duplicate line 2020-05-15 15:04:01 +10:00
David Cook
79df4868de 5299: Unit and feature test for filtering by multiple order cycles 2020-05-15 15:04:01 +10:00
Maikel Linke
51feef83ca Update translations from Transifex 2020-05-15 14:10:36 +10:00
Maikel
90baec0e2c Merge pull request #5393 from openfoodfoundation/transifex
Transifex
2020-05-15 13:53:56 +10:00
Maikel
d566051e7d Merge pull request #5432 from openfoodfoundation/dependabot/bundler/mini_racer-0.2.11
Bump mini_racer from 0.2.10 to 0.2.11
2020-05-15 11:20:46 +10:00
Maikel
6c409d6c70 Merge pull request #5380 from ckhung5/5201-fix-missing-jquery-ui
Update jquery-ui-rails version to 4.1.1
2020-05-15 11:11:36 +10:00
dependabot-preview[bot]
4613502707 Bump bugsnag from 6.13.0 to 6.13.1
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby) from 6.13.0 to 6.13.1.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases)
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.13.0...v6.13.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-14 21:04:00 +00:00
dependabot-preview[bot]
3bc09cfcfb Bump stripe from 5.15.0 to 5.22.0
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 5.15.0 to 5.22.0.
- [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/v5.15.0...v5.22.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-14 21:03:21 +00:00
dependabot-preview[bot]
99ab7688b6 Bump mini_racer from 0.2.10 to 0.2.11
Bumps [mini_racer](https://github.com/discourse/mini_racer) from 0.2.10 to 0.2.11.
- [Release notes](https://github.com/discourse/mini_racer/releases)
- [Changelog](https://github.com/rubyjs/mini_racer/blob/master/CHANGELOG)
- [Commits](https://github.com/discourse/mini_racer/compare/v0.2.10...v0.2.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-14 20:36:44 +00:00
Luis Ramos
644c65b124 Merge pull request #5430 from coopdevs/make-logger-spec-more-reliable
Make JobLogger spec more reliable
2020-05-14 14:33:52 +01:00
Pau Perez
403e1d317d Make JobLogger spec more reliable
This will hopefully fix our bild. I believe that the underlying issue is
that the logger's test double gets leaked into other examples, as RSpec
tells when running `spec/jobs/` specs.

```
5) SubscriptionPlacementJob performing the job when unplaced proxy_orders exist processes placeable proxy_orders
     Failure/Error: JobLogger.logger.info("Placing Order for Proxy Order #{proxy_order.id}")
       #<InstanceDouble(Logger) (anonymous)> was originally created in one example but has leaked into another example and can no longer be used. rspec-mocks' doubles are designed to only last for one example, and you need to create a new one in each example you wish to use it for.
     # ./app/jobs/subscription_placement_job.rb:31:in `place_order_for'
```
Read more: https://relishapp.com/rspec/rspec-mocks/v/3-4/docs/basics/scope#doubles-cannot-be-reused-in-another-example

For whatever reason the JobLogger keeps its `.logger` being stubbed
after this spec.
2020-05-14 13:51:57 +02:00
Transifex-Openfoodnetwork
bd8b3f11d1 Updating translations for config/locales/en_FR.yml 2020-05-14 05:42:38 +10:00
Transifex-Openfoodnetwork
937c981dd8 Updating translations for config/locales/fr.yml 2020-05-14 05:41:55 +10:00
Luis Ramos
19da0ba969 Merge branch 'master' into 3-0-stable-may13 2020-05-13 19:50:32 +01:00
Luis Ramos
5f7c1474a2 Merge pull request #5377 from manvil/1782_enterprise_at_same_address
Handling multiple enterprises at the same location
2020-05-13 19:31:14 +01:00
Luis Ramos
1671184a3c Merge pull request #5375 from luisramos0/sample_order
[Spree 2.1] OFN v3 comes with sample orders :-)
2020-05-13 12:04:06 +01:00
Luis Ramos
be998a9eb6 Reload shipment before shipping otherwise shipment stays as ready but with shipped_at defined 2020-05-13 12:00:37 +01:00
Transifex-Openfoodnetwork
9b7de5ee6e Updating translations for config/locales/en_NZ.yml 2020-05-13 19:27:55 +10:00
Luis Ramos
ef2d7f9485 Merge pull request #5330 from openfoodfoundation/mobile-ux-filters
[mobile ux] Merge search and filter epic to master
2020-05-13 08:59:32 +01:00
Luis Ramos
58842e8cab Show order edit link on mobile instead of the cancel link 2020-05-12 19:44:01 +01:00
Matt-Yorkley
598071fa78 Remove conflicting "clear search" buttons added by Chrome 2020-05-12 18:59:15 +02:00
Matt-Yorkley
70e3f0f1f1 Fix closed shop message not displaying full-width 2020-05-12 18:29:48 +02:00
Matt-Yorkley
265a8ed573 Move messages and products form outside of row and columns to enable full-width 2020-05-12 18:24:10 +02:00
Luis Ramos
83381ad439 Relax array order verification 2020-05-12 15:46:23 +01:00
Luis Ramos
7804c740a6 Add name to permitted params and fix some rubocop issues 2020-05-12 15:35:47 +01:00
Luis Ramos
41645e8351 Merge pull request #5334 from coopdevs/output-logs-in-djs-log-file
Output logs in Delayed Job's log file
2020-05-12 10:05:26 +01:00
Luis Ramos
5f4882fc32 Merge pull request #5403 from openfoodfoundation/dependabot/bundler/ddtrace-0.35.2
Bump ddtrace from 0.35.1 to 0.35.2
2020-05-12 08:39:26 +01:00
dependabot-preview[bot]
1114e062b5 Bump ddtrace from 0.35.1 to 0.35.2
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.35.1 to 0.35.2.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.35.1...v0.35.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-11 22:07:52 +00:00
Luis Ramos
dcd097a22e Merge pull request #5231 from pacodelaluna/add-dfc-provider-engine
Add DFC Provider engine
2020-05-11 20:27:21 +01:00
Matt-Yorkley
ab143ceaed Merge pull request #5352 from pacodelaluna/change-date-displayed-on-sales-tax-report
Change date displayed on sales_tax reports
2020-05-11 09:56:38 +02:00
Matt-Yorkley
0cd4ad0a1a Ensure large amount of search text doesn't break layout with clear all button 2020-05-10 09:44:12 +02:00
Matt-Yorkley
9f882a8674 Ensure search results feedback wraps nicely onto next line 2020-05-10 09:44:12 +02:00
Matt-Yorkley
cb9c56d8aa Ensure correct left-alignment on text in search results feedback 2020-05-10 09:44:12 +02:00
Matt-Yorkley
dee793a392 Change join word between the two filter sets to be "and", to match the actual logic 2020-05-10 09:44:12 +02:00
Matt-Yorkley
7e6683581a Remove full stop from translation
This doesn't fit with the new syntax structure
2020-05-10 09:44:12 +02:00
Matt-Yorkley
b78976fcd7 Ensure consistent styling in both "no results" and "searching for" text 2020-05-10 09:44:12 +02:00
Matt-Yorkley
82b11d6947 Ensure join words are not bold 2020-05-10 09:44:12 +02:00
Matt-Yorkley
a75d3276a4 Include applied filters list in "no results" feedback 2020-05-10 09:44:12 +02:00
Matt-Yorkley
a1435e78c9 Extract applied filters feedback to partial 2020-05-10 09:44:12 +02:00
Matt-Yorkley
7be85d1dab Use bold font with teal colour for both applied taxons and applied properties 2020-05-10 09:44:12 +02:00
Matt-Yorkley
483a654d31 Add join word "or" when both categories and properties are present
Previously for example with "Organic" property and "Fruit" and "Nuts" categories it rendered as: "Fruit or Nuts Organic" instead of: "Fruit or Nuts or Organic"
2020-05-10 09:44:12 +02:00
Matt-Yorkley
f6b910b38a Fix clear search (x) button position on some layouts
Hopefully this will work on iPhones as well...?
2020-05-10 09:44:12 +02:00
Matt-Yorkley
ea06ec7ede Remove smaller (less than 1em) scaling in search bar on mobile 2020-05-10 09:44:12 +02:00
Matt-Yorkley
07ac7dd9c7 Add explicit 'search' input type to search field.
In theory this should improve some of the custom-keyboard functionality added by mobiles, but the implementations will be vary...
2020-05-10 09:44:12 +02:00
Matt-Yorkley
71fb3b1845 Focus search field after it's cleared, ready for immediate typing of new search term on mobile 2020-05-10 09:44:12 +02:00
Matt-Yorkley
e0cb514cad Add hover state to filters button with darker background 2020-05-10 09:44:12 +02:00
Matt-Yorkley
5ceaff24e9 Darken overlay background colour to reduce distraction 2020-05-10 09:44:11 +02:00
Matt-Yorkley
a7771a20c4 Adjust border-radius on filters button 2020-05-10 09:44:11 +02:00
Matt-Yorkley
03afae01b3 Decrease sidebar width on mobile for more tapping space 2020-05-10 09:44:11 +02:00
Matt-Yorkley
96c6da304a Increase margin between filter selectors 2020-05-10 09:44:11 +02:00
Matt-Yorkley
2964ec138d Update display of join words in filters list and rearrange code a bit for clarity
Here we need to build a really dynamic structure on the page like "Results for: <search-term> in <filter1> or <filter2>" and the styling on each of the words needs to be a bit different, specifically the filter terms need to be differently styled to the join words like "in" and "or". We have to generate those bits on the Angular side, but they also have to be wrapped in HTML in a specific way.

$sce.trustAsHtml() marks the injected HTML as "safe" (in relation to security issues like XSS). In this case the injected content doesn't involve any user-defined data, so it should be fine.
2020-05-10 09:44:11 +02:00
Matt-Yorkley
14d928c39d Fix feature specs where UI has changed 2020-05-10 09:44:11 +02:00
Matt-Yorkley
6b66787004 Update "no results" layout on mobile and tablet 2020-05-10 09:44:11 +02:00
Matt-Yorkley
4b695014e4 Update "no results" styling 2020-05-10 09:44:11 +02:00
Matt-Yorkley
c9bfccf465 Update styling on search feedback bar 2020-05-10 09:44:11 +02:00
Matt-Yorkley
026b98022c Add clear search button in shop searchbar 2020-05-10 09:44:11 +02:00
Matt-Yorkley
ff69389bb0 Make search bar "sticky" for tablets and mobile 2020-05-10 09:44:11 +02:00
Matt-Yorkley
f24969edb1 Remove gutter padding on shop content to gain a bit more horizontal real-estate 2020-05-10 09:44:11 +02:00
Matt-Yorkley
cbb67e15ed Extract button styles 2020-05-10 09:44:11 +02:00
Matt-Yorkley
865dcf79cb Extract some properties to variables 2020-05-10 09:44:11 +02:00
Matt-Yorkley
ebe00bdc31 Update filters clear button functionality 2020-05-10 09:44:11 +02:00
Matt-Yorkley
9eaf55f4c0 Add missing translation key 2020-05-10 09:44:11 +02:00
Matt-Yorkley
d1ea2c5f77 Extract shop searchbar styles to separate file 2020-05-10 09:44:11 +02:00
Matt-Yorkley
035bde9eff Define breakpoints in mixin and refactor 2020-05-10 09:44:11 +02:00
Matt-Yorkley
cbd77b4941 Improve element sizing and position on small screens 2020-05-10 09:44:11 +02:00
Matt-Yorkley
f337fd49e1 Extract search feedback bar into partial and move into main column 2020-05-10 09:44:11 +02:00
Matt-Yorkley
e25e4e7482 Fix issue with button submitting form instead of opening popup 2020-05-10 09:44:11 +02:00
Matt-Yorkley
ff07b97033 Add sidebar footer and buttons
Also includes a minor refactor to resolve an issue with animation timings. Angular was not adding the "shown" class to the different elements at the same time in the digest cycle, and it looked a bit shaky.
2020-05-10 09:44:11 +02:00
Matt-Yorkley
94145d0f7e Improve layout and sizing on mobile 2020-05-10 09:44:11 +02:00
Matt-Yorkley
da1d8e90e2 Update search placeholder 2020-05-10 09:44:11 +02:00
Matt-Yorkley
7c00d41fc4 Add some animation effects 2020-05-10 09:44:11 +02:00
Matt-Yorkley
8e9833fd06 Implement overlaid sidebar on mobile and tablet 2020-05-10 09:44:11 +02:00
Matt-Yorkley
f43bf3880c Add filters button on mobile and tablet 2020-05-10 09:44:11 +02:00
Matt-Yorkley
142cef3f3a Add filters count 2020-05-10 09:44:11 +02:00
Matt-Yorkley
0d9f049d24 Add inner icon and restyle search input element 2020-05-10 09:44:11 +02:00
Matt-Yorkley
f46ca0c595 Move search to new searchbar
This required a lot of refactoring, as the search needed to be inside both the form element and the Angular ProductsCtrl element, but to get a full-width row for the searchbar it needed to be outside of the 12 column layout of the other shop page elements...
2020-05-10 09:44:11 +02:00
Matt-Yorkley
532e27b7e1 Move filters into new column on desktop 2020-05-10 09:37:56 +02:00
Matt-Yorkley
3ca491683a Merge pull request #5317 from Matt-Yorkley/caching-timed-shops
[Caching] Timed caching on shops data
2020-05-09 15:33:26 +02:00
Transifex-Openfoodnetwork
644d06fb08 Updating translations for config/locales/en_FR.yml 2020-05-09 18:41:29 +10:00
Transifex-Openfoodnetwork
3044e62d8b Updating translations for config/locales/fr.yml 2020-05-09 18:06:16 +10:00
Pau Pérez Fabregat
b85e439b0e Merge pull request #5395 from coopdevs/skip-broken-spec
Skip unreliable caching test
2020-05-08 17:11:12 +02:00
Pau Perez
fa8c1270ce Skip unreliable caching test
This spec failed two times in a row and it's blocking the release.
2020-05-08 16:37:30 +02:00
Pau Pérez Fabregat
09caf88b6c Merge pull request #5396 from coopdevs/fix-brittle-test
Make test not depend on response's order
2020-05-08 16:37:06 +02:00
Pau Perez
b99bcc3c12 Make test not depend on response's order
I'm assuming this is failing in CI due to the order in which the closed
shops are returned.
2020-05-08 15:56:20 +02:00
Transifex-Openfoodnetwork
296a927900 Updating translations for config/locales/en_FR.yml 2020-05-08 22:49:17 +10:00
Transifex-Openfoodnetwork
32ead7b6b7 Updating translations for config/locales/fr.yml 2020-05-08 22:49:02 +10:00
Luis Ramos
0a6bd1424c Make ship method display on back_end work correcly by making checkout ignore ship methods configured for backoffice only
Adding both unit and feature tests as this is important enough for that
2020-05-08 12:59:17 +01:00
Luis Ramos
34d8b1957e Improve variable names 2020-05-08 12:42:32 +01:00
Luis Ramos
40dd307a35 Remove shipping method display on front_end option, it is not working and it's not straight forward to make it work correctly 2020-05-08 12:00:58 +01:00
Transifex-Openfoodnetwork
4485dcd7fe Updating translations for config/locales/en_GB.yml 2020-05-08 20:57:56 +10:00
Pau Perez
ad70a63370 Update all locales with the latest Transifex translations 2020-05-08 12:01:42 +02:00
Pau Pérez Fabregat
60470aaf9f Merge pull request #5332 from coopdevs/add-timestamps-to-oc-schedule
Add timestamps to OC schedule join table
2020-05-08 10:51:43 +02:00
Pau Pérez Fabregat
2cf407ce35 Merge pull request #5349 from openfoodfoundation/transifex
Transifex
2020-05-08 10:20:07 +02:00
Pau Pérez Fabregat
c38c59b0b9 Merge pull request #5223 from luisramos0/def_user
Change default user from spree@example.com to ofn@example.com ❤️
2020-05-08 09:51:31 +02:00
Luis Ramos
424932d61b Merge pull request #5262 from luisramos0/closed_shop_msg
[Mobile] Improve the design of shop page messages (closed shop, private shop and select OC)
2020-05-08 07:52:58 +01:00
Robin Klaus
aa46aec935 Fix translation keys in en.yml file from previous conflicting PRs 2020-05-08 13:21:47 +10:00
Kok Hung Cheah
19d5bcb150 Upgrade jquery-ui-rails to 4.1.2 instead of 4.1.1 2020-05-08 09:54:10 +10:00
Matt-Yorkley
5518ffa856 Ensure validations are called when updating attributes in test 2020-05-07 19:37:43 +02:00
Luis Ramos
dd5041db65 Remove unnecessary default user email and pwd from docker setup
These are now the default values in the app
2020-05-07 18:18:42 +01:00
Luis Ramos
052dbca1ba Merge pull request #5370 from Matt-Yorkley/dont-render-twice
Don't render twice
2020-05-07 18:15:47 +01:00
Matt-Yorkley
86bfd1bebb Add explanatory comments on usages of Timecop.travel 2020-05-07 17:29:58 +02:00
Pau Perez
ee94101edd Log subs jobs to DJ's log file
There's a bunch of logging bits we need to find out what happened in
`#5294`, the first of which is logging as we are used to for Rails
itself.  Turns out we were already logging but the log lines weren't
displayed.

That's because workers have no access to the Rails logger unless we hack
things a bit in the config/initializer. If we want to keep DJ's logs in
a different file, which I think is good for debugging purposes, we need
to diverge from Rails.logger.

However, there's no access to Delayed::Worker.logger in custom job
classes either so there's no way other than mimicking that logger's format
if we want log lines to be consistent.

Now the current logs will see the light like:

```
2020-05-07T14:09:42+0000: [Worker(host:8dc5e7e6f434 pid:1)] Job SubscriptionPlacementJob (id=54) RUNNING
2020-05-07T14:09:42+0000: Placing Order for Proxy Order 1
2020-05-07T14:09:42+0000: Issue in Subscription Order 2: complete
2020-05-07T14:09:42+0000: Placing Order for Proxy Order 7
2020-05-07T14:09:42+0000: Issue in Subscription Order 3: complete
2020-05-07T14:09:43+0000: [Worker(host:8dc5e7e6f434 pid:1)] Job SubscriptionPlacementJob (id=54) COMPLETED after 0.3378
2020-05-07T14:09:43+0000: [Worker(host:8dc5e7e6f434 pid:1)] 1 jobs processed at 2.8054 j/s, 0 failed
```

We'll see if we need to format these messages differently to make them
more greppeable.
2020-05-07 17:21:39 +02:00
Luis Ramos
468576ee8a Merge pull request #5329 from romale/master
Correct translations
2020-05-07 16:04:24 +01:00
Luis Ramos
c9b60d0f62 Merge pull request #5341 from mathewdbutton/5173-show-outstanding-order-balance-on-orders-page
Show outstanding balance on orders page
2020-05-07 16:03:58 +01:00
Luis Ramos
52b39d04a4 Merge pull request #5359 from mbudm/issue/5108
Add NavigationCheck to order cycles edit form
2020-05-07 14:37:32 +01:00
Matt-Yorkley
01d741509f Fix test of rendered properties AMS
Here the displayed properties that we're testing also rely on shops data (including the list of supplied properties), which is now cached for 15 seconds. We clear that cache entry so we can cleanly test only the caching of the properties AMS array.
2020-05-07 15:20:37 +02:00
Manvil George
63a1a6fefa More optimsations: removing unwanted code 2020-05-07 22:58:09 +10:00
Luis Ramos
66fe26fcc5 Merge pull request #5295 from Matt-Yorkley/shopfront-optimising
Enterprise serializer optimisations
2020-05-07 13:08:14 +01:00
Matt-Yorkley
460ab6cdb4 Use #allow instead of #stub 2020-05-07 13:20:30 +02:00
Matt-Yorkley
7457543c2b Adds spec for timed caching on shops data 2020-05-07 13:20:30 +02:00
Matt-Yorkley
6b6ab864ef Improve comment on Fragment Caching 2020-05-07 13:20:30 +02:00
Matt-Yorkley
e73c8232de Improve unit test in cache_service_spec 2020-05-07 13:20:30 +02:00
Matt-Yorkley
37821beb1b Extract home stats caching to method in service 2020-05-07 13:20:30 +02:00
Matt-Yorkley
2292cbaae4 Extract timed enterprise AMS fragment caching options to service 2020-05-07 13:20:28 +02:00
Luis Ramos
987347d5ab Move translation keys to new correct location 2020-05-07 12:18:40 +01:00
Luis Ramos
3c7970f72f Add select oc message when there are multiple OCs 2020-05-07 12:18:40 +01:00
Luis Ramos
d4980893a1 Refactor darker-background directive, extract method 2020-05-07 12:17:43 +01:00
Luis Ramos
0d6d071db2 Remove dead class .shopfront_hidden_message 2020-05-07 12:17:43 +01:00
Luis Ramos
cba9382230 Replace line-height with margin 2020-05-07 12:17:43 +01:00
Luis Ramos
7fcee0fe6d Fix problem in warning sign 2020-05-07 12:17:43 +01:00
Luis Ramos
f3347a8e16 Make teal links appear only when the darker background is activated
This way links in producers, about, etc, where the background is white will still appear as orange, as per design
2020-05-07 12:17:43 +01:00
Luis Ramos
782988b61c Fix with-darker-background class by moving it inside page-view selector and using opacity instead of just grey so that other elements in the page (shadow from element above) can be seen 2020-05-07 12:17:43 +01:00
Luis Ramos
21a1ba2fb5 Move translation keys according to new location in the customer_required partial 2020-05-07 12:17:43 +01:00
Luis Ramos
ba25986756 Fix some css rubocop issues 2020-05-07 12:17:43 +01:00
Luis Ramos
098ad6f250 Merge partial messages back to home partial where it is only used 2020-05-07 12:17:43 +01:00
Luis Ramos
319657d2c5 Move closed shop partial to /messages 2020-05-07 12:17:43 +01:00
Luis Ramos
eb773a813e Extract open shop message to partial 2020-05-07 12:17:43 +01:00
Luis Ramos
5dedbc4231 Extract customer_required message to separate partial 2020-05-07 12:17:43 +01:00
Luis Ramos
84c00fe215 Remove duplicate conditionals already present in ShopHelper#shop_tabs, when these partials are rendered, these conditions will always be true
In the shops partial, by adding the else, we avoid rendering empty space with an empty
products list in case the shop is closed
2020-05-07 12:17:43 +01:00
Luis Ramos
77d7d2b804 Make the background darker only in specific cases 2020-05-07 12:17:43 +01:00
Luis Ramos
b34fb79d69 Move content div to messages partial so that it's not used in the closed shop message (no margin according to design) 2020-05-07 12:17:43 +01:00
Luis Ramos
1c41061f9e If shop is closed show closed shop message partial in the home tab 2020-05-07 12:17:43 +01:00
Luis Ramos
b86081090f Extract closed shop message to a partial 2020-05-07 12:17:43 +01:00
Luis Ramos
dbdbe01d6a Add new style to closed shop message 2020-05-07 12:17:43 +01:00
Luis Ramos
0996c28c09 Memoize helper methods that are called several times in the views 2020-05-07 12:17:43 +01:00
Luis Ramos
5f70ef6e75 Improve style of closed shop message and remove border from message 2020-05-07 12:17:43 +01:00
Luis Ramos
e0b3e9a040 Remove border of message and paddings, add background color, change link color and split message in two lines 2020-05-07 12:17:43 +01:00
Matt-Yorkley
2876b98155 Use time-based caching on rendered AMS data for shops 2020-05-07 13:11:53 +02:00
Matt-Yorkley
545ca85644 Extract caching of homepage stats to service 2020-05-07 13:11:28 +02:00
Luis Ramos
c64ba75e8d Merge pull request #5348 from luisramos0/single_oc_selector
Replace select box with text when only one OC is available for selection
2020-05-07 12:07:19 +01:00
Luis Ramos
56b9737676 Merge pull request #5343 from luisramos0/windows
Make OC selector options color explicitly gray and not white
2020-05-07 11:44:14 +01:00
Luis Ramos
d967d855fc Merge pull request #5319 from Matt-Yorkley/caching-by-class
[Caching] Caching data by class
2020-05-07 11:43:44 +01:00
Luis Ramos
1e9b4516cb Merge pull request #5318 from Matt-Yorkley/caching-api
[Caching] API Action Caching on shop filters
2020-05-07 11:42:52 +01:00
Transifex-Openfoodnetwork
ffebaee9c7 Updating translations for config/locales/tr.yml 2020-05-07 17:34:22 +10:00
Manvil George
a629e1ecb7 Remove incorrect commenting 2020-05-07 11:46:49 +10:00
Manvil George
d7cf825531 Minimised version of the svg 2020-05-07 11:33:35 +10:00
Manvil George
585a754b18 Missed out on inverting the boolean expression 2020-05-07 11:31:27 +10:00
Kok Hung Cheah
edcdae6b58 Update jquery-ui-rails version to 4.1.1 2020-05-07 10:48:07 +10:00
Manvil George
d3504c177e A better SVG 2020-05-07 10:40:48 +10:00
Manvil George
7123d8347a XML Formatted The SVG 2020-05-07 09:50:27 +10:00
Manvil George
7847c4ed9e Removing unwanted blank lines 2020-05-07 09:37:35 +10:00
Manvil George
5b009f606a More optimizations around coding standards 2020-05-07 09:07:32 +10:00
Luis Ramos
066f978c59 Update ruby version in GETTING_STARTED 2020-05-06 22:19:43 +01:00
François Turbelin
d5b69ec90c Remove before call when no factorization 2020-05-06 22:04:56 +02:00
François Turbelin
13f00480ce Use serialized_data 2020-05-06 22:04:56 +02:00
François Turbelin
f6e06b5658 Use default enterprise_id to get the entreprise 2020-05-06 22:04:56 +02:00
François Turbelin
99798b010f Use ActionController::Base 2020-05-06 22:04:56 +02:00
François Turbelin
43293f00df Make the endpoint unrelated to enterprise id
Better to avoid to have endpoint specific to an enterprise
as we don't know the enterprise id yet on DFC side
2020-05-06 22:04:56 +02:00
François Turbelin
f0f8224934 Put back former lighter inclusions 2020-05-06 22:04:56 +02:00
François Turbelin
013198b33b Update routes 2020-05-06 22:04:56 +02:00
François Turbelin
830bf796d0 Update authors and remove emails 2020-05-06 22:04:56 +02:00
François Turbelin
dd9c994f9d Use spree_api_controller_setup layer 2020-05-06 22:04:56 +02:00
François Turbelin
c1d173d601 Add the access token logic, light version 2020-05-06 22:04:56 +02:00
François Turbelin
a8fb059482 Add basic spec 2020-05-06 22:04:56 +02:00
François Turbelin
496174255f Add REAME.md file 2020-05-06 22:04:56 +02:00
François Turbelin
80bbd5d513 Adjust namespace and scope for routes 2020-05-06 22:04:56 +02:00
François Turbelin
b152e532d2 Cosmetics 2020-05-06 22:04:56 +02:00
François Turbelin
d9d218f661 Add DFC Provider engine 2020-05-06 22:04:56 +02:00
Luis Ramos
d1392d400a Merge pull request #5350 from luisramos0/edit_order_snail
Improve order edit page in data inconsistency scenario (follow up from S2 #4186)
2020-05-06 20:33:40 +01:00
Luis Ramos
20984ac008 Merge pull request #5379 from openfoodfoundation/dependabot/bundler/ddtrace-0.35.1
Bump ddtrace from 0.35.0 to 0.35.1
2020-05-06 20:31:20 +01:00
dependabot-preview[bot]
7f9dfb6142 Bump ddtrace from 0.35.0 to 0.35.1
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.35.0 to 0.35.1.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.35.0...v0.35.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-06 19:20:07 +00:00
Transifex-Openfoodnetwork
6c71259b25 Updating translations for config/locales/en_FR.yml 2020-05-07 03:10:34 +10:00
Transifex-Openfoodnetwork
29a54cbfe4 Updating translations for config/locales/fr.yml 2020-05-07 03:10:22 +10:00
Manvil George
bf3bb4fb63 Review Comments incorporation 2020-05-07 00:54:01 +10:00
Transifex-Openfoodnetwork
05820c7ef0 Updating translations for config/locales/tr.yml 2020-05-07 00:14:33 +10:00
Transifex-Openfoodnetwork
492f96c90f Updating translations for config/locales/tr.yml 2020-05-07 00:11:28 +10:00
Pau Pérez Fabregat
ace3767eb2 Merge pull request #5333 from coopdevs/add-worker-docker-container
Create a container to run a DJ worker in dev
2020-05-06 16:11:21 +02:00
Luis Ramos
c7c8bfe212 Merge pull request #5347 from luisramos0/hide_oc_selector_for_private_shop
[Mobile] Hide OC selector if shop requires login/customer
2020-05-06 14:31:52 +01:00
Pau Pérez Fabregat
dadc17398f Merge pull request #5371 from Matt-Yorkley/cart-add-error
Cart add error handling
2020-05-06 15:22:06 +02:00
Pau Pérez Fabregat
194c87e805 Merge pull request #5361 from Matt-Yorkley/cart-with-soft-deletion
Cart with soft-deletion
2020-05-06 15:20:35 +02:00
Manvil George
6c51841039 Reverting unrelated changes 2020-05-06 23:05:34 +10:00
Luis Ramos
cb7a261594 Merge pull request #5374 from luisramos0/3-0-stable-may-5
[Spree 2.1] Merge master into 3-0-stable
2020-05-06 13:57:11 +01:00
Manvil George
d1e03909ec Minor CSS alterations to make the button visible at the bottom 2020-05-06 22:30:33 +10:00
Pau Pérez Fabregat
ead21a97cc Merge pull request #5327 from openfoodfoundation/luisramos0-patch-2
Add link to docker tips wiki page to Docker.md
2020-05-06 14:10:37 +02:00
Pau Pérez Fabregat
a0012e1c5b Merge pull request #5326 from openfoodfoundation/luisramos0-patch-1-1
Add link to Docker.md from GETTING_STARTED.md
2020-05-06 12:31:00 +02:00
Matt-Yorkley
9c24c1cd05 Ensure #caches_action works in test suite 2020-05-06 12:24:33 +02:00
Matt-Yorkley
4aac97c985 Add feature spec for action caching of taxon and properties endpoints 2020-05-06 11:47:51 +02:00
Matt-Yorkley
7e4c00ba3f Ensure caching works in cache tests for API controllers 2020-05-06 11:47:45 +02:00
Pau Pérez Fabregat
65433c6ac6 Merge pull request #5351 from luisramos0/improve_sample_data
Improve ship methods names on sample data
2020-05-06 11:27:34 +02:00
Pau Pérez Fabregat
b3205c5459 Merge pull request #5309 from luisramos0/better-karma
Make dockerfile install node and adapt karma browser config to work inside a docker container
2020-05-06 11:11:00 +02:00
Transifex-Openfoodnetwork
d52db51b29 Updating translations for config/locales/nb.yml 2020-05-06 17:25:07 +10:00
Mathew Button
e088b27a13 Always display the outstanding balance if not zero 2020-05-06 16:45:44 +10:00
Manvil George
f802775ad6 Fixing up old Enterprise Modal references 2020-05-06 15:37:28 +10:00
Manvil George
e9cba32f31 Appeasing the Codeclimate Workers 2020-05-06 13:13:35 +10:00
Manvil George
19b5f6a562 Handling multiple enterprises at the same location
Changes:
* Introduced a cluster marker to denote multiple points of interest at
the same location
* Seperated out a plain enterprise modal into 2 parts
  * A modal called EnterpriseModal for showing a list of enterprises at
  the same location
  * A box called EnterpriseBox(which by the way is also a technically a
  modal) that shows the details of that particular enterprise selected
* If at a location there exists only a single enterprise then only the
box is shown
2020-05-06 12:54:42 +10:00
Robin Klaus
f43380fce5 Added inputmode attribute to show appropriate mobile keyboard for selected field 2020-05-06 12:52:53 +10:00
Robin Klaus
7dce53a77b Added inputmode attribute to show appropriate mobile keyboard for selected field 2020-05-06 12:46:37 +10:00
Steve Roberts
4573127c59 Add NavigationCheck to order cycles edit form
- Simplify if statements with safe navigation operator
- Simplify order cycle nav check spec
- Rename nav check callback so a comment is not needed and remove unnecessary assignation to $scope
2020-05-06 10:43:21 +10:00
Luis Ramos
825f747dff Add more types of sample orders 2020-05-05 23:16:54 +01:00
Luis Ramos
4083da5b16 Add sample order to sample data 2020-05-05 23:16:54 +01:00
Luis Ramos
be4104d6f3 Merge branch 'master' into 3-0-stable-may-5 2020-05-05 19:11:20 +01:00
Matt-Yorkley
61d7adaf74 Enable optional caching tag in test metadata 2020-05-05 18:43:09 +02:00
Matt-Yorkley
bdc2d002fa Update karma tests 2020-05-05 17:22:12 +02:00
Matt-Yorkley
13e4411b89 Add error message on cart populate failure and don't keep re-sending the data to the server.
This was triggering many requests to be continuously re-sent in a very problematic way (server-melting), and with no user feedback.
2020-05-05 17:22:10 +02:00
Luis Ramos
c2a9a698f4 Merge pull request #5312 from openfoodfoundation/dependabot/bundler/unicorn-5.5.5
Bump unicorn from 5.5.4 to 5.5.5
2020-05-05 15:24:59 +01:00
Matt-Yorkley
9a7807b134 Don't continuously re-post data on cart error 2020-05-05 16:04:05 +02:00
Luis Ramos
24414b83dd Merge pull request #5325 from oeoeaio/enhancement-5214
Add order number and date/time to order cycles customer report
2020-05-05 14:34:47 +01:00
Matt-Yorkley
4f4b3fb206 Don't render twice 🙈 2020-05-05 15:21:05 +02:00
Matt-Yorkley
6afda87baf Add explanatory comment on soft-deleted variant stock logic 2020-05-05 13:57:50 +02:00
Matt-Yorkley
0a28abbf2d Add additional feature specs for soft-deleted variants in cart 2020-05-05 13:57:50 +02:00
Matt-Yorkley
26ba76cff9 Fix soft-deletion in CartService and update spec 2020-05-05 13:57:50 +02:00
Matt-Yorkley
a3458aa562 Ensure VariantStockLevels can process soft-deleted variants 2020-05-05 13:57:50 +02:00
Matt-Yorkley
0e429da377 Return zero available stock (total_on_hand) for variants that are soft-deleted 2020-05-05 13:57:50 +02:00
Matt-Yorkley
eb51b87bea Add spec for current soft deletion behaviour in OrderCycle#variants_distributed_by scope 2020-05-05 13:57:50 +02:00
Matt-Yorkley
d3de1ce47e Add spec for current soft deletion behaviour in VariantOverride#indexed 2020-05-05 13:57:50 +02:00
Matt-Yorkley
5639b21c77 Add tests for current soft-deleted variant behavior in CartService 2020-05-05 13:57:50 +02:00
Matt-Yorkley
068c8feea7 Merge pull request #5289 from Matt-Yorkley/cart-populate
Cart populate
2020-05-05 13:56:17 +02:00
François Turbelin
6e5cbebf4a Change date value on order_and_distributor_report 2020-05-05 12:27:17 +02:00
François Turbelin
9cfd7db99d Change date displayed on sales_tax reports 2020-05-05 12:27:17 +02:00
Luis Ramos
bcfa8982ef Merge pull request #5364 from openfoodfoundation/dependabot/bundler/ddtrace-0.35.0
Bump ddtrace from 0.34.2 to 0.35.0
2020-05-05 10:58:13 +01:00
Matt-Yorkley
805f91e838 Remove unnecessary #all call 2020-05-05 09:56:08 +02:00
Matt-Yorkley
a3757992b5 Use #tap to destroy and remove before block 2020-05-05 09:55:14 +02:00
Steve Roberts
3b8acdc577 Split order_cycle_spec into smaller specs grouped by theme 2020-05-05 15:39:45 +10:00
dependabot-preview[bot]
7180af2736 Bump ddtrace from 0.34.2 to 0.35.0
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.34.2 to 0.35.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.34.2...v0.35.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-05-04 22:46:59 +00:00
Eduardo
2fca16f02f change shop name to be link to shop on transactions page 2020-05-04 07:06:07 -03:00
Mathew Button
fe6c810505 Add brackets in view instead of API response 2020-05-04 19:09:18 +10:00
Luis Ramos
44872844ed Make ship methods in sample data have the name of the enterprise so it's easier to distinguish them 2020-05-03 16:36:12 +01:00
Luis Ramos
bf0b941e1c Merge pull request #4935 from coopdevs/data-archiving
Allow data archiving using the :truncate_data task
2020-05-03 12:58:31 +01:00
Luis Ramos
e2b26b2e9c Replace break with if
What we would need would be a continue, not break, so that other units will be processed without halting the cycle through the units
2020-05-03 12:00:23 +01:00
Luis Ramos
92d0a5b735 Change default user from spree@example.com to ofn@example.com 2020-05-03 10:12:43 +01:00
Luis Ramos
8e27ace563 Adapt specs where there is only one OC available to the absence of the OC selector 2020-05-02 20:16:41 +01:00
Transifex-Openfoodnetwork
93881a742e Updating translations for config/locales/en_GB.yml 2020-05-03 05:09:16 +10:00
Luis Ramos
b92e257e44 Fix codeclimate issue 2020-05-02 19:12:47 +01:00
Luis Ramos
fa908d4024 Extract change_order_cycle partial from main enterprise shop view 2020-05-02 19:01:36 +01:00
Luis Ramos
7fd14cf29b Adjust line height of select label and select itself 2020-05-02 19:01:36 +01:00
Luis Ramos
ef0e9dc0ca Replace select box with text when only one OC is available for selection 2020-05-02 19:01:33 +01:00
Luis Ramos
89cb447387 Hide OC selector if shop requires login/customer 2020-05-02 17:56:49 +01:00
Luis Ramos
b568d25446 Update all locales with the latest Transifex translations 2020-05-02 17:08:53 +01:00
Luis Ramos
303464a04e Merge pull request #5297 from openfoodfoundation/transifex
Transifex
2020-05-02 15:40:54 +01:00
Luis Ramos
0662c57d9d Merge pull request #5344 from luisramos0/debug_assets
Move PROFILE debug assets flag to another ENV var
2020-05-02 14:21:15 +01:00
Luis Ramos
acb7e9751b Move debug assets flag to another env var so we go back to having both profile and debug assets disabled by default 2020-05-02 10:42:49 +01:00
Luis Ramos
9ae3ad9279 Move rule on option out of the select rule to fix rubocop issue 2020-05-01 17:43:52 +01:00
Luis Ramos
240e2a36d3 Make option color explicitly gray and not white otherwise we will have options render white on white on some browsers, namely chrome on windows 10 2020-05-01 17:39:12 +01:00
Mathew Button
8087e6b31b Show outstanding balance on orders page
Prior to this change, there was no way of knowing how much was owed (or
in need of refunding) at a glance for each order on the orders index page,
this information was only available by clicking through to an order
payment page

This change adds the outstanding balance for each order
2020-05-01 21:38:20 +10:00
Transifex-Openfoodnetwork
39875308c2 Updating translations for config/locales/en_FR.yml 2020-05-01 04:55:35 +10:00
Transifex-Openfoodnetwork
c424e7b65e Updating translations for config/locales/fr.yml 2020-05-01 04:55:21 +10:00
Pau Perez
9d253e1e3e Create a container to run a DJ worker in dev 2020-04-30 17:52:22 +02:00
Matt-Yorkley
1990417b72 Test values are not fetched from database when cache exists 2020-04-30 17:37:48 +02:00
Matt-Yorkley
7a22f7f783 Move and rename caching spec 2020-04-30 17:37:45 +02:00
Luis Ramos
74c7a01151 Merge pull request #5259 from luchiago/add-extra-social-media-to-emails
Add extra social media to order confirmation email
2020-04-30 15:01:09 +01:00
Matt-Yorkley
f724d1b572 Add feature spec for caching properties and taxons AMS 2020-04-30 15:35:39 +02:00
Luis Ramos
8845260979 Merge pull request #5285 from rmklaus12/5246-missing-translation-orders-list
5246 missing translation orders list
2020-04-30 14:00:26 +01:00
Pau Perez
1903134e13 Add timestamps to OC schedule join table
This is critical to debug bugs related to subscriptions.

Essentially, `has_and_belongs_to_many` doesn't give us the option for
any other column that the foreign keys themselves:

> A has_and_belongs_to_many association creates a direct many-to-many
> connection with another model, with no intervening model.

Source: https://guides.rubyonrails.org/v3.2/association_basics.html#the-has_and_belongs_to_many-association

Note however, that there's no way to update an order_cycle_schedule,
that I can think of but `updated_at` doesn't do any harm.
2020-04-30 15:00:13 +02:00
Pau Pérez Fabregat
4174ea69a1 Merge pull request #5247 from chrishil1/Placeholders_variant
Added placeholders in variant edit page
2020-04-30 12:05:59 +02:00
Pau Pérez Fabregat
676add18c3 Merge pull request #5322 from luisramos0/dead_content
Delete some dead views
2020-04-30 12:02:14 +02:00
Matt-Yorkley
a35f8cdb02 Move cache keys used in views into the cache service 2020-04-30 09:45:15 +02:00
Luis Ramos
8a107bee98 Merge pull request #5235 from luisramos0/mail_methods
Remove smtp config from admin config page
2020-04-29 19:10:02 +01:00
Matt-Yorkley
210029aaff Enable optional caching tag in test metadata 2020-04-29 20:04:54 +02:00
Transifex-Openfoodnetwork
5bc5ef9a9d Updating translations for config/locales/pt_BR.yml 2020-04-30 03:52:57 +10:00
Matt-Yorkley
f2cd122ec8 Update variant_stock_spec for unsaved and soft-deleted cases 2020-04-29 18:29:44 +02:00
Matt-Yorkley
4054bdd722 Add Bugsnag call for "variant with no stock item" case 2020-04-29 17:34:48 +02:00
Pau Pérez Fabregat
e04b18c70e Merge pull request #5320 from luisramos0/vo_fix
[Spree 2.1] Fix variant overrides specs and shops spec
2020-04-29 17:30:41 +02:00
romale
3a4ef2697c Correct translations
Without it, some labels not translated to other language.
And, please check code:
en.admin.subscription.subscriptions - does not exists
but
en.admin.subscriptions.subscriptions - is exist
2020-04-29 18:27:09 +03:00
Matt-Yorkley
2bdda7de04 Change order of methods for easier reading 2020-04-29 17:22:46 +02:00
Matt-Yorkley
92a881c584 Simplify relation used in #exchanges_supplying 2020-04-29 17:19:16 +02:00
Pau Perez
647a7bdddf Clarify we won't use truncate_date in prod yet
We initially aimed at implementing data archiving in production reusing
this rake task but priorities have changed. It'll be just a refactor for
now.
2020-04-29 17:00:53 +02:00
Pau Perez
e0228f66af Default to archiving data older than 2 years.
This is safer than the current 3 months.
2020-04-29 16:49:43 +02:00
Pau Perez
38ea95ea85 Prevent nil input to turn into 0 2020-04-29 16:49:43 +02:00
Pau Perez
6ceeda7d9e Instrument TruncateData logging start and end 2020-04-29 16:49:43 +02:00
Pau Perez
703706ee0b Replace one-letter variable with full word 2020-04-29 16:49:43 +02:00
Pau Perez
e2a3dd0c6f Delete only return auths. of the deleted orders
They are associated to order and as such we can't remove them all
blindly.
2020-04-29 16:49:43 +02:00
Pau Perez
a3b8638faf Delete sessions older than two weeks
This affects users that are actively purchasing, so 2 weeks data is more
than enough. Others can afford to log in again.
2020-04-29 16:49:43 +02:00
Pau Perez
4f015320a3 Upper case DELETE statement
This keeps it consistent with the rest of the log.
2020-04-29 16:49:43 +02:00
Pau Perez
0f1d57db73 Delete LogEntries older than a month
They are useful for troubleshooting but a month data seems enough.
2020-04-29 16:49:43 +02:00
Pau Perez
5f84c51c13 Delete StateChanges older than a month
They are useful for troubleshooting but a month data seems enough.
2020-04-29 16:49:43 +02:00
Pau Perez
d215c76bc9 Make it even more explicit the action is dangerous
We're yelling at the person to make a backup before proceeding.
2020-04-29 16:49:43 +02:00
Pau Perez
e1a80edb7e Carefully doc how to archive data from an instance 2020-04-29 16:49:43 +02:00
Pau Perez
a4372e4d31 Fix long lines 2020-04-29 16:49:43 +02:00
Pau Perez
b6d3c3039a Fix "Method has too many lines" violation 2020-04-29 16:49:43 +02:00
Pau Perez
f199cb1bea Warn but allow executing :truncate_data in prod 2020-04-29 16:49:43 +02:00
Pau Perez
be123b2a72 Specify how much data to remove in :truncate_data 2020-04-29 16:49:43 +02:00
Pau Perez
60d29d619f Replace :truncate_data definition with new class
And cover it with a test.
2020-04-29 16:49:43 +02:00
Pau Perez
78fd785f0c Extract TruncateData out of :truncate_data task 2020-04-29 16:49:43 +02:00
Pau Pérez Fabregat
f9f4bdae8f Merge pull request #5238 from Matt-Yorkley/moar-performance
Improve Pain Points
2020-04-29 16:36:15 +02:00
Luis Ramos
0f16c43f21 Add link to docker tips wiki page to Docker.md 2020-04-29 14:16:59 +01:00
Luis Ramos
865024fc1f Add link to the docker setup guide to the getting started guide. 2020-04-29 14:05:45 +01:00
Luis Ramos
407d890d23 Merge pull request #5315 from Matt-Yorkley/ordercyles-controller-tweaks
OrderCylesController tweaks
2020-04-29 13:50:10 +01:00
Luis Ramos
0e5d7c1eb1 Add migration to drop dead spree_mail_methods table and some dead mail_methods preferences 2020-04-29 13:34:50 +01:00
Luis Ramos
a38b18bd0d Remove smtp config from admin config page 2020-04-29 13:34:19 +01:00
Rob H
6405c34428 Add order number and date/time to order cycles customer report 2020-04-29 21:20:14 +10:00
Pau Pérez Fabregat
e7df9bb58d Merge pull request #5178 from coopdevs/dont-populate-empty-cart
Dont populate empty cart
2020-04-29 13:08:26 +02:00
Matt-Yorkley
d3af3d3f27 Avoid extra query on stock_items every time #on_demand is called on a variant.
In the case where the variant has not been saved yet, we can use #new_record? here instead of #stock_items.empty?, to avoid an additional query. This can be called a vast number of times per request, in various N+1s. The other case where we need to return here is when a variant has been deleted, so #stock_items will be empty and #stock_item will be nil. Likewise, we can just check that with #deleted? and avoid #stock_items.empty?
2020-04-28 20:54:04 +02:00
Matt-Yorkley
9682544442 Eager-load and update BasicEnterpriseSerializer 2020-04-28 20:10:40 +02:00
Matt-Yorkley
f4bcf6c6d5 Eager-load line_item associations in order 2020-04-28 20:10:40 +02:00
Luis Ramos
e6fa08edfc Delete some dead views 2020-04-28 19:07:19 +01:00
Luis Ramos
f3e651b1f7 present? calls length which is breaking it with error ActiveModel::MissingAttributeError Exception: missing attribute: address_id
any? works well as it just verifies the size of the collection
2020-04-28 16:31:11 +01:00
Luis Ramos
7e12142f91 Collection must be after load_data so that hubs are already available for VOs calculation 2020-04-28 16:31:11 +01:00
Luis Ramos
794fb5dfc5 Merge pull request #5316 from luisramos0/3-0-stable-Apr28
[Spree 2.1] Merge master into 3-0-stable
2020-04-28 16:30:29 +01:00
Transifex-Openfoodnetwork
18fc4b7c92 Updating translations for config/locales/ca.yml 2020-04-29 01:13:42 +10:00
Transifex-Openfoodnetwork
612cc45ab7 Updating translations for config/locales/en_FR.yml 2020-04-29 01:13:35 +10:00
Transifex-Openfoodnetwork
16e289bf37 Updating translations for config/locales/en_GB.yml 2020-04-29 01:13:29 +10:00
Transifex-Openfoodnetwork
b54c6fcb26 Updating translations for config/locales/nb.yml 2020-04-29 01:13:26 +10:00
Transifex-Openfoodnetwork
8365c66add Updating translations for config/locales/fil_PH.yml 2020-04-29 01:13:22 +10:00
Transifex-Openfoodnetwork
5590671c23 Updating translations for config/locales/fr.yml 2020-04-29 01:13:19 +10:00
Luis Ramos
9e43661127 Merge pull request #5153 from luisramos0/bye_bye_ga
Bye bye Google Analytics
2020-04-28 16:09:16 +01:00
Luis Ramos
8c29797b23 Remove empty space on ffi line that was breaking bundle install
fuubar gets automatically moved to 2-5-0 as it is in master
2020-04-28 14:57:21 +01:00
Matt-Yorkley
ec581dccb8 Use class-based caching for queries in EnterpriseInjectionData 2020-04-28 15:11:59 +02:00
Matt-Yorkley
4d098448f5 Cache rendered AMS arrays in darkswarm layout based on latest timestamps of rendered object classes 2020-04-28 15:11:59 +02:00
Matt-Yorkley
53ebe10483 Fix issue with generic primary taxon in product factory changing which taxons are correctly counted as being in open order cycles. 2020-04-28 15:11:59 +02:00
Matt-Yorkley
eb5f8b85ff Touch primary taxon when a product's primary_taxon is changed 2020-04-28 15:11:59 +02:00
Matt-Yorkley
1b18808d21 Touch ShippingMethod when it's assigned to a new distributor 2020-04-28 15:11:59 +02:00
Matt-Yorkley
6ef345c5d8 Touch taxon when a taxon is applied to a product 2020-04-28 15:11:59 +02:00
Matt-Yorkley
a25a75bbe8 Ensure action caching includes GET params
By default the auto-generated action cache keys looks like this:
`views/0.0.0.0:3000/api/order_cycles/1/properties`

With this change the cache keys now look like this:
`views/0.0.0.0:3000/api/order_cycles/1/properties?distributor=3`
2020-04-28 15:11:14 +02:00
Matt-Yorkley
ea1ec1a1c6 Use ActionCaching in OrderCyclesController (taxons and properties) 2020-04-28 15:11:12 +02:00
Matt-Yorkley
975afb3152 Enable use of Action Caching in the API 🎉
See: https://guides.rubyonrails.org/api_app.html#adding-other-modules
2020-04-28 15:11:00 +02:00
Luis Ramos
839b373b5c Merge branch 'master' into 3-0-stable-Apr28 2020-04-28 13:40:19 +01:00
Kristina Lim
265871932f Merge pull request #5146 from coopdevs/dev-mode-profiling-settings
Add PROFILE var to set production-like settings
2020-04-28 20:31:13 +08:00
Kristina Lim
c34570e96e Merge pull request #5313 from kristinalim/fix/mirror_db_script_bucket
Fix script for syncing public/ in AWS bucket to local
2020-04-28 20:28:05 +08:00
Matt-Yorkley
ac166f3590 Add CacheService 2020-04-28 14:15:16 +02:00
Matt-Yorkley
e4985a9d51 Avoid needlessly fetching the current user records (for authentication and API key checks)
These endpoints are absolutely public, and don't need the current user at any point.
2020-04-28 14:06:02 +02:00
Matt-Yorkley
eb7de18298 Return early (before hitting the DB) in complex product list rendering if we already know the order cycle is closed 2020-04-28 13:51:25 +02:00
Matt-Yorkley
67a7140642 Memoize distributor and order_cycle in Api::OrderCyclesController 2020-04-28 13:48:07 +02:00
Luis Ramos
868929eed3 Merge pull request #4993 from luisramos0/move_ent_fees
Change engine routes to better work with specs in rails 4
2020-04-28 11:48:41 +01:00
Transifex-Openfoodnetwork
8e6d53f6c6 Updating translations for config/locales/nb.yml 2020-04-28 17:59:10 +10:00
Robin Klaus
f072e9d9c2 Add missing translations on order list page 2020-04-28 16:47:39 +10:00
Kristina Lim
7c985f39ab Fix script for syncing public/ in AWS bucket to local 2020-04-28 13:22:48 +08:00
Kristina Lim
efb83c2f95 Merge pull request #5250 from mkllnk/mirror-db-script
Add cache to mirror_db script
2020-04-28 13:18:29 +08:00
Matt-Yorkley
74e81b078f Avoid N+1s in Order#cap_quantity_at_stock! 2020-04-28 01:11:28 +02:00
Matt-Yorkley
3fa2b3161f Avoid N+1s when using OrderCycle#exchanges_supplying 2020-04-28 01:10:07 +02:00
Matt-Yorkley
fe2bf8d531 Eager-load variants and stock items when doing stock checks on multiple variants 2020-04-28 01:05:42 +02:00
Matt-Yorkley
eb858159ce Eager-load :default_price on variants 2020-04-28 01:04:22 +02:00
Matt-Yorkley
43869fc140 Replace fired events with clearer method call
The 'spree.cart.add' event has no listeners in spree_core on in ofn. The 'spree.order.contents_changed' just has a single listener that calls `order.update_distribution_charge`.
2020-04-28 00:56:18 +02:00
Matt-Yorkley
a5c4364f92 Fetch (or create) current_order only once 2020-04-28 00:52:09 +02:00
dependabot-preview[bot]
02775d033d Bump unicorn from 5.5.4 to 5.5.5
Bumps [unicorn](https://yhbt.net/unicorn/) from 5.5.4 to 5.5.5.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-27 20:50:56 +00:00
Luis Ramos
6559b4d3a4 Make dockerfile install node and adapt karma browser config to work inside a docker container 2020-04-27 19:05:11 +01:00
Luis Ramos
d851aa5106 Add model definition to migration to make migration more resilient 2020-04-27 18:40:56 +01:00
Luis Ramos
c5b9727177 Remove ga_cookies_preference from DB 2020-04-27 18:40:56 +01:00
Luis Ramos
248b0016d4 Remove trackers and google analytics 2020-04-27 18:40:33 +01:00
Luis Ramos
d8d6bad11c Remove config and sections related to google analytics in the cookies banner and cookies page 2020-04-27 18:40:00 +01:00
Luis Ramos
ab16931d70 Merge pull request #5257 from luisramos0/stripe_sca_payments_last
StripeSCA - reuse better method to fetch last payment of an order to avoid nasty bugs in the future
2020-04-27 18:34:35 +01:00
Matt-Yorkley
e33de8a20e Update specs and refactor a bit 2020-04-27 19:27:07 +02:00
Matt-Yorkley
468cb3f57e Remove obviously private methods from the public interface in CartService
These methods are not called from anywhere in the app, only in a couple of tests in cart_service_spec.
2020-04-27 19:27:07 +02:00
Matt-Yorkley
1152f307e2 Eager-load associated line_items data in #update_distribution_charge! 2020-04-27 19:27:07 +02:00
Matt-Yorkley
25525d4f75 Use guard clause in each block 2020-04-27 19:27:07 +02:00
Matt-Yorkley
a759d8c7c7 Avoid N+1s for variants and for line_items of variants 2020-04-27 19:27:07 +02:00
Matt-Yorkley
b3242041e5 Return earlier (before scoping process, if possible) 2020-04-27 19:27:07 +02:00
Matt-Yorkley
106bb7a27f Rename some variables and add comments for clarity in cart_service 2020-04-27 19:27:07 +02:00
Matt-Yorkley
2334ab6d00 Delete some dead code in cart_service
This Bugsnag error was added a year ago and hasn't been seen
2020-04-27 19:27:07 +02:00
Matt-Yorkley
11af5dffdc Memoize scoper in cart_service
Avoids fetching all of the hub's variant overrides from the db every time it's initialized.
2020-04-27 19:27:07 +02:00
Matt-Yorkley
3ce7e96777 Add some debounce and an onwheel hack to product add to basket field
Debounce ensures we don't get a million requests if the up/down buttons are clicked rapidly. The onwheel hack adds some protection against scrolling triggering the quantity up/down. See: https://stackoverflow.com/a/51076231
2020-04-27 19:27:07 +02:00
Transifex-Openfoodnetwork
670fff9d36 Updating translations for config/locales/es_CR.yml 2020-04-28 02:38:07 +10:00
Transifex-Openfoodnetwork
171ba09663 Updating translations for config/locales/fr.yml 2020-04-28 01:40:44 +10:00
Transifex-Openfoodnetwork
65c9c287e8 Updating translations for config/locales/en_FR.yml 2020-04-28 01:37:49 +10:00
Transifex-Openfoodnetwork
4332734f27 Updating translations for config/locales/ca.yml 2020-04-28 01:37:44 +10:00
Transifex-Openfoodnetwork
340f669506 Updating translations for config/locales/en_GB.yml 2020-04-28 01:37:36 +10:00
Transifex-Openfoodnetwork
3b7ad0ef4e Updating translations for config/locales/ca.yml 2020-04-27 23:49:48 +10:00
Luis Ramos
6e23f5bdac Merge pull request #5233 from luisramos0/stripe_sca_bo
[StripeSCA] Fix card payments in the Backoffice
2020-04-27 13:00:24 +01:00
Luis Ramos
8b5378e673 Merge pull request #5251 from luisramos0/Issue4654
Change Result of PriceSack Calculation from Integers to Floats, clone #4812
2020-04-27 12:36:18 +01:00
Transifex-Openfoodnetwork
ba32e2d676 Updating translations for config/locales/fil_PH.yml 2020-04-27 18:08:38 +10:00
Pau Pérez Fabregat
74c4722cfe Merge pull request #5286 from rmklaus12/4966-missing-translation-admin-prod-list
4966 missing translation admin prod list
2020-04-27 09:28:57 +02:00
Luis Ramos
b3eda9fecb Merge pull request #5256 from dacook/5190-fix-order-sorting
Fix sorting of orders list
2020-04-26 14:24:00 +01:00
Pau Perez
c224df9b6a Do not trigger an orderChanged with null quantity
When loading the page $watchGroup calls the listener function for every
listed line item but with a set variant and null quantity and
max_quantity. There's no point on computing an order change when there
was none.

This saves an empty request on the second most used endpoint of the app,
specially busy when users are placing orders.
2020-04-24 15:54:46 +02:00
Luis Ramos
b9c86d54b0 Merge pull request #5261 from luisramos0/search-iphone
[Mobile] Make search box font size be 16px so that no zoom happens on iphone
2020-04-24 11:30:26 +01:00
Transifex-Openfoodnetwork
cebba4dd43 Updating translations for config/locales/en_GB.yml 2020-04-24 18:22:49 +10:00
Matt-Yorkley
43ba73ac19 Avoid expensive queries for supplied product properties if enterprise is not a supplier 2020-04-23 21:51:39 +02:00
Matt-Yorkley
728326c2a5 Eager-load :properties on supplied products in enterprise_shopfront_serializer 2020-04-23 21:48:41 +02:00
Transifex-Openfoodnetwork
8bcc9456d8 Updating translations for config/locales/en_FR.yml 2020-04-24 04:30:04 +10:00
Transifex-Openfoodnetwork
5f51b21fe9 Updating translations for config/locales/fr.yml 2020-04-24 04:29:52 +10:00
Luis Ramos
2984829790 Merge pull request #5253 from luisramos0/edit_order
Make edit order page work even if inventory_items dont have a corresponding line_item in the order
2020-04-23 19:27:31 +01:00
Luis Ramos
f366aa2605 Merge pull request #5290 from openfoodfoundation/dependabot/bundler/mini_racer-0.2.10
Bump mini_racer from 0.2.9 to 0.2.10
2020-04-23 18:53:14 +01:00
Matt-Yorkley
bf16a10129 Update all locales with the latest Transifex translations 2020-04-23 19:05:22 +02:00
Matt-Yorkley
43836d2b30 Merge pull request #5292 from openfoodfoundation/transifex
Transifex
2020-04-23 18:53:36 +02:00
Pau Pérez Fabregat
82156e32e0 Merge pull request #4920 from luisramos0/api_var_ctrl
Bring Spree::Variant#active from Spree so that we can improve it
2020-04-23 17:35:49 +02:00
Matt-Yorkley
69cf7dff2c Memoize :active in enterprise serializers that call it multiple times 2020-04-23 13:17:44 +02:00
Pau Pérez Fabregat
a8ca471cd2 Merge pull request #5189 from Matt-Yorkley/mobile-buttons
[Mobile UX] Style updates on buttons
2020-04-23 12:56:49 +02:00
Luis Ramos
aa52cf8bf0 Merge pull request #5254 from chrishil1/missing_translation_save_as_default
Added missing translation to column dropdown
2020-04-23 11:08:33 +01:00
Luis Ramos
ac6501c5d8 Merge pull request #5195 from luisramos0/prod_helper
Delete dead code from several places...
2020-04-23 11:07:44 +01:00
Luis Ramos
568e570b4b Move method to more generic helper to use it in mailers 2020-04-23 16:08:10 +10:00
Luis Ramos
42be6c905f Added spec for OrderPaymentFinder 2020-04-23 16:08:10 +10:00
Luis Ramos
d482cccefe Use OrderPaymentFinder methods instead of payments.last and payments.pending.last 2020-04-23 16:08:10 +10:00
Luis Ramos
52becf6abc Extract payment method logic from OrderPaymentFinder into the orders helper 2020-04-23 16:08:10 +10:00
Transifex-Openfoodnetwork
15319d66e2 Updating translations for config/locales/es_CR.yml 2020-04-23 12:27:58 +10:00
Robin Klaus
d8f4df4bcc Fixed missing translation, added keys to en.yml file 2020-04-23 09:58:47 +10:00
dependabot-preview[bot]
240d4a7802 Bump mini_racer from 0.2.9 to 0.2.10
Bumps [mini_racer](https://github.com/discourse/mini_racer) from 0.2.9 to 0.2.10.
- [Release notes](https://github.com/discourse/mini_racer/releases)
- [Changelog](https://github.com/rubyjs/mini_racer/blob/master/CHANGELOG)
- [Commits](https://github.com/discourse/mini_racer/compare/v0.2.9...v0.2.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-22 19:41:50 +00:00
Luis Ramos
3dff11e405 Merge pull request #5182 from luisramos0/nokogiri
Bump Nokogiri
2020-04-22 20:40:04 +01:00
Pau Perez
2d9b41729e Use memory cache-store when profiling
Or you want see any change when playing fragment-caching or other caching
strategies.
2020-04-22 17:56:56 +02:00
Pau Perez
de8d8e658c Add PROFILE var to set production-like settings
I took this from a recent newsletter I read. Sometimes replication
performance issues locally is actually slower than production due to dev
mode settings (code reloading, etc.), heavy de-only gems and the asset
pipeline.

The PROFILE env var switches these settings all at the same time,
giving us an environment closer to production, essential for reliable
profiling. Then, rack-mini-profiler is going to be more accurate.

Apparently it's something
[RubyGems](b026df86ae/config/environments/development.rb (L72-L92))
and
[CodeTriage](a3c957647d)
both use.
2020-04-22 17:53:17 +02:00
Pau Pérez Fabregat
a7013b5542 Merge pull request #5241 from Matt-Yorkley/remove-old-migrations
Remove old migrations!
2020-04-22 17:01:01 +02:00
Maikel
24fe7e8878 Merge pull request #5280 from openfoodfoundation/transifex
Transifex
2020-04-22 16:08:57 +10:00
Maikel
eb94c5a5bd Merge pull request #5283 from Matt-Yorkley/customer-tags
Fix disappearing tags issue
2020-04-22 16:03:17 +10:00
Matt-Yorkley
4ef61b642e Fix disappearing tags issue 2020-04-22 01:33:38 +02:00
Luis Ramos
23f4faf192 Merge pull request #4841 from luisramos0/kill_rabl
Hide broken product taxons field, remove last rabl template and rabl itself
2020-04-21 18:49:12 +01:00
Transifex-Openfoodnetwork
becd57f7a4 Updating translations for config/locales/fr.yml 2020-04-21 22:52:47 +10:00
Transifex-Openfoodnetwork
2e4b224d48 Updating translations for config/locales/en_FR.yml 2020-04-21 22:42:53 +10:00
Transifex-Openfoodnetwork
2b210bd096 Updating translations for config/locales/fr.yml 2020-04-21 22:42:34 +10:00
Matt-Yorkley
53183b8598 Eager-load properties in inject_enterprise_and_relatives 2020-04-21 11:13:20 +02:00
Pau Perez
91306d5ce4 Update all locales with the latest Transifex translations 2020-04-21 10:13:00 +02:00
Pau Pérez Fabregat
e20e19f963 Merge pull request #5244 from coopdevs/include-deleted-variants-and-products
Include deleted products in OC mailer
2020-04-20 20:46:21 +02:00
Luis Ramos
2ab07bc6a9 Make search box font size be 16px so that no zoom happens on iphone 2020-04-18 18:50:25 +01:00
Luis Ramos
15e56b21ae Merge pull request #5229 from chrishil1/missing_translation
Added missing translations to enterprise_relationship page
2020-04-18 18:15:54 +01:00
Luis Ramos
629db3ae4d Merge pull request #5230 from chrishil1/missing_translation_2
Add product translations to admin order creation
2020-04-18 18:15:01 +01:00
Luis Ramos
43274ecb4f Remove dead code
Dead since https://github.com/openfoodfoundation/openfoodnetwork/pull/3305
2020-04-18 14:47:33 +01:00
Luis Ramos
437c7367db Remove dead code 2020-04-18 14:37:07 +01:00
Lucas Hiago
acfe0c540a Create instagram css property and apply 2020-04-18 10:06:14 -03:00
Lucas Hiago
ac2ab34e11 Add connect with us footer to customer order confirmation email 2020-04-18 10:06:06 -03:00
Lucas Hiago
41c0204cfa Update instagram and linkedin links 2020-04-18 10:05:59 -03:00
Luis Ramos
910cc99c2f Add spec to cover orders_controller watch sortOptions 2020-04-18 10:23:02 +01:00
David Cook
a0a361673a Fix sorting of orders
(wrong copied function call)
2020-04-18 15:03:39 +10:00
jeffrey s hill md
70005a99a3 Added missing translations 2020-04-17 17:02:37 -05:00
Luis Ramos
8f8dce4bab Do not render inventory items in the shipment that dont have a line item in the order 2020-04-17 20:23:29 +01:00
Luis Ramos
8973a1b76c Merging 6 specs in one takes around 1 minute of execution time 2020-04-17 20:18:13 +01:00
Luis Ramos
c1b28543c6 Extract print ticket spec to a separate file 2020-04-17 20:07:45 +01:00
Luis Ramos
c33352904a Make spec a bit more resilient 2020-04-17 18:48:20 +01:00
Luis Ramos
8bd3062b16 Fix rubocop issues 2020-04-17 18:17:54 +01:00
jeffrey s hill md
ed91c179cd Changed translation paths 2020-04-17 12:04:27 -05:00
Luis Ramos
c7fb85a715 Replace background with members with before with let statements 2020-04-17 17:34:36 +01:00
Luis Ramos
e901615b61 Make spec simpler 2020-04-17 16:56:56 +01:00
Pau Perez
d8e6d98912 Preload line item's option_values
This fixes an N+1 with the query

```sql
SELECT "spree_option_values".* FROM "spree_option_values"
INNER JOIN "spree_option_types"
  ON "spree_option_types"."id" = "spree_option_values"."option_type_id"
INNER JOIN "spree_option_values_line_items"
  ON "spree_option_values"."id" = "spree_option_values_line_items"."option_value_id"
WHERE "spree_option_values_line_items"."line_item_id" = 1679
ORDER BY spree_option_types.position asc
```
2020-04-17 17:34:53 +02:00
Luis Ramos
c455dfb609 Make some specs faster by going directly to the order edit page and move incomplete order spec to a specific context 2020-04-17 16:28:27 +01:00
Pau Perez
63eb0980eb Memoize result of line items query
No need to fetch twice what we just loaded from DB.
2020-04-17 17:27:21 +02:00
Pau Perez
06ead827d8 Split long method 2020-04-17 17:27:21 +02:00
Pau Perez
6dd4a866e5 Address some Rubocop violations 2020-04-17 17:25:35 +02:00
Pau Perez
04c962432a Skip deleted default_scope in OC notification
This fixes the RuntimeError we get when accessing deleted variants due
to the variant being nil.

https://github.com/rails/rails/issues/11036 is still an open Rails bug,
as some people mention in https://github.com/rails/rails/pull/21550.

The issue is that `includes` doesn't respect `unscoped`. I found
a potential solution for the entire app in
https://github.com/rails/rails/issues/11036#issuecomment-302133116 but
our friend @markets has a gem,
https://github.com/markets/unscoped_associations, that solves that too.
2020-04-17 17:25:34 +02:00
Luis Ramos
d96d6b2337 Split orders_spec in two: tests for orders list page and tests for orders edit page 2020-04-17 15:21:03 +01:00
Luis Ramos
9147518422 Remove some unnecessary code 2020-04-17 14:51:06 +01:00
Luis Ramos
d23397f250 Move float test to a separate context 2020-04-17 14:49:09 +01:00
blainebillings
993a684e44 Add Price Sack Spec for Float Amounts 2020-04-17 14:43:28 +01:00
blainebillings
427dc54945 Change Result of PriceSack Calculation from Integers to Floats 2020-04-17 14:43:28 +01:00
Luis Ramos
ffceff3f0a Update GETTING_STARTED.md
Update link to osx catalina setup guide in wiki
2020-04-17 11:41:02 +01:00
Maikel Linke
b5d159e163 Add cache to mirror_db script
Also added some better error handling around image syncing.
2020-04-17 16:09:22 +10:00
Maikel Linke
4658a53aeb Update translations from Transifex 2020-04-17 15:37:54 +10:00
Maikel
3bc834435d Merge pull request #5152 from Matt-Yorkley/missing-indexes
Add missing indexes to spree_orders and spree_products
2020-04-17 15:16:03 +10:00
Maikel
9111ff1a38 Merge pull request #5211 from openfoodfoundation/transifex
Transifex
2020-04-17 14:24:26 +10:00
Maikel
b0eac1ecaa Merge branch 'master' into missing-indexes 2020-04-17 14:17:32 +10:00
Maikel
2e31f234d6 Merge pull request #5196 from Matt-Yorkley/customers-performance
Admin Customers performance
2020-04-17 13:28:39 +10:00
Maikel
e29a81cacc Merge pull request #5186 from oeoeaio/customer-totals-inventory-sku
Take sku overrides into account in customer totals report
2020-04-17 13:27:43 +10:00
Maikel
a672af1a79 Merge pull request #5237 from luisramos0/master_with_change
Clone of #5176
2020-04-17 13:27:14 +10:00
Maikel Linke
75207247e6 Correct database commands 2020-04-17 12:52:05 +10:00
Maikel Linke
8af40f4675 Format and indent migration message
It's much clearer to read this way:

```
==  OldMigrationsRemoved: migrating ===========================================
rake aborted!
StandardError: An error has occurred, this and all later migrations canceled:

      You haven't updated your dev environment in a long time!
      Legacy migration files before 2019 have now been removed.
      Run `rails db:schema:load` before running `rails db:migrate`.

```
2020-04-17 12:47:49 +10:00
Maikel Linke
63ac6c5088 Remove superfluous conditional
A migration's `up` method is only run when the migration needs to be
applied. The only case we could have a higher version number is when a
migration with a higher version got merged before the current one. And
in that case, we still want this migration to fail, because it hasn't
been applied yet.
2020-04-17 12:40:54 +10:00
jeffrey s hill md
d8444dcf3c Added placeholders 2020-04-16 14:59:41 -05:00
Matt-Yorkley
71c7c35679 Remove old migrations! 🎉 2020-04-16 13:44:18 +02:00
Pau Pérez Fabregat
e1c2b7e105 Merge pull request #5159 from luisramos0/timezone_mixup
[Spree 2.1] Fix timezone mix up in a spec
2020-04-16 11:38:54 +02:00
Pau Pérez Fabregat
7b656fa0a4 Merge pull request #5194 from luisramos0/update_spree_rev
[Spree 2.1] Update spree revision to a version that doesnt depend on deface
2020-04-16 11:37:42 +02:00
Maikel
f282ff805d Merge pull request #5172 from kristinalim/feature/5170-increase_locale_chars_in_spree_users
Increase max characters for locale in spree_users
2020-04-16 18:18:45 +10:00
Transifex-Openfoodnetwork
2f7dc9a578 Updating translations for config/locales/es.yml 2020-04-16 17:09:44 +10:00
chrishil1
a9829ba5d9 Update _enterprise_relationship.html.haml 2020-04-15 17:01:22 -05:00
Luis Ramos
8532fa16cd Merge pull request #5202 from luisramos0/improve_checkout_js
Improve Checkout error handling in JS
2020-04-15 22:25:05 +01:00
chrishil1
c3f01be580 Fixed display all required tag 2020-04-15 19:00:35 +01:00
Luis Ramos
fcc746a1b7 Fix long lines in payments_controller_spec 2020-04-15 16:18:17 +01:00
Luis Ramos
8f7b3df9b5 Make payment controller authorize stripe_sca payments before processing them or advancing order workflow (that also calls payment.process) 2020-04-15 16:07:34 +01:00
jeffrey s hill md
e23045b19e Add product translations 2020-04-14 14:15:57 -05:00
jeffrey s hill md
5e1dea61a8 added missing translations to enterprise_relationship page 2020-04-14 11:20:56 -05:00
Luis Ramos
cedf1b26f2 If no flash is sent from the server, show the generic error 2020-04-14 14:31:34 +01:00
Luis Ramos
47a93568dc Make code simpler by extracting methods 2020-04-14 13:55:20 +01:00
Luis Ramos
62471bf2ab Clear Loading spinner when exception is caught 2020-04-14 13:50:38 +01:00
Luis Ramos
cdf5bcb7eb Improve unexpected error handling and add test cases for it 2020-04-14 13:44:58 +01:00
Luis Ramos
7414047b92 Switch from old success/error to modern then/catch structure
Catch() will get a few more errors then errors()

Also, add try/catch inside catch to detect any errors parsing the
response error payload
2020-04-14 13:04:28 +01:00
Pau Pérez Fabregat
4ef5dfe430 Merge pull request #5199 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.5.2
Bump rubocop-rails from 2.5.1 to 2.5.2
2020-04-14 10:17:59 +02:00
Pau Pérez Fabregat
e58a1d080f Merge pull request #5205 from openfoodfoundation/dependabot/bundler/ddtrace-0.34.2
Bump ddtrace from 0.34.1 to 0.34.2
2020-04-14 10:17:06 +02:00
Luis Ramos
357a88fa22 Merge pull request #4786 from luisramos0/stripe_sca_extra_subs_fix
Make StripeSCA (with new authorize/purchase workflow) work with Subscriptions again
2020-04-13 17:21:53 +01:00
Rob H
f71045b3f2 Improve naming of variables in VariantOverridesIndexed for readability 2020-04-13 22:24:25 +10:00
Rob H
dcdd3f2444 Modify interface of VariantOverridesIndexed#indexed
Stop using keyword args and accept variant_ids instead of line_items
2020-04-13 22:11:58 +10:00
Rob H
6820919552 Rename VariantOverrides class to VariantOverridesIndexed 2020-04-13 21:56:37 +10:00
Rob H
4a4173bdc0 Move VariantOverrides class to app/services 2020-04-13 21:54:10 +10:00
Rob H
9a7e782102 Only load up variant overrides for relevant hubs 2020-04-13 12:07:17 +10:00
Transifex-Openfoodnetwork
9fa892346e Updating translations for config/locales/es_CR.yml 2020-04-13 10:30:00 +10:00
Transifex-Openfoodnetwork
7341912390 Updating translations for config/locales/pt_BR.yml 2020-04-12 07:14:21 +10:00
Transifex-Openfoodnetwork
d0c797b797 Updating translations for config/locales/es_CR.yml 2020-04-12 07:12:21 +10:00
Transifex-Openfoodnetwork
cb2e17d7dc Updating translations for config/locales/es_CR.yml 2020-04-12 07:09:21 +10:00
Transifex-Openfoodnetwork
147654df41 Updating translations for config/locales/es_CR.yml 2020-04-12 07:05:59 +10:00
Rob H
14cf168e3b Take sku overrides into account in customer totals report 2020-04-11 16:05:15 +10:00
dependabot-preview[bot]
c3ee7b7c64 Bump ddtrace from 0.34.1 to 0.34.2
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.34.1 to 0.34.2.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.34.1...v0.34.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-10 19:19:13 +00:00
Matt-Yorkley
a6414b6dbe Make sure taggable_type is 'Customer' when querying customer tags 2020-04-10 20:14:14 +02:00
Luis Ramos
eafffa2c23 Update all locales with the latest Transifex translations 2020-04-10 13:08:11 +01:00
Luis Ramos
82a4753eec Merge pull request #5191 from openfoodfoundation/transifex
Transifex
2020-04-10 13:05:30 +01:00
Matt-Yorkley
b92e858448 Merge pull request #5197 from Matt-Yorkley/cart-populate-performance
Cart populate performance
2020-04-10 11:41:56 +02:00
Matt-Yorkley
4c41c84cc1 Refactor tag rules loading for customers
Fixes N+1 queries on customer tags
2020-04-10 10:12:32 +02:00
Matt-Yorkley
e53f733966 Eager-load addresses in customer serializer 2020-04-10 08:20:15 +02:00
Matt-Yorkley
2a8809e6e8 Eager-load default card in customer serializer 2020-04-10 08:20:15 +02:00
Matt-Yorkley
31a54e49c5 Allow User#default_card to work with eager-loading 2020-04-10 08:20:13 +02:00
Luis Ramos
b5ba2acb21 Merge pull request #5169 from jeduardo824/enhancement/5102-make-shop-names-links
make shop name a link on /account
2020-04-09 22:01:34 +01:00
dependabot-preview[bot]
0fabde8849 Bump rubocop-rails from 2.5.1 to 2.5.2
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.5.1 to 2.5.2.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.5.1...v2.5.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-09 19:21:30 +00:00
Transifex-Openfoodnetwork
e97a16cb40 Updating translations for config/locales/ca.yml 2020-04-10 04:14:21 +10:00
Luis Ramos
314fed063d Merge property with property_decorator both in our codebase 2020-04-09 19:09:22 +01:00
Luis Ramos
0d5c08c363 Remove dead code, there's no Spree::Money in app/models/spree and the Spree::Money in lib/spree already has a class_eval with this function 2020-04-09 19:06:05 +01:00
Matt-Yorkley
57d87a8042 Eager-load variant stock items
Avoids another N+1
2020-04-09 19:55:08 +02:00
Matt-Yorkley
0ca87580e8 Load variants in cart in one query
Avoids an N+1
2020-04-09 19:55:06 +02:00
Luis Ramos
59f56cb0f6 Remove before delivery method in checkout controller, this differentiator is never used in OFN, only in Spree frontend code 2020-04-09 17:32:28 +01:00
Matt-Yorkley
cf712e9478 Select only enterprise id 2020-04-09 17:41:13 +02:00
Luis Ramos
2ff8356c63 Delete dead code from products helper 2020-04-09 16:33:17 +01:00
Luis Ramos
59e0f3d9f4 Merge pull request #5175 from Matt-Yorkley/memoize-scoper
Memoize ScopeProductToHub in product list
2020-04-09 14:45:57 +01:00
Luis Ramos
fc5aff8c79 Merge pull request #5145 from luisramos0/inv_perf
Performance improvements to Inventory page
2020-04-09 13:56:33 +01:00
Luis Ramos
7d82c6a014 Update spre revision to a version that doesnt depend on deface, this allows us to upgrade nokogiri (done in another PR in the master branch) 2020-04-09 13:51:54 +01:00
Luis Ramos
4aad80c134 Update message for capybara with new upgrade blocker 2020-04-09 13:39:40 +01:00
Luis Ramos
71ffa6b178 Upgrade nokogiri as much as possible (it's not an explicit dependency of OFN and we dont need to control the version now, so I remove it from Gemfile) 2020-04-09 13:39:40 +01:00
Luis Ramos
e3de71668a Depend on a spree version in which spree_core doesnt depend on deface AND remove deface from list of dependencies 2020-04-09 13:39:40 +01:00
Luis Ramos
dd717fe8ac Merge pull request #5184 from Matt-Yorkley/inventory-loading
Inventory loading
2020-04-09 13:26:12 +01:00
Luis Ramos
4b23adca2d Merge pull request #5157 from luisramos0/email_validation
[Spree 2.1] Add order.email regexp validation
2020-04-09 10:14:11 +01:00
Luis Ramos
6341c5fd80 Merge pull request #4964 from luisramos0/po_fix
Fix proxy orders controller in rails 4 by removing the use of responders
2020-04-09 10:12:33 +01:00
Matt-Yorkley
47ac6c1491 Remove unused methods from ProductSimpleSerializer 2020-04-09 09:51:32 +02:00
Matt-Yorkley
6afda141a1 Remove track_inventory_levels conditional
This value is always true in OFN
2020-04-09 09:19:37 +02:00
Matt-Yorkley
5bb2614f9d Refactor PagedFetcher so it makes one request at a time 2020-04-09 09:19:37 +02:00
Matt-Yorkley
b3c968856b Fix some rubocop issues 2020-04-09 09:19:37 +02:00
Matt-Yorkley
b0a7497f2a Remove another N+1 in product serialization 2020-04-09 09:19:37 +02:00
Matt-Yorkley
f959e632ea Modify Spree::Stock::Quantifier to not re-fetch stock items if they are already eager-loaded
This helps to remove a big N+1 here, and will also be very helpful elsewhere in the app
2020-04-09 09:19:37 +02:00
Matt-Yorkley
f9cf826f1c Bring Spree::Stock::Quantifier in to OFN
This is the original unmodified Class from Spree. Modifications added in subsequent commits.
2020-04-09 09:19:36 +02:00
Matt-Yorkley
ececbce596 Only select id in producers query 2020-04-09 09:16:44 +02:00
Matt-Yorkley
1b7ac1a252 Don't re-use fat serializers when thin ones are needed.
This cuts the pageload and query count in half, again.
2020-04-09 09:10:41 +02:00
Transifex-Openfoodnetwork
d31b24786a Updating translations for config/locales/en_NZ.yml 2020-04-09 16:16:24 +10:00
Matt-Yorkley
374bf04118 Merge pull request #5142 from Matt-Yorkley/shops-firefighting
Don't load distributed properties on inactive distributors
2020-04-08 20:45:01 +02:00
Matt-Yorkley
3aff7f62e3 Don't query distributed properties on enterprises that aren't active distributors
Cuts page load on /shops by ~75% (with production data) and removes ~300 expensive and superfluous queries.
2020-04-08 20:08:12 +02:00
Matt-Yorkley
fc5e346a06 Merge pull request #5156 from Matt-Yorkley/closed-shops
Load closed shops in a separate request on /shops page
2020-04-08 20:05:26 +02:00
Matt-Yorkley
538e4e54d2 Set cart buttons to fixed width and expand when screen is too small 2020-04-08 11:19:14 +02:00
Matt-Yorkley
1ddbabd841 Adjust colours of primary buttons to use (bright) orange instead of (warning) red 2020-04-08 10:57:33 +02:00
Matt-Yorkley
0414f4984d Align buttons left and right on cart page 2020-04-08 10:55:55 +02:00
Matt-Yorkley
9c421e146e Remove arrows from cart and checkout buttons 2020-04-08 10:23:18 +02:00
Luis Ramos
29bbf2fa74 Merge pull request #5088 from coopdevs/do-not-recreate-when-booting-docker
Do not reset the dev env when booting docker
2020-04-07 21:56:09 +01:00
Matt-Yorkley
64c66ddedc Eager-load variant data for overridable products
Cuts query count and page load time in half for this endpoint.
2020-04-07 15:16:32 +02:00
Luis Ramos
e0e2c32d9f Merge pull request #5177 from openfoodfoundation/dependabot/bundler/oj-3.10.6
Bump oj from 3.10.5 to 3.10.6
2020-04-07 11:44:09 +01:00
Luis Ramos
ff799b6e82 Avoid using update_attributes that save the order to the DB 2020-04-07 11:13:29 +01:00
Matt-Yorkley
003341ef7a Add loading indicator when showing closed shops 2020-04-07 10:40:49 +02:00
Matt-Yorkley
94f8ea2f93 Fix flicker effect showing 3 buttons when clicking "Show Closed Shops" button 2020-04-07 10:31:56 +02:00
Kristina Lim
e6cd33ee57 Increase max characters for locale in spree_users
There are many locales that have six (6) characters.
2020-04-07 15:08:49 +08:00
Maikel
45c0209971 Merge pull request #5154 from luisramos0/prop_strong
[Spree 2.1] Add strong params implementation to properties controller
2020-04-07 16:27:22 +10:00
Maikel
eb64112b22 Merge pull request #5144 from openfoodfoundation/transifex
Transifex
2020-04-07 16:23:35 +10:00
Maikel
3e14b62b46 Merge pull request #5136 from openfoodfoundation/dependabot/bundler/ddtrace-0.34.1
Bump ddtrace from 0.34.0 to 0.34.1
2020-04-07 16:05:53 +10:00
Maikel
3244650932 Merge pull request #5135 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.5.1
Bump rubocop-rails from 2.5.0 to 2.5.1
2020-04-07 16:05:18 +10:00
Transifex-Openfoodnetwork
b6753a2593 Updating translations for config/locales/fil_PH.yml 2020-04-07 16:03:57 +10:00
Transifex-Openfoodnetwork
1b119805b4 Updating translations for config/locales/fil_PH.yml 2020-04-07 15:15:12 +10:00
Transifex-Openfoodnetwork
edde7689a9 Updating translations for config/locales/de_DE.yml 2020-04-07 13:57:54 +10:00
Transifex-Openfoodnetwork
8060977786 Updating translations for config/locales/en_GB.yml 2020-04-07 13:54:53 +10:00
Transifex-Openfoodnetwork
837a345958 Updating translations for config/locales/en_FR.yml 2020-04-07 13:54:46 +10:00
dependabot-preview[bot]
7c5e511fde Bump oj from 3.10.5 to 3.10.6
Bumps [oj](https://github.com/ohler55/oj) from 3.10.5 to 3.10.6.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.5...v3.10.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-06 19:24:48 +00:00
Luis Ramos
d18a06a0f7 Merge pull request #4783 from luisramos0/stripe_sca_extra_subs
Move all subscriptions services to the OrderManagement engine
2020-04-06 20:20:02 +01:00
Luis Ramos
d23b4fd307 Merge pull request #5174 from coopdevs/change-pool-size
Allow changing the connection pool size
2020-04-06 19:29:09 +01:00
Matt-Yorkley
2cb4c6bec2 Memoize OpenFoodNetwork::ScopeProductToHub
This means we avoid fetching all of the hub's variants every time we scope a product. Applies to every product loaded when displaying a shops's product list.
2020-04-06 19:41:05 +02:00
Pau Pérez Fabregat
924e816a5b Merge pull request #5151 from luisramos0/fix_order_perms
Fix Permissions::Order spec in rails 4
2020-04-06 18:07:39 +02:00
Pau Pérez Fabregat
109da43905 Merge pull request #2 from luisramos0/do-not-recreate-when-booting-docker
Re-add setup instructions removed from docker-compose into Dockerfile…
2020-04-06 16:55:59 +02:00
Pau Perez
33ca6a2096 Allow changing the connection pool size
This allows us to tune for UK. The hypothesis from @kristinalim is:

> From what I understand, it can result to Rails processes waiting for
each other to complete, while the DB server can take more simultaneous
connections.
2020-04-06 16:03:06 +02:00
Eduardo
e7b780f963 make shop name a link on /account 2020-04-06 08:34:24 -03:00
dependabot-preview[bot]
13cba3d244 Bump ddtrace from 0.34.0 to 0.34.1
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.34.0 to 0.34.1.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.34.0...v0.34.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-06 11:27:10 +00:00
Matt-Yorkley
ce45e7cf71 Merge pull request #5162 from Matt-Yorkley/unicorn-worker-killer
Add optional unicorn-worker-killer configs
2020-04-06 13:25:22 +02:00
Matt-Yorkley
ba5a56db14 Make upper and lower bounds configurable 2020-04-06 10:39:51 +02:00
Matt-Yorkley
276dcf4a3b Add optional unicorn-worker-killer configs 2020-04-06 10:39:50 +02:00
Transifex-Openfoodnetwork
dcfb1aec6d Updating translations for config/locales/en_PH.yml 2020-04-06 18:11:07 +10:00
Pau Pérez Fabregat
fde2aac366 Merge pull request #5163 from coopdevs/collect-Ruby-GC
Enable Ruby Runtime Metrics in Datadog
2020-04-05 14:32:54 +02:00
Luis Ramos
63138aef30 Re-add setup instructions removed from docker-compose into Dockerfile and Docker.md 2020-04-05 00:06:31 +01:00
Pau Perez
7612415991 Enable Ruby Runtime Metrics in Datadog
This automatically collects a bunch of Ruby's GC-related metrics that
will come in handy while we tune the Unicorn workers. Some of theres
are:

* runtime.ruby.class_count
* runtime.ruby.gc.malloc_increase_bytes
* runtime.ruby.gc.total_allocated_objects
* runtime.ruby.gc.total_freed_objects
* runtime.ruby.gc.heap_marked_slots
* runtime.ruby.gc.heap_available_slots
* runtime.ruby.gc.heap_free_slots
* runtime.ruby.thread_count

Check https://docs.datadoghq.com/tracing/runtime_metrics/ruby/#data-collected for the complete list.

The cool thing is that

> Runtime metrics can be viewed in correlation with your Ruby services
2020-04-05 00:16:10 +02:00
Luis Ramos
53d901b41b Merge pull request #5064 from luisramos0/fix_sample_data
Fix sample data and custom paper_trail config on order_cycles and schedules on rails 4
2020-04-04 18:29:26 +01:00
Luis Ramos
fa4b8832e9 Fix timezone mix up in specs
Converting times with timezones to string was ignoring the timezone and this making the start date be before the end date in this spec
2020-04-04 16:39:23 +01:00
Luis Ramos
4ceaebf098 Add order.email regexp validation and add some tests for it 2020-04-04 16:13:23 +01:00
Matt-Yorkley
bc859cf9f7 Add api/shops_controller and refactor 2020-04-04 17:02:27 +02:00
Matt-Yorkley
af48cac140 Load closed shops in a separate request on /shops page 2020-04-04 14:06:10 +02:00
Luis Ramos
451cfac788 Merge pull request #4995 from Matt-Yorkley/3-0-eager-load
[Spree 2.1] Staging and Production configs
2020-04-04 12:21:25 +01:00
Luis Ramos
59bb956677 Merge pull request #5010 from Matt-Yorkley/remove_simple_form
Remove simple_form
2020-04-04 11:53:06 +01:00
Luis Ramos
4f08ed1801 Remove commented turbo-sprockets-rails3 from Gemfile, thsi gem is not needed in rails 4 2020-04-04 11:39:20 +01:00
Luis Ramos
1364a5e367 Merge pull request #4916 from luisramos0/adj_eli
[Spree 2.1] Make Spree::OrderUpdater update all adjustments, not just promotions and shipment adjustments
2020-04-04 11:28:13 +01:00
Luis Ramos
07264446e6 Add strong params implementation to properties controller 2020-04-04 11:17:38 +01:00
Luis Ramos
b8f8db0341 Merge pull request #5147 from luisramos0/3-0-stable-apr3
[Spree 2.1] Merge master into 3-0-stable
2020-04-04 11:03:14 +01:00
Matt-Yorkley
8a544f3ab3 Add missing indexes to spree_orders and spree_products 2020-04-04 10:12:15 +02:00
Luis Ramos
04986dd0d5 Merge pull request #4932 from luisramos0/line_items_fix
Adapt line items scope to include deleted variants and deleted products - rails 4 fix
2020-04-03 20:09:35 +01:00
Luis Ramos
55b3f4d54f Move search params test case to a different context so that we dont have to set the producer of the products in the order
This is working in master by chance of the factories but breaks in rails 4 because the orders in this test dont have products supplied by the producer which is a necessary condition in the context where it was
2020-04-03 19:47:33 +01:00
Luis Ramos
384ca310a3 Merge branch 'master' into 3-0-stable-apr3 2020-04-03 18:26:26 +01:00
Luis Ramos
452ab3a842 Add comment to better explain variant_override_set.collection_to_delete 2020-04-03 15:36:19 +01:00
Luis Ramos
a049e7a433 Add product to includes to avoid N+1 queries to fetch products when VO authorization is done right after this 2020-04-03 14:48:06 +01:00
Transifex-Openfoodnetwork
97063bf47e Updating translations for config/locales/en_GB.yml 2020-04-03 23:24:25 +11:00
Luis Ramos
e64d573337 Revert accidental push of a byebug statement with the direct translations push to master 🙈 2020-04-03 12:06:39 +01:00
Luis Ramos
7858a26e5e Update all locales with the latest Transifex translations 2020-04-03 12:03:40 +01:00
Luis Ramos
4922c05bcf Merge pull request #5139 from openfoodfoundation/transifex
Transifex
2020-04-03 11:28:11 +01:00
Transifex-Openfoodnetwork
d06b7b8606 Updating translations for config/locales/de_DE.yml 2020-04-03 19:26:04 +11:00
Transifex-Openfoodnetwork
72b47fbceb Updating translations for config/locales/de_DE.yml 2020-04-03 19:22:55 +11:00
Luis Ramos
da7b0966be Merge pull request #5133 from Matt-Yorkley/cache-in-hand
Cache counts used in homepage for 24 hours
2020-04-03 08:34:58 +01:00
Luis Ramos
445eb9f287 Merge pull request #5121 from Matt-Yorkley/flaky-maps-js
Update vendor/assets/angular-google-maps.min.js
2020-04-02 22:13:51 +01:00
dependabot-preview[bot]
5b4dd57380 Bump rubocop-rails from 2.5.0 to 2.5.1
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.5.0...v2.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-02 19:15:11 +00:00
Matt-Yorkley
adb61e48c5 Cache counts used in homepage for 24 hours 2020-04-02 19:09:03 +02:00
Matt-Yorkley
838ffdbf00 Add code comment for dependency 2020-04-02 17:33:10 +02:00
Pau Pérez Fabregat
fe8beb5448 Merge pull request #5099 from Matt-Yorkley/ticking-time-bom
Improve BOM
2020-04-02 16:01:48 +02:00
Matt-Yorkley
18ee5254f9 Make Geo service calls more resilient in /shops page
The Geo service is used heavily in the /shops page and especially in the search function. If the google maps js library has failed to load it was throwing a lot of fatal errors, so this change ensures the /shops page can at least: a) load, b) show some shops, and c) search for shops by name (but not location)
2020-04-02 13:56:25 +02:00
Matt-Yorkley
40f8cf660c Update vendor/assets/angular-google-maps.min.js
Fixes an issue where if the js library from maps.googleapis.com failed to load in the <head>, all of our subsequent Angular would completely break.
See: https://github.com/angular-ui/angular-google-maps
Note: `bluebird.js` is a new dependency of `angular-google-maps.js`.
2020-04-02 13:32:55 +02:00
Matt-Yorkley
2c70db7952 Merge pull request #5070 from luisramos0/master_card
Translate credit card brand so that active merchand code handles the payment correctly
2020-04-02 12:18:00 +02:00
Pau Pérez Fabregat
1a38a4e1a7 Merge pull request #5091 from openfoodfoundation/transifex
Transifex
2020-04-02 11:56:29 +02:00
Pau Pérez Fabregat
15d106bb0a Merge pull request #5116 from openfoodfoundation/dependabot/bundler/ddtrace-0.34.0
Bump ddtrace from 0.33.1 to 0.34.0
2020-04-02 11:55:53 +02:00
Pau Pérez Fabregat
c8be2fb89a Merge pull request #5125 from openfoodfoundation/dependabot/bundler/rubocop-0.81.0
Bump rubocop from 0.80.1 to 0.81.0
2020-04-02 11:54:00 +02:00
Transifex-Openfoodnetwork
b1f8f91011 Updating translations for config/locales/fr.yml 2020-04-02 18:03:11 +11:00
Transifex-Openfoodnetwork
e08606a310 Updating translations for config/locales/en_FR.yml 2020-04-02 18:02:57 +11:00
Transifex-Openfoodnetwork
2230d83729 Updating translations for config/locales/pt_BR.yml 2020-04-02 08:41:25 +11:00
dependabot-preview[bot]
d38da02113 Bump rubocop from 0.80.1 to 0.81.0
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.80.1 to 0.81.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.80.1...v0.81.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-04-01 19:20:42 +00:00
Luis Ramos
0e268a171f Switch to console.error so we get a bugsnag alert everytime a user has a problem with their card
Add paymentMethodsAPI specific mapping function, we had some errors in production with mastercards probably caused by ActiveMerchant not handling the card type correctly
2020-04-01 18:58:43 +01:00
Luis Ramos
73c4eedd06 Translate credit card brand so that active merchant code handles the payment correctly
Adds a simple console.log statement in case there is an error adding the
card
2020-04-01 18:58:10 +01:00
Luis Ramos
8a220742f5 Merge pull request #5103 from jeduardo824/bug/5092-remove-blue-setence-in-payment-method-setting
remove blue sentence in payment method setting
2020-04-01 18:56:09 +01:00
Luis Ramos
9fa604db0d Merge pull request #5076 from luisramos0/rails_f_helper
Remove Rails Foundation Helper and improve error display and logging in checkout controller
2020-04-01 18:54:45 +01:00
Transifex-Openfoodnetwork
6083d91d3e Updating translations for config/locales/ca.yml 2020-04-02 01:57:50 +11:00
Transifex-Openfoodnetwork
9bdb396b86 Updating translations for config/locales/ca.yml 2020-04-02 01:54:42 +11:00
Matt-Yorkley
ad42b1b485 Remove pagination limits in BOM
We can re-assess this later, but for now it looks like some of the BOM functionality won't work if results are returned across multiple pages.
2020-04-01 13:43:21 +02:00
Luis Ramos
78170bc709 Merge pull request #4807 from openfoodfoundation/dependabot/bundler/compass-rails-4.0.0
Bump compass-rails from 3.1.0 to 4.0.0
2020-04-01 12:42:42 +01:00
Luis Ramos
957b398a54 Add call to $evalAsync() after Loading and FlashLoader are updated so
that a angular digest is triggered

This is required so that Loading.clear triggers a refresh and makes its placeholder to be cleared
2020-04-01 12:08:55 +01:00
Luis Ramos
c3d25bf163 Make checkout controller send bugsnag alerts on every checkout problem
There are two new situations here: we will see order.errors after update_attributes fails but before order restart; and we will see how often the order is not complete when the workflow finishes (maybe none)
2020-04-01 12:03:39 +01:00
Luis Ramos
ce2a164c66 Stop using f_form_for
Add labels for some fields, this was done automatically by rails foundation helper
2020-04-01 12:03:39 +01:00
Luis Ramos
b898ce1ae1 Make checkout controller add flash error if order contains any type of error
Here we add translations for a particular case where the credit card expiry date is in the past
2020-04-01 12:03:39 +01:00
Luis Ramos
409681b7af Merge pull request #5089 from Matt-Yorkley/checkout-scoping
Cart variant scoping
2020-04-01 11:49:23 +01:00
Luis Ramos
9317549103 Merge pull request #4813 from luisramos0/oc_selector
If there's only one OC available to the customer because there are tag rules hidding other OCs, select that OC by default
2020-04-01 10:44:58 +01:00
Luis Ramos
154e223a12 Make sure test data is available before the test 2020-04-01 10:00:07 +01:00
Luis Ramos
80b9800b36 Replace SQL with equivalent AR code 2020-04-01 10:00:07 +01:00
Luis Ramos
6e095bdb68 Fix bug in line_item_decorator, should be inner join not left outer join 2020-04-01 10:00:07 +01:00
Luis Ramos
a4c7dbc329 Add comment to better explain why this scope is not simply using joins(:product) 2020-04-01 10:00:07 +01:00
Luis Ramos
8909238682 Fix one rubocop issue 2020-04-01 10:00:07 +01:00
Luis Ramos
7c367da904 Adapt LineItem#supplied_by_any scope to include deleted variants and deleted products (both not included in the respective default scopes) and use it in Permissions::Order so that variants of deleted products are seen in reports 2020-04-01 10:00:07 +01:00
Luis Ramos
0c8635403a Delete dead scope in line_items
This is not used anywhere in the code
2020-04-01 10:00:07 +01:00
dependabot-preview[bot]
b22ad244f9 Bump ddtrace from 0.33.1 to 0.34.0
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.33.1 to 0.34.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.33.1...v0.34.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-31 19:40:01 +00:00
Transifex-Openfoodnetwork
9c17a91215 Updating translations for config/locales/en_GB.yml 2020-04-01 05:07:08 +11:00
Luis Ramos
6a1c541479 Remove specific error color on checkout page so that the error message takes the default foundation error color which is white 2020-03-31 16:32:33 +01:00
Luis Ramos
6c64261868 Merge pull request #5113 from mkllnk/5110-bugsnag-js-logging
Add Bugsnag JS logging
2020-03-31 15:51:12 +01:00
Matt-Yorkley
f437d0f8a0 Report environment correctly in Bugsnag JS 2020-03-31 15:59:17 +02:00
Transifex-Openfoodnetwork
79d6d7cc9e Updating translations for config/locales/de_DE.yml 2020-03-31 22:09:16 +11:00
Matt-Yorkley
e200ece280 Rename partial to bugsnag_js for clarity 2020-03-31 12:57:12 +02:00
Matt-Yorkley
30bf9257ab Move conditional inside partial and use default key as fallback 2020-03-31 12:55:28 +02:00
Matt-Yorkley
03e229da08 Add bugsnag js script to admin layout above all.js 2020-03-31 12:25:42 +02:00
Maikel Linke
28473c9087 Add Bugsnag JS logging 2020-03-31 15:51:04 +11:00
Matt-Yorkley
09c8819e5a Remove unnecessary Bugsnag calls
The Bugsnag notification was just here to see if this was dead code. It's not.
2020-03-30 20:36:45 +02:00
Matt-Yorkley
f7c047b798 Memoize ScopeVariantToHub to avoid fetching the hub's overrides each time 2020-03-30 20:33:27 +02:00
Luis Ramos
635ea9c505 Fix some long lines on variant_decorator 2020-03-30 11:21:47 +01:00
Luis Ramos
fbbe586996 Avoid rails 3 bug where the first where clause is overriden by a second where clause
Co-Authored-By: Maikel <maikel@email.org.au>
2020-03-30 11:21:47 +01:00
Luis Ramos
a5184cce9d Make method a bit more readable and add comment with details 2020-03-30 11:21:47 +01:00
Luis Ramos
69b57544f1 Bring Spree::Variant#active so that we can make it return just variants without includes
This makes the variants returned not readonly in rails 4 and thus fixes a spec in Spree::VariantsController#destroy
2020-03-30 11:21:47 +01:00
Eduardo
b6da0e2092 remove @payment_method explict variable from the view 2020-03-29 20:32:55 -03:00
Matt-Yorkley
95963c5732 Refactor Angular line_items_controller 2020-03-29 19:54:49 +02:00
Matt-Yorkley
aba1b5b67a Add pagination specs and refactor 2020-03-29 19:54:49 +02:00
Matt-Yorkley
fe58121c7f Fix clear filters button 2020-03-29 19:54:49 +02:00
Matt-Yorkley
5c4a2c2790 Update javascript specs 2020-03-29 19:54:49 +02:00
Matt-Yorkley
a07281910b Fix dropdown placeholders 2020-03-29 19:54:49 +02:00
Matt-Yorkley
72f9da3ac4 Fix regex validation and HTML "type" settings not allowing decimals for final_weight_volume
`final_weight_volume` can be a decimal, and often *is* in production data. Not regarding them as valid was breaking the form submission in various cases
2020-03-29 19:54:49 +02:00
Matt-Yorkley
375b4648dc Add pagination to Bulk Order Management 2020-03-29 19:54:47 +02:00
Transifex-Openfoodnetwork
9af0a39305 Updating translations for config/locales/en_FR.yml 2020-03-29 06:43:01 +11:00
Transifex-Openfoodnetwork
6817231f29 Updating translations for config/locales/fr.yml 2020-03-29 06:42:36 +11:00
Matt-Yorkley
7c7f9551d6 Fix bug in order cycle select dropdown
The date filters were being filled with the string: "Invalid date" because momentjs was not able to parse the input
2020-03-28 15:17:31 +01:00
Matt-Yorkley
d568b45d4a Limit spamming the server with lots of requests
This uses "debounce" to add a little waiting time whilst the user is part-way through selecting dates (or manually typing in the date filter) so we don't make too many unnecessary requests.
2020-03-28 11:20:23 +01:00
Matt-Yorkley
b76a6d15a3 Improve date field query triggers
Don't submit the request if the user is part-way through typing something in the date field and the date is (currently) invalid; this results in the date ranges being broken and triggering a query for *all* results (with no date range).
2020-03-28 11:16:25 +01:00
Luis Ramos
940423acfc Merge pull request #5067 from gao329700254/fix/fix_fr_translation_in_order_cycles_outgoing(4937)
Fix translation missing in order cycles outgoing page (closed #4937)
2020-03-27 22:00:19 +00:00
Transifex-Openfoodnetwork
6a57aa3b29 Updating translations for config/locales/en_FR.yml 2020-03-28 04:08:31 +11:00
Transifex-Openfoodnetwork
ca78e9d0e2 Updating translations for config/locales/fr.yml 2020-03-28 04:08:17 +11:00
Luis Ramos
e705e88007 Merge pull request #5087 from luisramos0/custom_data
Fix bug in subscriptions logging by making versions.custom_data a longer field
2020-03-27 16:04:31 +00:00
Pau Pérez Fabregat
1fbb9fa3df Merge pull request #5083 from openfoodfoundation/transifex
Transifex
2020-03-27 16:51:30 +01:00
Matt-Yorkley
71f00f9283 Remove comment warning about this issue 2020-03-27 14:23:48 +01:00
Matt-Yorkley
7d33a237d0 Add scoping to VariantsStockLevels when variant is not in the order 2020-03-27 14:15:15 +01:00
Matt-Yorkley
857cacb74b Add test for additional case where variant is not in the order 2020-03-27 14:03:17 +01:00
Matt-Yorkley
fbfe663ebc Add variant scoping to VariantStockLevels 2020-03-27 13:38:57 +01:00
Matt-Yorkley
83b90f3167 Add spec variant override test to VariantsStockLevels 2020-03-27 13:31:39 +01:00
Luis Ramos
14fd9a121e Make versions.custom_data text so it can take longer lists 2020-03-27 11:34:01 +00:00
Pau Perez
904e89e325 Do not reset the dev env when booting docker
The current web container's command destroys anything you might have in
your local DB from a previous session, assuming you always want start
from a clean environment. This is hardly the case and makes
`docker-compose up` take quite long. What if you just stopped containers
temporally while developing?

This changes the approach to not assume anything. If you need to install
a new gem or reset your DB just run the commands you would without
docker. You can run anything you want with `docker-compose run web bundle exec
<rails/rake command>` anyway.

For someone setting things for the first time, the `Dockerfile` process
still installs all dependencies.
2020-03-27 12:17:09 +01:00
Maikel
d254df7ccc Merge pull request #5073 from Matt-Yorkley/mobile-checkout
[Mobile UX] Order cycle section updates
2020-03-27 15:34:19 +11:00
Pau Pérez Fabregat
a218eab67b Merge pull request #4987 from Matt-Yorkley/3-0-packing
[Spree 2.1] Packing report deleted variants
2020-03-26 17:37:51 +01:00
Pau Pérez Fabregat
8caf10f634 Merge pull request #5079 from openfoodfoundation/dependabot/bundler/unicorn-5.5.4
Bump unicorn from 5.5.3 to 5.5.4
2020-03-26 17:32:17 +01:00
Transifex-Openfoodnetwork
2e98b0b5c1 Updating translations for config/locales/en_GB.yml 2020-03-27 01:40:20 +11:00
Matt-Yorkley
2966dd9536 Update all locales with the latest Transifex translations 2020-03-26 14:25:34 +01:00
Matt-Yorkley
21e1c0ed0b Merge pull request #5025 from openfoodfoundation/transifex
Transifex
2020-03-26 14:22:38 +01:00
Matt-Yorkley
48b99d02b9 Merge pull request #5060 from Matt-Yorkley/weight-calculator
Fix weight calculator
2020-03-26 14:19:21 +01:00
Pau Pérez Fabregat
f17a2eeaea Merge pull request #5062 from luisramos0/prop_bug
Fix broken new property button in properties page (regression from removing spree_backend)
2020-03-26 11:35:47 +01:00
Pau Pérez Fabregat
18419d0276 Merge pull request #5043 from luisramos0/fix_cookies
Fix cookies policy helper spec in rails 4
2020-03-26 11:23:49 +01:00
Pau Pérez Fabregat
1c2815d2b7 Merge pull request #5044 from luisramos0/add_spring
[Spree 2.1] Re-add spring and newrelic_rpm
2020-03-26 11:23:19 +01:00
Pau Pérez Fabregat
bd19d8b0bd Merge pull request #5042 from luisramos0/api_base
Make explicit the namespace of the BaseController for api controllers
2020-03-26 11:21:27 +01:00
Pau Pérez Fabregat
b3a47964e6 Merge pull request #5033 from luisramos0/ent_fees_data_types
[Spree 2.1] Adapt EnterpriseFeeSummary report code to slightly different rails 4 sql data conversion
2020-03-26 11:20:44 +01:00
Pau Pérez Fabregat
9daa40ce9c Merge pull request #5028 from luisramos0/remove_attr_accessible
[Spree 2.1] Remove new attr_accessible entries
2020-03-26 11:20:08 +01:00
Pau Pérez Fabregat
f70e155b1b Merge pull request #4984 from Matt-Yorkley/3-0-cart-route
[Spree 2.1] Fix cart page update
2020-03-26 11:14:07 +01:00
Maikel Linke
4bcd665379 Handle all line items without unit_value in weight calculation 2020-03-26 17:13:29 +11:00
Matt-Yorkley
e63dbcfa89 Fix some SCSS linting warnings 2020-03-25 23:12:23 +01:00
Matt-Yorkley
c3283adcf5 Show full-width ordercycle subheader on tablet and below 2020-03-25 23:12:23 +01:00
Matt-Yorkley
b2ed69831b Adjust style contexts 2020-03-25 23:12:23 +01:00
Matt-Yorkley
7daba62f43 Update colours for different order cycle sidebar cases 2020-03-25 23:12:23 +01:00
Matt-Yorkley
a08020490d Define new colour and use variable where already in use 2020-03-25 23:12:23 +01:00
Matt-Yorkley
eb4d970bc7 Adjust positioning for order cycle sidebar 2020-03-25 23:12:23 +01:00
Matt-Yorkley
7a3549209f Use 4 columns on checkout sidebar 2020-03-25 23:12:23 +01:00
Matt-Yorkley
52ebd1b402 Remove order cycle popovers; these styles are no longer used 2020-03-25 23:12:08 +01:00
Matt-Yorkley
a3a26f704f Extract re-used box-shadow style 2020-03-25 23:07:39 +01:00
Matt-Yorkley
cff8f6dd96 Add box-shadow to distributor header for cart, checkout, and order confirmation pages 2020-03-25 23:07:39 +01:00
Matt-Yorkley
81537d92cf Extract styles for distributor header
These styles are used in shop, cart, checkout, order confirmation. Not just shop.
2020-03-25 23:07:39 +01:00
Matt-Yorkley
91e88bd028 Allow conditional use of order cycle sidebar
We need to re-use the "shopping_shared/header" partial in multiple places, but we don't always want the (nested) order cycle sidebar inside it.
2020-03-25 23:07:39 +01:00
Matt-Yorkley
f5e254a105 Remove quick fix for hiding oc selector 2020-03-25 23:07:39 +01:00
Sigmund Petersen
b41b5d0395 Update Slack invitation link 2020-03-25 20:38:45 +01:00
dependabot-preview[bot]
296d2e5edb Bump unicorn from 5.5.3 to 5.5.4
Bumps [unicorn](https://yhbt.net/unicorn/) from 5.5.3 to 5.5.4.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-25 19:17:31 +00:00
Luis Ramos
ac0a62e962 Merge pull request #5050 from Matt-Yorkley/bullet_tweaks
Performance tweaks 2
2020-03-25 18:32:49 +00:00
Matt-Yorkley
0cc5cbd1d2 Merge pull request #5038 from luisramos0/strong_params_prod
[Spree 2.1] Implement strong params in products, variants, variant_overrides and resource controllers
2020-03-25 18:35:58 +01:00
Luis Ramos
523faa670d Remove FoundationRailsHelper, this is dead code now 2020-03-25 17:31:56 +00:00
Luis Ramos
2c5db8935b Merge pull request #5022 from Matt-Yorkley/performance_tweaks
Performance tweaks
2020-03-25 15:42:07 +00:00
Luis Ramos
e5e9325499 Fix paper_trail custom_data for order_cycle, custom data must be a string, cant be an array 2020-03-25 15:35:51 +00:00
Luis Ramos
2e4f8003b6 Fix group factory in rails 4
params[:address] was breaking the creation of the EnterpriseGroup
2020-03-25 15:32:16 +00:00
Luis Ramos
24c8f38111 Restructure spec to avoid variable names with numbers 2020-03-25 15:48:57 +01:00
Luis Ramos
b801bffcd9 Merge pull request #5030 from Matt-Yorkley/reports-loading
Improve reports performance
2020-03-25 12:54:34 +00:00
Yuhao Gao
60d9edb185 fix translation missing in order cycles outgoing page (closed #4937) 2020-03-25 21:51:13 +09:00
Luis Ramos
434b68b019 Merge pull request #5048 from Matt-Yorkley/3-0-user-spec
Ensure perform_deliveries is correctly set in user email spec
2020-03-25 11:52:43 +00:00
Luis Ramos
f1b64e90e0 Add comment to explain unusual fix 2020-03-25 11:49:14 +00:00
Matt-Yorkley
433ae00818 Ensure :info log level is set in Rails 4 2020-03-25 11:39:03 +00:00
Matt-Yorkley
7bc29769cd Fix logging configs for Rails 4 2020-03-25 11:38:29 +00:00
Matt-Yorkley
483d847b00 Use eager_load = true in production and staging environments 2020-03-25 11:36:33 +00:00
Luis Ramos
9af4bb9757 Use create instead of build so that we test with callbacks 2020-03-25 11:22:40 +00:00
Luis Ramos
95ba1fd02c Merge pull request #5065 from luisramos0/upgrade_deps
[Spree 2.1] Upgrade some dependencies... rails 4.0.13 :-)
2020-03-25 11:04:13 +00:00
Luis Ramos
c02a3e919f Merge pull request #5039 from luisramos0/strong_params_ent
[Spree 2.1] Implement strong params in enterprises, enterprise_groups, enterprise_roles, customers and customer_details controllers
2020-03-25 10:53:01 +00:00
Luis Ramos
b7cb95ae3e Fix problem in PermittedAttributes::Address namespace 2020-03-25 10:52:23 +00:00
Luis Ramos
6b62c8aafd Extract permitted attributes to separate service 2020-03-25 10:52:23 +00:00
Luis Ramos
e5f56c19c0 Switch to using PermittedAttributes::Address instead of spree version of it that will be removed later 2020-03-25 10:52:23 +00:00
Luis Ramos
22a005df47 Add needed permitted attributes to admin/customers_controller 2020-03-25 10:51:55 +00:00
Luis Ramos
9b0d7b9604 Ammend customers_controller to include ship address attributes permit and also permit #update with specific attributes 2020-03-25 10:51:55 +00:00
Luis Ramos
4fd3026bd8 Add strong parameters permits to some controllers 2020-03-25 10:51:55 +00:00
Luis Ramos
a9a92e11e2 Bring some strong parameters code from spree to our Spree controllers
This code comes from spree commit fbc2d150f6
2020-03-25 10:51:55 +00:00
Luis Ramos
fec5e1d84e Add needed param to enterprises controller 2020-03-25 10:51:55 +00:00
Luis Ramos
ad9e5d979a Permit extra needed params in enterprises controller 2020-03-25 10:51:55 +00:00
Luis Ramos
29a457575b Permit specific params in enterprise_groups controller 2020-03-25 10:51:55 +00:00
Luis Ramos
5c179a0932 Ammend strong params on enterprise controller to cover create action 2020-03-25 10:51:55 +00:00
Luis Ramos
34488e5f63 Handle strong params in enterprise_roles controller 2020-03-25 10:51:55 +00:00
Luis Ramos
6ba3a3c373 Handle strong params in admin/enterprises_controller 2020-03-25 10:51:55 +00:00
Matt-Yorkley
d847560d7c Fix rubocop issues 2020-03-25 10:15:03 +01:00
Pau Pérez Fabregat
a72957e3c3 Merge pull request #4827 from luisramos0/strong_params
[Spree 2.1] Implement Strong Parameters in various controllers
2020-03-25 10:07:14 +01:00
Pau Pérez Fabregat
87fae15434 Merge pull request #4909 from luisramos0/line_items_spec
Adapt line_items_spec to work in the rails 4 branch as well
2020-03-25 10:05:20 +01:00
Pau Pérez Fabregat
2c487c2592 Merge pull request #5037 from luisramos0/strong_params_subs
[Spree 2.1] Implement strong params in subscriptions controller
2020-03-25 09:50:47 +01:00
Pau Pérez Fabregat
d4d72c6c6c Merge pull request #5036 from luisramos0/strong_params_users
[Spree 2.1] Implement strong params in user related controllers
2020-03-25 09:48:52 +01:00
Pau Pérez Fabregat
b323364661 Merge pull request #5035 from luisramos0/strong_params_checkout
[Spree 2.1] Implement strong params in checkout controller
2020-03-25 09:46:53 +01:00
Pau Pérez Fabregat
e70daf53ce Merge pull request #4876 from luisramos0/strong_params_oc
[Spree 2.1] Implement strong params in admin Order cycles controller
2020-03-25 09:44:13 +01:00
Pau Pérez Fabregat
c5621b7740 Merge pull request #5034 from luisramos0/strong_params_payment_methods
[Spree 2.1] Implement strong params in admin payment methods controller
2020-03-25 09:39:34 +01:00
Matt-Yorkley
e27f7a4301 Ensure perform_deliveries is correctly set when testing user confirmation emails 2020-03-25 08:42:21 +01:00
Luis Ramos
bddfa95eb5 Fix broken new property button in properties page 2020-03-24 21:50:49 +00:00
Matt-Yorkley
ef0fb18fda Fix calculations for weight when variant.unit_value is zero 2020-03-24 22:05:55 +01:00
Luis Ramos
570fb4bfb4 Upgrade factory_bot_rails 2020-03-24 19:18:13 +00:00
Luis Ramos
89cc7ee5ef Upgrade devise-encryptable to 0.2.0 which is latest 2020-03-24 19:18:13 +00:00
Luis Ramos
5453fed716 Upgrade rails from 4.0.0 to 4.0.13 2020-03-24 19:18:13 +00:00
Luis Ramos
b8ed28b38c Remove deface, it's already included in spree_core, it's not a direct dependency of OFN anymore 2020-03-24 19:18:13 +00:00
Matt-Yorkley
87ee4bbebc Add spec for current problematic behaviour 2020-03-24 20:09:54 +01:00
Transifex-Openfoodnetwork
f5567e556b Updating translations for config/locales/pt_BR.yml 2020-03-25 02:22:31 +11:00
Matt-Yorkley
e014e6c1a4 Ensure perform_deliveries is correctly set when testing user confirmation emails 2020-03-24 13:12:20 +00:00
Matt-Yorkley
54c3c73ed2 Fix duplicate key in hash 2020-03-24 12:46:21 +01:00
Luis Ramos
8dfdc9bc15 Merge pull request #5056 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.5.0
Bump rubocop-rails from 2.4.2 to 2.5.0
2020-03-24 11:22:21 +00:00
Matt-Yorkley
36aa52736a Refactor order filtering logic 2020-03-24 09:36:59 +01:00
Matt-Yorkley
ac38b2735c Eager-load data in OrdersController 2020-03-23 22:38:57 +01:00
Matt-Yorkley
8b93c5ab56 Invert conditionals for better readability 2020-03-23 22:38:57 +01:00
Matt-Yorkley
434f98fb46 Fix insane N+1 in Package
The #ships_with? method was being called ~800 times when loading the admin order edit page (with Aus production data), and triggering a new query each time it was called.
2020-03-23 22:38:57 +01:00
Matt-Yorkley
c82c54873c Pluck :id when querying active distributors for serializer data 2020-03-23 22:38:55 +01:00
dependabot-preview[bot]
de180d32bf Bump rubocop-rails from 2.4.2 to 2.5.0
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.4.2 to 2.5.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.2...v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-23 20:37:57 +00:00
Matt-Yorkley
5b481c19cc Eager-load country in Producers controller 2020-03-23 19:33:15 +01:00
Matt-Yorkley
7110f9e6ee Eager-load data used in EnterpriseGroupsController
Cuts page load time by ~75%
2020-03-23 19:33:13 +01:00
Transifex-Openfoodnetwork
63d748b2a4 Updating translations for config/locales/pt_BR.yml 2020-03-24 03:32:23 +11:00
Transifex-Openfoodnetwork
310906c7da Updating translations for config/locales/en_NZ.yml 2020-03-23 15:49:19 +11:00
Transifex-Openfoodnetwork
b81843921b Updating translations for config/locales/en_CA.yml 2020-03-23 08:57:54 +11:00
Luis Ramos
2de550eac1 Make OrderUpdate update all adjustments again as in v2.0.4 otherwise adjustments that are not shipment adjustments will not be calculated correctly 2020-03-22 20:08:11 +00:00
Luis Ramos
85f6be756e Merge pull request #5027 from luisramos0/3-0-stable-mar20
[Spree 2.1] Merge master into 3-0-stable - 20 March 2020
2020-03-22 13:20:54 +00:00
Matt-Yorkley
dd0e135a4d Add test coverage for Permissions::Order with search_params 2020-03-22 11:45:40 +01:00
Luis Ramos
658a024272 Re-add spring and newrelix_rpm 2020-03-22 10:41:59 +00:00
Luis Ramos
0f2c5d379a Add test locales to I18n.available_locales before the test and reset them afterwards 2020-03-22 10:32:16 +00:00
Luis Ramos
a29f263041 Make explicit the namespace of the BaseController for api controllers 2020-03-22 09:55:07 +00:00
Luis Ramos
478f885b26 Fix problem in PermittedAttributes::Variant namespace 2020-03-21 22:36:31 +00:00
Luis Ramos
5e6a210632 Fix problem in PermittedAttributes::User namespace 2020-03-21 22:36:03 +00:00
Luis Ramos
26cd0f4a9d Merge pull request #5023 from mkllnk/5019-invoice-bill-address
Display shipping and billing address on invoices
2020-03-21 20:38:00 +00:00
Luis Ramos
4e43535512 Add missing permitted attribute 2020-03-21 20:30:34 +00:00
Luis Ramos
3ccd58d50b Fix a problem in the permit list to allow a list to be taken 2020-03-21 20:30:34 +00:00
Luis Ramos
5a0319213f Fix schedules controller permitted attributes 2020-03-21 20:30:34 +00:00
Luis Ramos
b7c0caf883 Add needed permitted attributes to orders_controller 2020-03-21 20:30:34 +00:00
Luis Ramos
8c5dfea92f Fix strong params in order_cycles and schedules controllers 2020-03-21 20:30:34 +00:00
Luis Ramos
2a426d29b6 Permit specific params in zones controller 2020-03-21 20:30:34 +00:00
Luis Ramos
47505b6225 Permit specific params in shipping methods controller 2020-03-21 20:30:34 +00:00
Luis Ramos
6fa1ed03dc Permit specific params in adjustments controller 2020-03-21 20:30:34 +00:00
Luis Ramos
d73d851095 Permit specific params in tax_rates controller 2020-03-21 20:30:34 +00:00
Luis Ramos
495c3a3810 Permit specific params in images controller 2020-03-21 20:30:34 +00:00
Luis Ramos
9681437fba Permit specific params in tax_categories controller 2020-03-21 20:30:34 +00:00
Luis Ramos
b99d4ab627 Permit specific params in schedules controller 2020-03-21 20:30:34 +00:00
Luis Ramos
423d5a5a61 Permit specific params in taxonomies controller 2020-03-21 20:30:34 +00:00
Luis Ramos
e5a214da78 Permit specific params in states controller 2020-03-21 20:30:34 +00:00
Luis Ramos
46025915d5 Make taxons_controller strong_params method consistent with all other controllers 2020-03-21 20:30:34 +00:00
Luis Ramos
e23267156d Improve inventory_items_controller strong params by not using permit! 2020-03-21 20:30:34 +00:00
Luis Ramos
6bd72f44de Handle strong params in credit card controllers 2020-03-21 20:30:34 +00:00
Luis Ramos
913ea5b883 Handle strong parameters in bulk_line_items controller 2020-03-21 20:30:34 +00:00
Luis Ramos
d496a4bdc8 Add strong parameters permits to some controllers 2020-03-21 20:30:34 +00:00
Luis Ramos
c15433af3f Bring some strong parameters code from spree to our Spree controllers
This code comes from spree commit fbc2d150f6
2020-03-21 20:30:34 +00:00
Luis Ramos
244499a27d Extract permitted atttributes to specific classes 2020-03-21 19:41:05 +00:00
Luis Ramos
58a2805bc9 Make resource controller raise error if permitted_resource_params is not overriden 2020-03-21 19:41:05 +00:00
Luis Ramos
49a2522305 Permit specific params in variants controller 2020-03-21 19:27:55 +00:00
Luis Ramos
527f6cb624 Add necessary attributes to admin/products_controller and handle empty params case 2020-03-21 19:14:26 +00:00
Luis Ramos
36389b7bed Add missing permitted attributes to bulk_product_update controller 2020-03-21 19:14:26 +00:00
Luis Ramos
b5cdcdf8cb Permit specific params in products controller 2020-03-21 19:14:26 +00:00
Luis Ramos
a261ae118d Add missing permitted attributes to variant overrides controller 2020-03-21 19:14:26 +00:00
Luis Ramos
7320b38b93 Add missing attributes to variant override controller 2020-03-21 19:14:26 +00:00
Luis Ramos
0151b5ee9a Permit extra needed params in variant overrides controller 2020-03-21 19:14:26 +00:00
Luis Ramos
5b37e89738 Handle strong params in variant_overrides_controller
We use a simpler way to permit on array within params here and change products_controller to the same style
2020-03-21 19:14:26 +00:00
Luis Ramos
c110f4832d Handle strong params in spree/admin/products_controller 2020-03-21 19:14:26 +00:00
Luis Ramos
79b0867507 Extract permitted attributes to separate service 2020-03-21 19:08:37 +00:00
Luis Ramos
58c83d056d Add missing permitted attributes to subscriptions controller 2020-03-21 18:57:37 +00:00
Luis Ramos
c3897b2f1c Handle strong params in subscriptions controller 2020-03-21 18:57:37 +00:00
Luis Ramos
d7cfda8385 Handle strong params in subscription_line_items controller 2020-03-21 18:57:37 +00:00
Luis Ramos
0ee562c718 Add test coverage for PermittedAttributes::User 2020-03-21 18:48:04 +00:00
Luis Ramos
aec7f12f5a Extract common user permitted attributes to a separate class 2020-03-21 18:31:14 +00:00
Luis Ramos
6ed93da3f1 Fix case with empty spree_user in user_registrations controller 2020-03-21 18:00:04 +00:00
Luis Ramos
d0bd2818c2 Handle strong params on users_controller 2020-03-21 18:00:04 +00:00
Luis Ramos
431076fc6d Add strong parameters permits to admin users_controller 2020-03-21 17:59:46 +00:00
Luis Ramos
980fdd65a1 Replace hash rockets syntax 2020-03-21 17:00:08 +00:00
Luis Ramos
2c453359c1 Extract permitted params into a specific service 2020-03-21 16:49:26 +00:00
Luis Ramos
1d9a6edefb Permit params in checkout controller before we adapt them to bypass issues with permitting added attributes like source CreditCard 2020-03-21 16:30:20 +00:00
Luis Ramos
5ae2e6865c Add one more needed permitted attribute to checkout controller 2020-03-21 16:30:20 +00:00
Luis Ramos
d7cccd4143 Add guard clause in checkout_controller for empty params[:order] 2020-03-21 16:30:20 +00:00
Luis Ramos
5af27bb14e Make checkout controller handle strong parameters 2020-03-21 16:30:20 +00:00
Luis Ramos
fd2cf7295e Extract permitted_attributes from order_cycle_controller into a specific service 2020-03-21 16:17:20 +00:00
Luis Ramos
20c7a0d3ef Adapt to latest changes in order cycles controller strong params changes 2020-03-21 14:45:51 +00:00
Luis Ramos
57f8fa26ab Fix strong params in order_cycles 2020-03-21 14:45:51 +00:00
Luis Ramos
1a46e7b7ee Improve strong params implementation on order_cycle controller and fix corresponding specs 2020-03-21 14:45:51 +00:00
Luis Ramos
905811ccb3 Handle strong params in admin order_cycles controller 2020-03-21 14:45:51 +00:00
Luis Ramos
df799340df Add missing permitted attributes to payment_methods controller 2020-03-21 14:21:52 +00:00
Luis Ramos
eac0da9812 Fix payment method controllers by removing unnecessary param that only exists in stripe connect payment method preferred_enterprise_id 2020-03-21 14:09:33 +00:00
Luis Ramos
e5ebf45765 Improve strong params implementation on payment methods controller by specifying specific list of permitted attributes 2020-03-21 14:09:33 +00:00
Luis Ramos
38849f5589 Extract method in payments_method_controller to make it readable 2020-03-21 14:09:32 +00:00
Luis Ramos
86d09ff21e Bring strong parameters code from spree to payment_methods_controller
This code comes from spree commit fbc2d150f6
2020-03-21 14:08:03 +00:00
Luis Ramos
337b2ab592 Merge pull request #4979 from Matt-Yorkley/3-0-customer-details
[Spree 2.1] Customer details
2020-03-21 13:26:09 +00:00
Matt-Yorkley
80e5608436 Ensure customer selection dropdown is visible when adding customer details
For some reason the order is in address state here instead of cart state when adding customer details. There's a conditional in the view which loads the customer selection dropdown that was not being triggered, so a customer could not be selected (and their existing address was not being filled out in the form).

Fixes:

  1)
    As an administrator
    I want to manage orders
 filling customer details
     Failure/Error: expect(order.ship_address.lastname).to eq @customer.ship_address.lastname

     NoMethodError:
       undefined method `lastname' for nil:NilClass
     # ./spec/features/admin/orders_spec.rb:179:in `block (2 levels) in <top (required)>'
2020-03-21 14:14:31 +01:00
Luis Ramos
b33969e6a2 Adapt to slightly different rails 4 sql data conversion 2020-03-21 12:50:34 +00:00
Matt-Yorkley
0b878dd0a2 Use named scope for finding line_items in a set of orders 2020-03-21 09:45:35 +01:00
Matt-Yorkley
45c204017f Improve reports performance
Add the scoping from the search filters for reports into the logic of building sets like `editable_line_items` before combining them into the query to reduce the number of `line_item` ids in the IN clause.
2020-03-21 09:45:33 +01:00
Transifex-Openfoodnetwork
fa98a8ea17 Updating translations for config/locales/en_NZ.yml 2020-03-21 15:19:06 +11:00
Luis Ramos
17c2f7b138 Merge pull request #4889 from luisramos0/3-0-prod-set
[Spree 2.1] Fix ProductSet spec (1 broken spec)
2020-03-20 19:33:19 +00:00
Matt-Yorkley
70643a84b2 Update all locales with the latest Transifex translations 2020-03-20 18:44:23 +01:00
Matt-Yorkley
62a00b17a2 Merge pull request #5026 from Matt-Yorkley/checkout_display
Temporarily hide OC selector in checkout page
2020-03-20 18:33:47 +01:00
Luis Ramos
9915717a22 Remove attr_accessible from paper_trail config
In rails 4 this is not needed
2020-03-20 15:09:18 +00:00
Luis Ramos
03cdaf589e Remove newly added attr_accessible from stripe_sca
This is not needed, in rails 4 the params are permitted at controller level
2020-03-20 15:08:29 +00:00
Pau Pérez Fabregat
c4f96a1dcf Merge pull request #4972 from mkllnk/4810-tab-navigation
4810 Shop tab / page navigation with browser buttons
2020-03-20 15:24:50 +01:00
Pau Pérez Fabregat
6f4f3d42cc Merge pull request #5012 from openfoodfoundation/dependabot/bundler/rack-mini-profiler-2.0.1
Bump rack-mini-profiler from 2.0.0 to 2.0.1
2020-03-20 15:22:43 +01:00
Transifex-Openfoodnetwork
7582df2771 Updating translations for config/locales/en_CA.yml 2020-03-21 00:37:37 +11:00
Luis Ramos
1c628fac58 Merge branch 'master' into 3-0-stable-mar20 2020-03-20 11:28:06 +00:00
Matt-Yorkley
e8692fec4c Temporarily hide OC selector in checkout page 2020-03-20 12:08:58 +01:00
Luis Ramos
9994bc75ca Adapt reports controller to handle routes of reports in the order_management engine differently 2020-03-20 11:07:23 +00:00
Luis Ramos
3f5a964dec Move enterprise_fee_summaries_spec to order_management engine, moving
translation keys for the views and adapting some routes
2020-03-20 11:07:23 +00:00
Luis Ramos
b4befea606 Fix namespace in spec 2020-03-20 11:07:23 +00:00
Luis Ramos
58465c4645 Adapt routes placeholder in the new catalog engine to make it similar to the other engines 2020-03-20 11:07:23 +00:00
Luis Ramos
0b05312f19 Move cookies spec to web engine and adapt routes to the fact they are now normal main apps routes 2020-03-20 11:07:23 +00:00
Luis Ramos
e209452f8b Make engine routes just prepend to apps routes instead of creating engine routes
This makes things a bit simpler in terms of routing, we avoid a problem running specs and we can still have the engine routes separated in specific files
2020-03-20 11:07:23 +00:00
Luis Ramos
a8078b22f8 Move enterprise fees summaries controller and views to ordermanagement engine 2020-03-20 11:07:23 +00:00
Luis Ramos
3b2c10526d Merge pull request #4838 from openfoodfoundation/dependabot/bundler/jquery-rails-3.1.5
[Security] Bump jquery-rails from 3.0.4 to 3.1.5
2020-03-20 09:49:22 +00:00
Luis Ramos
0e62dc04bd Improve comments to explain glitch on set_order_cycle and OrderCyclesList 2020-03-20 09:47:59 +00:00
Luis Ramos
e2940eb9ff Add namespace to OrderCyclesList
Shop will probably be the name of the future engine/domain for the shopfront pages
2020-03-20 09:47:59 +00:00
Luis Ramos
1c1f066884 Extract Shop::OrderCyclesList from base_controller 2020-03-20 09:47:59 +00:00
Luis Ramos
d5cf355a11 Call fetch_order_cycles from reset_order_cycles so we dont repeat the calculation
BaseController#set_order_cycle cant be used in reset_order_cycle because it will empty the order if the OC is not defined previously
2020-03-20 09:47:59 +00:00
Luis Ramos
d2eee1dafd Extract and fix reset_order_cycle logic from set_order_cycles: ActiveRecord.count will reload the relation and ignore the changes done by the TagRuleApplicator 2020-03-20 09:46:05 +00:00
Luis Ramos
540b26105f Delete dead code in oc helper 2020-03-20 09:46:05 +00:00
Transifex-Openfoodnetwork
c788f1ae57 Updating translations for config/locales/it.yml 2020-03-20 19:32:35 +11:00
Maikel Linke
b1a274ea27 Update translations 2020-03-20 16:20:21 +11:00
Maikel
00c7b9986b Merge pull request #5020 from openfoodfoundation/transifex
Transifex
2020-03-20 16:15:54 +11:00
Maikel Linke
25b11f1f4b Display delivery details in the header 2020-03-20 15:51:49 +11:00
Maikel Linke
22384cb4da Display shipping and billing address on invoices 2020-03-20 15:14:24 +11:00
Transifex-Openfoodnetwork
9dc18afef0 Updating translations for config/locales/pt_BR.yml 2020-03-20 12:20:04 +11:00
Matt-Yorkley
7baa875a91 Fix big N+1 issues in enterprises#edit for superadmin
The page is usable now as superadmin. Roughly 10x faster...
2020-03-19 23:41:47 +01:00
Matt-Yorkley
3de887e1d8 Remove some N+1s relating to address (found with bullet gem) 2020-03-19 23:41:47 +01:00
Transifex-Openfoodnetwork
d2d3d767ac Updating translations for config/locales/en_GB.yml 2020-03-19 23:53:09 +11:00
Transifex-Openfoodnetwork
a4ff74272b Updating translations for config/locales/nb.yml 2020-03-19 22:47:36 +11:00
Transifex-Openfoodnetwork
1000dc52bf Updating translations for config/locales/en_FR.yml 2020-03-19 19:37:32 +11:00
Transifex-Openfoodnetwork
54b8d22e0d Updating translations for config/locales/fr.yml 2020-03-19 19:37:21 +11:00
Maikel Linke
7e00f78a77 Highlight menu item only when active or hovered
The `:focus` selector meant that every link that was clicked on was
still highlighted after going back or forward in the browser history. We
don't need that selector because tabs you click on are then active and
are highlighted anyway.
2020-03-19 15:49:29 +11:00
Maikel Linke
5a9b5660f1 Simplify logic in PageSelectionCtrl 2020-03-19 15:38:00 +11:00
Maikel Linke
1d42ce885b Stay on shop page when opening login modal
The login modal changes the URL to `#/login` which interfers with our
shop pages. In order to show the right shop page, we need to know which
pages are valid and where we have been before we clicked on Login.
2020-03-19 15:38:00 +11:00
Maikel Linke
17751c448f Rename PageSelectionCtrl for clarity 2020-03-19 15:37:13 +11:00
Maikel Linke
4b8d9d18d7 Simplify PagesetCtrl 2020-03-19 15:37:13 +11:00
Maikel Linke
a21ef19529 Render only shop tabs within shop
The include directive was listening to all $location paths including
`#login` which is unrelated to the shop tabs. Angular tried to load the
template `shop/login.html` which doesn't exist.

We now whitelist the templates that can be included by having an include
tag for each shop tab/page.
2020-03-19 15:37:13 +11:00
Maikel Linke
ea80ae3832 Enable page navigation via URL fragment
The broadcasting of notifications didn't update properly and I couldn't
find a way to listen to $location updates. I replaced the three
intertwined directives with one controller and a bit more HTML code. Now
we have only one scope that listens to $location and all browser actions
like the back button is reflected in the page.

As nice side-effect, the menu links have now the right destination so
that you can copy the link and paste it into another browser window.

40 lines less code.
2020-03-19 15:37:13 +11:00
Maikel Linke
bf26a26743 Reduce complexity by removing unused code branch 2020-03-19 15:36:24 +11:00
Maikel Linke
e3f840f48c Remove dependency to Tabsets 2020-03-19 15:36:23 +11:00
Maikel Linke
42ca7888c0 Simplify by reducing unused options 2020-03-19 15:36:23 +11:00
Maikel Linke
8aa892136e Duplicate shop tab code for rewrite
The old code is still used on the user page.
2020-03-19 15:36:23 +11:00
Maikel Linke
2d21341183 Update all locales with the latest Transifex translations 2020-03-19 14:06:04 +11:00
Maikel
5cabf59015 Merge pull request #5016 from openfoodfoundation/revert-4879-inner-join-visible-orders
Revert "Inner join visible orders"
2020-03-19 12:37:20 +11:00
Maikel
289dff5b91 Merge pull request #4988 from openfoodfoundation/transifex
Transifex
2020-03-19 12:06:37 +11:00
Maikel
c4e4beb912 Revert "Inner join visible orders" 2020-03-19 12:01:00 +11:00
Maikel
27d8951add Merge pull request #5013 from openfoodfoundation/mobile-ux-3
Merge mobile-ux-3 branch into master
2020-03-19 11:51:41 +11:00
Transifex-Openfoodnetwork
f7720f1b1f Updating translations for config/locales/en_FR.yml 2020-03-19 05:18:19 +11:00
Transifex-Openfoodnetwork
c46ae4354d Updating translations for config/locales/en_FR.yml 2020-03-19 05:15:09 +11:00
Transifex-Openfoodnetwork
5f00323cbb Updating translations for config/locales/fr.yml 2020-03-19 05:14:27 +11:00
Transifex-Openfoodnetwork
c52f29706b Updating translations for config/locales/en_CA.yml 2020-03-19 03:47:42 +11:00
Luis Ramos
2590745b2e Merge pull request #4954 from luisramos0/dead_temp
Delete templates that are not used
2020-03-18 13:52:15 +00:00
Matt-Yorkley
6db0421347 Merge pull request #4764 from Matt-Yorkley/mobile-tabs-styling
[mobile ux] Mobile tabs styling
2020-03-18 08:42:44 +01:00
Maikel
b63c47cca2 Merge pull request #4816 from mkllnk/1860-copy-paste
1860 Remove style from pasted text for shopfront messages
2020-03-18 16:23:50 +11:00
Maikel
2b9f57f4e0 Merge pull request #4998 from mkllnk/4277-signup-flow
Direct new enterprise users to their dashboard
2020-03-18 16:17:41 +11:00
Matt-Yorkley
8a1de72542 Center order cycle select elements in tablet view 2020-03-17 20:32:18 +01:00
Matt-Yorkley
2cb3a0cd99 Adjust padding, size, colour (transparency), caret size and position, border-radius, etc 2020-03-17 20:32:18 +01:00
Matt-Yorkley
b0637a24ff Adjust padding, size, colour transparency, caret size 2020-03-17 20:32:18 +01:00
Matt-Yorkley
d969b68c8c Add placeholder to order cycle selector 2020-03-17 20:32:18 +01:00
Matt-Yorkley
a89d4266d5 Update ordercycleselector to show message in red and remove powertip. 2020-03-17 20:32:18 +01:00
Matt-Yorkley
4b8ced5fc0 Add right-margin on bullet points in groups tab 2020-03-17 20:32:18 +01:00
Matt-Yorkley
2678342122 Reduce padding on ordercycle selector 2020-03-17 20:32:18 +01:00
Matt-Yorkley
b33c819863 Reduce rounding on ordercycle edges (box-radius) 2020-03-17 20:32:18 +01:00
Matt-Yorkley
97d7e27786 Update social icon colours 2020-03-17 20:32:18 +01:00
Matt-Yorkley
e73e43838c Add 2px margin under Contact subheadings 2020-03-17 20:32:18 +01:00
Matt-Yorkley
cdc40fbc38 Update Contact tab subheading text colour 2020-03-17 20:32:18 +01:00
Matt-Yorkley
3430cc617a Maximise space for tabs to fit on small screens 2020-03-17 20:32:18 +01:00
Matt-Yorkley
ed6f042446 Adjust tab widths/spacing on mobile and tablet 2020-03-17 20:32:18 +01:00
Matt-Yorkley
80a8c436d6 Update box-shadow underneath tab buttons 2020-03-17 20:32:18 +01:00
Matt-Yorkley
049a87e8a9 Remove defunct text-shadow from tab text 2020-03-17 20:32:18 +01:00
Matt-Yorkley
deb5b8e74c Fix minor display issue where "Ready For" option with lots of characters is too big to fit on screen on mobile.
The layout was breaking in some specific cases where the content didn't fit on very small screens.
2020-03-17 20:32:18 +01:00
Matt-Yorkley
a5dd14d902 Adjust new colour variables to match Zeplin 2020-03-17 20:32:18 +01:00
Matt-Yorkley
9a6859edc0 Fix CodeClimate issue with SCSS variable naming 2020-03-17 20:32:18 +01:00
Matt-Yorkley
c0c53113d3 Change font on shop tab titles 2020-03-17 20:32:18 +01:00
Matt-Yorkley
26688409a1 Use alternate dots in <ul> display 2020-03-17 20:32:18 +01:00
Matt-Yorkley
0893d14025 Add new shop link colours 2020-03-17 20:32:18 +01:00
Matt-Yorkley
efd314e3b1 Restyle contact tab 2020-03-17 20:23:45 +01:00
Matt-Yorkley
bd7549c57f Update layout for producers and groups tabs 2020-03-17 20:23:45 +01:00
Matt-Yorkley
45cf54408d Readjust layout after rebase 2020-03-17 20:23:45 +01:00
Matt-Yorkley
15360740b1 Add ng-cloak to ordercycle box to improve appearance whilst page loads 2020-03-17 20:23:45 +01:00
Matt-Yorkley
5ce5072f26 Adjust position of OC popover tip to not cover up the "ready for" label 2020-03-17 20:23:45 +01:00
Matt-Yorkley
35133f7ee8 Adjust height of ordercycle selector on desktop 2020-03-17 20:23:45 +01:00
Matt-Yorkley
5becbc2a11 Move caret svg to /app/assets/images 2020-03-17 20:23:45 +01:00
Matt-Yorkley
390d80f0eb Update order cycle selector positioning 2020-03-17 20:23:45 +01:00
Matt-Yorkley
6da43850d1 Restyle order cycle dropdown 2020-03-17 20:23:45 +01:00
Matt-Yorkley
a146bdacc8 Realign ordercycle text on tablet downwards 2020-03-17 20:23:45 +01:00
Matt-Yorkley
43cadb00c4 Recolour order cycle selector 2020-03-17 20:23:45 +01:00
Matt-Yorkley
2e616a9e31 Fix conditional display of order cycle selection element 2020-03-17 20:23:45 +01:00
Matt-Yorkley
1927e2883e Move brackets inside conditionals for rendering last closed / next open message 2020-03-17 20:23:45 +01:00
Matt-Yorkley
a4b94cf39f Add dividing line on tabs
Shows a thin grey line when the tab view content is white, but doesn't interfere when the content below is a full-width colour image.
2020-03-17 20:23:45 +01:00
Matt-Yorkley
a35f3c130e Recolour shop tab buttons 2020-03-17 20:23:45 +01:00
Matt-Yorkley
a93243a8b7 Change vertical position of shop name in relation to logo 2020-03-17 20:23:45 +01:00
Matt-Yorkley
de4402457a Improve layout and positioning on mobile and tablet 2020-03-17 20:23:45 +01:00
Matt-Yorkley
bf9f7309f7 Adapt style definitions to altered layout 2020-03-17 20:23:45 +01:00
Matt-Yorkley
4b0e1610ec Update order cycle selection box 2020-03-17 20:23:45 +01:00
dependabot-preview[bot]
0c6fe20e82 Bump rack-mini-profiler from 2.0.0 to 2.0.1
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases)
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v2.0.0...v2.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-17 19:19:22 +00:00
Luis Ramos
0f2e23d225 Merge pull request #4968 from lin-d-hop/customer-balances
Revert changes that broke existing usage of this report
2020-03-17 18:06:35 +00:00
Matt-Yorkley
45b5e838b7 Remove simple_form
It looks like we don't use this at all. Discovered during the Spree 2.1 upgrade.
2020-03-17 17:03:48 +01:00
Luis Ramos
da837ff100 Remove rabl dependency 🎉 2020-03-17 15:51:50 +00:00
Luis Ramos
da2598282b Can be object or {}, it's what the injector is doing, not related to rabl any more 2020-03-17 15:51:26 +00:00
Luis Ramos
0308f1465d Remove taxons/search action and respective rabl view
This is dead code
2020-03-17 15:51:26 +00:00
Luis Ramos
a6e4893287 Remove taxons list field from product edit form.
It is not working and it's not used in any other place in the app, there's the product category already (product.primary_taxon_id)
2020-03-17 15:51:25 +00:00
Luis Ramos
eccaaca907 Merge pull request #4930 from luisramos0/3-0-stable-mar6
Merge master into 3-0-stable
2020-03-17 14:49:30 +00:00
Pau Pérez Fabregat
42d5b5d8a3 Merge pull request #4974 from luisramos0/payment_rollback
[Spree 2.1] Bypass broken payment rollback callback
2020-03-17 15:37:28 +01:00
Pau Pérez Fabregat
129de8fd57 Merge pull request #5006 from Matt-Yorkley/loggageddon
Logageddon Hotfix
2020-03-17 14:48:12 +01:00
Matt-Yorkley
e24d858af9 Ensure log level is the default :info for staging and production
The default was being ignored in our new logging configuration, and the actual log output was way too high. This was causing serious disk space issues.
2020-03-17 12:25:25 +01:00
Matt-Yorkley
d2cacf5330 Add comments for unusable log_level setting 2020-03-17 12:22:58 +01:00
Transifex-Openfoodnetwork
af231d2ebe Updating translations for config/locales/fr.yml 2020-03-17 20:32:15 +11:00
Pau Pérez Fabregat
711a3debe7 Merge pull request #4990 from openfoodfoundation/dependabot/bundler/webmock-3.8.3
Bump webmock from 3.8.2 to 3.8.3
2020-03-17 09:59:10 +01:00
Pau Pérez Fabregat
d09b0849e4 Merge pull request #4936 from luisramos0/fix_order_syncer
Fixes spec/services/order_syncer_spec in rails 4
2020-03-17 09:56:17 +01:00
Pau Pérez Fabregat
b2d015416a Merge pull request #4934 from luisramos0/latest_spree_branch
[Spree 2.1] Use latest version of spree which includes PR openfoodfoundation/spree#39
2020-03-17 09:55:49 +01:00
Pau Pérez Fabregat
c639821dc3 Merge pull request #4931 from luisramos0/fix_ent_ser
Fix serializers/api/enterprise_shopfront_serializer_spec in rails 4
2020-03-17 09:53:31 +01:00
Maikel
d9b643d795 Merge pull request #4799 from mkllnk/4771-back-to-shop-button
4771 Back to shop button
2020-03-17 19:51:02 +11:00
Maikel Linke
6b8b3be524 Show "Back To Store" button when no shop has been selected yet 2020-03-17 10:28:03 +11:00
Maikel Linke
1db8283e98 Link "Back To Store" button to products page 2020-03-17 10:28:03 +11:00
Maikel Linke
5fce40ee71 Link "Continue shopping" to products tab 2020-03-17 10:28:03 +11:00
Maikel Linke
c64493ca77 Continue shopping with the products list 2020-03-17 10:28:03 +11:00
Maikel Linke
5b942e6933 Add spec for "continue shopping" from cart
https://github.com/openfoodfoundation/openfoodnetwork/issues/4771
2020-03-17 10:28:03 +11:00
Luis Ramos
26769b4150 Add StripeSCA payment authorize and use it both subs_confirm job as well as on teh checkout stripe redirect 2020-03-16 20:04:59 +00:00
Luis Ramos
84745e4ccb Add stripe payment setup spec and make minor tweaks to the code itself.
Also, add a missing . to card_set? that eanbles it! If the card was
already set, it would anyway set the default card. Now it will use the
defined card if there is one already.
2020-03-16 20:03:12 +00:00
Luis Ramos
aac7a5e559 Adapt PaymentSetup spec to new version and remove some private method testing (payment) as well as some tests testing order.pending_payments logic 2020-03-16 20:03:12 +00:00
Luis Ramos
0a2941ed96 Extract StripePaymentSetup from PaymentSetup 2020-03-16 20:03:12 +00:00
Luis Ramos
ffbb5934d7 Merge pull request #4989 from luisramos0/specs_in_engines
Adapt task that runs engine specs
2020-03-16 19:17:04 +00:00
dependabot-preview[bot]
05ccd1ecbf Bump compass-rails from 3.1.0 to 4.0.0
Bumps [compass-rails](https://github.com/Compass/compass-rails) from 3.1.0 to 4.0.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/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-16 18:49:51 +00:00
Luis Ramos
bae9df8214 Merge pull request #4787 from luisramos0/catalog_domain
Add new domain/engine Catalog
2020-03-16 18:47:55 +00:00
Luis Ramos
f8a4f00d52 Fix rubocop issues in subs specs 2020-03-16 17:20:01 +00:00
Luis Ramos
29377bbff9 Move 5 subscriptions services from app/services to the engines/order_management/app/services 2020-03-16 17:20:01 +00:00
Luis Ramos
f68d0c2a0f Remove Subscription from the name of the subscription summarizer and summary because it is already in the namespace 2020-03-16 17:20:01 +00:00
Luis Ramos
3901c49af9 Fix rubocop issues 2020-03-16 17:20:01 +00:00
Luis Ramos
ae0ceb61a1 Move ProxyOrderSyncer to OrderManagement engine 2020-03-16 17:20:01 +00:00
Luis Ramos
fb1c825fbc Move both subscription summarizer and subscription summary to order management engine 2020-03-16 17:20:01 +00:00
Luis Ramos
e36b0249b9 Use nested module names to fix rubocpo issue 2020-03-16 17:20:01 +00:00
Luis Ramos
34fa2d7ad6 Move Subscriptions::PaymentSetup to OrderManagement engine where all subscription code will be at some point in the future 2020-03-16 17:19:04 +00:00
Luis Ramos
3aefea9f04 Prepare SubsConfirmJob to receive a bit more payment logic 2020-03-16 17:19:04 +00:00
Luis Ramos
15231a9128 Make SubsConfirmJob more readable 2020-03-16 17:19:04 +00:00
Luis Ramos
25e3f72934 Fix rubocop issues in subs payment_setup 2020-03-16 17:19:04 +00:00
Luis Ramos
523d819575 Move and rename SubscriptionPaymentUpdater to Subscriptios::PaymentSetup to move to services/subscriptions and call it Setup instead to make explicit this is executed before the payment is processed 2020-03-16 17:16:31 +00:00
Luis Ramos
5da47b3f19 Merge pull request #4757 from luisramos0/stripe_sca_extra
StripeSCA - Handle further SCA auth request when checking out
2020-03-16 16:45:28 +00:00
Luis Ramos
b14e4237cc Make the task that runs engines specs run from the main app, not inside the engine
Right now and for some time the engines are not independent of the main_app. We should aim for that but it will naturally take a while to disentangle the code
2020-03-16 16:20:36 +00:00
Pau Pérez Fabregat
3e7685193f Merge pull request #4996 from luisramos0/fix_build
Fix broken master build
2020-03-16 16:37:09 +01:00
Luis Ramos
8558000c22 Merge pull request #5 from coopdevs/fix-suppliers-report-test-case
Fix suppliers report test case
2020-03-16 13:47:03 +00:00
Pau Perez
6486e5f908 Provide a non-zero amount for ship/pay calculator
This way the adjustment's total_amount is not 0 and thus, not filtered
out but the report service.
2020-03-16 13:56:52 +01:00
Maikel Linke
9244a95472 Direct new enterprise users to their dashboard
People were directed to the home page and had to do several more clicks
to continue with their enterprise setup.
2020-03-16 11:18:32 +11:00
Transifex-Openfoodnetwork
bd237ef257 Updating translations for config/locales/fr_CA.yml 2020-03-15 07:22:12 +11:00
Transifex-Openfoodnetwork
bc06e10146 Updating translations for config/locales/en_CA.yml 2020-03-15 07:21:33 +11:00
Pau Perez
05eadac935 Fix some filtering test cases for fee report
The calculators of the adjustments related to the enterprise fees
created in the test setup have a preferred_amount of 0. So, when
computed, the adjustments' amounts end up being `0 = 0 * 1 line_item`.

Then, the ReportService filters these out in
`#exclude_groups_with_zero_total` from the result set. This is why the
assertions can't find them in `totals`.
2020-03-14 11:19:35 +01:00
Pau Perez
5a83b12c66 Make EnterpriseFee report SQL readable 2020-03-14 11:04:49 +01:00
Pau Perez
71576fd7db Refactor PerItem calculator to ease readability 2020-03-14 11:04:16 +01:00
Luis Ramos
63a1d4145a Adapt order factories to work with enterprise fees summaries report specs 2020-03-13 12:36:01 +00:00
Luis Ramos
1049525e50 Merge pull request #4963 from luisramos0/variants_fix
Fix 2 broken buttons in the product variants list page
2020-03-12 23:48:50 +00:00
Luis Ramos
bd32510837 Merge pull request #4860 from mkllnk/3395-remove-unused-assets
3395 remove unused assets
2020-03-12 22:44:41 +00:00
dependabot-preview[bot]
f0b40eea1e Bump webmock from 3.8.2 to 3.8.3
Bumps [webmock](https://github.com/bblimke/webmock) from 3.8.2 to 3.8.3.
- [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/v3.8.2...v3.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-12 19:20:17 +00:00
Transifex-Openfoodnetwork
ed790ab65d Updating translations for config/locales/en_GB.yml 2020-03-13 05:26:37 +11:00
Matt-Yorkley
1cba129432 Ensure line_item.variant succeeds when variant is soft-deleted 2020-03-12 19:13:15 +01:00
Matt-Yorkley
e24d8d7104 Fix deprecation warning for use of #includes without #references 2020-03-12 19:12:36 +01:00
Matt-Yorkley
40b8eb470c Fix deprecation warning for use of #all 2020-03-12 19:12:06 +01:00
Luis Ramos
f2089af0c4 Merge pull request #4907 from luisramos0/3-0-enterprise_relationship
[Spree 2.1] Uncomment Enterprise#relate_to_owners_enterprises
2020-03-12 17:18:47 +00:00
Luis Ramos
949b6ebad1 Merge pull request #4982 from Matt-Yorkley/3-0-orders-form
[Spree 2.1] Fix order index search form
2020-03-12 16:58:08 +00:00
Luis Ramos
32a4355f09 Merge branch 'master' into 3-0-stable-mar6 2020-03-12 16:54:09 +00:00
Luis Ramos
46e23b28fd Merge pull request #4975 from openfoodfoundation/dependabot/bundler/rspec-rails-3.9.1
Bump rspec-rails from 3.9.0 to 3.9.1
2020-03-12 16:47:14 +00:00
Luis Ramos
bc904a7afa Merge pull request #4976 from openfoodfoundation/dependabot/bundler/rack-mini-profiler-2.0.0
Bump rack-mini-profiler from 1.1.6 to 2.0.0
2020-03-12 16:46:43 +00:00
Luis Ramos
a209b3e860 Merge pull request #4980 from Matt-Yorkley/3-0-destroy-route
[Spree 2.1] Line items destroy route
2020-03-12 16:28:05 +00:00
Matt-Yorkley
9a5452cd52 Delete test in line_items_controller_spec.rb
Rails 4 does not recognise requests to destroy routes without ids as valid routes.

Fixes:

 14) LineItemsController destroying a line item on a completed order without a line item id fails and raises an error
      Failure/Error: delete :destroy

      ActionController::UrlGenerationError:
        No route matches {:action=>"destroy", :controller=>"line_items"}
      # ./spec/controllers/line_items_controller_spec.rb:46:in `block (5 levels) in <top (required)>'
2020-03-12 14:15:00 +01:00
Matt-Yorkley
a207c6c45f Fix cart page update
Fixes:

  2) full-page cart viewing the cart updating quantities with insufficient stock available shows the quantities saved, not those submitted
     Failure/Error: @app.call(env)

     AbstractController::ActionNotFound:
       The action 'update' could not be found for CartController
     # ./lib/open_food_network/rack_request_blocker.rb:36:in `call'
     # ------------------
     # --- Caused by: ---
     # Capybara::ExpectationNotMet:
     #   expected to find text "Insufficient stock available, only 2 remaining" in "Internal Server Error The action 'update' could not be found for CartController WEBrick/1.3.1 (Ruby/2.3.7/2018-03-28) at 127.0.0.1:38614"
     #   ./spec/features/consumer/shopping/cart_spec.rb:182:in `block (5 levels) in <top (required)>'
2020-03-12 13:34:55 +01:00
Pau Perez
8ccc8dfaf6 Update all locales with the latest Transifex translations 2020-03-12 13:33:42 +01:00
Luis Ramos
55b32c828c Merge pull request #4978 from Matt-Yorkley/dev-env-reload
Fix reloading issue in dev environment
2020-03-12 12:22:00 +00:00
Pau Pérez Fabregat
25dfd8ad40 Merge pull request #4939 from openfoodfoundation/transifex
Transifex
2020-03-12 13:19:59 +01:00
Pau Pérez Fabregat
62c35ef6e5 Merge pull request #4953 from luisramos0/sch_fix
Fix problem with misssing params in schedules controller
2020-03-12 12:57:27 +01:00
Pau Pérez Fabregat
f6a1a101a8 Merge pull request #4955 from luisramos0/auth_fix
[Spree 2.1] Fix authentication spec by adapting code to devise 3
2020-03-12 12:51:46 +01:00
Pau Pérez Fabregat
2a5311493f Merge pull request #4969 from luisramos0/oc_apli
Fix spec in rails 4 branch by making code in OrderCycleFormApplicator a bit more resilient
2020-03-12 12:51:23 +01:00
Pau Pérez Fabregat
57ac28cfbd Merge pull request #4970 from openfoodfoundation/dependabot/bundler/ddtrace-0.33.1
Bump ddtrace from 0.33.0 to 0.33.1
2020-03-12 12:50:01 +01:00
Pau Pérez Fabregat
1cba857bdb Merge pull request #4933 from luisramos0/ent_helper
[Spree 2.1] Fix tag rule applicator in enterprises_helper
2020-03-12 12:49:18 +01:00
Pau Pérez Fabregat
568cba9d58 Merge pull request #4941 from luisramos0/devise
[Spree 2.1] Delete unnecessary code related to spree_auth_devise
2020-03-12 12:48:59 +01:00
Pau Pérez Fabregat
4b12d0be46 Merge pull request #4940 from luisramos0/ent_ctrl
[Spree 2.1] Fix issues in EnterprisesController
2020-03-12 12:48:28 +01:00
Pau Pérez Fabregat
de06eed945 Merge pull request #4911 from luisramos0/3-0-manifest
[Spree 2.1] Change Shipment#manifest to include deleted variants (again, this time in rails 4)
2020-03-12 12:47:45 +01:00
Pau Pérez Fabregat
fb02043e6e Merge pull request #4926 from luisramos0/prod_api
Fix products api spec in rails 4
2020-03-12 12:46:45 +01:00
Matt-Yorkley
d62d89aa4f Fix order index search form
Fixes:

  2) spree/admin/orders/index.html.haml print invoices button displays button when invoices are enabled
     Failure/Error: = form_tag nil, {name: "orders_form", "ng-submit" => "fetchResults()"} do

     ActionView::Template::Error:
       No route matches {:action=>"index", :controller=>"spree/admin/orders"}
     # ./app/views/spree/admin/orders/_filters.html.haml:2:in `_a1b716152f19bf3f4772a98e56adf411'
     # ./app/views/spree/admin/orders/index.html.haml:20:in `block in _d04c5552f7a480bf5f02e5fad0c10de6'
     # ./app/views/spree/admin/orders/index.html.haml:19:in `_d04c5552f7a480bf5f02e5fad0c10de6'
     # ./spec/views/spree/admin/orders/index.html.haml_spec.rb:26:in `block (3 levels) in <top (required)>'
     # ./spec/views/spree/admin/orders/index.html.haml_spec.rb:8:in `block (2 levels) in <top (required)>'
     # ------------------
     # --- Caused by: ---
     # ActionController::UrlGenerationError:
     #   No route matches {:action=>"index", :controller=>"spree/admin/orders"}
     #   ./app/views/spree/admin/orders/_filters.html.haml:2:in `_a1b716152f19bf3f4772a98e56adf411'

  3) spree/admin/orders/index.html.haml print invoices button does not display button when invoices are disabled
     Failure/Error: = form_tag nil, {name: "orders_form", "ng-submit" => "fetchResults()"} do

     ActionView::Template::Error:
       No route matches {:action=>"index", :controller=>"spree/admin/orders"}
     # ./app/views/spree/admin/orders/_filters.html.haml:2:in `_a1b716152f19bf3f4772a98e56adf411'
     # ./app/views/spree/admin/orders/index.html.haml:20:in `block in _d04c5552f7a480bf5f02e5fad0c10de6'
     # ./app/views/spree/admin/orders/index.html.haml:19:in `_d04c5552f7a480bf5f02e5fad0c10de6'
     # ./spec/views/spree/admin/orders/index.html.haml_spec.rb:34:in `block (3 levels) in <top (required)>'
     # ./spec/views/spree/admin/orders/index.html.haml_spec.rb:8:in `block (2 levels) in <top (required)>'
     # ------------------
     # --- Caused by: ---
     # ActionController::UrlGenerationError:
     #   No route matches {:action=>"index", :controller=>"spree/admin/orders"}
     #   ./app/views/spree/admin/orders/_filters.html.haml:2:in `_a1b716152f19bf3f4772a98e56adf411'
2020-03-12 12:44:50 +01:00
Transifex-Openfoodnetwork
30d7cc89fa Updating translations for config/locales/pt_BR.yml 2020-03-12 09:25:51 +11:00
Transifex-Openfoodnetwork
d14b5eb46b Updating translations for config/locales/pt_BR.yml 2020-03-12 09:22:44 +11:00
dependabot-preview[bot]
8eb60388fd Bump rack-mini-profiler from 1.1.6 to 2.0.0
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 1.1.6 to 2.0.0.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases)
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v1.1.6...v2.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-11 19:19:24 +00:00
dependabot-preview[bot]
633f1bd7cf Bump rspec-rails from 3.9.0 to 3.9.1
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.9.0 to 3.9.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.0...v3.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-11 19:15:51 +00:00
Luis Ramos
5506cc86d2 Bypass after_rollback callback in payment
This is causing several specs to fail on rollback and, according to some manual testing (and all the auto tests we have), we dont need this fix in OFN
2020-03-11 14:33:54 +00:00
Matt-Yorkley
933b5f1606 Fix reloading issue in dev environment
I constantly get `NameError: uninitialized constant Spree::AuthenticationHelpers` when touching local files and then reloading a page, and have to restart my rails server every time (in development). I read the other day that this is the best way to fix the issue, and it seems to work...
2020-03-11 15:31:25 +01:00
Transifex-Openfoodnetwork
4c7b8209b9 Updating translations for config/locales/nb.yml 2020-03-11 19:49:14 +11:00
Pau Pérez Fabregat
802ac647e3 Merge pull request #4879 from coopdevs/inner-join-visible-orders
Inner join visible orders
2020-03-10 22:54:03 +01:00
dependabot-preview[bot]
c83bded763 Bump ddtrace from 0.33.0 to 0.33.1
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.33.0 to 0.33.1.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.33.0...v0.33.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-10 19:19:31 +00:00
Luis Ramos
03246d425d Make this method handle the case where the variants hash passed is nil
This fixes a spec in the rails 4 branch
2020-03-10 18:41:26 +00:00
Luis Ramos
7585e3d1d6 The variants_to_a method was dead but actually we can use it to make the code simpler 2020-03-10 18:40:46 +00:00
Luis Ramos
bc0a1d9bae Remove one more responder and fix rubocop issues 2020-03-10 15:56:08 +00:00
Luis Ramos
a53dc3a8c1 Remove usage of the responder as this is a json only controller 2020-03-10 14:46:16 +00:00
Luis Ramos
bc1430c984 Make new_variant button work again by making a normal call to the server, isntead of an ajax call that was no longer working 2020-03-10 14:21:26 +00:00
Luis Ramos
676d949972 Make variants collection show deleted again by bypassing the default scope that removed deleted variants 2020-03-10 14:21:20 +00:00
Luis Ramos
de2c6a8717 Revert previous commits and use collection_singular_ids=(ids) setter instead 2020-03-10 11:21:36 +00:00
lin-d-hop
e4bd7c4e30 Revert changes that broke existing usage of this report 2020-03-10 10:59:18 +00:00
Pau Pérez Fabregat
50cdda7c63 Merge pull request #4802 from luisramos0/too_many
Last batch to fix error "subquery with too many columns" in rails 4 branch
2020-03-10 09:20:44 +01:00
Pau Pérez Fabregat
d0af046e59 Merge pull request #4908 from luisramos0/package_spec
Make package spec work in rails 4
2020-03-10 09:17:53 +01:00
Pau Pérez Fabregat
5811f3ead1 Merge pull request #4905 from luisramos0/untouch
Remove some live but elderly debug code
2020-03-10 09:17:13 +01:00
Pau Pérez Fabregat
d7d3c9ea53 Merge pull request #4938 from openfoodfoundation/dependabot/bundler/ddtrace-0.33.0
Bump ddtrace from 0.32.0 to 0.33.0
2020-03-10 08:48:31 +01:00
Pau Pérez Fabregat
a02cc1de34 Merge pull request #4857 from luisramos0/schedules_ctrl
Remove dead spec in SchedulesController
2020-03-10 08:38:46 +01:00
Luis Ramos
014e22a7ad Fix problem with misssing params in schedules controller and adapt its spec 2020-03-09 16:04:59 +00:00
Luis Ramos
5ce4fec68b Add html to show the errors reported by devise 3 about password and password confirmation mismatch on user.errors[:password_confirmation] (instead of user.errors[:password]) 2020-03-09 15:48:45 +00:00
Luis Ramos
94783f44f9 Delete templates that are not used 2020-03-09 15:30:37 +00:00
Luis Ramos
8c367a2ed2 Merge branch 'master' into 3-0-stable-mar6 2020-03-09 13:20:19 +00:00
Luis Ramos
e5f05b4db9 Handle case where no user_ids are sent to the controller. Fixes original spec. 2020-03-07 20:10:32 +00:00
Luis Ramos
7daa68a8bc Adapt consumer/shopping/orders_spec to use an order with a nil user to test a guest checkout, which is what happens in the real checkout 2020-03-07 20:00:40 +00:00
Luis Ramos
56c29ab472 Make EnterprisesController inherit from Api::BaseController to fix authentication and fix problem with saving params[:user_ids] 2020-03-07 18:14:36 +00:00
Luis Ramos
ffe814ce6b Adapt specs to not use anonymous user
Api::BaseController#authenticate is already taking care of the unauthenticated use case when spree_current_user is nil
2020-03-07 18:14:07 +00:00
Luis Ramos
e4d307fe5e Remove dead code related to user management 2020-03-07 18:14:07 +00:00
Luis Ramos
2184c7c06b Merge pull request #4856 from Matt-Yorkley/dead-code
Delete some dead code in Product Import (fixes 1 broken spec)
2020-03-07 15:26:39 +00:00
Transifex-Openfoodnetwork
928bf0d9c7 Updating translations for config/locales/fr.yml 2020-03-08 01:24:08 +11:00
Transifex-Openfoodnetwork
0d02b2afcf Updating translations for config/locales/en_FR.yml 2020-03-08 01:21:12 +11:00
Transifex-Openfoodnetwork
1e76f3f744 Updating translations for config/locales/fr.yml 2020-03-08 01:20:57 +11:00
dependabot-preview[bot]
7c3a0a292f Bump ddtrace from 0.32.0 to 0.33.0
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.32.0 to 0.33.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.32.0...v0.33.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-06 19:31:47 +00:00
Luis Ramos
c5ca0976a5 Merge pull request #4873 from jeduardo824/ampersand-not-showing-correctly
fix ampersand problem using ng-bind-html
2020-03-06 17:40:54 +00:00
Pau Pérez Fabregat
be7b3d5a12 Merge pull request #4809 from jeduardo824/redirect-to-shops-when-shop-does-not-exist
redirect to shops list when an enterprise is not found
2020-03-06 18:39:00 +01:00
Luis Ramos
d3f498f5b1 The shipping rates refresh process changed a little in spree 2.1 and the selection is and was random, it picks the first acceptable
In this case we need to specifically select one shipping method so that the test is valid
2020-03-06 16:39:20 +00:00
Luis Ramos
855d08957c Adjust completed_order_with_totals to have a distributor so that logic around refreshing shipping rates doesnt fail badly 2020-03-06 16:01:29 +00:00
Luis Ramos
063f733dda Use latest version of spree which includes PR openfoodfoundation/spree#39 2020-03-06 15:05:29 +00:00
Luis Ramos
4b21aaafc4 Convert ActiveRecord_Associations_CollectionProxy to array so that the modifications the tagRuleApplicator does on it will remain
Reject on ActiveRecord_Associations_CollectionProxy wont work
2020-03-06 13:51:53 +00:00
Luis Ramos
55941a1206 Round time values to make spec green as in rails 4, for unknown reason, the timestamps are differing in some miliseconds 2020-03-06 10:16:58 +00:00
Luis Ramos
0815068050 Merge branch 'master' into 3-0-stable-mar6 2020-03-06 09:20:03 +00:00
Luis Ramos
6304a085c0 Update all locales with the latest Transifex translations 2020-03-06 08:30:04 +00:00
Luis Ramos
7c708de937 Merge pull request #4928 from openfoodfoundation/transifex
Transifex
2020-03-06 08:28:09 +00:00
Transifex-Openfoodnetwork
5d51e5d393 Updating translations for config/locales/pt_BR.yml 2020-03-06 07:41:46 +11:00
Transifex-Openfoodnetwork
464717dec5 Updating translations for config/locales/pt_BR.yml 2020-03-06 07:38:36 +11:00
Pau Pérez Fabregat
4ea891ee2f Merge pull request #4834 from Matt-Yorkley/3-0-bind-message
[Spree 2.1] PG::ProtocolViolation: ERROR: bind message supplies 0 parameters...
2020-03-05 19:31:06 +01:00
Pau Pérez Fabregat
7a06018c3e Merge pull request #4874 from openfoodfoundation/transifex
Transifex
2020-03-05 19:29:21 +01:00
Pau Pérez Fabregat
b8c76ff633 Merge pull request #4906 from luisramos0/ent_caching
Fix enterprise_caching_spec in rails 4
2020-03-05 19:28:54 +01:00
Pau Pérez Fabregat
1ecc0bfe07 Merge pull request #4927 from luisramos0/variants_delete
Fix spree/admin/variants_controller_spec.rb in rails 4
2020-03-05 19:24:35 +01:00
Pau Pérez Fabregat
600d2d23c8 Merge pull request #4912 from luisramos0/cart_serv_fix
Make cart_service spec green in rails 4 branch
2020-03-05 19:11:58 +01:00
Pau Pérez Fabregat
bf3211fd01 Merge pull request #4918 from luisramos0/bulk_lis
Fix spec/controllers/admin/bulk_line_items_controller_spec in rails 4
2020-03-05 19:07:37 +01:00
Pau Pérez Fabregat
2a010a3233 Merge pull request #4919 from luisramos0/ship_ctrl
[Spree 2.1] Fix shipments admin/enterprises and api/enterprises controller specs
2020-03-05 19:07:10 +01:00
Pau Pérez Fabregat
5fd0d9406d Merge pull request #4923 from openfoodfoundation/dependabot/bundler/oj-3.10.5
Bump oj from 3.10.3 to 3.10.5
2020-03-05 19:06:20 +01:00
Pau Pérez Fabregat
c78a6bea91 Merge pull request #4921 from luisramos0/li_ctrl
Fix line_items_controller_spec in the rails 4 branch
2020-03-05 19:05:46 +01:00
Pau Pérez Fabregat
be9f33312b Merge pull request #4904 from luisramos0/tax_rates_match
Move TaxRate#match to OFN to avoid having to adapt to the spree 2.1 version
2020-03-05 18:55:55 +01:00
Luis Ramos
f23575302b In rails 4 variant.destroy is removing the variants from the exchanges as needed and variant.exchange_variants becomes immediatly empty but variant.exchanges is not automatically updated anymore and needs a refresh to become empty 2020-03-05 17:07:08 +00:00
Pau Perez
0042ab2f28 Rewrite INNER JOIN in ActiveRecord's DSL 2020-03-05 17:45:06 +01:00
Pau Perez
53a63775fe Replace LEFT JOIN with INNER JOIN
I see no reason why a LEFT might be needed and its the root cause of the
awful performance.
2020-03-05 17:45:06 +01:00
Pau Perez
461b1b26f3 Add controller tests to cover totals by supplier 2020-03-05 17:45:06 +01:00
Luis Ramos
f13d7d6845 Fix products api spec in rails 4 2020-03-05 15:20:45 +00:00
Luis Ramos
cfbec2accc Fix controller specs after PR #4675 adapted code to rails 4 finders 2020-03-05 11:55:13 +00:00
dependabot-preview[bot]
e4d09b5404 Bump oj from 3.10.3 to 3.10.5
Bumps [oj](https://github.com/ohler55/oj) from 3.10.3 to 3.10.5.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.3...v3.10.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-04 19:16:40 +00:00
Luis Ramos
415415273c In rails 4 we need to update the stub after we update the order.user otherwise the stub will return the previous value 2020-03-04 15:50:52 +00:00
Luis Ramos
0f726c207f Fix shipments controller after PR #4675 adapted code to rails 4 finders 2020-03-04 14:47:32 +00:00
Luis Ramos
d969190ca5 Bypass problem with quick_login_as_admin in rails 4 and just user simple factory 2020-03-04 14:29:11 +00:00
Luis Ramos
a180576c0a Make cart_service spec green in rails 4 branch 2020-03-03 17:29:38 +00:00
Luis Ramos
3b37fa8872 Move variant scoping from alias method into manifest method 2020-03-03 16:40:31 +00:00
Luis Ramos
5688de4936 Make Shipment#manifest work with deleted variants again
This makes the default variant scope in inventory_unit being used which includes deleted variants
2020-03-03 16:38:03 +00:00
Luis Ramos
d8a92eec4b Bring Shipment#manifest from spree as is 2020-03-03 16:37:00 +00:00
Luis Ramos
1382bb3c6b For some reason in rails 4/spree 2.1 setting the line item as adjustable on the adjustment is not enough to populate line_item.adjustments. Here we make this assignment explicit fixing the spec in rails 4 2020-03-03 15:04:51 +00:00
Luis Ramos
7fdaa0f0c7 Make package spec work in rails 4 by persisting the test enterprises so that the copnnection between shipping methods and enterprises works 2020-03-03 14:46:12 +00:00
Luis Ramos
e584233c9e Uncomment code that was commented earlier on in the upgrade, we are now ready to handle this 2020-03-03 14:25:17 +00:00
Luis Ramos
ba750547a2 The touch process in 'belongs_to :supplier, class_name: 'Enterprise', touch: true' must have changed in rails 4 and now we need to reload the enterprise to get the new updated_at value 2020-03-03 12:26:18 +00:00
Luis Ramos
af8369ae1b Remove 5 years old debug code
This reverts ab9bc7b1dc, it can be added if the issue happens again
2020-03-03 10:56:57 +00:00
Luis Ramos
cf777b3fa2 Merge pull request #4882 from Matt-Yorkley/3-0-api-with-nil-id
[Spree 2.1] Fix spec setup in api/orders_controller_spec
2020-03-03 10:00:32 +00:00
Luis Ramos
829a73c58d Merge pull request #4886 from openfoodfoundation/dependabot/bundler/oj-3.10.3
Bump oj from 3.10.2 to 3.10.3
2020-03-03 09:57:46 +00:00
Luis Ramos
a2691df64e Merge pull request #4887 from openfoodfoundation/dependabot/bundler/rubocop-0.80.1
Bump rubocop from 0.80.0 to 0.80.1
2020-03-03 09:56:37 +00:00
Pau Pérez Fabregat
9980723060 Merge pull request #4880 from Matt-Yorkley/3-0-duplicate-validations
[Spree 2.1] Fix duplicate validations in payment methods and shipping methods
2020-03-03 10:44:40 +01:00
Pau Pérez Fabregat
f5ec11047a Merge pull request #4896 from Matt-Yorkley/3-0-cc_type
[Spree 2.1] Add missing :cc_type attribute to default :credit_card factory
2020-03-03 10:43:18 +01:00
Pau Pérez Fabregat
f50593ced8 Merge pull request #4883 from Matt-Yorkley/3-0-helper
[Spree 2.1] Fix expectation in helper spec
2020-03-03 10:42:28 +01:00
Pau Pérez Fabregat
b0962f65da Merge pull request #4872 from Matt-Yorkley/3-0-touch
[Spree 2.1] Touch on new records
2020-03-03 10:39:58 +01:00
Pau Pérez Fabregat
a47745c1cc Merge pull request #4866 from Matt-Yorkley/3-0-ofn-qz
[Spree 2.1] ofn-qz
2020-03-03 10:37:10 +01:00
Pau Pérez Fabregat
a60974c760 Merge pull request #4864 from luisramos0/oc_times
[Spree 2.1] Fix OrderCycle.earliest_closing_times spec
2020-03-03 10:36:35 +01:00
Pau Pérez Fabregat
e733761e8a Merge pull request #4847 from Matt-Yorkley/3-0-enterprise-user
[Spree 2.1] Fix #create_enterprise_user
2020-03-03 10:30:25 +01:00
Luis Ramos
6c8b175344 Merge match and its alias method 2020-03-03 09:29:02 +00:00
Pau Pérez Fabregat
390cc61273 Merge pull request #4867 from Matt-Yorkley/3-0-gmappable
[Spree 2.1] acts_as_gmappable
2020-03-03 10:28:12 +01:00
Pau Pérez Fabregat
ad10053271 Merge pull request #4903 from luisramos0/address_finder
[Spree 2.1] Adapt address finder spec to work with spree 2.1 code
2020-03-03 10:27:13 +01:00
Luis Ramos
a508c55700 Bring TaxRate.match to OFN
The version of this method in spree 2.1 will break our build

This way we simply bypass this fix in spree: https://github.com/spree/spree/pull/3669

We can get back to this in the future if we ever experience the mentioned bug
2020-03-03 09:27:04 +00:00
Pau Pérez Fabregat
1e2e50ce54 Merge pull request #4888 from Matt-Yorkley/3-0-shipping-method-id
[Spree 2.1] Remove assignment of invalid attribute in test setup
2020-03-03 10:26:15 +01:00
Pau Pérez Fabregat
c48bd12440 Merge pull request #4843 from Matt-Yorkley/3-0-product-import
[Spree 2.1] Product import specs
2020-03-03 10:21:48 +01:00
Transifex-Openfoodnetwork
2712be3fa4 Updating translations for config/locales/fr.yml 2020-03-03 14:14:38 +11:00
Transifex-Openfoodnetwork
484326561f Updating translations for config/locales/en_GB.yml 2020-03-03 14:11:28 +11:00
Transifex-Openfoodnetwork
7ea96f88e8 Updating translations for config/locales/en_CA.yml 2020-03-03 14:08:26 +11:00
Transifex-Openfoodnetwork
de752b05a7 Updating translations for config/locales/fr_CA.yml 2020-03-03 14:08:17 +11:00
Maikel
0b18344572 Merge pull request #4790 from mkllnk/4779-payment-method-display
4779 payment method display
2020-03-03 10:10:51 +11:00
Luis Ramos
690474c01a Adapt address finder spec to work with spree 2.1 code
Order ship address is required to get have an order with shipping rates
2020-03-02 21:55:21 +00:00
Matt-Yorkley
6cb8bb2fc3 Add missing :cc_type attribute to default :credit_card factory
Fixes 5 specs, including:

  11) Spree::CreditCardsController#update when the specified credit card is found and the card is owned by the user when the update completes successfully renders a serialized copy of the updated card
      Failure/Error: object.cc_type.capitalize

      NoMethodError:
        undefined method `capitalize' for nil:NilClass
      # ./app/serializers/api/credit_card_serializer.rb:6:in `brand'
      # (eval):4:in `_fast_attributes'
      # ./app/controllers/spree/credit_cards_controller.rb:26:in `update'
      # ./spec/controllers/spree/credit_cards_controller_spec.rb:100:in `block (7 levels) in <top (required)>'
      # ./spec/controllers/spree/credit_cards_controller_spec.rb:100:in `block (6 levels) in <top (required)>'
      # ------------------
      # --- Caused by: ---
      # NoMethodError:
      #   undefined method `capitalize' for nil:NilClass
      #   ./app/serializers/api/credit_card_serializer.rb:6:in `brand'
2020-03-02 22:07:20 +01:00
Luis Ramos
777754f8a9 Remove dead code that creates products in product_set 2020-03-02 19:41:51 +00:00
Matt-Yorkley
13b8cfcd9c Remove assignment of invalid attribute in test setup
Fixes:

  11) Order Management viewing a completed order when checking out as an anonymous guest allows the user to see the details
      Failure/Error:
        order.update_attributes!(
          bill_address: bill_address,
          ship_address: ship_address,
          shipping_method_id: shipping_method.id
        )

      ActiveRecord::UnknownAttributeError:
        unknown attribute: shipping_method_id
      # ./spec/features/consumer/shopping/orders_spec.rb:30:in `block (3 levels) in <top (required)>'
      # ------------------
      # --- Caused by: ---
      # NoMethodError:
      #   undefined method `shipping_method_id=' for #<Spree::Order:0x00007f5e82a94d80>
      #   ./spec/features/consumer/shopping/orders_spec.rb:30:in `block (3 levels) in <top (required)>'

  12) Order Management viewing a completed order when logged in as the customer allows the user to see order details
      Failure/Error:
        order.update_attributes!(
          bill_address: bill_address,
          ship_address: ship_address,
          shipping_method_id: shipping_method.id
        )

      ActiveRecord::UnknownAttributeError:
        unknown attribute: shipping_method_id
      # ./spec/features/consumer/shopping/orders_spec.rb:30:in `block (3 levels) in <top (required)>'
      # ------------------
      # --- Caused by: ---
      # NoMethodError:
      #   undefined method `shipping_method_id=' for #<Spree::Order:0x00007f5e83382708>
      #   ./spec/features/consumer/shopping/orders_spec.rb:30:in `block (3 levels) in <top (required)>'

  13) Order Management viewing a completed order when not logged in allows the user to see order details after login
      Failure/Error:
        order.update_attributes!(
          bill_address: bill_address,
          ship_address: ship_address,
          shipping_method_id: shipping_method.id
        )

      ActiveRecord::UnknownAttributeError:
        unknown attribute: shipping_method_id
      # ./spec/features/consumer/shopping/orders_spec.rb:30:in `block (3 levels) in <top (required)>'
      # ------------------
      # --- Caused by: ---
      # NoMethodError:
      #   undefined method `shipping_method_id=' for #<Spree::Order:0x00007f5e8bafe6f0>
      #   ./spec/features/consumer/shopping/orders_spec.rb:30:in `block (3 levels) in <top (required)>'
2020-03-02 20:37:58 +01:00
dependabot-preview[bot]
e4c5893c1e Bump rubocop from 0.80.0 to 0.80.1
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.80.0 to 0.80.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.80.0...v0.80.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-02 19:36:43 +00:00
dependabot-preview[bot]
67aeae4a6d Bump oj from 3.10.2 to 3.10.3
Bumps [oj](https://github.com/ohler55/oj) from 3.10.2 to 3.10.3.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.2...v3.10.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-02 19:34:09 +00:00
Matt-Yorkley
0d08ad7d2e Fix expectation in helper spec
The output of this link helper has changed slightly. All the attributes are the same as before, but they seem to be in alphabetical order now.

Fixes:

  69) Spree::BaseHelper#link_to_remove_fields returns an `a` tag followed by a hidden `input` tag
      Failure/Error: expect(subject).to eq("<a href=\"#\" class=\"remove_fields  icon_link with-tip icon-trash\" data-action=\"remove\" title=\"Remove\"><span class='text'>Hola</span></a>&lt;input type=&quot;hidden&quot; name=&quot;_method&quot; value=&quot;destroy&quot;&gt;")

        expected: "<a href=\"#\" class=\"remove_fields  icon_link with-tip icon-trash\" data-action=\"remove\" title=\"...</span></a>&lt;input type=&quot;hidden&quot; name=&quot;_method&quot; value=&quot;destroy&quot;&gt;"
             got: "<a class=\"remove_fields  icon_link with-tip icon-trash\" data-action=\"remove\" href=\"#\" title=\"...</span></a>&lt;input type=&quot;hidden&quot; name=&quot;_method&quot; value=&quot;destroy&quot;&gt;"

        (compared using ==)
      # ./spec/helpers/spree/admin/base_helper_spec.rb:12:in `block (3 levels) in <top (required)>'
2020-03-02 19:41:47 +01:00
Matt-Yorkley
0784b8263a Fix spec setup in api/orders_controller_spec
ActionController doesn't accept nil values for :id as a valid route request in Rails 4.

Fixes:

  2) Api::OrdersController#show Resource not found when no order number is given
     Failure/Error: get :show, id: nil

     ActionController::UrlGenerationError:
       No route matches {:action=>"show", :controller=>"api/orders", :id=>nil}
     # ./spec/controllers/api/orders_controller_spec.rb:168:in `block (4 levels) in <module:Api>'
2020-03-02 19:22:43 +01:00
Matt-Yorkley
ed5351d23e Fix duplicate validations in payment methods and shipping methods
Updates the syntax to follow the recommended usage in the code comments of the ActiveModel #validates_with method.

Fixes:

  12) Spree::PaymentMethod raises errors when required fields are missing
      Failure/Error: expect(pm.errors.to_a).to eq(["Name can't be blank", "At least one hub must be selected"])

        expected: ["Name can't be blank", "At least one hub must be selected"]
             got: ["Name can't be blank", "At least one hub must be selected", "At least one hub must be selected"]

        (compared using ==)
      # ./spec/models/spree/payment_method_spec.rb:16:in `block (2 levels) in <module:Spree>'
2020-03-02 19:02:07 +01:00
Luis Ramos
02008769e9 Make spree_payment.cvv_response_message without size limit so that long stripe redirect URLs can be stored there 2020-03-02 17:31:01 +00:00
Luis Ramos
65dd9f51cf Add spec to cover update request where a stripe redirect must happen 2020-03-02 17:30:12 +00:00
Luis Ramos
a224c53200 Add spec to test receiving a redirect from stripe with a valid payment intent id 2020-03-02 17:30:12 +00:00
Luis Ramos
66f07c0d1c Make checkout controller spec test both extracted payment redirects 2020-03-02 17:30:12 +00:00
Luis Ramos
d5287026f8 Add spec for Checkout::PostCheckoutActions 2020-03-02 17:30:12 +00:00
Luis Ramos
6b80eb2c16 Add spec for AuthorizeResponsePatcher 2020-03-02 17:30:12 +00:00
Luis Ramos
b54b981740 Improve readability of PaymentIntentValidator and cover with specs 2020-03-02 17:30:12 +00:00
Luis Ramos
895032fe6a Move stubbed requests to the top as they are the same for every test 2020-03-02 17:30:12 +00:00
Luis Ramos
531c385aae Adapt stripe sca spec to new double step auth+capture payment process 2020-03-02 17:30:12 +00:00
Luis Ramos
d0a3ab68f3 Make processing payments also pending payments 2020-03-02 17:30:12 +00:00
luisramos0
b5038c5745 Adapt subscriptionPaymentUpdater to include pending payments as pending payments! Pending payments of credit cards are payments already authorized, ready to be captured
This is problably what will happen with subscriptions credit cards where payments will be authorized by the customer and the confirmation process on process_payments! will just capture the payment
2020-03-02 17:30:12 +00:00
luisramos0
6877485c90 Extract AuthorizeResponsePatcher from stripeSCA gateway 2020-03-02 17:30:12 +00:00
luisramos0
95c1b7f7a6 Extract PaymentIntentValidator from StripeSCA gateway 2020-03-02 17:30:12 +00:00
luisramos0
3fcf286516 Extract PostCheckoutActions from checkout controller 2020-03-02 17:30:12 +00:00
luisramos0
e2cdb01a28 Improve readability of stripe sca gateway code 2020-03-02 17:30:12 +00:00
luisramos0
08e729673f Move stripe sca gateway error messages to translatable keys 2020-03-02 17:30:12 +00:00
luisramos0
c0bf09131f Make order.pending_payments include payments in pending state so that these payments (pending is the state after authorization for credit cards) are also processed as part of the normal order workflow 2020-03-02 17:30:12 +00:00
luisramos0
19042e0d37 Make checkout controller able to receive a redirect from stripe with a payment_intent as parameter 2020-03-02 17:30:12 +00:00
luisramos0
4b3b4e00ff Add authorize action to the stripe_sca gateway and make it fetch the redirect url if provided
Change the purchase action to only capture the alrteady authorized payment intent
2020-03-02 17:30:12 +00:00
luisramos0
e3ffe8fe6b Add Checkout Stripe redirect logic to get users redirected to stripe authentication pages provided by the stripe API 2020-03-02 17:30:12 +00:00
luisramos0
d91578ab80 Rename checkout payment redirect to checkout paypal redirect 2020-03-02 17:30:12 +00:00
luisramos0
873dcc373f Small refactoring to make next commit easier 2020-03-02 17:30:12 +00:00
luisramos0
1289c3f1a2 Fix rubocop issues in credit_cards_controller 2020-03-02 17:29:30 +00:00
Luis Ramos
c37218fdc5 Merge pull request #4719 from luisramos0/stripe_card_to_pm
Make StripeSCA payment method work with existing credit cards (the ones saved through the Stripe Charges API)
2020-03-02 17:22:07 +00:00
Luis Ramos
dad21a52b2 Merge pull request #4672 from luisramos0/stripe_sca_method
Add new Stripe payment method compatible with the new Stripe Payment Intents API
2020-03-02 17:19:05 +00:00
Pau Pérez Fabregat
97a65d760f Merge pull request #4527 from luisramos0/subs_logs
Improve Subscriptions logging
2020-03-02 15:48:45 +01:00
Transifex-Openfoodnetwork
63e92197f5 Updating translations for config/locales/pt_BR.yml 2020-03-02 09:40:20 +11:00
Transifex-Openfoodnetwork
fd534bf629 Updating translations for config/locales/pt_BR.yml 2020-03-02 09:37:10 +11:00
Eduardo
64d83bfc4d fix ampersand problem using ng-bind-html 2020-03-01 17:54:36 -03:00
Matt-Yorkley
a0999f5d58 Check #persisted? before calling #touch
Rails 4 now throws a fatal error if calling #touch on an object that hasn't been saved yet: c63cfc8722/activerecord/lib/active_record/persistence.rb (L957)

Fixes:

  41) Stock::Package#shipping_methods does not return shipping methods not used by the package's order distributor
      Failure/Error: distributors.each(&:touch)

      ActiveRecord::ActiveRecordError:
        can not touch on a new record object
      # ./app/models/spree/shipping_method_decorator.rb:81:in `touch_distributors'
      # ./spec/models/stock/package_spec.rb:39:in `block (2 levels) in <module:Stock>'
      # ./spec/models/stock/package_spec.rb:17:in `block (2 levels) in <module:Stock>'
      # ./spec/models/stock/package_spec.rb:32:in `block (2 levels) in <module:Stock>'
      # ./spec/models/stock/package_spec.rb:7:in `block (2 levels) in <module:Stock>'
      # ./spec/models/stock/package_spec.rb:44:in `block (3 levels) in <module:Stock>'

  42) Stock::Package#shipping_categories returns shipping categories that are not shipping categories of the order's products
      Failure/Error: distributors.each(&:touch)

      ActiveRecord::ActiveRecordError:
        can not touch on a new record object
      # ./app/models/spree/shipping_method_decorator.rb:81:in `touch_distributors'
      # ./spec/models/stock/package_spec.rb:39:in `block (2 levels) in <module:Stock>'
      # ./spec/models/stock/package_spec.rb:17:in `block (2 levels) in <module:Stock>'
      # ./spec/models/stock/package_spec.rb:32:in `block (2 levels) in <module:Stock>'
      # ./spec/models/stock/package_spec.rb:7:in `block (2 levels) in <module:Stock>'
      # ./spec/models/stock/package_spec.rb:50:in `block (3 levels) in <module:Stock>'
2020-03-01 18:40:15 +01:00
Matt-Yorkley
847a349a6b Fix geocoding in Rails 4 🎉
Responsibility for geocoding has moved from the `gmaps4rails` gem using `acts_as_taggable`, to the `geocoding` gem using `geocoded_by`. We already use this in the Address model.
2020-02-29 13:08:06 +01:00
Matt-Yorkley
7dbe0bd6b9 Use new branch of ofn-qz gem 2020-02-28 15:27:11 +01:00
Matt-Yorkley
5c526bf5cc Move definitions into constants and use #freeze 2020-02-28 13:08:17 +01:00
Matt-Yorkley
a9e6622639 Update product import #assign_attributes calls
For some reason some of the superfluous attributes being assigned here have started throwing fatal errors in Rails 4 instead of being silently ignored...
2020-02-28 13:08:17 +01:00
Luis Ramos
ddebd47e32 Merge pull request #4862 from Matt-Yorkley/3-0-paypal
[Spree 2.1] Re-introduce Paypal gem
2020-02-28 11:25:16 +00:00
Luis Ramos
56c6ef5e79 Merge pull request #4853 from Matt-Yorkley/3-0-base-controller
[Spree 2.1] Fix headers in api/base_controller spec
2020-02-28 11:21:16 +00:00
Matt-Yorkley
eef1574ebe Call #permit on params object in before_filter 2020-02-28 12:18:53 +01:00
Matt-Yorkley
95996dc11e Un-comment :credit_cards in routes 2020-02-28 12:18:53 +01:00
Matt-Yorkley
78e430613f Fix spree routes helper in payment_redirect.rb 2020-02-28 12:18:53 +01:00
Luis Ramos
4f3247c196 Revert "Temporarily remove broken specs"
This reverts commit c0dc999e0d.
2020-02-28 12:18:53 +01:00
Luis Ramos
427d3b7641 Revert "Comment spree_paypal express in all.js temporarily"
This reverts commit 26ba37b117.
2020-02-28 12:18:53 +01:00
Luis Ramos
61439a3750 Re-add paypal controller code 2020-02-28 12:18:53 +01:00
Matt-Yorkley
1f59bc8bef Use new branch of the paypal gem
This uses the `2-1-0-stable` branch of the paypal gem. It's the 2-1-stable branch plus a couple of old OFN modifications (from 2-0-stable), plus a minor modification to the gemspec to allow it to be used with spree_core `2.1.0`
2020-02-28 12:18:53 +01:00
Matt-Yorkley
cc1ab1bdb9 Fix issue with broken SQL fragments in scopes and nested subqueries
It looks like there are some issues with prepared statements here, where the resulting SQL contains something like: `WHERE "enterprise_roles"."user_id" = $1` in a subquery. The "$1" part is being lost somehow and isn't present if it's used in nested subqueries.

Example fixed spec (there are lots like this one):

  59) Spree::Admin::ReportsController Supplier Bulk Coop where I have granted P-OC to the distributor only shows product line items that I am supplying
      Failure/Error: produced_line_items.select("spree_line_items.id"))

      ActiveRecord::StatementInvalid:
        PG::ProtocolViolation: ERROR:  bind message supplies 0 parameters, but prepared statement "" requires 1
        : SELECT id FROM "spree_line_items"  WHERE "spree_line_items"."order_id" IN (SELECT id FROM "spree_orders"  WHERE (("spree_orders"."distributor_id" IN (SELECT enterprises.id FROM "enterprises" INNER JOIN "enterprise_roles" ON "enterprise_roles"."enterprise_id" = "enterprises"."id" WHERE (enterprise_roles.user_id = 947)) OR "spree_orders"."order_cycle_id" IN (SELECT id FROM "order_cycles"  WHERE "order_cycles"."coordinator_id" IN (SELECT "enterprises"."id" FROM "enterprises" INNER JOIN "enterprise_roles" ON "enterprises"."id" = "enterprise_roles"."enterprise_id" WHERE "enterprise_roles"."user_id" = $1)))))
      # ./app/services/permissions/order.rb:28:in `visible_line_items'
      # ./lib/open_food_network/reports/line_items.rb:16:in `list'
      # ./lib/open_food_network/bulk_coop_report.rb:54:in `table_items'
      # ./app/controllers/spree/admin/reports_controller.rb:264:in `order_grouper_table'
      # ./app/controllers/spree/admin/reports_controller.rb:101:in `bulk_coop'
      # ./spec/controllers/spree/admin/reports_controller_spec.rb:168:in `block (5 levels) in <top (required)>'
      # ------------------
      # --- Caused by: ---
      # PG::ProtocolViolation:
      #   ERROR:  bind message supplies 0 parameters, but prepared statement "" requires 1
      #   ./app/services/permissions/order.rb:28:in `visible_line_items'
2020-02-28 12:16:55 +01:00
Luis Ramos
e5232c6b79 Merge pull request #4863 from Matt-Yorkley/3-0-gemfile-lock-fixed
[Spree 2.1] Fix Gemfile.lock
2020-02-28 11:15:24 +00:00
Luis Ramos
95415cddbd Merge pull request #4858 from Matt-Yorkley/3-0-embedded
[Spree 2.1] Fix embedded response headers
2020-02-28 11:12:16 +00:00
Matt-Yorkley
789ecbb8f2 Fix Gemfile.lock 2020-02-28 12:06:44 +01:00
Luis Ramos
0e607003c1 Fix problem in order cycles spec where miliseconds were not matching 2020-02-28 11:06:16 +00:00
Luis Ramos
1d0392e644 Merge pull request #4848 from Matt-Yorkley/3-0-test-locales
[Spree 2.1] Add 'pt' to list of available locales in test suite
2020-02-28 11:04:23 +00:00
Matt-Yorkley
02d46b7c51 Fix test in order_cycles_spec.rb 2020-02-28 11:51:09 +01:00
Matt-Yorkley
8672124f31 Add 'pt' to list of available locales in test suite
Fixes several errors such as:

104) UserRegistrationsController via ajax sets user.locale from cookie on create
       Failure/Error: I18n.locale = spree_current_user.andand.locale || cookies[:locale] || I18n.default_locale

       I18n::InvalidLocale:
         "pt" is not a valid locale
       # ./app/helpers/i18n_helper.rb:14:in `set_locale'
       # ./spec/controllers/user_registrations_controller_spec.rb:56:in `block (3 levels) in <top (required)>'
2020-02-28 11:44:33 +01:00
Pau Pérez Fabregat
9440363a22 Merge pull request #4821 from luisramos0/3_val_issues
[Spree 2.1] Fix creation of enterprises/users in specs
2020-02-28 11:34:27 +01:00
Pau Pérez Fabregat
19dd5d0af3 Merge pull request #4855 from luisramos0/3-0-ship-method-services
[Spree 2.1] Fix ShippingMethod.services query
2020-02-28 11:31:53 +01:00
Pau Pérez Fabregat
3d453eb5ee Merge pull request #4861 from luisramos0/3-0-merge-master
[Spree 2.1] Merge master into 3-0-stable
2020-02-28 11:28:56 +01:00
Pau Pérez Fabregat
83065a798e Merge pull request #4814 from luisramos0/rubop_rules
Add new cops (disabled) to rubocop config
2020-02-28 11:15:34 +01:00
Pau Pérez Fabregat
de9f14c305 Merge pull request #4849 from Matt-Yorkley/3-0-private-method
[Spree 2.1] Make private method #total_units public
2020-02-28 11:00:12 +01:00
Pau Pérez Fabregat
455241859e Merge pull request #4850 from Matt-Yorkley/3-0-shipments
[Spree 2.1] Fix expectations in order_shipment_spec
2020-02-28 10:58:58 +01:00
Luis Ramos
bf47d34434 Merge branch 'master' into 3-0-merge-master 2020-02-28 09:52:01 +00:00
Matt-Yorkley
b661b3ee40 Merge pull request #4823 from luisramos0/require_specs
Add some require statements to specs
2020-02-28 10:46:29 +01:00
Pau Pérez Fabregat
d03d1c0cc2 Merge pull request #4832 from Matt-Yorkley/3-0-more_strong_params
[Spree 2.1] Add strong_params to admin/enterprise_relationships_controller.rb
2020-02-28 10:41:05 +01:00
Pau Pérez Fabregat
6854301025 Merge pull request #4828 from Matt-Yorkley/3-0-strong_params
[Spree 2.1] Strong params
2020-02-28 10:40:52 +01:00
Pau Pérez Fabregat
dc9ebd620a Merge pull request #4833 from Matt-Yorkley/3-0-moar_params
[Spree 2.1] Add strong params to admin/column_preferences_controller.rb
2020-02-28 10:30:54 +01:00
Matt-Yorkley
7124c6bb73 Fix embedded response headers
Rails 4 adds an extra layer of "default" headers that override any that are missing (or deleted). This was breaking embedded shopfront responses.

Fixes:

  74) setting response headers for embedded shopfronts with embedded shopfronts enabled with a valid whitelist allows iframes on certain pages when enabled in configuration
      Failure/Error: expect(response.headers['X-Frame-Options']).to be_nil

        expected: nil
             got: "SAMEORIGIN"
      # ./spec/requests/embedded_shopfronts_headers_spec.rb:54:in `block (4 levels) in <top (required)>'

  75) setting response headers for embedded shopfronts with embedded shopfronts enabled with www prefix matches the URL structure in the header
      Failure/Error: expect(response.headers['X-Frame-Options']).to be_nil

        expected: nil
             got: "SAMEORIGIN"
      # ./spec/requests/embedded_shopfronts_headers_spec.rb:75:in `block (4 levels) in <top (required)>'
2020-02-27 20:53:09 +01:00
Luis Ramos
b528903aa8 Remove spec covering html format in SchedulesController#index, this is not used anywhere 2020-02-27 19:05:36 +00:00
Luis Ramos
bd0245229b Move enterprise logo and promo_image setting in factories to after creation fixes a problem with enterprise_roles in the enterprise validation 2020-02-27 18:32:56 +00:00
Matt-Yorkley
38215c2a88 Delete some dead code
This feature for assigning defaults via the UI was previously removed
2020-02-27 19:28:25 +01:00
Luis Ramos
b1714d73ef Capitalize 'Method' in the flash message to make specs pass 2020-02-27 18:01:24 +00:00
Luis Ramos
ade52dd07d Make ship methods services query work with rails 4, bool_or now results in a boolean and not in t or f as before 2020-02-27 17:40:32 +00:00
Matt-Yorkley
d280bf0d4d Update all locales with the latest Transifex translations 2020-02-27 11:42:02 +01:00
Matt-Yorkley
0fa73e3b02 Fix headers in api/base_controller spec
The headers in the request were not being populated correctly in the test, so the #api_key method was not functioning as intended.

Fixes:

  48) Api::BaseController cannot make a request to the API with an invalid API key
      Failure/Error: expect(json_response).to eq( "error" => "Invalid API key (fake_key) specified." )

        expected: {"error"=>"Invalid API key (fake_key) specified."}
             got: {"products"=>[]}

        (compared using ==)

        Diff:
        @@ -1,2 +1,2 @@
        -"error" => "Invalid API key (fake_key) specified.",
        +"products" => [],

      # ./spec/controllers/api/base_controller_spec.rb:40:in `block (3 levels) in <top (required)>'
2020-02-27 11:23:48 +01:00
Eduardo
4c3916a93d redirect to shops list when an enterprise is not found 2020-02-26 19:25:38 -03:00
Luis Ramos
677f31ffa8 Make payment source_views/gateway work with nil credit card
This will happen if user deletes a saved credit card used previously. In this case, the admin payment details page will render empty details and the payment amount
2020-02-26 11:55:17 +00:00
Luis Ramos
5848a46149 Add missing template to render stripeSCA payment and add spec to verify it's presence 2020-02-26 11:38:42 +00:00
Matt-Yorkley
c758cb5508 Fix expectations in order_shipment_spec
Some depreacted calls to #find_by_* had previously been updated elsewhere, but the spec was still checking if the object received the #find_by_shipping_method_id message.

Fixes:

  85) OrderShipment#select_shipping_method when order has a shipment when shipping_method_id is not valid for the order returns nil
      Failure/Error: expect(shipment.shipping_rates).to receive(:find_by_shipping_method_id).with(invalid_shipping_method_id) { nil }

        (#<ActiveRecord::Associations::CollectionProxy []>).find_by_shipping_method_id(1312)
            expected: 1 time with arguments: (1312)
            received: 0 times
      # ./spec/models/concerns/order_shipment_spec.rb:53:in `block (5 levels) in <top (required)>'
2020-02-26 11:50:51 +01:00
Matt-Yorkley
82052e459d Make private method #total_units public
This method is being called by another class as if it were public.

Fixes 2 instances of this error:

  90) OpenFoodNetwork::OrdersAndFulfillmentsReport::SupplierTotalsReport generates the report
      Failure/Error: delegate :supplier_name, :product_name, :line_items_name, :total_units, to: :context

      NoMethodError:
        private method `total_units' called for #<OpenFoodNetwork::OrdersAndFulfillmentsReport:0x00007f8db5d67168>
      # ./lib/open_food_network/orders_and_fulfillments_report/supplier_totals_report.rb:8:in `total_units'
      # ./lib/open_food_network/orders_and_fulfillments_report/supplier_totals_report.rb:48:in `block in columns'
      # ./lib/open_food_network/order_grouper.rb:41:in `block in build_table'
      # ./lib/open_food_network/order_grouper.rb:41:in `map'
      # ./lib/open_food_network/order_grouper.rb:41:in `build_table'
      # ./lib/open_food_network/order_grouper.rb:47:in `block in build_table'
      # ./lib/open_food_network/order_grouper.rb:43:in `each'
      # ./lib/open_food_network/order_grouper.rb:43:in `build_table'
      # ./lib/open_food_network/order_grouper.rb:47:in `block in build_table'
      # ./lib/open_food_network/order_grouper.rb:43:in `each'
      # ./lib/open_food_network/order_grouper.rb:43:in `build_table'
      # ./lib/open_food_network/order_grouper.rb:47:in `block in build_table'
      # ./lib/open_food_network/order_grouper.rb:43:in `each'
      # ./lib/open_food_network/order_grouper.rb:43:in `build_table'
      # ./lib/open_food_network/order_grouper.rb:56:in `table'
      # ./spec/lib/open_food_network/orders_and_fulfillments_report/supplier_totals_report_spec.rb:19:in `block (2 levels) in <top (required)>'
      # ./spec/lib/open_food_network/orders_and_fulfillments_report/supplier_totals_report_spec.rb:23:in `block (2 levels) in <top (required)>'
2020-02-26 11:35:00 +01:00
Matt-Yorkley
167c8543aa Fix #create_enterprise_user
User was not being associated to enterprises passed in attributes
2020-02-26 10:46:41 +01:00
Luis Ramos
03c91dfac1 Merge pull request #4780 from luisramos0/bulk_prod_errors
Fix javascript logic that parses server errors in the bulk product edit page
2020-02-25 18:49:54 +00:00
Luis Ramos
60e12063cd Merge pull request #4758 from luisramos0/fix_incomplete_stripe
Make the payment methods filter handle misconfigured stripe payment methods
2020-02-25 18:47:09 +00:00
Pau Pérez Fabregat
e5b57af315 Merge pull request #4815 from openfoodfoundation/transifex
Transifex
2020-02-25 13:37:30 +01:00
Pau Pérez Fabregat
a396a7f0af Merge pull request #4818 from luisramos0/delete_dead_code
Delete dead code after PRs 4512 and 4508
2020-02-25 13:32:23 +01:00
Luis Ramos
6b6cdf07fb Remove inactive confirm
The new version of jquery is picking up a confirm in the ship action that was not being triggered in the previous version

The orders_spec was not expecting this confirm to appear so we are removing here to keep the behaviour and the spec green
2020-02-25 11:56:23 +00:00
Transifex-Openfoodnetwork
d084789c56 Updating translations for config/locales/nb.yml 2020-02-25 19:57:08 +11:00
Transifex-Openfoodnetwork
dafac32e70 Updating translations for config/locales/nb.yml 2020-02-25 19:53:59 +11:00
Maikel Linke
8432dab142 Remove unused Javascript manifest
It reduces compilation from 25s to 24s.
2020-02-25 11:43:53 +11:00
Maikel Linke
0b0263a605 Remove unused stylesheet manifest
Compiling assets with application.css: 40s
Compiling assets without application.css: 25s
2020-02-25 11:43:39 +11:00
Transifex-Openfoodnetwork
6ca39f3aa5 Updating translations for config/locales/fr_CA.yml 2020-02-25 09:10:13 +11:00
Transifex-Openfoodnetwork
234a9ef1b4 Updating translations for config/locales/en_CA.yml 2020-02-25 08:41:07 +11:00
Luis Ramos
24a1327805 Merge pull request #4785 from openfoodfoundation/dependabot/bundler/stripe-5.15.0
Bump stripe from 5.11.0 to 5.15.0
2020-02-24 20:12:39 +00:00
Luis Ramos
33d77d57f4 Merge pull request #4776 from luisramos0/remove_assets_group
Remove the assets group from the gemfile (taken from spree upgrade branch)
2020-02-24 20:12:01 +00:00
dependabot-preview[bot]
51dd55c5b9 [Security] Bump jquery-rails from 3.0.4 to 3.1.5
Bumps [jquery-rails](https://github.com/rails/jquery-rails) from 3.0.4 to 3.1.5. **This update includes a security fix.**
- [Release notes](https://github.com/rails/jquery-rails/releases)
- [Changelog](https://github.com/rails/jquery-rails/blob/v3.1.5/CHANGELOG.md)
- [Commits](https://github.com/rails/jquery-rails/compare/v3.0.4...v3.1.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-24 19:14:38 +00:00
Transifex-Openfoodnetwork
0571b657aa Updating translations for config/locales/en_FR.yml 2020-02-25 04:39:02 +11:00
Transifex-Openfoodnetwork
e4958baddc Updating translations for config/locales/en_FR.yml 2020-02-25 04:35:52 +11:00
Transifex-Openfoodnetwork
c985747297 Updating translations for config/locales/fr.yml 2020-02-25 04:31:33 +11:00
Maikel Linke
17ea2cd510 Clean up JS assets comments 2020-02-24 11:22:47 +11:00
Maikel Linke
325c427219 Remove style from pasted HTML in editor 2020-02-24 11:22:47 +11:00
Maikel Linke
a3e87d893a Remove obsolete angular-sanitize
Our TextAngular module supplies that code.
2020-02-24 11:22:47 +11:00
Maikel Linke
480a629349 Bump textAngular to latest v1.5.16
I'm not sure which version we had previously. This update should come
with lots of minor improvements even though we didn't have anyone
complain.
2020-02-24 11:22:47 +11:00
Luis Ramos
03fac6f285 Avoid subquery with too many columns error by specifying the selected column 2020-02-23 20:05:13 +00:00
Matt-Yorkley
90d1a5e605 Add strong params to admin/column_preferences_controller.rb
Fixes failures such as:

  119) Admin::ColumnPreferencesController bulk_update json where I don't own the preferences submitted prevents me from updating the column preferences
       Failure/Error: raise ActiveModel::ForbiddenAttributesError, params.to_s

       ActiveModel::ForbiddenAttributesError:
         {"action_name"=>"enterprises_index", "column_preferences"=>[{"id"=>1, "user_id"=>2716, "action_name"=>"enterprises_index", "column_name"=>"name", "visible"=>false}, {"id"=>nil, "user_id"=>2716, "action_name"=>"enterprises_index", "column_name"=>"producer", "visible"=>true}, {"id"=>nil, "user_id"=>2716, "action_name"=>"enterprises_index", "column_name"=>"status", "visible"=>true}], "format"=>"json", "controller"=>"admin/column_preferences", "action"=>"bulk_update"}
       # ./app/controllers/application_controller.rb:16:in `print_params'
       # ./spec/controllers/admin/column_preferences_controller_spec.rb:28:in `block (5 levels) in <top (required)>'
       # ------------------
       # --- Caused by: ---
       # ActiveModel::ForbiddenAttributesError:
       #   ActiveModel::ForbiddenAttributesError
       #   ./app/models/model_set.rb:24:in `block in collection_attributes='
2020-02-23 14:52:06 +01:00
Matt-Yorkley
fccc8037f0 Add strong_params to enterprise_relationships_controller.rb
Fixes specs such as:

  31)
  As an Administrator
  I want to manage relationships between enterprises
 as a site administrator creating a relationship
      Failure/Error: raise ActiveModel::ForbiddenAttributesError, params.to_s

      ActiveModel::ForbiddenAttributesError:
        {"enterprise_relationship"=>{"parent_id"=>284, "child_id"=>285, "permissions_list"=>["add_to_order_cycle", "edit_profile", "create_variant_overrides"]}, "action"=>"create", "controller"=>"admin/enterprise_relationships"}
      # ./app/controllers/application_controller.rb:16:in `print_params'
      # ./lib/open_food_network/rack_request_blocker.rb:36:in `call'
      # ------------------
      # --- Caused by: ---
      # ActiveModel::ForbiddenAttributesError:
      #   ActiveModel::ForbiddenAttributesError
      #   ./app/controllers/admin/enterprise_relationships_controller.rb:10:in `create'
2020-02-23 14:26:14 +01:00
Transifex-Openfoodnetwork
f5ffdfc258 Updating translations for config/locales/en_NZ.yml 2020-02-23 22:32:56 +11:00
Matt-Yorkley
f77194875c Add strong parameters to orders_controller.rb 2020-02-22 16:24:30 +01:00
Matt-Yorkley
bd6b409708 Add strong parameters to user_registrations_controller.rb 2020-02-22 16:24:30 +01:00
Matt-Yorkley
eae7dc7f2e Temporarily add extra debugging to help with strong parameters 2020-02-22 16:24:28 +01:00
Matt-Yorkley
f5bc120fb1 Remove without_protection: true argument from #create calls
Needed for using Strong Parameters in Rails 4
2020-02-22 14:35:10 +01:00
Matt-Yorkley
3896644a04 Remove attr_accessible declarations
Needed for using Strong Parameters in Rails 4
2020-02-22 14:03:16 +01:00
Matt-Yorkley
74965eb635 Remove protected_attributes gem
This starts the move towards using Strong Parameters in Rails 4
2020-02-22 13:41:46 +01:00
Luis Ramos
e64d21d81d Move user enterprises definition in tests to after creation fixes a problem with enterprise_roles 2020-02-22 12:06:33 +00:00
Luis Ramos
1dc7b5793c Fix Enterprise validation and factory so that users are added after the validation 2020-02-22 12:06:33 +00:00
Luis Ramos
10c6e5ad9b Rebuild rubocop todo after latest rebase 2020-02-22 11:53:35 +00:00
Luis Ramos
f06a4fb1d0 This configuration is no longer needed as this is the default behaviour in rails 4 2020-02-22 11:53:35 +00:00
Luis Ramos
7640c7b606 Make all timestamps nullable, non-nullable timestamps are not required to maketimestamps work properly 2020-02-22 11:53:35 +00:00
Luis Ramos
26ba37b117 Comment spree_paypal express in all.js temporarily 2020-02-22 11:53:35 +00:00
Luis Ramos
2108a282c8 Add some require statements to specs 2020-02-22 11:49:52 +00:00
Matt-Yorkley
8b54281254 Add missing method removed from order model in Spree 2.1
It looks like #price_adjustments was refactored/removed in Spree 2.1, but we still call the method in order_decorator
2020-02-22 11:06:51 +00:00
Matt-Yorkley
e9e4168102 Fix ActiveModel::MissingAttributeError in order_cycle_permissions.rb
Failure/Error: variant_ids_by_supplier_id(permissions.all_incoming_editable_variants.all)

     ActiveModel::MissingAttributeError:
       missing attribute: product_id
     # ./app/serializers/api/admin/order_cycle_serializer.rb:36:in `editable_variants_for_incoming_exchanges'
     # (eval):9:in `_fast_attributes'
     # ./app/controllers/spree/admin/base_controller_decorator.rb:98:in `render_as_json'
     # ./app/controllers/admin/order_cycles_controller.rb:28:in `block (2 levels) in show'
     # ./app/controllers/admin/order_cycles_controller.rb:25:in `show'
     # ./lib/open_food_network/rack_request_blocker.rb:36:in `call'
     # ------------------
     # --- Caused by: ---
     # ActiveModel::MissingAttributeError:
     #   missing attribute: product_id
     #   ./app/serializers/api/admin/order_cycle_serializer.rb:36:in `editable_variants_for_incoming_exchanges'
2020-02-22 11:06:51 +00:00
Matt-Yorkley
b9db6df952 Replace current_spree_user method
This wasn't working before but now seems to be fixed
2020-02-22 11:06:51 +00:00
Matt-Yorkley
b3e7f9a07e Fix deprecated arguments used in #sanitize
Failure/Error: d = sanitize(object.description, tags: "p, b, strong, em, i, a, u", attributes: "href, target")

     ArgumentError:
       You should pass :tags as an Enumerable
     # ./app/serializers/api/product_serializer.rb:26:in `description_html'
     # (eval):10:in `_fast_attributes'
     # ./app/services/products_renderer.rb:24:in `products_json'
     # ./app/controllers/api/order_cycles_controller.rb:14:in `products'
     # ./lib/open_food_network/rack_request_blocker.rb:36:in `call'
2020-02-22 11:06:51 +00:00
Matt-Yorkley
04b760f221 Fix changed order of arguments for TestCase#process
DEPRECATION WARNING: TestCase#process now expects the HTTP method as second argument: process(action, http_method, params, session, flash). (called from api_process at /home/user/Github/openfoodnetwork/spec/support/controller_hacks.rb:22)
2020-02-22 11:06:51 +00:00
Matt-Yorkley
df1299b290 Fix user not yet loaded in prepend_before_filter 2020-02-22 11:06:51 +00:00
Matt-Yorkley
c0ecdb9e3a Fix deprecated #includes in join without reference
DEPRECATION WARNING: It looks like you are eager loading table(s) (one of: variant_overrides, enterprises, enterprise_roles) that are referenced in a string SQL snippet. For example:

    Post.includes(:comments).where("comments.title = 'foo'")

Currently, Active Record recognizes the table in the string, and knows to JOIN the comments table to the query, rather than loading comments in a separate query. However, doing this without writing a full-blown SQL parser is inherently flawed. Since we don't want to write an SQL parser, we are removing this functionality. From now on, you must explicitly tell Active Record when you are referencing a table from a string:

    Post.includes(:comments).where("comments.title = 'foo'").references(:comments)

If you don't rely on implicit join references you can disable the feature entirely by setting `config.active_record.disable_implicit_join_references = true`. (called from collection at /home/user/Github/openfoodnetwork/app/controllers/admin/variant_overrides_controller.rb:77)
2020-02-22 11:06:51 +00:00
Matt-Yorkley
6c22d655c8 Temporarily remove additional email validation on Spree::Order
A new custom email validator class was added to Spree::Order, and currently it fails every time (breaking lots of specs). This ugly hack disables it for now.
2020-02-22 11:06:51 +00:00
Matt-Yorkley
3615dcd355 Fix namespacing in cookies test
NameError: uninitialized constant ActionDispatch::Cookies::SignedCookieJar::MAX_COOKIE_SIZE
     # ./spec/requests/large_request_spec.rb:8
2020-02-22 11:06:51 +00:00
Matt-Yorkley
49bc3308be Fix broken references to url_helpers 2020-02-22 11:06:51 +00:00
Matt-Yorkley
fd11d4fa5b Fix broken html encoding of injected json in admin views 2020-02-22 11:06:51 +00:00
Matt-Yorkley
e3ae65fad5 Update rubocop_todo 2020-02-22 11:06:51 +00:00
Matt-Yorkley
ae11cb9954 Update rubocop_styleguide for Rails 4 2020-02-22 11:06:51 +00:00
Matt-Yorkley
98fdbb8621 Update deprecated #scoped calls
Model#scoped is now deprecated. Model#where(nil) in Rails 4 returns the same result as Model#scoped in Rails 3
2020-02-22 11:06:51 +00:00
Matt-Yorkley
241e9221b4 Replace deprecated :restrict option in address_decorator.rb
DEPRECATION WARNING: The :restrict option is deprecated. Please use :restrict_with_exception instead, which provides the same functionality. (called from block in <top (required)> at /home/user/Github/openfoodnetwork/app/models/spree/address_decorator.rb:4)
2020-02-22 11:06:51 +00:00
Matt-Yorkley
9fd4863a13 Fix missing roles error in spec workflow #create_enterprise_user 2020-02-22 11:06:51 +00:00
Matt-Yorkley
6541b55872 Fix default_association deprecated syntax in OrderCycle and Schedule 2020-02-22 11:06:51 +00:00
Matt-Yorkley
aff8911309 Update database_cleaner to >1.0 to fix transaction issues in test suite 2020-02-22 11:06:51 +00:00
Matt-Yorkley
39459b4a63 Temporarily fix root_path missing error in many controllers 2020-02-22 11:06:51 +00:00
Matt-Yorkley
7aef5af71c Fix report types spec 2020-02-22 11:06:51 +00:00
Matt-Yorkley
0a9d63dd2f Fix deprecated syntax on associations 2020-02-22 11:06:51 +00:00
Matt-Yorkley
5cc223e8f4 Update routes loading for Rails 4 2020-02-22 11:06:51 +00:00
Matt-Yorkley
a12ec8c5d9 Move filter parameters to initializer for Rails 4 2020-02-22 11:06:51 +00:00
Matt-Yorkley
046d8e0b87 Explicitly configure shoulda-matchers in spec_helper
This is apparently needed in Rails 4
2020-02-22 11:06:51 +00:00
Matt-Yorkley
16d56a8cbd Routes using match must specify a request method in Rails 4 2020-02-22 11:06:51 +00:00
Matt-Yorkley
a8b8269a02 Update deprecated #find_or_initialize_by_* methods 2020-02-22 11:06:51 +00:00
Matt-Yorkley
b80929022b Remove unused newrelic_rpm gem 2020-02-22 11:06:51 +00:00
Matt-Yorkley
53645517af Update deprecated #find_by_* methods 2020-02-22 11:06:51 +00:00
Matt-Yorkley
30558485de Update deprecated #find_or_create_by_* methods 2020-02-22 11:06:51 +00:00
Matt-Yorkley
6dd982532c Update deprecated/changed Rubocop rule names 2020-02-22 11:06:51 +00:00
Matt-Yorkley
418e9d23fe Add missing eager_load setting in test.rb 2020-02-22 11:06:51 +00:00
Matt-Yorkley
b8e608abc2 Remove deprecated #whiny_nils 2020-02-22 11:06:51 +00:00
Matt-Yorkley
6eef2555f1 Fix i18n available locales error
For some reason the locales defined in config/environment/test.rb are `en,es`, but in the used application.yml they were `en,es,en-GB`. This seems to trigger errors in the test environment ("en-GB is not a valid locale") if the two lists don't match..?
2020-02-22 11:06:51 +00:00
Matt-Yorkley
5603b70379 Fix html escaping of characters in AMS rendering causing fatal javascript errors 2020-02-22 11:06:51 +00:00
Matt-Yorkley
b03ef140f7 Enable sass 2020-02-22 11:06:51 +00:00
Matt-Yorkley
8ffdd806bf Enable rails-i18n 4.0 2020-02-22 11:06:25 +00:00
Matt-Yorkley
1fa2d05c0c Fix AuthenticationHelper#spree_current_user
`current_spree_user`: method not found...
2020-02-22 11:05:24 +00:00
Matt-Yorkley
5b8552f541 Fix ActiveRecord::Relation issue
Rails 4 now returns an Activerecord::Relation when using `SomeModel.all`. To get all the objects (as in Rails 3) we need to use `SomeModel.all.to_a`. See: https://stackoverflow.com/a/22417170
2020-02-22 11:05:24 +00:00
Matt-Yorkley
6f62c2cf27 Fix SCSS import file error 2020-02-22 11:05:24 +00:00
luisramos0
2f69d2a7e7 Remove devise email validation regexp, it's not needed in this version 2020-02-22 11:05:24 +00:00
luisramos0
2dc78d2f50 Remove spree_auth_devise and upgrade devise to 3.0.1 2020-02-22 11:05:24 +00:00
luisramos0
d1248c76fa Temporarily disable caching classes in test to fix karma rake task
This fixes the error "can't modify immutable index" in lib/tasks/karma.rake:25:in `application_spec_files'
2020-02-22 11:05:24 +00:00
luisramos0
4ca9a19d8a Temporarily remove broken fontawesome and spree_paypal_express assets 2020-02-22 11:05:24 +00:00
luisramos0
1ef9209183 Remove the assets group in the gemfile (removed in rails 4) 2020-02-22 11:05:24 +00:00
luisramos0
9c369caae2 Temporarily comment part of Enterprise.relate_to_owners_enterprises so that most specs pass for now 2020-02-22 11:05:24 +00:00
luisramos0
b23ce20488 Add migration from spree v2.1 2020-02-22 11:05:24 +00:00
luisramos0
18ca9980c9 Temporarily comment Enterprise.ensure_owner_is_manager otherwise all specs erroring out with 'Enterprise roles invalid' 2020-02-22 11:05:24 +00:00
luisramos0
c0dc999e0d Temporarily remove broken specs 2020-02-22 11:05:24 +00:00
luisramos0
8fe3a8aea4 Setting secret key in config/initializers/secret_token.rb 2020-02-22 11:05:24 +00:00
luisramos0
8e747e54a0 Setting eager loading on each env configuration 2020-02-22 11:05:24 +00:00
luisramos0
8dbe4accaf Upgrade to the spree branch 2-1-0-stable and rails 4.0.0 2020-02-22 11:05:24 +00:00
Luis Ramos
a3a61967a8 Merge pull request #4621 from luisramos0/spree_backend_js
OFN without spree_backend 🎉
2020-02-22 10:24:50 +00:00
luisramos0
404e7c1f37 Make credit card cloner clone the payment method even if the customer is not given
This makes the payments without saving card work again in the frontoffice as well as the payments taken by the seller in the backoffice
2020-02-21 14:11:13 +00:00
Luis Ramos
1bdeda4a21 Delete dead code after PRs 4512 and 4508 2020-02-21 12:25:07 +00:00
Luis Ramos
47916f823f Add spec to credit card cloner. No customer given. 2020-02-21 10:56:32 +00:00
Luis Ramos
ab4add1954 Fix CreditCardCloner basic spec 2020-02-21 10:56:32 +00:00
Luis Ramos
10fff31dca Fix stripe_sca spec 2020-02-21 10:56:32 +00:00
Luis Ramos
7fb85092ce Remove duplicate customers stubs 2020-02-21 10:56:32 +00:00
Luis Ramos
7584e96759 Make customer stub always return the same customer id
I cant make stripe customers stub return different customer_ids based on the stripe_account header
2020-02-21 10:56:32 +00:00
Luis Ramos
f8ab64d71e Move specs around in stripe_sca_spec so we can re-use the cloning stubs when storing a new card and when re-using a new card 2020-02-21 10:56:32 +00:00
Luis Ramos
ccb4c77d1f Adapt credit card cloner to not clone card if it's a card to be used only once
Adapt stripe_sca specs to new cloner logic
2020-02-21 10:56:32 +00:00
luisramos0
5ef1510fc7 Adapt CreditCard cloner to clone not 'cards of the platform account to payment_methods of the connected accounts' but instead 'cards or payment_methods of the platform account to payment_methods of the connected accounts'
This process mimicks the existing process of generating a token on the connected account from a card on the platform account. In the Payment Intents API we need to create a payment method in the connected account, a token is not enough
2020-02-21 10:56:32 +00:00
luisramos0
1afd712ff4 Make StripeSCA store cards (and delete them) on the Stripe platform account and not the Stripe Connected account (the sellers accounts)
This is important so that cards can be re-used across sellers in OFN
2020-02-21 10:56:32 +00:00
luisramos0
699110258b Add spec for credit_card_cloner 2020-02-21 10:56:32 +00:00
luisramos0
3fb1df9bb3 Rename CardCloner to CreditCardCloner because it's dependent on Spree:CreditCard attributes 2020-02-21 10:56:32 +00:00
luisramos0
14c03ead31 Extract CardCloner to separate class 2020-02-21 10:56:32 +00:00
luisramos0
4480c2f0f0 Add logic to stripe_sca gateway to handle cards stored in the platform account with the stripe Charges API: card_* 2020-02-21 10:56:32 +00:00
luisramos0
b3ac5d8f41 Improve code readability a little 2020-02-21 10:52:56 +00:00
luisramos0
6fb74c88cd Fix a typo 2020-02-21 10:52:56 +00:00
luisramos0
38fd028a9f Fix some rubocop issues from previous commit 2020-02-21 10:52:56 +00:00
luisramos0
4e84310d63 Add StripeSCA where StripeConnect is treated as an exception in the setting up of process of a payment method and subscriptions
Here we are copy pasting and adding stripe SCA because we are planning to delete the StripeConnect that will be replaced by the stripe sca implementation
2020-02-21 10:52:56 +00:00
luisramos0
66440f9e4c Add missing translations for new payment method stripe sca 2020-02-21 10:52:56 +00:00
luisramos0
b8457ebece Make profile storer a bit easier to read 2020-02-21 10:52:56 +00:00
Luis Ramos
668fd1c7c0 Add spec for profile storer to cover happy path for both response attribute cases: existin stripe integration and new stripe sca 2020-02-21 10:52:55 +00:00
Luis Ramos
aff934c814 Remove unnecessary test setup code 2020-02-21 10:52:55 +00:00
Luis Ramos
6bb04f6cc6 Adapt stripe_sca_spec to actual stripe SCA API 2020-02-21 10:52:55 +00:00
luisramos0
0e815439b3 Duplicate stripe_connect_spec and adapt to new stripe_sca
stripe_connect_spec will be deleted at some point when all users are migrated to the sca api
2020-02-21 10:52:55 +00:00
luisramos0
c7b01c37af Fix a problem in credit cards controller spec and test case where stripe_account_id must be included in the stripe api call 2020-02-21 10:52:55 +00:00
luisramos0
ac8f3c811f Fix rubocop issues in some stripe integration related files 2020-02-21 10:52:55 +00:00
luisramos0
1b820ea85c Fix rubocop issues in credit_cards_controller 2020-02-21 10:52:55 +00:00
luisramos0
ec7b91bb68 Make ProfileStorer a bit easier to read 2020-02-21 10:52:29 +00:00
luisramos0
c773cde191 Add admin payment template for stripe sca and respective js code to make it work 2020-02-21 10:52:29 +00:00
luisramos0
db1065a69e Make saving a card on checkout work with the payment intents api by making profile storer work with the slightly different api responses from stripe 2020-02-21 10:52:29 +00:00
luisramos0
9fa4bad0b4 Add stripe SCA checkotu payment template and move stripe object definition to it and the other stripe template
We need to set the stripe object with the stripe account id to work with the payment intents api but we cannot set it to work with the stripe charges api

This makes the two payment methods incompatible: a given enterprise cannot use both the old stripe integration and this new one at the same time.
2020-02-21 10:52:29 +00:00
luisramos0
a52c4b542c Make destroy stored cards work for stripe SCA by setting stripe account id before making the call to the stripe api
This account id cannot be sent when dealing with the old StripeConnect gateway
2020-02-21 10:52:29 +00:00
luisramos0
283abf9a88 Remove dead code from Stripe connect gateway
Update Source is dead since a74c502fd9
2020-02-21 10:52:29 +00:00
luisramos0
f691d1aafd Add new payment method StripeSCA that will use the Stripe Payment Intents API instead of the Stripe Charges API that the current StripeConnect gatreway uses 2020-02-21 10:52:29 +00:00
luisramos0
5724c3bb0a Add code from ActiveMerchant v1.98.0 that supports the Stripe Payment Intents API
This commit can be reverted once we upgrade to v1.98.0
2020-02-21 10:52:29 +00:00
Transifex-Openfoodnetwork
49ba83da6d Updating translations for config/locales/en_GB.yml 2020-02-21 05:32:39 +11:00
Transifex-Openfoodnetwork
19d1497c4b Updating translations for config/locales/en_GB.yml 2020-02-21 05:29:31 +11:00
Luis Ramos
06200c9d3c Add new cops (disabled) to rubocop config 2020-02-20 18:04:43 +00:00
Luis Ramos
2412658e51 Update db/schema timestamp according to last change 2020-02-20 11:41:49 +00:00
Luis Ramos
0c4f22f847 Fix images/new.js path and add simple spec to verify the page loads correctly
Testing the file upload would be a bit more complicated
2020-02-20 11:18:22 +00:00
Luis Ramos
1803ea3c38 Add traling breakline to case where errors come in a array 2020-02-20 10:06:10 +00:00
Pau Pérez Fabregat
93fda02e43 Merge pull request #4803 from openfoodfoundation/dependabot/bundler/rubocop-0.80.0
Bump rubocop from 0.79.0 to 0.80.0
2020-02-20 09:34:10 +01:00
Pau Pérez Fabregat
77958f9afe Merge pull request #4796 from openfoodfoundation/dependabot/bundler/i18n-js-3.6.0
Bump i18n-js from 3.5.1 to 3.6.0
2020-02-20 09:32:02 +01:00
Maikel Linke
82e402f31a Update translations from Transifex 2020-02-20 16:20:06 +11:00
Maikel Linke
03fa3e2269 Find last payment deterministically 2020-02-20 15:59:57 +11:00
Maikel Linke
11fbe7d5c9 Show last payment method in order confirmations 2020-02-20 15:59:57 +11:00
Maikel Linke
799c1f08de Optimise finding last payment
Suggested by Rubocop.
2020-02-20 15:59:56 +11:00
Maikel Linke
6b66458bfd Replace andand with new Ruby syntax 2020-02-20 15:59:56 +11:00
Maikel Linke
3e0a5bac6a Move helper to service for re-use 2020-02-20 15:59:56 +11:00
Maikel Linke
2c2023df03 Show last payment method in order confirmation
If we had multiple failed payments and then a successful payment, the
order confirmation was displaying the payment method of the first failed
payment. That was confusing and is now changed to the last payment
method.
2020-02-20 15:59:56 +11:00
Maikel Linke
7306d379a5 Display payment method literally
Don't allow for HTML and potentially bad scripts. But this also prevents
accidental display errors. If someone wrote, "We only take <cash>", it
would mess with the site.
2020-02-20 15:59:56 +11:00
Maikel Linke
e15c61d862 Add spec for order confirmation view 2020-02-20 15:59:56 +11:00
Maikel
35aeb98d45 Merge pull request #4792 from openfoodfoundation/transifex
Transifex
2020-02-20 10:43:45 +11:00
Luis Ramos
d99cba3b6e Merge pull request #4709 from mkllnk/4172-js-pluralize
Pluralize common variant unit names
2020-02-19 22:28:54 +00:00
dependabot-preview[bot]
4c6fd96bcc Bump rubocop from 0.79.0 to 0.80.0
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.79.0 to 0.80.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.79.0...v0.80.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-18 19:18:53 +00:00
Luis Ramos
1eba17f048 Make select column explicit to avoid too many columns sql error 2020-02-18 18:32:52 +00:00
dependabot-preview[bot]
ff088c6203 Bump stripe from 5.11.0 to 5.15.0
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 5.11.0 to 5.15.0.
- [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/v5.11.0...v5.15.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-18 12:01:10 +00:00
Luis Ramos
a1cb6928db Merge pull request #4793 from openfoodfoundation/dependabot/bundler/webmock-3.8.2
Bump webmock from 3.8.1 to 3.8.2
2020-02-18 11:59:14 +00:00
Luis Ramos
40a5b60dcb Merge pull request #4794 from openfoodfoundation/dependabot/bundler/oauth2-1.4.4
Bump oauth2 from 1.4.3 to 1.4.4
2020-02-18 11:58:58 +00:00
Luis Ramos
2711736004 Use Array#join and make code simpler 2020-02-18 10:49:41 +00:00
Luis Ramos
18c165e893 Merge pull request #4784 from CSCI-462-01-2020/Issue4731
Add Order Cycle Button Tooltips
2020-02-17 19:32:39 +00:00
Luis Ramos
0aaa04295b Improve and unit test errorsParser 2020-02-17 11:21:21 +00:00
Luis Ramos
7639e9a38d Extrac ErrorsParser to separate class and make it handle the rails error structure with keys 2020-02-17 11:21:21 +00:00
Transifex-Openfoodnetwork
d783bd771f Updating translations for config/locales/ar.yml 2020-02-15 09:33:06 +11:00
Transifex-Openfoodnetwork
9dd9d14107 Updating translations for config/locales/ar.yml 2020-02-15 09:29:56 +11:00
Transifex-Openfoodnetwork
e942266dd7 Updating translations for config/locales/pt_BR.yml 2020-02-15 07:05:18 +11:00
dependabot-preview[bot]
c8f78904d6 Bump i18n-js from 3.5.1 to 3.6.0
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.5.1 to 3.6.0.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.5.1...v3.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-14 19:24:49 +00:00
Transifex-Openfoodnetwork
a982fd1e2b Updating translations for config/locales/tr.yml 2020-02-14 22:27:33 +11:00
Transifex-Openfoodnetwork
7e8b2f6be5 Updating translations for config/locales/tr.yml 2020-02-14 22:24:23 +11:00
Transifex-Openfoodnetwork
921c7bbc3a Updating translations for config/locales/tr.yml 2020-02-14 22:21:12 +11:00
Transifex-Openfoodnetwork
eaff6b0c68 Updating translations for config/locales/nb.yml 2020-02-14 19:26:01 +11:00
Transifex-Openfoodnetwork
e1ab424481 Updating translations for config/locales/nb.yml 2020-02-14 19:22:51 +11:00
Luis Ramos
00e57c8a55 Add module definition in the recently moved service and adapt all it's usages to refer to the new namespace 2020-02-13 20:17:09 +00:00
Luis Ramos
2e74e64e22 Move Product Reset Strategy to the catalog domain 2020-02-13 20:17:09 +00:00
Luis Ramos
fc5d623465 Add new domain structure Catalog 2020-02-13 20:17:06 +00:00
Transifex-Openfoodnetwork
e59c9720fc Updating translations for config/locales/en_GB.yml 2020-02-14 06:53:13 +11:00
dependabot-preview[bot]
b25f0007f0 Bump oauth2 from 1.4.3 to 1.4.4
Bumps [oauth2](https://github.com/oauth-xx/oauth2) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/oauth-xx/oauth2/releases)
- [Changelog](https://github.com/oauth-xx/oauth2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/oauth-xx/oauth2/compare/v1.4.3...v1.4.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-13 19:19:44 +00:00
dependabot-preview[bot]
65c5cdd52f Bump webmock from 3.8.1 to 3.8.2
Bumps [webmock](https://github.com/bblimke/webmock) from 3.8.1 to 3.8.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/v3.8.1...v3.8.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-13 19:16:18 +00:00
Transifex-Openfoodnetwork
a2873ea553 Updating translations for config/locales/fr.yml 2020-02-14 05:05:51 +11:00
Transifex-Openfoodnetwork
3a593ff255 Updating translations for config/locales/fr.yml 2020-02-14 05:02:42 +11:00
Transifex-Openfoodnetwork
92e1193ffb Updating translations for config/locales/en_FR.yml 2020-02-14 05:01:02 +11:00
Transifex-Openfoodnetwork
016968dcb9 Updating translations for config/locales/fr.yml 2020-02-14 04:59:33 +11:00
Luis Ramos
9d8608f210 Merge pull request #4630 from Matt-Yorkley/product_counts
Show counts including all variants in order cycle exchanges
2020-02-13 11:33:58 +00:00
Luis Ramos
323ca906bc Merge pull request #4759 from pacodelaluna/order-admin-products
Order admin products
2020-02-13 11:33:05 +00:00
Luis Ramos
c43b34e0fa Merge pull request #4760 from luisramos0/checkout_ctrl
Merge Spree::CheckoutController with CheckoutController and clean it up
2020-02-13 11:31:15 +00:00
Luis Ramos
bc7f0e0962 Update all locales with the latest Transifex translations 2020-02-13 11:19:07 +00:00
Luis Ramos
cf4f7c562a Merge pull request #4778 from openfoodfoundation/transifex
Transifex
2020-02-13 11:08:01 +00:00
François Turbelin
4c7bd4d6a8 Fix mess with order 2020-02-13 06:38:13 +01:00
François Turbelin
523b266308 Put back created_at desc as default order 2020-02-13 06:38:13 +01:00
François Turbelin
212413c8b3 Avoid mutable q params 2020-02-13 06:38:13 +01:00
François Turbelin
b248dc598e Cosmetics 2020-02-13 06:38:13 +01:00
François Turbelin
e7b74b99ba Refactor SortingOptions JS 2020-02-13 06:38:13 +01:00
François Turbelin
89d2750fc4 Set default value at backend side 2020-02-13 06:38:13 +01:00
François Turbelin
7100111f93 Fix specs and cosmetics 2020-02-13 06:38:13 +01:00
François Turbelin
3dcb66014e Factorize column sorter partial 2020-02-13 06:38:13 +01:00
François Turbelin
06971b7198 Add sortable name column for Admin Products 2020-02-13 06:38:13 +01:00
François Turbelin
56f9adc5b7 Filter Admin products by name asc 2020-02-13 06:38:13 +01:00
Luis Ramos
38374a9835 Merge pull request #4761 from openfoodfoundation/dependabot/bundler/unicorn-5.5.3
Bump unicorn from 5.5.2 to 5.5.3
2020-02-12 20:56:19 +00:00
Luis Ramos
8d6a8ee214 Merge pull request #4763 from mkllnk/rails4-form-rendering
Future proof form rendering in admin orders
2020-02-12 20:56:00 +00:00
blainebillings
fec653186a Add Order Cycle Button Tooltips 2020-02-11 10:10:39 -05:00
Transifex-Openfoodnetwork
ebe7456b66 Updating translations for config/locales/tr.yml 2020-02-11 21:48:53 +11:00
Transifex-Openfoodnetwork
8187669a25 Updating translations for config/locales/tr.yml 2020-02-11 21:45:44 +11:00
Transifex-Openfoodnetwork
a6aa0df53b Updating translations for config/locales/fr_BE.yml 2020-02-10 03:32:33 +11:00
Transifex-Openfoodnetwork
116695b1d9 Updating translations for config/locales/en_NZ.yml 2020-02-08 18:53:00 +11:00
Transifex-Openfoodnetwork
387ac40dc9 Updating translations for config/locales/en_NZ.yml 2020-02-08 18:49:51 +11:00
luisramos0
66320b5055 Remove the assets group from the gemfile, it will disappear in rails 4 2020-02-07 12:29:02 +00:00
luisramos0
858d2cc6c2 Add doc to Spree::CheckoutController to make it more obvious why this controller exists 2020-02-07 11:50:23 +00:00
luisramos0
43280da187 Dup params to avoid nasty effects of a mutated params object in the controller 2020-02-07 10:26:04 +00:00
luisramos0
3b399b899c Extract methods in subscription_placement_job to fix rubocop complexity issues 2020-02-07 10:06:59 +00:00
luisramos0
01d69c89aa Add some log messages to help debug problems in subscription placement and subscription confirmation processes 2020-02-07 10:06:58 +00:00
luisramos0
a2801e40a2 Improve readability of proxy_order_syncer and add some log messages 2020-02-07 10:06:58 +00:00
luisramos0
abd4f0b923 Add custom_data column to paper_trail versions table so we can track a specific list of ids in a model
Activate paper_trail in order_cycles and schedules and track each others ids

An alternative way of doing this would be to use a gem for paper_trail associations but this way we avoid adding a new dependency to the app
2020-02-07 10:06:58 +00:00
Luis Ramos
e1eface5f8 Merge pull request #4542 from luisramos0/logger
Add timestamp to log entries
2020-02-07 10:02:55 +00:00
Luis Ramos
5cd14253d0 Merge pull request #4770 from openfoodfoundation/dependabot/bundler/webmock-3.8.1
Bump webmock from 3.8.0 to 3.8.1
2020-02-07 09:31:19 +00:00
Maikel
be691df7ac Merge pull request #4769 from openfoodfoundation/transifex
Transifex
2020-02-07 18:09:31 +11:00
Maikel Linke
7783b28ca2 Update concurrency spec after refactor
In order to make the spec fail if the controller was not thread safe, it
uses breakpoints. One of those breakpoints was set for a method that has
now been removed.

I changed the method that is used for the breakpoint and changed `allow`
to `expect` so that this spec will fail if we remove that method as
well. Future version of Rspec will check if a mocked method actually
exists but our version just mocks it anyway. This is one way how specs
can become invalid after refactoring.
2020-02-07 17:46:42 +11:00
Maikel
6d51856821 Merge pull request #4734 from openfoodfoundation/dependabot/bundler/oauth2-1.4.3
Bump oauth2 from 1.4.2 to 1.4.3
2020-02-07 16:48:42 +11:00
dependabot-preview[bot]
890704b75c Bump webmock from 3.8.0 to 3.8.1
Bumps [webmock](https://github.com/bblimke/webmock) from 3.8.0 to 3.8.1.
- [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/v3.8.0...v3.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-06 19:17:54 +00:00
Transifex-Openfoodnetwork
922484b2e7 Updating translations for config/locales/en_GB.yml 2020-02-07 05:02:38 +11:00
Luis Ramos
3e7288648b Merge pull request #4762 from openfoodfoundation/dependabot/bundler/roo-2.8.3
Bump roo from 2.8.2 to 2.8.3
2020-02-06 14:44:21 +00:00
luisramos0
f0f537ff8f Fix path of spree-select2.js pointing to the file in ofn rather the file in spree_backend 2020-02-06 11:21:47 +00:00
Transifex-Openfoodnetwork
b7f920c4b6 Updating translations for config/locales/ca.yml 2020-02-06 21:12:27 +11:00
Pau Pérez Fabregat
be19d50639 Merge pull request #4768 from openfoodfoundation/transifex
Transifex
2020-02-06 11:11:23 +01:00
Transifex-Openfoodnetwork
0ceb8ab6c4 Updating translations for config/locales/ca.yml 2020-02-06 21:09:16 +11:00
Pau Pérez Fabregat
e387c7db83 Merge pull request #4548 from luisramos0/improve_truncate_data
Improve truncate data process
2020-02-06 11:01:36 +01:00
Pau Pérez Fabregat
d5df48f3c0 Merge pull request #4737 from openfoodfoundation/transifex
Transifex
2020-02-06 11:00:46 +01:00
Pau Pérez Fabregat
c9abdac2e0 Merge pull request #4722 from mkllnk/code-climate-rubocop
Bump Code Climate's Rubocop version to their latest
2020-02-06 10:32:46 +01:00
Transifex-Openfoodnetwork
ff08d9f210 Updating translations for config/locales/nb.yml 2020-02-06 09:39:52 +11:00
luisramos0
e5c9468d09 Fix rubocop issues in navigation_helper 2020-02-05 22:16:20 +00:00
luisramos0
8aed173127 Uncomment events in order edit page and remove unused spree autocomplete js code 2020-02-05 20:04:15 +00:00
luisramos0
61ecca7257 Move template loading to directive of customer search override 2020-02-05 20:04:15 +00:00
luisramos0
7eba657b2f Add missing templates from spree_backend 2020-02-05 20:04:15 +00:00
luisramos0
784de340d1 Disable adaptive menu when running tests, this is what spree_backend was doing before 2020-02-05 20:04:15 +00:00
luisramos0
9191628f29 Bring custom form_builder initializer from spree_backend 2020-02-05 20:04:15 +00:00
luisramos0
88410b1efd Add missing general config routes from spree_backend 2020-02-05 20:04:12 +00:00
luisramos0
afea032361 Add return_authorizations route from spree_backend 2020-02-05 16:02:43 +00:00
luisramos0
3decb4056c Remove repeated include spree_paypal_express and add require css select2 2020-02-05 16:02:43 +00:00
luisramos0
8e9b08feca Remove jquery-alerts from head html 2020-02-05 16:02:43 +00:00
luisramos0
694995ea5d Prefix root_path with main_app so that ofn's route is used. The spree root path is no longer defined, we dont need it 2020-02-05 16:02:43 +00:00
luisramos0
22de7252d0 Fix route in login nav and bring reports and properties resource route from spree_backend 2020-02-05 16:02:43 +00:00
luisramos0
2acf8e5125 Remove config_locale from base controller, in OFN we dont have separate locales for frontoffice and backoffice 2020-02-05 16:02:43 +00:00
luisramos0
e1f61e645d Remove dependency to spree_backend and add dependencies still required: jquery-ui-rails and select2-rails 2020-02-05 16:02:43 +00:00
luisramos0
687d827ceb Add required css require for select2 2020-02-05 16:02:43 +00:00
luisramos0
2885e38113 Re-activate/re-add click events that were registered in spree_backend code before 2020-02-05 16:02:43 +00:00
luisramos0
9f3ca58b55 Add empty admin/spree_backend.js
This file is required by spree_paypal_express that we still need after leaving spree_backend
2020-02-05 16:02:43 +00:00
luisramos0
ffe3228848 Remove spree_backend dependencies from all.js and all.css and fix some dependencies path problems 2020-02-05 16:02:43 +00:00
luisramos0
834231eb8f Add js code needed for the zones admin page 2020-02-05 16:02:43 +00:00
luisramos0
68f5aabd3f Add js code needed where calculators are used: ship methods and payment methods config pages 2020-02-05 16:02:43 +00:00
luisramos0
7e7ea92833 Add js code needed in the states admin page 2020-02-05 16:02:43 +00:00
luisramos0
ebf22ceb19 Add js and css code for image settings from spree_backend 2020-02-05 16:02:43 +00:00
Luis Ramos
9313a57d19 Merge pull request #4511 from luisramos0/backend_ctrl_search
Bring spree_backend search controller to OFN
2020-02-05 15:54:30 +00:00
Luis Ramos
c38c7c35bc Add spec for user default address setter 2020-02-05 14:49:17 +00:00
luisramos0
2663f74767 Add specs for new services 2020-02-05 14:49:17 +00:00
luisramos0
b41de52012 Moved checkout services into a specific folder under app/services 2020-02-05 14:49:17 +00:00
luisramos0
214eb43122 Add frozen string literal magic comment 2020-02-05 14:49:17 +00:00
luisramos0
01fc4e0513 Add Spree::CheckoutController only to redirect to CheckoutController
I have not managed to make the spree checkout route, that paypal express uses, go to CheckoutController directly. According to the rails docs "to: '/checkout#edit'" should do it, but it doesnt work here.
2020-02-05 14:49:17 +00:00
luisramos0
6ce50a5fa5 Extract paypal redirect logic to service class 2020-02-05 14:49:17 +00:00
luisramos0
4fbd2cfa52 Extract UserDefaultAddress logic into separate class to take more 30 lines out of CheckoutController 2020-02-05 14:49:17 +00:00
luisramos0
383b28e170 Add order and current_user to checkout_form_data_adapter where they are required
Also re-add order.state condition to update_result: in some tests, the order state is complete but no completion data (completed?) is present
2020-02-05 14:49:17 +00:00
luisramos0
bf55a15f81 Extract checkout params adaptation logic into a service class 2020-02-05 14:49:17 +00:00
luisramos0
eb7e6dc5b8 Remove spree checkout controller spec, it is no longer necessary 2020-02-05 14:49:17 +00:00
luisramos0
139ecfe604 Remove rubocop exceptions resolved so far in checkout controller 2020-02-05 14:49:17 +00:00
luisramos0
43a6798db2 Move methods around in checkout controller into a more logical organisation: first the filters code and then support code for the update action 2020-02-05 14:49:17 +00:00
luisramos0
06d6579486 Refactor construct_saved_card_attributes to fix rubocop issues 2020-02-05 14:49:17 +00:00
luisramos0
76df526002 Remove dead code from construct_saved_card_attributes 2020-02-05 14:49:17 +00:00
luisramos0
06569ea24c Refactor load_order to fix rubocop issues 2020-02-05 14:49:17 +00:00
luisramos0
25431f851b Refactor object_params to fix rubocop issues 2020-02-05 14:49:17 +00:00
luisramos0
bab2420bb3 Break up default address methods to fix rubocop issues 2020-02-05 14:49:17 +00:00
luisramos0
0b2acb3a76 Extracted two methods from checkout_workflow to fix rubocop issues 2020-02-05 14:49:17 +00:00
luisramos0
27db9e604f Extract respond_to_update_succeeded from update_succeeded 2020-02-05 14:49:17 +00:00
luisramos0
c4e58ebb9e Extract update_succeeded from checkout#update 2020-02-05 14:49:17 +00:00
luisramos0
9a0ee254af Extract checkout_workflow from checkout#update 2020-02-05 14:49:17 +00:00
luisramos0
5ce3e1e0d2 Fix some rubocop issues in checkout controller 2020-02-05 14:49:17 +00:00
luisramos0
4b345d928c Remove old code to detect Phantom Fees, no bugsnag events detected at all 2020-02-05 14:49:17 +00:00
luisramos0
52b1e6c71a Move all logic required in Spree::CheckoutController to CheckoutController 2020-02-05 14:49:17 +00:00
Matt-Yorkley
140e0b9cb1 Refactor #exchangeLoadedVariants 2020-02-05 15:11:34 +01:00
Matt-Yorkley
b3f05d1a98 Use "Variants" instead of "Products" in order cycle exchanges UI 2020-02-05 15:11:34 +01:00
Matt-Yorkley
9644b145cc Remove num_of_products 2020-02-05 15:11:34 +01:00
Matt-Yorkley
6f644936b0 Show counts including all variants in order cycle exchanges 2020-02-05 15:10:26 +01:00
Matt-Yorkley
b86759d7a7 Fix form rendering in admin orders
ActionView::Template::Error: Nil location provided. Can't build URI.
  0) Account and Billing Settings updating as an admin user loads the page
     Failure/Error: = form_tag false, {name: "orders_form", "ng-submit" => "fetchResults()"} do
2020-02-05 16:37:23 +11:00
luisramos0
b0f2e01c70 Delete extra inventory_units that are for some unknown reason connected to shipments of orders to delete but not to orders to delete 2020-02-05 16:30:14 +11:00
Maikel
747be81aec Link to new release template 2020-02-05 15:21:26 +11:00
Maikel
fd124daf50 Add task to notify instance managers of upcoming changes 2020-02-05 14:58:57 +11:00
Transifex-Openfoodnetwork
ef33d27e6c Updating translations for config/locales/en_FR.yml 2020-02-05 06:55:27 +11:00
Transifex-Openfoodnetwork
3a01e00d7b Updating translations for config/locales/fr.yml 2020-02-05 06:51:14 +11:00
Luis Ramos
81103f3f71 Merge pull request #4742 from CSCI-462-01-2020/Issue4109
Edit new_resource partial
2020-02-04 19:44:16 +00:00
dependabot-preview[bot]
9d1e3f0318 Bump roo from 2.8.2 to 2.8.3
Bumps [roo](https://github.com/roo-rb/roo) from 2.8.2 to 2.8.3.
- [Release notes](https://github.com/roo-rb/roo/releases)
- [Changelog](https://github.com/roo-rb/roo/blob/master/CHANGELOG.md)
- [Commits](https://github.com/roo-rb/roo/compare/v2.8.2...v2.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-04 19:23:42 +00:00
dependabot-preview[bot]
67adf3c801 Bump unicorn from 5.5.2 to 5.5.3
Bumps [unicorn](https://yhbt.net/unicorn/) from 5.5.2 to 5.5.3.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-04 19:22:39 +00:00
Luis Ramos
a8b48a561f Merge pull request #4733 from lin-d-hop/master
Fixing incorrect payment and balance calculation
2020-02-04 18:11:48 +00:00
Luis Ramos
c7038f6ac9 Merge pull request #4620 from luisramos0/spree_backend_css
Bring basic CSS rules from spree backend
2020-02-04 18:06:15 +00:00
Luis Ramos
ea75714561 Merge pull request #4635 from luisramos0/main_app_routes
Replace use of spree.root_path and root_url with main_app.root_path and main_app.root_url
2020-02-04 16:02:48 +00:00
luisramos0
b7d19dd34c Remove unused route from Spree.routes 2020-02-04 14:55:34 +00:00
luisramos0
44d1b3f00c Remove unused search/users controller action 2020-02-04 14:55:34 +00:00
luisramos0
f8376c0aeb Remove unused route search_customer_addresses 2020-02-04 14:55:34 +00:00
luisramos0
88464d58c2 Fix some rubocop issues and extract ransack hash to reduce repetition 2020-02-04 14:55:34 +00:00
luisramos0
962779bba1 Merge search controller with decorator 2020-02-04 14:54:51 +00:00
luisramos0
1ae73dd6ae Add search_controller from spree_backend so that we can now merge it with the OFN's decorator 2020-02-04 14:54:51 +00:00
luisramos0
f48ab57782 Add explicit css import statements where they are needed 2020-02-04 14:52:44 +00:00
luisramos0
8b6ebfb351 Add imports for new css files from spree_backend 2020-02-04 14:52:44 +00:00
luisramos0
9c0788c3e0 Bring shared css rules from spree_backend 2020-02-04 14:52:17 +00:00
luisramos0
f61258d0b4 Bring components css from spree_backend
pagination and navigation rules were merged
2020-02-04 14:52:17 +00:00
luisramos0
289f62f115 Bring and require date picker css from spree_backend 2020-02-04 14:52:17 +00:00
luisramos0
c3a98d5a4f Bring css dependencies from spree_backend
These dependencies are in spree_core so we dont need to bring them to ofn right now
2020-02-04 14:52:17 +00:00
Luis Ramos
d8374e9caa Merge pull request #4614 from luisramos0/base_admin_js
Bring some basic js functions and dependencies from spree_backend
2020-02-04 14:48:38 +00:00
luisramos0
0648f23e94 Move css dependencies to specific css files and add some required dependencies from spree_backend 2020-02-04 14:47:51 +00:00
luisramos0
e37cb2d63f Remove underscope from select2 css file name 2020-02-04 14:47:51 +00:00
luisramos0
ee64238bdd Add jquery.adaptivemenu require but commeent out the activation for now because it is already called in spree_backend
This can be reverted when spree_backend is removed
2020-02-04 14:47:51 +00:00
luisramos0
d3130e111f Remove on click events
These events can only be added to OFN when spree_backend is removed otherwise the evetns will be registered twice
2020-02-04 14:47:51 +00:00
luisramos0
93f4eee887 Make newly imported js files compatible with the karma build 2020-02-04 14:47:51 +00:00
luisramos0
408ada9097 Remove unnecessary build exception 2020-02-04 14:47:51 +00:00
luisramos0
e14ebd9503 Add required variables from spree_backend 2020-02-04 14:47:51 +00:00
luisramos0
289b99c30e Bring and require equalize from spree_backend 2020-02-04 14:47:26 +00:00
luisramos0
f85c36a17e Bring and require select2 from spree_backend 2020-02-04 14:47:26 +00:00
luisramos0
4715df3258 Bring and require jquery.horizontalNav.js from spree_backend 2020-02-04 14:47:26 +00:00
luisramos0
b20be101cc Bring and require spin from spree_backend and respective progress indicator js and css 2020-02-04 14:47:26 +00:00
luisramos0
d424987587 Bring and require jquery.vAlign.js from spree_backend 2020-02-04 14:47:26 +00:00
luisramos0
a0575430dd Require spree.js from spree_core for some basic functions like Spree.url 2020-02-04 14:46:57 +00:00
luisramos0
c1e6344b18 Merge spree js function and override 2020-02-04 14:46:57 +00:00
luisramos0
ed0198382f Bring spree_backend admin.js.erb, rename it to base.js.erb and remove requires that are not used in ofn 2020-02-04 14:46:57 +00:00
blainebillings
577fb88843 Move Create and Cancel References to Actions Namespace 2020-02-04 09:39:01 -05:00
Pau Pérez Fabregat
2b879221b2 Merge pull request #4756 from kristinalim/fix/4489-flaky_spec_for_editing_oc
4489 Flaky spec when editing outgoing exchanges in OC
2020-02-04 15:38:37 +01:00
blainebillings
22db2e99f0 Merge branch 'Issue4109' of https://github.com/CSCI-462-01-2020/openfoodnetwork into Issue4109 2020-02-04 09:38:19 -05:00
blainebillings
ef4aa488c3 Moves Create and Cancel References to Actions Namespace 2020-02-04 09:34:28 -05:00
Pau Pérez Fabregat
57775f49bc Merge pull request #4739 from openfoodfoundation/dependabot/bundler/rack-mini-profiler-1.1.6
Bump rack-mini-profiler from 1.1.4 to 1.1.6
2020-02-04 15:29:20 +01:00
Pau Pérez Fabregat
e8a12d9897 Merge pull request #4738 from openfoodfoundation/dependabot/bundler/oj-3.10.2
Bump oj from 3.10.1 to 3.10.2
2020-02-04 15:28:40 +01:00
Pau Pérez Fabregat
f3b8d5b868 Merge pull request #4741 from openfoodfoundation/dependabot/bundler/bugsnag-6.13.0
Bump bugsnag from 6.12.2 to 6.13.0
2020-02-04 15:28:00 +01:00
Pau Pérez Fabregat
246235b921 Merge pull request #4667 from Matt-Yorkley/rails-4-prep
Rails 4 prep
2020-02-04 15:20:28 +01:00
Luis Ramos
0ded41afee Merge pull request #4513 from luisramos0/backend_ctrl_orders
Bring spree_backend orders controller to OFN
2020-02-04 11:51:54 +00:00
luisramos0
d32e106bf0 Add partials needed in the orders edit page 2020-02-04 11:51:13 +00:00
luisramos0
bbb3748d3c Simplify orders events logic 2020-02-04 11:51:13 +00:00
luisramos0
08dd992344 Merge orders_helper with decorator 2020-02-04 11:51:13 +00:00
luisramos0
914244a1ee Bring orders helper from spree_backend 2020-02-04 11:51:13 +00:00
luisramos0
e5f089610c Bring admin orders routes from spree_backend 2020-02-04 11:51:13 +00:00
luisramos0
6e26841817 Fix load_order before filter and remove unused open and close adjustments actions 2020-02-04 11:50:44 +00:00
luisramos0
ab60c4a9dd Remove unnecessary index action override because this is no longer a decorator
Remove useless todo comment
2020-02-04 11:50:44 +00:00
luisramos0
7009cd89e0 Fix rubocop issues in customer details controller and update rubocop manual todo accordingly 2020-02-04 11:50:44 +00:00
luisramos0
b93af37ea9 Merge customer details decorator with controller 2020-02-04 11:50:03 +00:00
luisramos0
76b6a85509 Merge spree/admin/orders_controller and its decorator and fix a few rubocop issues 2020-02-04 11:50:03 +00:00
luisramos0
a1d4b4ee98 Add orders_controller from spree_backend so that we can now merge it with the OFN's decorator 2020-02-04 11:50:03 +00:00
luisramos0
51bca7ce2f Add customer_details_controller from spree_backend so that we can now merge it with the OFN's decorator 2020-02-04 11:50:03 +00:00
Luis Ramos
70147f908a Merge pull request #4611 from luisramos0/taxonomies_js
Bring js code to make taxonomies admin work without spree_backend
2020-02-04 11:47:27 +00:00
Luis Ramos
c4bf4f001f Merge pull request #4509 from luisramos0/backend_ctrl_payments
Bring spree_backend payments controller to OFN
2020-02-04 11:46:23 +00:00
Matt-Yorkley
7d71f21753 Add frozen_string_literal comment to new class 2020-02-04 11:11:24 +01:00
Matt-Yorkley
285c78a5e4 Remove use of #pluck and ensure subquery does not include all columns 2020-02-04 11:10:13 +01:00
luisramos0
6e78ae762a Make it work even if preferred_enterprise_id is null 2020-02-04 10:01:18 +00:00
luisramos0
9a2ad16926 Make explicit the dependency to font-awesome css rules 2020-02-04 09:34:59 +00:00
luisramos0
afec21eb3d Move imports to where they are needed 2020-02-04 09:34:59 +00:00
luisramos0
651ee720c6 Remove underscore from new jstree css file 2020-02-04 09:34:40 +00:00
luisramos0
2e6c5e1fad Add dependencies from spree_backend required by jstree 2020-02-04 09:34:40 +00:00
luisramos0
87366ae7fc Remove usage of jConfirm so that we dont have to bring dependency jquery.alerts from spree_backend 2020-02-04 09:33:58 +00:00
luisramos0
27aea0b277 Bring js code from spree_backend to make taxons admin work 2020-02-04 09:33:58 +00:00
luisramos0
d4edc9f20d Bring jstress css from spree_backend 2020-02-04 09:33:58 +00:00
luisramos0
6c7991be75 Bring jquery.jstree from spree_backend 2020-02-04 09:33:34 +00:00
luisramos0
3f81352df5 Bring jquery.cookie from spree_backend 2020-02-04 09:33:34 +00:00
Kristina Lim
9d0e26ae28 Wait for products panel to show in outgoing exchanges feature spec 2020-02-04 16:20:47 +08:00
Luis Ramos
d80554a14a Merge pull request #4744 from luisramos0/oc_pag_bug
Make pagination optional in the ExchangeProductsController
2020-02-03 17:19:06 +00:00
luisramos0
a5fe5fb448 Remove usage of deleted const DEFAULT_PAGE
If params[:page] is not in the request, the results will not be paginated now
2020-02-03 15:04:34 +00:00
luisramos0
4c51d60bfd Make pagination optional in the ExchangeProductsController 2020-02-03 13:11:26 +00:00
blainebillings
9218008530 Edit new_resource Partial 2020-02-02 11:22:54 -05:00
myersca1
f36c5b8938 Edit new_resource partial 2020-02-02 11:19:10 -05:00
dependabot-preview[bot]
67199fd2d6 Bump bugsnag from 6.12.2 to 6.13.0
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby) from 6.12.2 to 6.13.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases)
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.12.2...v6.13.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-31 19:15:09 +00:00
Transifex-Openfoodnetwork
18d17ec674 Updating translations for config/locales/fr_CA.yml 2020-02-01 04:02:53 +11:00
Transifex-Openfoodnetwork
3981ee7ec1 Updating translations for config/locales/en_CA.yml 2020-02-01 03:54:02 +11:00
Luis Ramos
a0475ee8a4 Merge pull request #4613 from luisramos0/autocomplete
Bring remaining variants autocomplete (and related) JS code from spree_backend
2020-01-31 16:08:50 +00:00
Luis Ramos
4cdc604f45 Merge pull request #4718 from luisramos0/variant_count
Make Order Cycle exchange tab summary not count inventory variants that are hidden
2020-01-31 16:03:21 +00:00
Luis Ramos
dbf44c41b2 Merge pull request #4657 from luisramos0/pi-xls
Remove Product import code for xls suppport
2020-01-31 12:12:25 +00:00
Maikel Linke
9535c5647f Make pluralisation code an independent lib
I considered moving the code to a service but I think that this code
can be completely independent of the Open Food Network use case. It
would be easy to move to a gem. The downcasing may need reconsidering
for general use.
2020-01-31 09:48:32 +11:00
Maikel Linke
6f8bb793e1 Add unit names commonly used in French 2020-01-31 09:48:32 +11:00
Maikel Linke
2476050f29 Remove usage count comments 2020-01-31 09:48:32 +11:00
Maikel Linke
1cce106977 Use our unit name pluralization in Ruby
This code will be used for the shop front and reports.
2020-01-31 09:48:32 +11:00
Maikel Linke
98b55287f1 Pluralize common variant unit names
This adds the most popular unit names as singular and plural to our
locale for translation. The added Javascript performs a reverse lookup
to find the right singular/plural form of a unit name in that language.
2020-01-31 09:48:32 +11:00
dependabot-preview[bot]
25c4aed368 Bump rack-mini-profiler from 1.1.4 to 1.1.6
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 1.1.4 to 1.1.6.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases)
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v1.1.4...v1.1.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-30 19:28:45 +00:00
dependabot-preview[bot]
c5a6ef673c Bump oj from 3.10.1 to 3.10.2
Bumps [oj](https://github.com/ohler55/oj) from 3.10.1 to 3.10.2.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.1...v3.10.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-30 19:26:07 +00:00
Transifex-Openfoodnetwork
79ba15fe9a Updating translations for config/locales/en_GB.yml 2020-01-31 03:53:48 +11:00
Kristina Lim
f797745848 Update all locales with the latest Transifex translations 2020-01-30 23:01:02 +08:00
Luis Ramos
25fae17677 Update Copyright to include year 2020 2020-01-30 14:44:31 +00:00
Kristina Lim
8ae6048202 Merge pull request #4720 from openfoodfoundation/transifex
Transifex
2020-01-30 22:40:47 +08:00
Luis Ramos
768631a90a Merge pull request #4616 from luisramos0/orders_js
Bring some JS and CSS code from spree_backend related to orders admin
2020-01-30 11:37:07 +00:00
luisramos0
d472ceafcc Add required dependencies from spree_backend 2020-01-30 11:36:09 +00:00
luisramos0
9a52a127a4 Add js code needed in the product images page 2020-01-30 11:36:09 +00:00
luisramos0
c20a41111c Bring some css needed in payments list and product edit page and add image for the credit cards in the payments page as well 2020-01-30 11:36:09 +00:00
luisramos0
fd26500ca4 Add orders css for the orders edit page 2020-01-30 11:36:09 +00:00
luisramos0
4f0e441407 Bring and require responsive-tables js and css from spree_backend 2020-01-30 11:36:09 +00:00
Luis Ramos
37a5d1d036 Merge pull request #4628 from luisramos0/be_fontawesome
Bring fontawesome font and associated css from spree_backend
2020-01-30 11:21:35 +00:00
Luis Ramos
c4f7588601 Merge pull request #4608 from luisramos0/power_tip
Bring powertip from spree_backend, including js and css
2020-01-30 11:20:37 +00:00
Luis Ramos
6509c6f7b5 Merge pull request #4588 from luisramos0/base_helper
Bring base helper from spree_backend
2020-01-30 11:18:35 +00:00
Kristina Lim
5aadd444aa Merge pull request #4721 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.4.2
Bump rubocop-rails from 2.4.1 to 2.4.2
2020-01-30 19:04:24 +08:00
Kristina Lim
278284583f Merge pull request #4735 from mkllnk/4729-init-taxon-dropdown
Activate Foundation's dropdowns after tab switch
2020-01-30 19:00:30 +08:00
luisramos0
e192207f4e Fix bug in before filters migration, needs to load payment for the show action 2020-01-30 10:27:26 +00:00
Maikel Linke
b63042236d Activate Foundation's dropdowns after tab switch
If the dropdown doesn't exist during page load, Foundation misses it. We
need to initialise it again.
2020-01-30 17:02:23 +11:00
dependabot-preview[bot]
48a75c956f Bump oauth2 from 1.4.2 to 1.4.3
Bumps [oauth2](https://github.com/oauth-xx/oauth2) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/oauth-xx/oauth2/releases)
- [Changelog](https://github.com/oauth-xx/oauth2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/oauth-xx/oauth2/compare/v1.4.2...v1.4.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-29 19:24:24 +00:00
lin-d-hop
baf1ecb436 Fixing incorrect payment and balance calculation
Corrections and added specs
2020-01-29 16:06:06 +00:00
Transifex-Openfoodnetwork
32f7a74df7 Updating translations for config/locales/en_NZ.yml 2020-01-29 15:43:31 +11:00
luisramos0
3e68dc5bb2 Extract some methods from base_helper to zones_helper to make it explicit they are only used in the zones admin pages 2020-01-28 18:05:30 +00:00
luisramos0
919242d9ec Fix rubocop issues in spree/admin/base_helper 2020-01-28 18:05:15 +00:00
luisramos0
844731061c Add needed generic partials 2020-01-28 18:04:36 +00:00
luisramos0
109f2866ae Merge base_helper with decorator 2020-01-28 18:04:36 +00:00
luisramos0
76eafa8415 Bring base_helper from spree_backend 2020-01-28 18:04:36 +00:00
luisramos0
947914724a Add frozen string literal magic comment 2020-01-28 18:02:58 +00:00
luisramos0
b5004f1cbf Add specs for ExchangeProductsRenderer#exchange_variants 2020-01-28 18:02:58 +00:00
luisramos0
4596399bc2 Extract logic from controller to renderer service
Re-using the filter_visible method for both products and variants
2020-01-28 18:02:58 +00:00
luisramos0
685abccb61 Make variant count consider oc config and not count variants that are hidden in the inventory of the coordinator of the OC 2020-01-28 18:02:58 +00:00
Luis Ramos
5e61ba8136 Merge pull request #4587 from luisramos0/navigation_helper
Bring navigation helper from spree_backend
2020-01-28 17:58:18 +00:00
luisramos0
f3447e3a96 Move dependency statement to powertip.css 2020-01-28 14:07:46 +00:00
luisramos0
3d0a31e838 Bring dependencies from spree_backend required by powertip 2020-01-28 14:07:46 +00:00
luisramos0
26bb8cc337 Bring powertip from spree_backend, including js and css 2020-01-28 14:07:45 +00:00
luisramos0
9254928656 Remove underscore from product_autocomplete css file 2020-01-28 13:53:04 +00:00
luisramos0
228997c35b Add handlebars dependency from spree_backend 2020-01-28 13:53:04 +00:00
luisramos0
667f44336d Remove unused split logic from variant autocomplete, the split functionality is not used in ofn because we only have one stock location 2020-01-28 13:53:04 +00:00
luisramos0
0a136ff2fb Comment out click event registration as this will duplicate events until the spree_backend code is there
These can be activated when spree_backend is removed
2020-01-28 13:53:04 +00:00
luisramos0
3f3577e73c Remove encoding tag from admin/spree/orders js files 2020-01-28 13:53:04 +00:00
luisramos0
cf1664bed3 Bring some variant autocomplete styling from spree_backend 2020-01-28 13:53:04 +00:00
luisramos0
b8aee4e857 Bring address_states as is from spre_backend 2020-01-28 13:53:04 +00:00
luisramos0
cfe3435851 Bring shipments.js as is from spree_backend 2020-01-28 13:53:04 +00:00
luisramos0
53e342ba1a Bring variant_autocomplete from spree_backend as is 2020-01-28 13:53:04 +00:00
luisramos0
6bdb14248c Require lodash.underscore to support _. calls in js
spree_backend relies on Underscore.js 1.4.4, from Jan 2013, in some auto complete functions, here we will be depending on Lo-Dash 2.4.1, from Dec 2013
2020-01-28 13:53:03 +00:00
luisramos0
8e27291b15 require handlebars extensions from spree_core to allow translations inside handlebar templates 2020-01-28 13:52:19 +00:00
Luis Ramos
a6ade31604 Merge pull request #4607 from luisramos0/legacy_browsers_support
Remove unused js dependencies (jquery-migrate-1.0.0 and timeago) and bring some legacy browsers support dependencies from spree_backend
2020-01-28 12:49:38 +00:00
Luis Ramos
b348552cdf Merge pull request #4651 from mkllnk/remove-unused-presenter
Remove unused presenter
2020-01-28 09:52:01 +00:00
Maikel Linke
ec67736dff Bump Code Climate's Rubocop version to their latest
Our used version is still higher than that.
2020-01-28 17:12:28 +11:00
Maikel
bd8af40afb Merge pull request #4691 from Matt-Yorkley/codeclimate-scss
Disable two codeclimate SCSS rules
2020-01-28 11:00:46 +11:00
dependabot-preview[bot]
54d2228a03 Bump rubocop-rails from 2.4.1 to 2.4.2
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.4.1 to 2.4.2.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.1...v2.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-27 19:33:28 +00:00
Transifex-Openfoodnetwork
3b0bec3c0f Updating translations for config/locales/en_FR.yml 2020-01-27 23:37:03 +11:00
Transifex-Openfoodnetwork
2a3e8db560 Updating translations for config/locales/fr.yml 2020-01-27 23:36:31 +11:00
Transifex-Openfoodnetwork
d6d3e5fb5a Updating translations for config/locales/ar.yml 2020-01-27 09:51:47 +11:00
Luis Ramos
d7bb063a30 Merge pull request #4716 from CSCI-462-01-2020/Issue4412
Change in English locale to add "end" term
2020-01-25 10:22:29 +00:00
Luis Ramos
c7d8e96beb Merge pull request #4699 from mkllnk/4696-rescue-checkout
Rescue unknown checkout errors
2020-01-24 18:11:38 +00:00
luisramos0
a6d4774a93 Bring font-awesome from spree_backend 2020-01-24 17:52:11 +00:00
luisramos0
7cd710622e Bring fontawesome css from spree_backend 2020-01-24 17:52:11 +00:00
Pau Pérez Fabregat
529265697c Merge pull request #4715 from openfoodfoundation/transifex
Transifex
2020-01-24 13:31:08 +01:00
Pau Pérez Fabregat
690f18c58c Merge pull request #4653 from Matt-Yorkley/db2fog_region
Db2fog region
2020-01-24 13:30:11 +01:00
Luis Ramos
1b9c020bee Merge pull request #4650 from tomekr/docker-rspec-fix
Docker rspec fix
2020-01-24 12:24:50 +00:00
Luis Ramos
af3ac703a5 Merge pull request #4717 from openfoodfoundation/dependabot/bundler/ddtrace-0.32.0
Bump ddtrace from 0.31.1 to 0.32.0
2020-01-24 12:23:51 +00:00
dependabot-preview[bot]
1d8fce09b6 Bump ddtrace from 0.31.1 to 0.32.0
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.31.1 to 0.32.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.31.1...v0.32.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-23 19:17:08 +00:00
luisramos0
904c85c5be Move css import to ie hacks file where it's needed 2020-01-23 19:01:52 +00:00
Transifex-Openfoodnetwork
c129af88d4 Updating translations for config/locales/en_FR.yml 2020-01-24 05:53:03 +11:00
Transifex-Openfoodnetwork
ca1e6744ad Updating translations for config/locales/fr.yml 2020-01-24 05:52:29 +11:00
Unknown
a101c5c507 Change in English locale to add "end"
The "end" term is used in the _date_range_form, but there is no entry in the English locale. Added so that it can start being translated with Transifex.
2020-01-23 12:56:07 -05:00
Transifex-Openfoodnetwork
d9672a0032 Updating translations for config/locales/en_GB.yml 2020-01-24 02:55:07 +11:00
Matt-Yorkley
7e7eb67e0a Merge pull request #4714 from luisramos0/fix_permissions_load_problem
Add require to fix loading issue. Some other Permissions module was being loaded
2020-01-23 15:56:27 +01:00
luisramos0
a5f222b067 Bring css_browser_selector_dev from spree_backend and respective hacks 2020-01-23 14:45:35 +00:00
luisramos0
0ec39106b1 Bring modernizr from spree_backend 2020-01-23 14:45:35 +00:00
luisramos0
c59afd4951 Remove jquery-migrate-1.0.0, we already have jquery-migrate 1.2.1 (jquery-migrate-min) through gemfile jquery-migrate-rails 2020-01-23 14:45:35 +00:00
luisramos0
2c59b522de Reorganize admin/all.js in meaningful groups 2020-01-23 14:45:35 +00:00
luisramos0
337fbf1be9 Remove unused JS dependency timeago, we use momentjs now 2020-01-23 14:45:35 +00:00
luisramos0
1548eaeb7e Add frozen_string_literal magic comment 2020-01-23 14:42:19 +00:00
luisramos0
ee3c9563d8 Add all submenus entries to the main tabs list so that the main menu keeps selected when user selects the submenus 2020-01-23 14:31:25 +00:00
luisramos0
4b0ddcda01 Add require to fix loading issue. Some other Permissions module was being loaded 2020-01-23 11:42:10 +00:00
Luis Ramos
f5adf6a9d7 Merge pull request #4697 from mkllnk/4457-line-item-spec
Stabilise spec by not creating noise data
2020-01-23 11:35:34 +00:00
Matt-Yorkley
86231672a6 Merge pull request #4703 from openfoodfoundation/daniellemoorhead-patch-1
Updated shopfront message placeholder for home tab
2020-01-23 12:32:08 +01:00
Luis Ramos
e47bd019a1 Merge pull request #4656 from mkllnk/config
Use strings for all environment variables
2020-01-23 11:07:17 +00:00
Matt-Yorkley
0011caccc6 Update all locales with the latest Transifex translations 2020-01-23 11:45:58 +01:00
Matt-Yorkley
ad5a599ddf Merge pull request #4710 from openfoodfoundation/transifex
Transifex
2020-01-23 11:37:10 +01:00
Luis Ramos
43d7609b81 Merge pull request #4707 from Matt-Yorkley/mobile-checkout-tabs
Remove tabs from cart and checkout
2020-01-23 10:19:50 +00:00
Transifex-Openfoodnetwork
56d17bca6a Updating translations for config/locales/nb.yml 2020-01-23 19:43:37 +11:00
Transifex-Openfoodnetwork
7f4e53f411 Updating translations for config/locales/fr.yml 2020-01-23 19:41:23 +11:00
Transifex-Openfoodnetwork
bd16b80d5f Updating translations for config/locales/en_FR.yml 2020-01-23 19:38:34 +11:00
Transifex-Openfoodnetwork
c8a1f9b93c Updating translations for config/locales/fr.yml 2020-01-23 19:38:12 +11:00
Maikel
9a8cd60d5a Merge pull request #4694 from Matt-Yorkley/rails-4-prep-routes
Rails 4 prep: spree routes
2020-01-23 17:42:37 +11:00
Maikel
4d11dced39 Merge pull request #4687 from openfoodfoundation/dependabot/bundler/ddtrace-0.31.1
Bump ddtrace from 0.31.0 to 0.31.1
2020-01-23 16:35:38 +11:00
Maikel Linke
bd67d63b63 Restore payment error feedback 2020-01-23 16:20:07 +11:00
Maikel Linke
6763012ee9 Rescue unknown checkout errors 2020-01-23 16:20:07 +11:00
Maikel
de2f09db75 Merge pull request #4698 from openfoodfoundation/transifex
Transifex
2020-01-23 15:59:36 +11:00
Luis Ramos
494cb00774 Merge pull request #4585 from luisramos0/backend_partial_calc_fields
Bring spree_backend calculator fields partial to OFN
2020-01-22 20:27:10 +00:00
Luis Ramos
d782bea458 Merge pull request #4633 from luisramos0/fix_prod_link_bug
Fix bug in frontoffice order details where the product image was a broken link
2020-01-22 20:25:24 +00:00
luisramos0
766303b332 Add required payment_helper from spree_backend 2020-01-22 20:22:28 +00:00
luisramos0
74226fbdf8 Fix one rubocop issue and update rubocop todo manual for the new controller 2020-01-22 20:22:28 +00:00
luisramos0
dc5374e284 Merge filter_payment_methods and load_data 2020-01-22 20:21:21 +00:00
luisramos0
f6ecf57737 Make before filters easier to understand using the fact that there are only index, create, new and fire actions in this controller 2020-01-22 20:21:21 +00:00
luisramos0
940953b043 Add missing translations for payments 2020-01-22 20:21:21 +00:00
luisramos0
fbc5887fa6 Bring payments routes from spree_backend 2020-01-22 20:21:21 +00:00
luisramos0
61ce849546 Merge spree/admin/payments_controller with its decorator and fix a few rubocop issues 2020-01-22 20:21:21 +00:00
luisramos0
afddaed9fc Add empty but needed payments templates for check payment method 2020-01-22 20:21:21 +00:00
luisramos0
12158d73fa Add payments_controller from spree_backend so that we can now merge it with the OFN's decorator 2020-01-22 20:21:21 +00:00
Matt-Yorkley
5f3abbf00e Refactor BaseController 2020-01-22 12:17:23 +01:00
Matt-Yorkley
a02c58e231 Add join_table to enterprise groups relation
has_and_belongs_to_many relationships now require a join_table
2020-01-22 12:17:23 +01:00
Matt-Yorkley
59ebfb9bd4 Fix subquery errors triggered by #warn_invalid_order_cycles 2020-01-22 12:17:23 +01:00
Matt-Yorkley
57ca1d54bb Fix issue with each_serializer not being called in some cases in Rails 4. 2020-01-22 12:17:23 +01:00
Matt-Yorkley
444747c8b2 Split shopping_shared/details partial into header and tabs partials and only include tabs in shop page (not cart and checkout). 2020-01-22 11:30:43 +01:00
Danni M
95f51e2db9 Updated shopfront message placeholder
Change required now that there is a home tab instead of a green shopfront message.

>An optional message to welcome customers and explain how to shop with you. If text is entered here it will be displayed in a home tab when customers first arrive at your shopfront.
2020-01-22 14:24:20 +11:00
Transifex-Openfoodnetwork
0463e05296 Updating translations for config/locales/pt_BR.yml 2020-01-22 10:35:12 +11:00
Transifex-Openfoodnetwork
f176e2ba91 Updating translations for config/locales/pt_BR.yml 2020-01-22 10:32:03 +11:00
luisramos0
cccff6b500 Remove unused methods from navigation helper 2020-01-21 22:51:23 +00:00
luisramos0
b4e6c5307e Convert orders submenu partial to haml 2020-01-21 22:51:23 +00:00
luisramos0
fb4f96eb4a Remove unused submenu entries from _tabs partial and convert hash syntax 2020-01-21 22:51:23 +00:00
luisramos0
27572cbe68 Remove alias_method klass_for_with_sym_fallback 2020-01-21 22:49:55 +00:00
luisramos0
8a912d6f02 Remove redundant method tab_with_cancan_check
This was introduced to work with previous versions of spree
2020-01-21 22:49:55 +00:00
luisramos0
cd7f97b01d Fix rubocop issues in nav helper 2020-01-21 22:49:55 +00:00
luisramos0
1b18595d94 Merge navigator_helper with decorator 2020-01-21 22:49:55 +00:00
Maikel Linke
30888a9e59 Stabilise spec by not creating noise data
We were using a more complex order factory that created more data than
we needed. The order contained a second line item and therefor the
manifest had two items as well. Sometimes we would pick the wrong one.
2020-01-22 09:49:37 +11:00
luisramos0
8987121058 Add navigation helper from spree_backend 2020-01-21 22:48:44 +00:00
Luis Ramos
6bb4f2477c Merge pull request #4586 from luisramos0/states_erb
Make states/new.js template depend on the states/new.haml template in OFN (not the states/new.erb in spree)
2020-01-21 22:47:28 +00:00
Matt-Yorkley
cca824f207 Ensure routes declared with match specify a method 2020-01-20 17:32:00 +01:00
Matt-Yorkley
147f7d4850 Separate non-report routes from reports route list for clarity 2020-01-20 17:30:46 +01:00
Matt-Yorkley
8024dcec64 Merge double Spree routes declarations into one
The app has a lot of problems with this in Rails 4
2020-01-20 17:27:26 +01:00
Matt-Yorkley
dfee9b6c6b Relax two codeclimate SCSS rules 2020-01-20 15:08:20 +01:00
Luis Ramos
1c3fd26eef Merge pull request #4655 from Matt-Yorkley/mobile-shoptabs
Mobile: shop tabs
2020-01-20 08:51:59 +00:00
Matt-Yorkley
f8145f8429 Update shop tab button styling in mobile 2020-01-19 15:59:37 +01:00
Matt-Yorkley
a1256f9aeb Remove old green box styling from shopfront messages 2020-01-19 15:57:01 +01:00
dependabot-preview[bot]
094c175a64 Bump ddtrace from 0.31.0 to 0.31.1
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.31.0 to 0.31.1.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/v0.31.1/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.31.0...v0.31.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-17 19:14:25 +00:00
Luis Ramos
dd9f2a063f Merge pull request #4682 from openfoodfoundation/dependabot/bundler/mini_racer-0.2.9
Bump mini_racer from 0.2.4 to 0.2.9
2020-01-17 13:36:02 +00:00
Luis Ramos
4973bcb9b6 Merge pull request #4677 from openfoodfoundation/dependabot/bundler/oj-3.10.1
Bump oj from 3.10.0 to 3.10.1
2020-01-17 13:14:15 +00:00
Maikel
9ee701bec1 Merge pull request #4683 from openfoodfoundation/dependabot/bundler/webmock-3.8.0
Bump webmock from 3.7.6 to 3.8.0
2020-01-17 09:14:50 +11:00
Maikel
e2469ded9a Merge pull request #4680 from openfoodfoundation/transifex
Transifex
2020-01-17 09:03:10 +11:00
dependabot-preview[bot]
eaa914a360 Bump webmock from 3.7.6 to 3.8.0
Bumps [webmock](https://github.com/bblimke/webmock) from 3.7.6 to 3.8.0.
- [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/v3.7.6...v3.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-16 19:19:26 +00:00
dependabot-preview[bot]
ea2fa9913d Bump mini_racer from 0.2.4 to 0.2.9
Bumps [mini_racer](https://github.com/discourse/mini_racer) from 0.2.4 to 0.2.9.
- [Release notes](https://github.com/discourse/mini_racer/releases)
- [Changelog](https://github.com/rubyjs/mini_racer/blob/master/CHANGELOG)
- [Commits](https://github.com/discourse/mini_racer/compare/v0.2.4...v0.2.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-16 19:15:52 +00:00
Matt-Yorkley
b69b5ea81a Merge pull request #4678 from mkllnk/4490-tag-rules-spec
4490 tag rules spec
2020-01-16 14:28:37 +01:00
Luis Ramos
18b3a8122d Merge pull request #4508 from luisramos0/backend_ctrl_prods_vars
Bring spree_backend products and variants controllers to OFN
2020-01-16 13:01:31 +00:00
luisramos0
1e203ae419 Remove destroy with js format in variants controller, we dont use this endpoint in OFN and it avoids having to bring additional code from spree_backend 2020-01-16 11:59:36 +00:00
luisramos0
70a24b25e2 Update rubocop manual todo and Remove some unnecessary comments 2020-01-16 11:59:36 +00:00
luisramos0
f7490ae28b Remove unused stock and destroy actions and bring product routes from spree_backend 2020-01-16 11:58:59 +00:00
luisramos0
836abbec92 Fix rubocop issues in variant controller 2020-01-16 11:58:59 +00:00
luisramos0
d153237b69 Merge variants decorator with controller 2020-01-16 11:58:59 +00:00
luisramos0
56b6bf82bb Fix some rubocop issues 2020-01-16 11:58:59 +00:00
luisramos0
0d44f298fe Merge spree/admin/products_controller with its decorator 2020-01-16 11:58:59 +00:00
luisramos0
ff3611f52a Add variants_controller from spree_backend so that we can now merge it with the OFN's decorator 2020-01-16 11:58:59 +00:00
luisramos0
7fa9b4699c Add products_controller from spree_backend so that we can now merge it with the OFN's decorator 2020-01-16 11:58:59 +00:00
luisramos0
138248e1c9 Product import only works with csv right now. Here we remove dead code
This can be reverted if we start suppporting xls and ods in the future
2020-01-16 09:59:27 +00:00
Transifex-Openfoodnetwork
3dadb7f91c Updating translations for config/locales/en_GB.yml 2020-01-16 20:12:18 +11:00
Transifex-Openfoodnetwork
dd5c867298 Updating translations for config/locales/en_GB.yml 2020-01-16 20:09:10 +11:00
Transifex-Openfoodnetwork
918a0f053d Updating translations for config/locales/ar.yml 2020-01-16 18:25:27 +11:00
Transifex-Openfoodnetwork
2171125e85 Updating translations for config/locales/ar.yml 2020-01-16 18:22:18 +11:00
Transifex-Openfoodnetwork
5d0cb3549a Updating translations for config/locales/ar.yml 2020-01-16 18:19:07 +11:00
Maikel Linke
12fde5b9fc Update all locales with the latest Transifex translations 2020-01-16 15:28:57 +11:00
Maikel Linke
6b18d4a60c Avoid false positives in specs
When switching from one tab to another, a `have_no_selector` check could
match because the new tab hasn't loaded yet. Now we use that check after
we verified other content on the new tab.
2020-01-16 15:10:25 +11:00
Maikel Linke
4d53f47d88 Leave tag rules spec in clean state 2020-01-16 15:10:25 +11:00
Maikel Linke
3a9aaf6764 Wait for the first enterprise tab to be loaded 2020-01-16 15:10:25 +11:00
Maikel Linke
42aa15767e DRY navigating to Tag Rules section 2020-01-16 15:10:25 +11:00
Maikel
0da6275d41 Merge pull request #4675 from Matt-Yorkley/rails-4-prep-3
Rails 4 prep continued
2020-01-16 15:08:11 +11:00
Maikel
52d2d1d23c Merge pull request #4668 from Matt-Yorkley/rails-4-prep-2
Rails 4 prep: admin dashboard route
2020-01-16 14:16:32 +11:00
Maikel
4dfc020eaa Merge pull request #4666 from openfoodfoundation/transifex
Transifex
2020-01-16 12:10:12 +11:00
Maikel
8ef52f97e5 Merge pull request #4665 from openfoodfoundation/dependabot/bundler/selenium-webdriver-3.142.7
Bump selenium-webdriver from 3.142.6 to 3.142.7
2020-01-16 12:09:29 +11:00
Maikel
68a7f547b1 Merge pull request #4664 from openfoodfoundation/dependabot/bundler/test-unit-3.3.5
Bump test-unit from 3.3.4 to 3.3.5
2020-01-16 12:08:51 +11:00
Maikel
7a0f2d47a3 Merge pull request #4660 from openfoodfoundation/dependabot/bundler/activerecord-import-1.0.4
Bump activerecord-import from 1.0.3 to 1.0.4
2020-01-16 12:06:15 +11:00
Luis Ramos
4affd01b7b Merge pull request #4627 from luisramos0/mini_racer
Update libv8 and keep it only in Gemfile.lock as a dependency of mini_racer
2020-01-15 22:25:25 +00:00
Luis Ramos
0432c73f19 Merge pull request #4510 from luisramos0/backend_ctrl_resource
Bring spree_backend resource controller to OFN
2020-01-15 22:22:24 +00:00
dependabot-preview[bot]
6163661610 Bump oj from 3.10.0 to 3.10.1
Bumps [oj](https://github.com/ohler55/oj) from 3.10.0 to 3.10.1.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.0...v3.10.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-15 19:15:31 +00:00
Matt-Yorkley
103902c006 Replace deprecated arguments in #find_by
Failure/Error: enterprise = Enterprise.find_by(name: enterprise_name, select: 'id, is_primary_producer')

       ActiveRecord::StatementInvalid:
         PG::UndefinedColumn: ERROR:  column enterprises.select does not exist
         LINE 1: ...HERE "enterprises"."name" = 'User Enterprise' AND "enterpris...
         : SELECT  "enterprises".* FROM "enterprises"  WHERE "enterprises"."name" = 'User Enterprise' AND "enterprises"."select" = 'id, is_primary_producer' LIMIT 1
       # ./app/models/product_import/spreadsheet_data.rb:48:in `block in create_enterprises_index'
       # ./app/models/product_import/spreadsheet_data.rb:43:in `each'
2020-01-15 16:39:33 +01:00
Matt-Yorkley
d2933e35f1 Explicitly require Spree::Admin::BaseHelper
NameError: undefined method `preference_field_tag' for module `Spree::Admin::BaseHelper'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method_chain'
/home/runner/openfoodnetwork/app/helpers/spree/admin/base_helper_decorator.rb:11:in `<module:BaseHelper>'
/home/runner/openfoodnetwork/app/helpers/spree/admin/base_helper_decorator.rb:3:in `<module:Admin>'
2020-01-15 13:07:50 +01:00
Matt-Yorkley
0b5e341ae7 Explicitly require Spree::Admin::NavigationHelper
NameError: undefined method `klass_for' for module `Spree::Admin::NavigationHelper'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method_chain'
/home/runner/openfoodnetwork/app/helpers/spree/admin/navigation_helper_decorator.rb:18:in `<module:NavigationHelper>'
2020-01-15 13:07:46 +01:00
Matt-Yorkley
7d36c3b5aa Make some private methods public in orders_and_fulfillments_report.rb
Fixes errors for "call to private method ..."
2020-01-15 13:05:36 +01:00
Matt-Yorkley
d511763733 Replace deprecated #in? method 2020-01-15 12:57:38 +01:00
Matt-Yorkley
a059c11d0f Update post/delete calls in credit_cards_controller_spec.rb
ActionController::UrlGenerationError:
       No route matches {:action=>"new_from_token", :cc_type=>"visa", :controller=>"spree/credit_cards", :exp_month=>12, :exp_year=>2020, :format=>:json, :last4=>4242, :token=>"tok_234bd2c22"}
     # ./spec/controllers/spree/credit_cards_controller_spec.rb:36:in `block (5 levels) in <top (required)>'
     # ./spec/controllers/spree/credit_cards_controller_spec.rb:36:in `block (4 levels) in <top (required)>'
2020-01-15 12:57:38 +01:00
Matt-Yorkley
cecc19ae1d Add recommended paper_trail config
DEPRECATION WARNING: PaperTrail.track_associations has not been set. As of PaperTrail 5, it defaults to false. Tracking associations is an experimental feature so we recommend setting PaperTrail.config.track_associations = false in your config/initializers/paper_trail.rb . (called from block (3 levels) in <top (required)> at /home/user/Github/openfoodnetwork/spec/controllers/admin/column_preferences_controller_spec.rb:10)
2020-01-15 12:57:38 +01:00
Matt-Yorkley
d4311a848e Fix default_scope deprecated syntax 2020-01-15 12:57:38 +01:00
Transifex-Openfoodnetwork
d64573f7fd Updating translations for config/locales/nb.yml 2020-01-15 22:29:37 +11:00
Transifex-Openfoodnetwork
a9fe6ec1b5 Updating translations for config/locales/nb.yml 2020-01-15 22:26:30 +11:00
Transifex-Openfoodnetwork
f14bbc5ed9 Updating translations for config/locales/nb.yml 2020-01-15 22:23:20 +11:00
Matt-Yorkley
5ba8efec2c Fix enterprise group spec
EnterpriseGroup.by_position now returns an ActiveRecord::Relation in Rails 4, so in this test case it doesn't respond as an array
2020-01-15 11:19:14 +01:00
Luis Ramos
3bf38b7c08 Merge pull request #4549 from luisramos0/arelize_order_permissions
Use arel in order permissions visible orders and editable orders so that we dont have queries with gigantic IN clauses
2020-01-14 14:24:34 +00:00
Transifex-Openfoodnetwork
a591e0736f Updating translations for config/locales/en_CA.yml 2020-01-14 23:41:38 +11:00
Luis Ramos
3080eb9dfd Merge pull request #4578 from kshlyk/remove_soft_delete_from_product_and_variant_api
Removing duplicate API method soft_delete for both products and variants
2020-01-14 11:32:10 +00:00
Transifex-Openfoodnetwork
ed98a16eec Updating translations for config/locales/fr.yml 2020-01-14 20:18:13 +11:00
Transifex-Openfoodnetwork
7a924bd9ca Updating translations for config/locales/fr.yml 2020-01-14 20:15:05 +11:00
Transifex-Openfoodnetwork
7639e19184 Updating translations for config/locales/en_FR.yml 2020-01-14 20:13:12 +11:00
Transifex-Openfoodnetwork
71aff7e1d2 Updating translations for config/locales/fr.yml 2020-01-14 20:11:56 +11:00
dependabot-preview[bot]
2506667bca Bump selenium-webdriver from 3.142.6 to 3.142.7
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.142.6 to 3.142.7.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-13 19:37:48 +00:00
Luis Ramos
f87a553230 Merge pull request #4648 from openfoodfoundation/dependabot/bundler/rubocop-0.79.0
Bump rubocop from 0.68.1 to 0.79.0
2020-01-13 19:35:50 +00:00
Luis Ramos
3171b60d6f Merge pull request #4580 from Matt-Yorkley/order_capture
Use asynchronous requests for order capture and ship actions
2020-01-13 17:14:40 +00:00
Matt-Yorkley
94afc70ea7 Refactor conditionals in contact tab view 2020-01-13 17:14:22 +01:00
Matt-Yorkley
d14d6fe865 Refactor open order cycle checks 2020-01-13 17:11:27 +01:00
Matt-Yorkley
0546acd6f9 Refactor #shop_tabs use and remove #first_visible_tab 2020-01-13 17:05:28 +01:00
Matt-Yorkley
aedaec8365 Improve layout of orders closed message 2020-01-13 17:05:28 +01:00
Matt-Yorkley
d508e7772c Fix angular templates bug
Angular controller data was being partially preserved when switching back and forth between tab templates, causing the ProductsCtrl to hold duplicate datasets when it is re-initialized after going from the shop tab to another tab, then back again.
2020-01-13 17:05:28 +01:00
Matt-Yorkley
43eef0c8c6 Adjust layout for fullwidth enterprise image 2020-01-13 17:05:28 +01:00
Matt-Yorkley
e658893e70 Fix ancient display bug where the order cycle selection popover shows over the top of the floating navigtion bar 2020-01-13 17:05:28 +01:00
Matt-Yorkley
e7d88f0df9 Move "orders closed" message to "shop" tab and adjust "home" tab message display logic 2020-01-13 17:05:28 +01:00
Matt-Yorkley
56223bb960 Improve about tab mobile and tablet display 2020-01-13 17:05:28 +01:00
Matt-Yorkley
17cf099f99 Always keep one shop tab open (don't toggle closed) 2020-01-13 17:05:28 +01:00
Matt-Yorkley
49aacf879f Change row nesting to fix product list layout display issues 2020-01-13 17:05:28 +01:00
Matt-Yorkley
c8c4f3e746 Improve mobile display 2020-01-13 17:05:28 +01:00
Matt-Yorkley
219f6ad78e Select first visible tab on page load if none are specified in the URL 2020-01-13 17:05:27 +01:00
Matt-Yorkley
48f329a716 Rework layout and CSS 2020-01-13 17:05:26 +01:00
Luis Ramos
516398fbd6 Merge pull request #4638 from luisramos0/fix_cart_s2
Replace adjustment.open with adjustment.fire_events(open) to avoid method name conflict
2020-01-13 14:16:56 +00:00
Luis Ramos
4a1b74c136 Merge pull request #4634 from luisramos0/remove_dead_code
Remove some dead code
2020-01-13 11:09:04 +00:00
luisramos0
5fccd5fe58 Add rubocop exception for application controller class length and fix one line length issue 2020-01-12 19:42:07 +00:00
Matt-Yorkley
b9edea7c0e Rename 'admin/overview#index' route from :admin to :admin_dashboard
Fixes issues with route declarations in Rails 4
2020-01-12 13:11:33 +01:00
Transifex-Openfoodnetwork
b9053f9fd2 Updating translations for config/locales/en_NZ.yml 2020-01-12 18:37:55 +11:00
dependabot-preview[bot]
f297cff8c7 Bump test-unit from 3.3.4 to 3.3.5
Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.3.4 to 3.3.5.
- [Release notes](https://github.com/test-unit/test-unit/releases)
- [Commits](https://github.com/test-unit/test-unit/compare/3.3.4...3.3.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-10 19:17:47 +00:00
Luis Ramos
7563d38b4b Merge pull request #4658 from openfoodfoundation/dependabot/bundler/ddtrace-0.31.0
Bump ddtrace from 0.30.0 to 0.31.0
2020-01-10 10:52:04 +00:00
Luis Ramos
83523a676f Merge pull request #4659 from openfoodfoundation/dependabot/bundler/webdrivers-4.2.0
Bump webdrivers from 4.1.3 to 4.2.0
2020-01-10 10:51:10 +00:00
Maikel Linke
abcfb5ce8d Update Rubocop config for new version
- A couple of cops moved into a different namespace.
- The target ruby version doesn't have to be specified, it's read from
  .ruby-version which has been updated to Ruby 2.3.
- Some files were missing in the todo lists.
2020-01-10 08:59:44 +11:00
Maikel Linke
8ee6d1c320 Add rubocop-rails gem
The rails cops used to be in the rubocop gem itself but moved into their
own gem recently. Our style guide refers to these cops though.
2020-01-10 08:59:44 +11:00
dependabot-preview[bot]
1bc19ad6a4 Bump rubocop from 0.68.1 to 0.79.0
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.68.1 to 0.79.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.68.1...v0.79.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-10 08:59:44 +11:00
Maikel
191b8064ed Merge pull request #4629 from openfoodfoundation/dependabot/bundler/unicorn-5.5.2
Bump unicorn from 5.5.1 to 5.5.2
2020-01-10 08:29:17 +11:00
dependabot-preview[bot]
e28274db14 Bump activerecord-import from 1.0.3 to 1.0.4
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/zdennis/activerecord-import/releases)
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.3...v1.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-09 19:16:47 +00:00
Luis Ramos
02dec1d6cd Merge pull request #4649 from tomekr/4623-remove-additional-footeer-links
Remove duplicate footer links
2020-01-09 18:04:30 +00:00
Luis Ramos
df04c837a5 Merge pull request #4631 from Matt-Yorkley/oc_buttons
Increase space for buttons in savebar layout
2020-01-09 17:56:01 +00:00
Luis Ramos
7a6c085b63 Merge pull request #4625 from openfoodfoundation/dependabot/bundler/roo-2.8.2
Bump roo from 2.7.1 to 2.8.2
2020-01-09 17:55:24 +00:00
dependabot-preview[bot]
a4317b70f4 Bump webdrivers from 4.1.3 to 4.2.0
Bumps [webdrivers](https://github.com/titusfortner/webdrivers) from 4.1.3 to 4.2.0.
- [Release notes](https://github.com/titusfortner/webdrivers/releases)
- [Changelog](https://github.com/titusfortner/webdrivers/blob/master/CHANGELOG.md)
- [Commits](https://github.com/titusfortner/webdrivers/compare/v4.1.3...v4.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-08 19:16:43 +00:00
dependabot-preview[bot]
cb90fb052d Bump ddtrace from 0.30.0 to 0.31.0
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.30.0 to 0.31.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.30.0...v0.31.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-08 19:15:48 +00:00
Matt-Yorkley
14bcba081d Adapt shopfront_helper to show/hide panels and display new tabs 2020-01-08 14:50:27 +01:00
Matt-Yorkley
fa0b365b28 Move "shop messages" and product list from main view into new "Home" and "Shop" tabs 2020-01-08 13:26:21 +01:00
Matt-Yorkley
673c587c3b Move tab templates to their own directory for clarity 2020-01-08 13:26:21 +01:00
Luis Ramos
18e5f9ba64 Merge pull request #4647 from jeduardo824/remove-groups-tab
remove group link from shop menu when there are no groups
2020-01-08 11:44:51 +00:00
Luis Ramos
e9a5b889de Merge pull request #4606 from cyrillefr/lone-hub-checked-by-default-4428
Select by default single Hub/Shop option on creation of payment/shipping method
2020-01-08 11:44:16 +00:00
Luis Ramos
cc57b0c200 Merge pull request #4609 from openfoodfoundation/dependabot/bundler/excon-0.71.1
[Security] Bump excon from 0.62.0 to 0.71.1
2020-01-08 09:49:13 +00:00
Maikel
a8040e986d Merge pull request #4626 from openfoodfoundation/dependabot/bundler/i18n-js-3.5.1
Bump i18n-js from 3.5.0 to 3.5.1
2020-01-08 17:58:53 +11:00
Maikel
2269f824c0 Merge pull request #4637 from openfoodfoundation/transifex
Transifex
2020-01-08 17:56:37 +11:00
Maikel Linke
bec73adc89 Restore file logging for custom format logger
The new custom logger was directed to stdout instead of a file.
2020-01-08 15:06:19 +11:00
luisramos0
23ec66e338 Add timestamp to Rails logger in staging and prod so that info in logs can be accurately compared with data in the DB 2020-01-08 15:05:55 +11:00
Maikel Linke
b14193b6b7 Use strings for all environment variables
Figaro complained:

  WARNING: Use strings for Figaro configuration. 25 was converted to "25".
  WARNING: Use strings for Figaro configuration. 4 was converted to "4".

Those numbers have been converted to strings in our example config.
2020-01-08 12:14:23 +11:00
Eduardo
c45a3c2303 remove group tabs from shop view when there are no groups 2020-01-07 11:24:46 -03:00
Matt-Yorkley
e06449aee3 Allow specifying an alternate region for db2fog backups 2020-01-07 12:29:42 +01:00
Matt-Yorkley
f4f05922ae Update outdated link to gem documentation 2020-01-07 12:26:24 +01:00
Maikel Linke
3204d0b37c Remove unused presenter
The usage of this presenter got removed seven years ago:
c5d031a6d7
2020-01-07 17:30:42 +11:00
Tomek Rabczak
8df0e2c66e Move db:test:prepare task after db:reset is run 2020-01-06 16:37:52 -06:00
Tomek Rabczak
0ec0d3fd81 Install Chrome and Chromedriver 2020-01-06 16:37:23 -06:00
Tomek Rabczak
8a0ffe1890 Add imagemagick and unzip packages 2020-01-06 16:37:02 -06:00
Tomek Rabczak
1327d80446 fixup: Revert non en.yml locale changes as they are generated via transifex 2020-01-06 16:33:36 -06:00
Tomek Rabczak
43a3ac0a7b Remove no longer used locales 2020-01-06 13:56:35 -06:00
Tomek Rabczak
b948312de7 Remove additional footer links 2020-01-06 13:47:54 -06:00
Transifex-Openfoodnetwork
7063de4734 Updating translations for config/locales/fr_CA.yml 2020-01-04 06:22:08 +11:00
Transifex-Openfoodnetwork
56c1a9cca2 Updating translations for config/locales/fr_CA.yml 2020-01-04 06:19:02 +11:00
Transifex-Openfoodnetwork
9555bfcc93 Updating translations for config/locales/fr.yml 2020-01-04 06:17:34 +11:00
Transifex-Openfoodnetwork
e455a47135 Updating translations for config/locales/fr.yml 2020-01-04 06:14:27 +11:00
Transifex-Openfoodnetwork
e15e71a3a7 Updating translations for config/locales/en_CA.yml 2020-01-04 06:07:34 +11:00
Matt-Yorkley
91d959b7d6 Remove "previous" button from order cycle savebar 2020-01-03 16:25:26 +01:00
luisramos0
108f57a705 Replace adjustment.open with adjustment.fire_events(open) to avoid method name conflict 2020-01-02 16:58:11 +00:00
Transifex-Openfoodnetwork
af42159e09 Updating translations for config/locales/en_GB.yml 2020-01-03 01:37:14 +11:00
Transifex-Openfoodnetwork
8e55c39ca0 Updating translations for config/locales/en_GB.yml 2020-01-03 01:34:04 +11:00
luisramos0
6cfb060184 Update all locales with the latest Transifex translations 2020-01-02 10:37:13 +00:00
Luis Ramos
0cfb7269c8 Merge pull request #4596 from openfoodfoundation/transifex
Transifex
2020-01-02 10:34:20 +00:00
luisramos0
cbec495620 Fix some rubocop issues in order_and_distributor_report 2019-12-29 19:01:44 +00:00
luisramos0
55eea21bb0 Adapt order_and_distributor_report to the new editable_orders query 2019-12-29 19:01:44 +00:00
luisramos0
f63c7cf54f Extract visible_orders_where_values to a private method 2019-12-29 19:01:44 +00:00
luisramos0
13633e8bea Use arel in order permissions visible orders and editable orders so that we dont have queries with gigantic IN clauses
The | operators here were converting the relations to long lists of IDs, in our current particular issue, an IN clause with 100k order_ids
2019-12-29 19:01:44 +00:00
luisramos0
4658b7a533 Fix rubocop issues in app/controllers/application_controller 2019-12-28 19:10:02 +00:00
luisramos0
d0f33e7c8a Avoid code in devise that is not needed and simply return the root path
This fixes a broken spec with error "No route matches {:controller=>"home"}"
2019-12-28 18:47:14 +00:00
luisramos0
55bb328d48 Prefix all calls to root_url with main_app 2019-12-28 18:46:50 +00:00
luisramos0
a8a6fce385 Prefix root_path with main_app so that ofn's route is used. The spree root path will no longer be defined when spree_backend is dropped 2019-12-28 18:45:57 +00:00
luisramos0
60677a2414 Make login nav use main_app router 2019-12-28 18:41:16 +00:00
luisramos0
093edb66d3 Remove unused view
This was introduced in 2013 and removed in 2014, see log below:

git log -Saddress_form_simple
commit 510333288c
Author: Maikel Linke <mkllnk@web.de>
Date:   Sun Mar 2 13:05:15 2014 +1100

    first steps of new design

commit 2e1de9a6d3
Author: Rohan Mitchell <rohan@rohanmitchell.com>
Date:   Fri Aug 23 13:12:36 2013 +1000

    Fix admin create order - remove override on spree address form, update to spree patched to fix respond_override (spree issue #2210), fix nil state error
2019-12-28 18:25:28 +00:00
luisramos0
fb25ddd219 Remove reference to user banners, this code is not used in OFN. 2019-12-28 18:13:04 +00:00
luisramos0
1295d33fa7 Fix bug in frontoffice order details where the product image was a link to nowhere 2019-12-28 17:54:28 +00:00
luisramos0
d54850f097 Move ActionCallBacks out of the spree namespace 2019-12-27 17:04:40 +00:00
luisramos0
f8451a2511 Bring needed action_callbacks from spree_backend 2019-12-27 17:04:31 +00:00
luisramos0
1a88549954 Update rubocop todo lists 2019-12-27 17:04:23 +00:00
luisramos0
f79182253a Fix some rubocop issues 2019-12-27 17:03:39 +00:00
luisramos0
8cfd7c610b Use nested module instead of class Spree::Admin:: 2019-12-27 17:03:39 +00:00
luisramos0
486b5e9edc Merge resource_decorator into resource controller 2019-12-27 17:03:39 +00:00
luisramos0
8fe3abfd45 Add resource_controller from spree_backend so that we can now merge it with the OFN's decorator 2019-12-27 17:03:39 +00:00
Luis Ramos
0e7dafea46 Merge pull request #4560 from kshlyk/fix_billing_addres_in_pdf_invoice
Billing address in pdf invoice fixed
2019-12-27 16:45:06 +00:00
Matt-Yorkley
4c9cc7460a Increase space for buttons in savebar layout 2019-12-27 17:08:37 +01:00
dependabot-preview[bot]
c9e3f58aed Bump unicorn from 5.5.1 to 5.5.2
Bumps [unicorn](https://bogomips.org/unicorn/) from 5.5.1 to 5.5.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-26 19:16:30 +00:00
Luis Ramos
4136306abf Updating mini_racer and libv8 at the same time 2019-12-26 11:01:09 +00:00
Luis Ramos
9f1eaf0b66 Merge pull request #4512 from luisramos0/backend_ctrl_base
Bring spree_backend base controller to OFN
2019-12-24 12:01:07 +00:00
dependabot-preview[bot]
4771612adb Bump i18n-js from 3.5.0 to 3.5.1
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.5.0...v3.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-23 19:21:17 +00:00
dependabot-preview[bot]
7ce3dfe365 Bump roo from 2.7.1 to 2.8.2
Bumps [roo](https://github.com/roo-rb/roo) from 2.7.1 to 2.8.2.
- [Release notes](https://github.com/roo-rb/roo/releases)
- [Changelog](https://github.com/roo-rb/roo/blob/master/CHANGELOG.md)
- [Commits](https://github.com/roo-rb/roo/compare/v2.7.1...v2.8.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-23 19:17:19 +00:00
Luis Ramos
6f13707b9d Merge pull request #4556 from openfoodfoundation/dependabot/bundler/stripe-5.11.0
Bump stripe from 4.24.0 to 5.11.0
2019-12-23 16:19:05 +00:00
Luis Ramos
64cb104434 Merge pull request #4577 from openfoodfoundation/dependabot/bundler/oj-3.10.0
Bump oj from 3.7.12 to 3.10.0
2019-12-23 16:14:33 +00:00
Luis Ramos
1606f9900f Merge pull request #4507 from luisramos0/backend_ctrl_reports
Bring spree_backend reports controller to OFN
2019-12-23 16:14:07 +00:00
Luis Ramos
9f0e8b0b2e Merge pull request #4558 from openfoodfoundation/dependabot/bundler/mini_racer-0.2.4
Bump mini_racer from 0.1.15 to 0.2.4
2019-12-23 16:13:10 +00:00
Luis Ramos
d796e96470 Merge pull request #4575 from Matt-Yorkley/admin_orders
Fix route on "continue" button on admin adjustments page
2019-12-23 16:12:28 +00:00
Luis Ramos
ba7f78ef60 Merge pull request #4515 from luisramos0/backend_ctrl_adjustments
Bring spree_backend adjustments controller to OFN
2019-12-23 16:05:04 +00:00
Maikel
988e146240 Merge pull request #4564 from openfoodfoundation/dependabot/bundler/rack-mini-profiler-1.1.4
Bump rack-mini-profiler from 1.0.0 to 1.1.4
2019-12-20 17:42:04 +11:00
cyrillefr
e6d9ec7bd7 Small fixes for default single Hub/Shop options issue
- removed mode variable
 - reverted html template accordingly
 - added a more specific helper
 - fixed some short variable names
2019-12-19 21:08:34 +01:00
Transifex-Openfoodnetwork
3acc53a389 Updating translations for config/locales/ar.yml 2019-12-20 04:33:09 +11:00
Transifex-Openfoodnetwork
9c9fc999de Updating translations for config/locales/ar.yml 2019-12-20 04:30:00 +11:00
Transifex-Openfoodnetwork
d824c84ce6 Updating translations for config/locales/fr.yml 2019-12-19 19:14:24 +11:00
Transifex-Openfoodnetwork
1a301f3dbb Updating translations for config/locales/fr.yml 2019-12-19 19:11:16 +11:00
Transifex-Openfoodnetwork
fad4f3b22a Updating translations for config/locales/en_FR.yml 2019-12-19 19:08:18 +11:00
Transifex-Openfoodnetwork
6080c99850 Updating translations for config/locales/fr.yml 2019-12-19 19:08:07 +11:00
Transifex-Openfoodnetwork
2944acff8a Updating translations for config/locales/nb.yml 2019-12-19 09:52:35 +11:00
dependabot-preview[bot]
2068a59b72 [Security] Bump excon from 0.62.0 to 0.71.1
Bumps [excon](https://github.com/excon/excon) from 0.62.0 to 0.71.1. **This update includes a security fix.**
- [Release notes](https://github.com/excon/excon/releases)
- [Changelog](https://github.com/excon/excon/blob/master/changelog.txt)
- [Commits](https://github.com/excon/excon/compare/v0.62.0...v0.71.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-18 19:33:23 +00:00
Luis Ramos
3063439ed1 Merge pull request #4541 from Matt-Yorkley/new_fee_errors
Handle validation messages when saving new fees
2019-12-18 13:35:45 +00:00
Matt-Yorkley
6bed05c721 Add missing feature test for order "Ship" button 2019-12-18 14:15:48 +01:00
Matt-Yorkley
a3ee6674ea Use asynchronous requests for order capture and ship actions 2019-12-18 14:15:46 +01:00
cyrillefr
e59077e63e Select by default single Hub/Shop option on creation of payment/shipping method
- added a helper
- added mode(new/edit) in payment/shipping views
- updated checkbox creation
- added tests
2019-12-18 10:45:00 +01:00
Transifex-Openfoodnetwork
f9f8d85841 Updating translations for config/locales/fr.yml 2019-12-18 04:37:36 +11:00
Transifex-Openfoodnetwork
0042690e18 Updating translations for config/locales/en_FR.yml 2019-12-18 04:35:31 +11:00
Transifex-Openfoodnetwork
5f1111b52b Updating translations for config/locales/fr.yml 2019-12-18 04:34:28 +11:00
Luis Ramos
25ded0d23c Merge pull request #4471 from luisramos0/paginate_exc_prods
Paginate Exchange Products API endpoint
2019-12-17 15:25:15 +00:00
Luis Ramos
a5458150ca Merge pull request #4455 from luisramos0/oc_prods
In the OC edit page, load products only when each products tab is opened by user
2019-12-17 13:40:19 +00:00
Pau Pérez Fabregat
96eebbabf3 Merge pull request #4590 from luisramos0/capybara
Upgrade capybara and webdrivers
2019-12-17 10:55:59 +01:00
luisramos0
c58e6fa964 Upgrade capybara 2019-12-16 15:25:45 +00:00
luisramos0
fbe8f5195c Upgrade webdrivers to latest 2019-12-16 15:25:36 +00:00
luisramos0
9648693329 Fix a problem in states/new template where erb instead of haml was referenced 2019-12-15 21:42:52 +00:00
luisramos0
9df9061ec1 Bring missing translation from spree and use root namespace for translations instead of the spre namespace 2019-12-15 21:39:26 +00:00
luisramos0
67526df420 Convert calculator fields partial to haml 2019-12-15 21:32:31 +00:00
luisramos0
766f8ab407 Add partial needed in payment and shipping methods 2019-12-15 21:24:50 +00:00
luisramos0
f587bbb7d5 Remove unnecessary helper 2019-12-15 21:03:53 +00:00
luisramos0
2793693a7c Improve if clause readability 2019-12-15 21:03:53 +00:00
luisramos0
07e2317369 Replace deprecated URI.unescape with CGI.unescape 2019-12-15 21:03:53 +00:00
luisramos0
042162eda8 Delete unused method 2019-12-15 21:03:53 +00:00
luisramos0
795f13d73a Remove spree alerts feature that would check spree website for security alerts
This is not something we need running such an old version of spree
2019-12-15 21:03:53 +00:00
luisramos0
f1814f1b67 Fix most rubocop issues in spree/admin/base_controller 2019-12-15 21:03:53 +00:00
luisramos0
4ab7b78cb8 Merge base_controller with its decorator 2019-12-15 21:03:53 +00:00
luisramos0
11631c3a33 Add base_controller from spree_backend so that we can now merge it with the OFN's decorator 2019-12-15 21:03:53 +00:00
Konstantin Shlyk
0212381362 fix for api/variants_controller_spec 2019-12-14 21:43:38 +03:00
Konstantin Shlyk
e6ca6bacac soft_delete api method deleted for products and variants 2019-12-14 01:05:35 +03:00
dependabot-preview[bot]
59df45b8cf Bump oj from 3.7.12 to 3.10.0
Bumps [oj](https://github.com/ohler55/oj) from 3.7.12 to 3.10.0.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.12...v3.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-13 19:17:46 +00:00
Luis Ramos
5892e85869 Merge pull request #4559 from openfoodfoundation/dependabot/bundler/selenium-webdriver-3.142.6
Bump selenium-webdriver from 3.141.0 to 3.142.6
2019-12-13 18:05:03 +00:00
luisramos0
c59326743b Remove sales total report 2019-12-13 16:44:46 +00:00
luisramos0
cb3397fd1a Convert reports index and sales_total views from erb to haml 2019-12-13 16:44:46 +00:00
luisramos0
2bd4de3e29 Add sales total report view 2019-12-13 16:44:46 +00:00
luisramos0
b2c5be775e Fix some rubocop issues 2019-12-13 16:44:46 +00:00
luisramos0
d22212ccfa Merge spree/admin/reports_controller with its decorator 2019-12-13 16:44:44 +00:00
luisramos0
dd600cd163 Add reports_controller from spree_backend so that we can now merge it with the OFN's decorator 2019-12-13 15:20:03 +00:00
Matt-Yorkley
f189ca8004 Fix route on "continue" button on admin adjustments page 2019-12-13 13:51:41 +01:00
Luis Ramos
db7146014c Rename exchange products file names to increase clarity 2019-12-13 12:24:19 +00:00
Luis Ramos
c6af55d9ae Restructure exchange products panels so that OC simple form does not include header and footer (product count and pagination) of the non-simple OC form 2019-12-13 12:24:16 +00:00
Maikel
0f588dbe0b Merge pull request #4561 from openfoodfoundation/transifex
Transifex
2019-12-13 17:02:32 +11:00
dependabot-preview[bot]
9c14d8ff36 Bump rack-mini-profiler from 1.0.0 to 1.1.4
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 1.0.0 to 1.1.4.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases)
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v1.0.0...v1.1.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-12 19:14:17 +00:00
luisramos0
a104bf8efd Add feature spec to validate load all and select all exchange products 2019-12-12 18:49:11 +00:00
luisramos0
a039ef13f4 Add spec for exchange products controller pagination 2019-12-12 18:49:11 +00:00
luisramos0
7ad8951375 DRY exchange products templates by extracting header and footer content to partial templates 2019-12-12 18:49:11 +00:00
luisramos0
99e59595b4 Add spinner when loading all products in an exchange 2019-12-12 18:48:36 +00:00
luisramos0
3264355f12 Add some basic test coverage to exchange_products_controller and exchange_products_renderer 2019-12-12 18:48:36 +00:00
luisramos0
7e3b6e2b5d Fix select all checkbox state in both incoming and outgoing exchanges by using the total count of variants to see if all variants are selected or not, even if not all variants are loaded 2019-12-12 18:48:36 +00:00
luisramos0
a9598c5d97 Only show load more and load all if not all products are loaded already 2019-12-12 18:48:36 +00:00
luisramos0
3e5b7ebbf1 Show exchange products list only after first page of products is loaded 2019-12-12 18:48:36 +00:00
luisramos0
1a9c3007b0 Make select all work again in incoming exchanges by loading alll products before triggering the select all process 2019-12-12 18:48:35 +00:00
luisramos0
2f7fd1482a Add link to load all products at the top of the list of products and include summary of number of products loaded already 2019-12-12 18:48:35 +00:00
luisramos0
0416521772 Add load all prouducts button to list of exchange products 2019-12-12 18:48:35 +00:00
luisramos0
cfe3f72d0e Add load more button to list of exchange products 2019-12-12 18:48:35 +00:00
luisramos0
00478cc57c Add count variants endpoint and use it instead of loading exchange products 2019-12-12 18:48:35 +00:00
luisramos0
d5e42ee1e5 Paginate exchange products results
This commit breaks the OC page when there are more than 100 products in an exchange
2019-12-12 18:48:35 +00:00
luisramos0
9451f1b66d Remove funky panel open listener code and initialize the panel data with a ng-init in the panel template 2019-12-12 18:44:45 +00:00
luisramos0
ff584f9be9 Adapt exchange products routes to make api/exchanges/products (without exchange_id) also go to exchange_products#index 2019-12-12 18:44:45 +00:00
luisramos0
a589ba38da Rename exchanges_products_controller to better exchange_products_controller 2019-12-12 18:44:45 +00:00
luisramos0
a4a2f98b6e Rename Product service to more appropriate ExchangeProduct 2019-12-12 18:44:45 +00:00
luisramos0
f5ddbfbac3 Make Product service more simple, there's no need to keep the data structure, that is already kept in the controller 2019-12-12 18:44:45 +00:00
luisramos0
a66a4c3edb Remove unnecessary passing of scopes around in controllers 2019-12-12 18:44:45 +00:00
luisramos0
8179252924 Replace the use of this with 2019-12-12 18:44:45 +00:00
luisramos0
0bec492208 Fix some rubocop issues 2019-12-12 18:44:45 +00:00
luisramos0
5cf50f0adf Convert the manipulation of arrays into active record relations: let the DB do the matching job 2019-12-12 18:44:45 +00:00
luisramos0
197fb36524 Extract ExchangeProductsRenderer from ExchangesProductsController 2019-12-12 18:44:45 +00:00
luisramos0
62e6f09d94 Make exchange products more simple 2019-12-12 18:44:45 +00:00
luisramos0
79b2460664 Make simple create and edit OC load exchange products on init
Simple create makes a new type of call to exchange products with no exchange_id and no prder_cycle_id, it simply lists supplied products for a given enterprise
2019-12-12 18:44:44 +00:00
luisramos0
66f3656bb5 Register products panel listeners after OrderCycle is loaded instead of using recurrent timeouts
Also, use this same approach for the case where a new distributor or new supplier is added to the list of exchanges
2019-12-12 18:44:44 +00:00
luisramos0
6b087adab8 Add route to process requests to exchanges/products without exchange id
This is needed when products for an exchange that is not yet saved are requested
2019-12-12 18:44:44 +00:00
luisramos0
3653b88da6 Make exchanges_products_controller more independent of the exchange field 2019-12-12 18:44:44 +00:00
luisramos0
3223bf930d Make total number of products in exchange work again.
Currently we are just loading the products from the server and count them.
This can be improved easily in two ways:
- we can switch this to a specific product count call to the server so that we dont load all products all the time
- or we paginate the products result and fetch the total_number from the payload of the first page.
2019-12-12 18:44:44 +00:00
luisramos0
2b3bc6d1ff Remove supplied products from enterprise serializer and from UI side
This list of products s now loaded in a specific call to ExchangeProducts and for each specific exchange
2019-12-12 18:44:44 +00:00
luisramos0
24d7672abb Use new exchange products endpoint for outgoing exchanges and make the exchange products panel work for outgoing exchanges 2019-12-12 18:44:44 +00:00
luisramos0
89628c27f3 Move exchange products endpoint to api namespace and make it work for outgoing exchanges 2019-12-12 18:44:44 +00:00
luisramos0
9adbdc377d Add new admin/exchange/products endpoint that replaces Enterprise/for_order_cycle#supplied_products 2019-12-12 18:44:44 +00:00
luisramos0
883cd81058 Load enterprise supplied products when the exchange products panel is opened for the first time 2019-12-12 18:44:44 +00:00
Transifex-Openfoodnetwork
0d7d029255 Updating translations for config/locales/en_GB.yml 2019-12-13 02:07:44 +11:00
Kristina Lim
ce31a059bf Merge pull request #4553 from openfoodfoundation/transifex
Transifex
2019-12-12 22:46:22 +08:00
Luis Ramos
17bac20c65 Merge pull request #4550 from luisramos0/fix_of_report
Remove eager loding of shipping_methods and shipping_rates from customer_totals so that report runs faster
2019-12-12 14:15:19 +00:00
Pau Pérez Fabregat
066243057f Merge pull request #4545 from coopdevs/fix-db-backups
Make whenever properly read the S3 bucket
2019-12-12 11:39:54 +01:00
Transifex-Openfoodnetwork
ea40547fd7 Updating translations for config/locales/fr_CA.yml 2019-12-12 10:22:26 +11:00
Transifex-Openfoodnetwork
0ebc6d4b1e Updating translations for config/locales/en_CA.yml 2019-12-12 09:28:07 +11:00
Transifex-Openfoodnetwork
62c2e4709a Updating translations for config/locales/en_CA.yml 2019-12-12 09:25:01 +11:00
Konstantin Shlyk
c5229dd763 billing address in pdf invoice fixed 2019-12-11 23:10:51 +03:00
dependabot-preview[bot]
99d4190814 Bump selenium-webdriver from 3.141.0 to 3.142.6
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.141.0 to 3.142.6.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 19:35:45 +00:00
dependabot-preview[bot]
f086c02e13 Bump mini_racer from 0.1.15 to 0.2.4
Bumps [mini_racer](https://github.com/discourse/mini_racer) from 0.1.15 to 0.2.4.
- [Release notes](https://github.com/discourse/mini_racer/releases)
- [Changelog](https://github.com/rubyjs/mini_racer/blob/master/CHANGELOG)
- [Commits](https://github.com/discourse/mini_racer/compare/v0.1.15...v0.2.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 19:35:03 +00:00
dependabot-preview[bot]
b726f961fc Bump stripe from 4.24.0 to 5.11.0
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 4.24.0 to 5.11.0.
- [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/v4.24.0...v5.11.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-11 19:33:30 +00:00
Transifex-Openfoodnetwork
4c17cf0087 Updating translations for config/locales/fr.yml 2019-12-12 04:29:14 +11:00
Transifex-Openfoodnetwork
9fe143cf94 Updating translations for config/locales/en_FR.yml 2019-12-12 04:26:13 +11:00
Transifex-Openfoodnetwork
e2d783c385 Updating translations for config/locales/fr.yml 2019-12-12 04:26:05 +11:00
Transifex-Openfoodnetwork
81cb162884 Updating translations for config/locales/nb.yml 2019-12-12 03:34:25 +11:00
Transifex-Openfoodnetwork
c7b6dd2677 Updating translations for config/locales/nb.yml 2019-12-12 03:31:14 +11:00
Transifex-Openfoodnetwork
d1fd73fd2b Updating translations for config/locales/ar.yml 2019-12-12 03:16:38 +11:00
Transifex-Openfoodnetwork
b0221d264e Updating translations for config/locales/ar.yml 2019-12-12 03:13:31 +11:00
Transifex-Openfoodnetwork
0f64badc74 Updating translations for config/locales/ar.yml 2019-12-12 03:10:21 +11:00
Luis Ramos
7ccfdc8d21 Merge pull request #4546 from kshlyk/fix_cart_link_on_mobile
Cart link in header on mobile leads to cart page instead of checkout …
2019-12-11 13:45:56 +00:00
Luis Ramos
4799293996 Merge pull request #4518 from Matt-Yorkley/ruby-2.3.7
Bump Ruby to 2.3.7
2019-12-11 13:29:01 +00:00
Luis Ramos
58a93c27ae Merge pull request #4539 from luisramos0/subs_s3
Make weight calculator work for SubscriptionLineItems
2019-12-11 11:20:53 +00:00
luisramos0
0202b59634 Remove eager loding of shipping_methods and shipping_rates from customer_totals so that report runs faster
Something makes the query run much slower with these includes
2019-12-10 21:18:17 +00:00
Luis Ramos
9f351607d1 Merge pull request #4538 from mkllnk/4537-paginated-product-order
Make product order deterministic
2019-12-10 18:00:45 +00:00
Maikel
c45e3c9cca Merge pull request #4543 from openfoodfoundation/transifex
Transifex
2019-12-10 20:10:23 +11:00
Luis Ramos
71bf3f5f71 Merge pull request #4514 from luisramos0/backend_ctrl_overview
Bring spree_backend overview controller to OFN
2019-12-09 23:36:32 +00:00
Konstantin Shlyk
ef142de5f2 Cart link in header on mobile leads to cart page instead of checkout page 2019-12-09 22:58:00 +03:00
luisramos0
f64e8bf50e Make user aware of server side errors when saving subscription products and unit test products_panel_controller 2019-12-09 17:49:38 +00:00
Pau Perez
e8d68e3b89 Make whenever properly read the S3 bucket
For unknown reasons the magic
[Figaro](https://github.com/laserlemon/figaro) does to turn keys in
`config/application.yml` into ENV vars that can be read through Ruby's
`ENV[]` is not working in `config/schedule.rb`.

As a result, the `db2fog` tasks are not translated into cron entries
which led to not having automatic backups.
2019-12-09 17:16:11 +01:00
luisramos0
1b29d474d0 Add specs to cover case where updating subscriptions products quantity fails 2019-12-09 15:11:32 +00:00
Luis Ramos
baae58ecb6 Merge pull request #4288 from luisramos0/oc_serializer_spec
Add spec for api/admin/order_cycle_serializer
2019-12-09 11:16:04 +00:00
Pau Pérez Fabregat
6411871ecb Merge pull request #4540 from openfoodfoundation/dependabot/bundler/ddtrace-0.30.0
Bump ddtrace from 0.29.1 to 0.30.0
2019-12-09 09:48:27 +01:00
Transifex-Openfoodnetwork
22833ae79b Updating translations for config/locales/it.yml 2019-12-09 19:28:13 +11:00
Transifex-Openfoodnetwork
ac20b0e7fb Updating translations for config/locales/it.yml 2019-12-09 19:25:06 +11:00
luisramos0
e9e6aa77d8 Make weight calculator work for SubscriptionLineItems by making it test if line_item responds to final_weight_volume field (final_weight_volume_present?)
We also add logic to weight_per_variant so that we use variant.unit_value if final_weight_volume is not available but variant_unit is weight
Adapt some test case to test unit_value (in grams) instead of weight (in kgs)
2019-12-08 17:36:21 +00:00
Matt-Yorkley
29e30c388e Make error message translatable 2019-12-07 15:48:46 +01:00
Matt-Yorkley
54a40fe79c Handle validation messages when saving new fees 2019-12-07 14:51:17 +01:00
dependabot-preview[bot]
7840118dea Bump ddtrace from 0.29.1 to 0.30.0
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.29.1 to 0.30.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.29.1...v0.30.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-06 19:18:08 +00:00
luisramos0
5e27bd6d6d Add for now very basic spec to api/admin/order_cycle_serializer 2019-12-06 16:41:54 +00:00
Maikel Linke
d4512904ea Make product order deterministic
When products are sorted by name and two products have the same name,
their order is undefined. With pagination, two pages can have a
different order of products with the same name which then means that two
pages can return the same product.

Sorting by product id makes sure that the result is always in the same
order, for every page.
2019-12-05 15:37:10 +11:00
Maikel
52dc288470 Merge pull request #4530 from openfoodfoundation/transifex
Transifex
2019-12-05 11:01:30 +11:00
Luis Ramos
302de04e73 Merge pull request #4526 from kristinalim/fix/3149-fix_tool_tips_in_orders_list
3149 Fix tooltips in orders list
2019-12-04 10:38:28 +00:00
Transifex-Openfoodnetwork
41767936d6 Updating translations for config/locales/ca.yml 2019-12-03 22:50:13 +11:00
Transifex-Openfoodnetwork
0ccf30202e Updating translations for config/locales/ca.yml 2019-12-03 22:47:06 +11:00
Transifex-Openfoodnetwork
00f36e4686 Updating translations for config/locales/ca.yml 2019-12-03 22:43:57 +11:00
Maikel
4d77f30bc0 Merge pull request #4506 from openfoodfoundation/dependabot/bundler/ddtrace-0.29.1
Bump ddtrace from 0.29.0 to 0.29.1
2019-12-03 20:39:58 +11:00
Maikel
f38b1b95f0 Merge pull request #4525 from kristinalim/fix/4489-flaky_spec_for_editing_oc
4489 Improve waiting in feature spec for edit Order Cycle page
2019-12-03 20:36:37 +11:00
Luis Ramos
97ef93b840 Merge pull request #4516 from openfoodfoundation/transifex
Transifex
2019-12-02 17:50:26 +00:00
Luis Ramos
6db15a0a20 Merge pull request #4524 from Matt-Yorkley/packing_reports
Packing reports performance
2019-12-02 17:32:52 +00:00
Luis Ramos
c8395a487a Merge pull request #4523 from luisramos0/permissions_improve
Replace pluck with select in permissions to avoid extra queries and extract Permissions::Orders from Permissions
2019-12-02 16:31:04 +00:00
Kristina Lim
852adfd436 Improve waiting in feature spec for order cycle page 2019-12-02 20:06:43 +08:00
luisramos0
1e948735fb Fix major performance problem by inverting the logic, instead of looking for line_items that are hidden, it looks for line items that are not editable using a merge statement that performs much better
Also, remove unnecessary if clause, merge will return an empty relation if no items are found, no need to test for empty.

The test report runs in a little over one minute instead of 8minutes
2019-11-30 22:38:03 +00:00
luisramos0
0ef4247914 Convert Report::LineItems to class and memoize orders so it's only executed once (this improves the report in 3secs for the case I am testing) 2019-11-29 21:51:54 +00:00
Kristina Lim
2673a6efee Fix Angular tracking of row in orders list
The tooltip content for the order in index n in page x was being used
for the order in index n in page y.

This was because ng-repeat was tracking the items/rows by index.
As far as ng-repeat is aware, rows with the same index in any page
were the same items/rows, so it didn't bother relinking the ofn-with-tip
directive.
2019-11-30 03:53:20 +08:00
Kristina Lim
6ffe7f1a99 Set width and enable wrapping for tooltips 2019-11-30 03:53:16 +08:00
Matt-Yorkley
6d1fb63a21 Eager-load option_values on line_item objects instead of variants in packing reports. 2019-11-29 20:16:48 +01:00
Matt-Yorkley
9bcd303f4f Remove shipping_category N+1 from packing reports 2019-11-29 20:16:48 +01:00
Matt-Yorkley
38c327dae0 Improve N+1 issues around #suppliers_of_products_distributed_by
There's still some real mess here with repeating queries, but resolving it is out of scope for this quick PR
2019-11-29 20:16:03 +01:00
Matt-Yorkley
51177b833e Remove customer_code N+1 from packing reports 2019-11-29 17:09:12 +01:00
luisramos0
cc3368704a Fix rubocop issues in reports_controller_decorator and in report line_items 2019-11-29 13:54:30 +00:00
Pau Pérez Fabregat
2d53fbbe8c Merge pull request #4520 from kristinalim/fix/4238-flaky_spec_in_api_taxons_index
4238 Do not assume order in spec for taxons list
2019-11-29 13:23:51 +01:00
luisramos0
3959f16d65 Switch some more references from Permissions to Permissions::Order 2019-11-29 12:22:50 +00:00
Pau Pérez Fabregat
fb28826d92 Merge pull request #4522 from kristinalim/fix/4239-flaky_spec_in_bulk_product_clone
4239 Do one thing at a time in feature spec for product cloning
2019-11-29 13:22:42 +01:00
luisramos0
beaa8ffa27 Use more specific selector to avoid ambigous column error 2019-11-29 11:45:22 +00:00
luisramos0
da6d035a1d Rename some reports permissions to order_permissions 2019-11-29 11:23:17 +00:00
luisramos0
5cb77c443b Fix rubocop issues 2019-11-29 10:53:40 +00:00
luisramos0
8d16f496f4 Move Permissions::Order specs to its specific spec file 2019-11-29 10:49:59 +00:00
luisramos0
82b274e522 Make selector more specific to avoid sql error 'ambiguos column' 2019-11-29 10:49:58 +00:00
luisramos0
484cdd1e07 Make managed_and_related_enterprises public so they can be used by other permissions classes 2019-11-29 10:49:27 +00:00
luisramos0
bb2e6324bd Rename order permissions to just order 2019-11-29 10:49:27 +00:00
luisramos0
89056e13ed Extract order permissions to a separate class 2019-11-29 10:48:58 +00:00
luisramos0
df0458743b Replace pluck with select in permissions to avoid extra queries 2019-11-28 23:37:49 +00:00
luisramos0
ba1ad0a6dd Rename decorator to controller so that the rubocop exception for the index action keeps being seen by code climate 2019-11-28 16:47:02 +00:00
luisramos0
4e7b397c5a Bring orders adjustments route from spree_backend 2019-11-28 16:26:22 +00:00
luisramos0
842e191c5f Remove toggle_state action that is not used in OFN 2019-11-28 16:20:35 +00:00
Kristina Lim
1476859c83 Do one thing at a time in feature spec for product cloning 2019-11-28 22:05:17 +08:00
Kristina Lim
c6fb7dafec Do not assume order in test for taxons list 2019-11-28 20:33:42 +08:00
Transifex-Openfoodnetwork
80069731ed Updating translations for config/locales/en_NZ.yml 2019-11-28 20:52:48 +11:00
Matt-Yorkley
feaa928674 Bump Ruby to 2.3.7 🎉 2019-11-28 10:42:13 +01:00
Maikel Linke
dfa3d40665 Create release task template recognised by Github 2019-11-28 15:58:14 +11:00
Maikel
00c2b95a0e Add issue template for release tasks 2019-11-28 15:53:34 +11:00
Maikel Linke
4a82a26830 Update all locales with the latest Transifex translations 2019-11-28 15:17:38 +11:00
Transifex-Openfoodnetwork
f1831fc6bb Updating translations for config/locales/en_AU.yml 2019-11-28 13:47:28 +11:00
Transifex-Openfoodnetwork
4c91a5571a Updating translations for config/locales/en_AU.yml 2019-11-28 13:47:08 +11:00
Transifex-Openfoodnetwork
ccb7a305bc Updating translations for config/locales/de_DE.yml 2019-11-28 13:45:01 +11:00
Transifex-Openfoodnetwork
0c87afefce Updating translations for config/locales/de_DE.yml 2019-11-28 13:41:53 +11:00
Maikel
d546817f0a Merge pull request #4486 from openfoodfoundation/transifex
Transifex
2019-11-28 10:36:06 +11:00
Luis Ramos
e0e833b2f3 Merge pull request #4454 from luisramos0/sort_products
Sort products alphabetically in OC edit page
2019-11-27 22:27:42 +00:00
luisramos0
c8d359a0da Merge spree/admin/overview_controller with its decorator 2019-11-27 22:08:46 +00:00
luisramos0
210757641c Add overview_controller from spree_backend so that we can now merge it with the OFN's decorator 2019-11-27 22:08:06 +00:00
luisramos0
68bf599a1a Merge spree/admin/adjustments_controller with decorator 2019-11-27 21:59:15 +00:00
luisramos0
a10966b66b Add adjustments_controller from spree_backend so that we can now merge it with the OFN's decorator 2019-11-27 21:59:15 +00:00
dependabot-preview[bot]
08003f2003 Bump ddtrace from 0.29.0 to 0.29.1
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.29.0 to 0.29.1.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.29.0...v0.29.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-27 19:17:20 +00:00
Luis Ramos
7cc034c2bc Merge pull request #4136 from mkllnk/4018-synchronise-checkout
Lock variants during checkout to avoid race condition
2019-11-27 15:40:28 +00:00
luisramos0
15bcde36cb Remove order by filter on outgoing exchanges list of products
The products are now coming from the server already sorted
2019-11-26 17:59:30 +00:00
Transifex-Openfoodnetwork
6e69960ee9 Updating translations for config/locales/nb.yml 2019-11-25 22:54:56 +11:00
Transifex-Openfoodnetwork
a7a03b04a9 Updating translations for config/locales/nb.yml 2019-11-25 22:51:50 +11:00
Pau Pérez Fabregat
5759dcee48 Merge pull request #4463 from jonleighton/docker-ruby-version
Use .ruby-version when building Docker container
2019-11-25 10:43:55 +01:00
Pau Pérez Fabregat
a9672011a5 Merge pull request #4479 from openfoodfoundation/dependabot/bundler/ddtrace-0.29.0
Bump ddtrace from 0.28.0 to 0.29.0
2019-11-25 09:42:48 +01:00
Pau Pérez Fabregat
808aa188ab Merge pull request #4478 from openfoodfoundation/dependabot/bundler/rspec-retry-0.6.2
Bump rspec-retry from 0.6.1 to 0.6.2
2019-11-25 09:42:06 +01:00
Transifex-Openfoodnetwork
ad7fc61228 Updating translations for config/locales/en_GB.yml 2019-11-24 05:29:07 +11:00
Transifex-Openfoodnetwork
3e32e5c16e Updating translations for config/locales/ar.yml 2019-11-24 03:48:31 +11:00
Transifex-Openfoodnetwork
f67a2120f4 Updating translations for config/locales/ar.yml 2019-11-24 03:45:25 +11:00
Matt-Yorkley
a4ee562387 Update all locales with the latest Transifex translations 2019-11-23 12:57:35 +01:00
Matt-Yorkley
165f4f9201 Merge pull request #4485 from openfoodfoundation/transifex
Transifex
2019-11-23 12:48:27 +01:00
Matt-Yorkley
0d1740ba4a Merge pull request #4430 from Matt-Yorkley/variant_option_types
Variant option_values
2019-11-23 12:37:34 +01:00
Matt-Yorkley
cbb3f202ca Eager-load option_values in OpenFoodNetwork::ScopeVariantsForSearch 2019-11-23 10:58:18 +01:00
Matt-Yorkley
ff076fd7be Eager-load option_values in Api::ProductsController 2019-11-23 10:58:18 +01:00
Matt-Yorkley
d30192207b Eager-load option_values in ProducerMailer 2019-11-23 10:58:18 +01:00
Matt-Yorkley
19afc1a6da Eager-load option_values in Api::VariantsController 2019-11-23 10:58:18 +01:00
Matt-Yorkley
4ef682915c Eager-load option_values in Admin::EnterprisesController 2019-11-23 10:58:18 +01:00
Matt-Yorkley
e693e8ac37 Eager-load option_values in Admin::BulkLineItemsController 2019-11-23 10:58:18 +01:00
Matt-Yorkley
07fe8e8390 Eager-load option_values in various reports 2019-11-23 10:58:18 +01:00
Matt-Yorkley
6e58ffa927 Enable variant option_values to be successfully eager-loaded 2019-11-23 10:58:18 +01:00
Transifex-Openfoodnetwork
8a8e612fd3 Updating translations for config/locales/fr.yml 2019-11-23 06:03:21 +11:00
Transifex-Openfoodnetwork
1e8ad4748a Updating translations for config/locales/fr.yml 2019-11-23 06:00:16 +11:00
Transifex-Openfoodnetwork
4c346549f5 Updating translations for config/locales/en_FR.yml 2019-11-23 05:58:47 +11:00
Transifex-Openfoodnetwork
427e44aee9 Updating translations for config/locales/fr.yml 2019-11-23 05:57:03 +11:00
Transifex-Openfoodnetwork
8dfc62b206 Updating translations for config/locales/ar.yml 2019-11-23 02:57:34 +11:00
Transifex-Openfoodnetwork
ef4a99eadc Updating translations for config/locales/ar.yml 2019-11-23 02:54:27 +11:00
Transifex-Openfoodnetwork
8337e43e64 Updating translations for config/locales/ar.yml 2019-11-23 02:51:17 +11:00
Luis Ramos
689eb88332 Merge pull request #4450 from luisramos0/return_auth
Move return authorizations from spree_backend to OFN
2019-11-22 14:33:45 +00:00
Matt-Yorkley
698210c849 Create release-template.md 2019-11-22 14:48:50 +01:00
luisramos0
e2087bcc8c Bring return authorizations view from spree_backend 2019-11-22 13:39:36 +00:00
luisramos0
b066b87141 Bring return authorizations controller from spree_backend 2019-11-22 13:39:04 +00:00
Matt-Yorkley
d88a766de4 Merge pull request #4461 from openfoodfoundation/dependabot/bundler/i18n-js-3.5.0
Bump i18n-js from 3.4.2 to 3.5.0
2019-11-22 14:37:10 +01:00
Matt-Yorkley
6c7910c8fa Merge pull request #4477 from openfoodfoundation/transifex
Transifex
2019-11-22 14:30:05 +01:00
Transifex-Openfoodnetwork
f83d469833 Updating translations for config/locales/en_CA.yml 2019-11-22 08:25:52 +11:00
Transifex-Openfoodnetwork
1cea5327e9 Updating translations for config/locales/en_CA.yml 2019-11-22 08:13:47 +11:00
dependabot-preview[bot]
6df7ec9dbd Bump ddtrace from 0.28.0 to 0.29.0
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.28.0 to 0.29.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.28.0...v0.29.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-21 19:20:49 +00:00
dependabot-preview[bot]
0f7357166d Bump rspec-retry from 0.6.1 to 0.6.2
Bumps [rspec-retry](https://github.com/noredink/rspec-retry) from 0.6.1 to 0.6.2.
- [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.6.1...v0.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-21 19:17:49 +00:00
Transifex-Openfoodnetwork
26c854df5b Updating translations for config/locales/en_FR.yml 2019-11-21 21:18:34 +11:00
Transifex-Openfoodnetwork
a43ef174f6 Updating translations for config/locales/nb.yml 2019-11-21 21:13:56 +11:00
Transifex-Openfoodnetwork
99f8bf039a Updating translations for config/locales/fr.yml 2019-11-21 21:12:07 +11:00
Transifex-Openfoodnetwork
bdb2c6efb3 Updating translations for config/locales/nb.yml 2019-11-21 21:10:49 +11:00
Transifex-Openfoodnetwork
21512e9722 Updating translations for config/locales/fr.yml 2019-11-21 21:09:00 +11:00
Luis Ramos
008921c201 Merge pull request #4447 from luisramos0/clickable_steps
Clickable steps on the OC edit page
2019-11-20 21:16:07 +00:00
Luis Ramos
0882887abe Merge pull request #4452 from luisramos0/ready_for
Make "Ready for" field show a red border when added to the list of outgoing exchanges
2019-11-20 21:14:25 +00:00
Luis Ramos
0eb4574b37 Merge pull request #4422 from luisramos0/the_poc
New Order Cycles edit page with steps
2019-11-20 21:11:23 +00:00
Maikel
b54edff4cc Merge pull request #4470 from luisramos0/oc_perms
Improve readability of OC permissions...
2019-11-20 11:38:38 +11:00
Maikel
0d6911f41c Merge pull request #4467 from openfoodfoundation/transifex
Transifex
2019-11-20 08:04:54 +11:00
Luis Ramos
498acaefbc Merge pull request #4469 from Matt-Yorkley/shipping_selection
Fix shipping_rate fetching in customer_totals_report
2019-11-19 09:39:13 +00:00
Maikel Linke
50093c325a Move checkout locking to its own service
It gives this complex logic more space and allows for better structure
and more comments at the right places.
2019-11-19 18:18:01 +11:00
Maikel Linke
4288428c70 Separating concurrency spec as it's entirely different 2019-11-19 18:18:01 +11:00
Maikel Linke
dc122a9450 Fix infinite loop in spec
The spec was setting the order's state to "complete" but didn't save
that state to the database. The new locking mechanism is was reloading
the order which loaded the cart state again. And since the order.next
method was mocked to just return true, the controller was trying to do
that in an infinite loop.
2019-11-19 18:18:01 +11:00
Maikel Linke
ec1b5a7a92 Test concurrent checkouts
When two people tried to buy the same item at the same time, it was
possible to oversell the item and end up with negative stock.

Parallel checkouts could also lead to other random failures. This spec
is testing that scenario by starting two threads which would run into a
race condition unless they use effective synchronisation. The added spec
fails if the synchronisation is removed from the CheckoutController.
2019-11-19 18:18:01 +11:00
Maikel Linke
df2306cf82 Lock variants during checkout to avoid race condition
It was possible that several people bought the same variant even though
there wasn't enough stock for everybody. That resulted in negative
stock.
2019-11-19 18:18:01 +11:00
Matt-Yorkley
585135d27e Fix shipping_method querying in customer totals reports 2019-11-18 15:14:10 +00:00
Matt-Yorkley
06fabe491d Add failing shipping_methods spec 2019-11-18 15:06:54 +00:00
luisramos0
052cc2848f Make visible_variants_for_incoming_exchanges_from and editable_variants_for_incoming_exchanges_from a bit easier to read 2019-11-18 13:25:38 +00:00
Transifex-Openfoodnetwork
b5b9d42764 Updating translations for config/locales/nb.yml 2019-11-18 19:04:54 +11:00
Transifex-Openfoodnetwork
d8e2239438 Updating translations for config/locales/nb.yml 2019-11-18 19:01:46 +11:00
Transifex-Openfoodnetwork
403ca3e538 Updating translations for config/locales/nb.yml 2019-11-18 18:58:37 +11:00
Transifex-Openfoodnetwork
ed65c80869 Updating translations for config/locales/ar.yml 2019-11-17 02:51:01 +11:00
Transifex-Openfoodnetwork
ca6ec9ee68 Updating translations for config/locales/ar.yml 2019-11-17 02:47:54 +11:00
Transifex-Openfoodnetwork
04fa4d3587 Updating translations for config/locales/fr.yml 2019-11-16 22:49:18 +11:00
Transifex-Openfoodnetwork
eedbcb6f1e Updating translations for config/locales/fr.yml 2019-11-16 22:46:21 +11:00
Transifex-Openfoodnetwork
61e3798533 Updating translations for config/locales/en_FR.yml 2019-11-16 22:44:43 +11:00
Transifex-Openfoodnetwork
bca978aacc Updating translations for config/locales/en_CA.yml 2019-11-16 15:06:46 +11:00
Transifex-Openfoodnetwork
190cb1dede Updating translations for config/locales/en_NZ.yml 2019-11-16 07:30:50 +11:00
Luis Ramos
9c8c71bd08 Merge pull request #4443 from openfoodfoundation/dependabot/bundler/roadie-rails-1.3.0
Bump roadie-rails from 1.1.1 to 1.3.0
2019-11-15 16:48:23 +00:00
Luis Ramos
2b37592280 Merge pull request #4449 from luisramos0/properties
Move properties and product properties from spree_backend to OFN
2019-11-15 08:57:32 +00:00
luisramos0
8546e11ffc Update all locales with the latest Transifex translations 2019-11-14 13:34:29 +00:00
Luis Ramos
76659d63d8 Merge pull request #4464 from openfoodfoundation/transifex
Transifex
2019-11-14 13:32:04 +00:00
Transifex-Openfoodnetwork
4d9cbf5d16 Updating translations for config/locales/nb.yml 2019-11-15 00:07:13 +11:00
Transifex-Openfoodnetwork
2166791554 Updating translations for config/locales/nb.yml 2019-11-15 00:04:04 +11:00
Luis Ramos
879e2f5c3a Merge pull request #4444 from openfoodfoundation/dependabot/bundler/wkhtmltopdf-binary-0.12.5
Bump wkhtmltopdf-binary from 0.12.4 to 0.12.5
2019-11-14 12:07:34 +00:00
Luis Ramos
471ec2023e Merge pull request #4426 from Matt-Yorkley/customer_totals
Orders and Fulfilment reports
2019-11-14 12:07:16 +00:00
Luis Ramos
5026afc011 Merge pull request #4141 from Matt-Yorkley/oc_performance
OC performance
2019-11-14 11:24:16 +00:00
Jon Leighton
172a79acc7 Use .ruby-version when building Docker container
The Ruby version was updated, but the Dockerfile wasn’t. This meant that
the Docker environment was broken. This change should prevent similar
breakage in the future by making .ruby-version the source of truth about
the correct version.
2019-11-14 15:44:49 +11:00
Maikel
7c9cdccb49 Merge pull request #4460 from openfoodfoundation/transifex
Transifex
2019-11-13 10:29:22 +11:00
dependabot-preview[bot]
179ec6a3e9 Bump i18n-js from 3.4.2 to 3.5.0
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.4.2 to 3.5.0.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.4.2...v3.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-12 19:34:42 +00:00
Transifex-Openfoodnetwork
19fbdb1848 Updating translations for config/locales/ar.yml 2019-11-13 05:24:53 +11:00
Transifex-Openfoodnetwork
c9b53022f2 Updating translations for config/locales/ar.yml 2019-11-13 05:21:47 +11:00
Pau Pérez Fabregat
a00b770229 Merge pull request #4459 from coopdevs/temporarily-disable-flaky-spec
Temporarily disable flaky line item spec
2019-11-12 13:59:02 +01:00
Pau Perez
16f570b8f7 Temporarily disable flaky line item spec
This is causing almost all PRs to fail in CI and blocking our delivery
pipe. We're already working on a solution in
https://github.com/openfoodfoundation/openfoodnetwork/pull/4458.
2019-11-12 13:23:04 +01:00
Luis Ramos
49bd21f29a Merge pull request #4456 from openfoodfoundation/dependabot/bundler/i18n-js-3.4.2
Bump i18n-js from 3.4.1 to 3.4.2
2019-11-12 12:09:34 +00:00
luisramos0
f1c055805f Use $timeout instead of setTimeout which makes it possible to remove apply() 2019-11-12 12:06:44 +00:00
luisramos0
5cadb0d16f Make ready for field show with red borders immediatly after exchange is added to the list 2019-11-12 12:06:44 +00:00
luisramos0
6875e9a41e Make view a bit simpler by removing unnecessary string interpolation 2019-11-12 12:05:40 +00:00
luisramos0
b6f1d6e395 Make OC edit page steps clickable when editing an OC 2019-11-12 12:05:40 +00:00
luisramos0
6e51be095b Add order to supplied products in enterprise serializer so that products in exchanges are sorted alphabetically 2019-11-12 12:04:42 +00:00
luisramos0
1c7237869a Refactor products_scope to make it more simple 2019-11-12 12:04:42 +00:00
luisramos0
14433e7764 Fix some rubocop issues in admin/order_cycles_controller 2019-11-12 12:02:36 +00:00
luisramos0
5fdb86ae43 Make simple create redirect to OC list but normal create to jump to incoming settings 2019-11-12 12:00:48 +00:00
luisramos0
6615469f8b Fix 3 more specs in OC edit pages 2019-11-12 12:00:48 +00:00
luisramos0
d281837dd9 Remove useless spec now that we have 3 steps in OC edit process 2019-11-12 12:00:48 +00:00
luisramos0
7c63e59ae9 Add OC imcoming and outgoing abilities to managers, this fixes a few OC feature specs 2019-11-12 12:00:48 +00:00
luisramos0
7c19fe418e Adapt OC specs to new page flow with 3 steps (these specs are not green yet) 2019-11-12 12:00:48 +00:00
luisramos0
46d0023018 Adapt OC spec to new page flow with 3 steps 2019-11-12 12:00:48 +00:00
luisramos0
43cf249184 Make NoDistributors warning only appear on simple_create and simple_edit and outgoing settings 2019-11-12 12:00:48 +00:00
luisramos0
537dbd3dc0 Fix angular specs by moving specs to the same place as the code was moved previously
Quite a few copy pasted specs were also removed
2019-11-12 12:00:48 +00:00
luisramos0
7c54781d90 Restructure OC page controllers so that methods related to exchanges are only loaded on the incoming and outgoing settings pages 2019-11-12 12:00:48 +00:00
luisramos0
3b4241c70d Remove more copy pasted code by adding new AdminOrderCycleCtrl with common code from create and edit OC controllers 2019-11-12 12:00:48 +00:00
luisramos0
a290e83501 Move more copy pasted code to basic OC controller 2019-11-12 12:00:48 +00:00
luisramos0
6e0019227b Remove some serious copy/paste party of the past... by extending from new AdminOrderCycleBasicCtrl where we put all the basic methods for the OC create/edit/simple_create/simple_edit controllers 2019-11-12 12:00:48 +00:00
luisramos0
7845b6c6fb Use only AdminOrderCycleIncomingCtrl in incoming view and make AdminOrderCycleIncomingCtrl extend AdminEditOrderCycleCtrl
Same for AdminOrderCycleOutgoingCtrl
2019-11-12 12:00:48 +00:00
luisramos0
e03e3ae50a Fix the simple edit OC and the new OC page flows 2019-11-12 12:00:48 +00:00
luisramos0
305d7b1125 Adapted navigation between OC edit pages by adding new previous and next buttons 2019-11-12 12:00:48 +00:00
luisramos0
5ef751d409 Add wizard to OC new and edit pages 2019-11-12 12:00:48 +00:00
luisramos0
683232dd10 Improve page titles and fix broken translation 2019-11-12 12:00:48 +00:00
luisramos0
5f1360e226 Move incoming and outgoing parts of the (not simple) OC new and edit pages to separate routes and views to make this page a multi step page 2019-11-12 12:00:48 +00:00
Matt-Yorkley
1a5eea3303 Refactor #all_incoming_editable_variants 2019-11-12 11:59:39 +00:00
Matt-Yorkley
a1146aed1b Refactor #sort_by_supplier_id 2019-11-12 11:59:39 +00:00
Matt-Yorkley
ab30307b1a Simplify #active_outgoing_variants 2019-11-12 11:59:39 +00:00
Matt-Yorkley
35b68239b0 Tidy up AR query syntax 2019-11-12 11:59:39 +00:00
Matt-Yorkley
9e09a3b379 Memoize #active_outgoing_variants result 2019-11-12 11:59:39 +00:00
Matt-Yorkley
77105e265e Memoize more repeated queries in #managed_enterprises 2019-11-12 11:59:38 +00:00
Matt-Yorkley
e73f2d682c Remove N+1 in editable_variants_for_incoming_exchanges 2019-11-12 11:59:13 +00:00
Matt-Yorkley
f4d71ae352 Fix order_cycle_permissions tests not running locally 2019-11-12 11:59:13 +00:00
Matt-Yorkley
c2823b3ffe Memoize #user_manages_coordinator_or result 2019-11-12 11:59:13 +00:00
Matt-Yorkley
c1366fced5 DRY some more variant queries 2019-11-12 11:59:13 +00:00
Matt-Yorkley
170bc94d92 Refactor order_cycle_serializer 2019-11-12 11:59:13 +00:00
Matt-Yorkley
2a5403e23f Clean up "visible and editable" variants 2019-11-12 11:59:13 +00:00
Matt-Yorkley
dc540444a2 Remove pointless code 2019-11-12 11:59:13 +00:00
Matt-Yorkley
ca5ecc4696 Refactor "active outgoing variants" 2019-11-12 11:59:13 +00:00
Matt-Yorkley
5082a133a1 Refactor adjustment fetching into new service and module 2019-11-12 11:57:54 +00:00
Matt-Yorkley
1f8e0ae637 Improve SupplierTotalsByDistributorReport 2019-11-12 11:57:19 +00:00
Matt-Yorkley
24e66b635b Improve DistributorTotalsBySupplierReport 2019-11-12 11:57:19 +00:00
Matt-Yorkley
891db4b81b Move methods to helper 2019-11-12 11:57:19 +00:00
Matt-Yorkley
8a57977b44 Increase eager-loading and adjustment calculations 2019-11-12 11:57:19 +00:00
Matt-Yorkley
77e70fd7d3 Eager-load adjustments and calculate in place 2019-11-12 11:57:19 +00:00
Matt-Yorkley
7b5e5f4039 Clean up OpenFoodNetwork::Permissions 2019-11-12 11:57:19 +00:00
Pau Pérez Fabregat
ed15bc422e Merge pull request #4453 from luisramos0/rubo
run rubocop --auto-correct
2019-11-12 10:30:21 +01:00
dependabot-preview[bot]
030747cff8 Bump i18n-js from 3.4.1 to 3.4.2
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.4.1...v3.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 19:15:49 +00:00
Luis Ramos
3e318e5c4e Merge pull request #4425 from Matt-Yorkley/admin_eager_loading
Eager-load variant associations in admin ProductsController
2019-11-11 15:29:45 +00:00
Luis Ramos
3eb4caeb3e Merge pull request #4408 from luisramos0/poc_oc
Remove dead code from OC edit page code
2019-11-11 14:55:37 +00:00
luisramos0
555ae12b35 Add exceptions to some unresolved rubocop issues 2019-11-10 19:40:41 +00:00
luisramos0
553d4ebaa0 Fix a few rubocop issues in reports code 2019-11-10 19:27:41 +00:00
luisramos0
73ee14cc7c Fix long line in injection helper 2019-11-10 19:21:08 +00:00
luisramos0
c9177feb19 Fix a few more rubocop issues manually 2019-11-10 19:14:12 +00:00
luisramos0
71ea281424 Regenerate rubocop todo files after last large fix of issues 2019-11-10 19:07:16 +00:00
luisramos0
9404aacfb2 run rubocop --auto-correct 2019-11-10 18:42:43 +00:00
Matt-Yorkley
5e99ecd9cc Merge pull request #4446 from luisramos0/remove_listen
Remove unused dependency listen
2019-11-10 10:03:19 +00:00
Matt-Yorkley
c94713c1ef Merge pull request #4451 from openfoodfoundation/dependabot/bundler/rack-mini-profiler-1.0.0
Bump rack-mini-profiler from 0.10.7 to 1.0.0
2019-11-09 19:28:54 +00:00
Maikel
6864c0d3c3 Merge pull request #4448 from luisramos0/rubo_kanp
Update rubocop todo lists and regenrate knapsack report
2019-11-09 10:59:14 +11:00
Maikel
5591525160 Merge pull request #4445 from openfoodfoundation/dependabot/bundler/test-unit-3.3.4
Bump test-unit from 3.3.3 to 3.3.4
2019-11-09 10:40:41 +11:00
luisramos0
4d00b79d8d Add new knapsack report so build jobs are more balanced 2019-11-08 20:43:49 +00:00
dependabot-preview[bot]
e3007db324 Bump rack-mini-profiler from 0.10.7 to 1.0.0
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 0.10.7 to 1.0.0.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases)
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v0.10.7...v1.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-08 19:18:25 +00:00
luisramos0
de1d7f2877 Remove references to prototype (inexistent in OFN) in model properties 2019-11-08 17:49:35 +00:00
luisramos0
215f2897f3 Bring Property model from spree core 2019-11-08 17:48:49 +00:00
luisramos0
2d240f23a8 Converted erb properties views to haml and added lazy lookups for translations 2019-11-08 17:31:43 +00:00
luisramos0
f8b0ad29df Bring properties views from spree_backend 2019-11-08 17:18:26 +00:00
luisramos0
af1eff9427 Bring properties and product_properties controllers from spree_backend 2019-11-08 17:18:04 +00:00
luisramos0
05ddebd78e Update rubocop todo lists with payment_methods_controler exceptions 2019-11-08 17:05:51 +00:00
Luis Ramos
fd6639c7d1 Merge pull request #4415 from lin-d-hop/delivery-report
Update end date on delivery report
2019-11-08 16:58:27 +00:00
Luis Ramos
314ecf6d90 Merge pull request #4372 from luisramos0/images
Move Images from spree_backend to OFN
2019-11-08 16:21:33 +00:00
Luis Ramos
ea8eb0ee14 Merge pull request #4371 from luisramos0/payment_methods
Move Payment methods from spree_backend to OFN
2019-11-08 14:26:21 +00:00
luisramos0
9bb940ae43 Remove unused dependency listen, it was used in guard but guard was deleted 2019-11-08 12:49:06 +00:00
Luis Ramos
9e713e449f Merge pull request #4441 from openfoodfoundation/dependabot/bundler/rubocop-0.68.1
Bump rubocop from 0.57.2 to 0.68.1
2019-11-08 12:35:11 +00:00
Matt-Yorkley
34f4bbe06c Eager-load variant associations in admin ProductsController 2019-11-08 10:44:47 +00:00
Maikel Linke
babe2247a5 Put new violations on the todo list 2019-11-08 19:08:36 +11:00
Maikel Linke
3295aedeee Update Rubocop config for new version 2019-11-08 19:08:36 +11:00
dependabot-preview[bot]
eaaf082572 Bump rubocop from 0.57.2 to 0.68.1
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.57.2 to 0.68.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.57.2...v0.68.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-08 19:08:36 +11:00
Maikel Linke
f8803888f2 Update Rubocop config to pass local run 2019-11-08 19:08:36 +11:00
Maikel
032fbc7348 Merge pull request #4440 from openfoodfoundation/transifex
Transifex
2019-11-08 17:44:02 +11:00
Matt-Yorkley
b64633d2d8 Merge pull request #4434 from coopdevs/remove-duplicate-feature-spec
Don't test existence of a field used in next spec
2019-11-08 00:43:57 +00:00
Transifex-Openfoodnetwork
bc46b2bccb Updating translations for config/locales/en_FR.yml 2019-11-08 07:28:30 +11:00
Transifex-Openfoodnetwork
fc8bd530e6 Updating translations for config/locales/en_GB.yml 2019-11-08 07:13:52 +11:00
Transifex-Openfoodnetwork
8e6079ad5b Updating translations for config/locales/en_GB.yml 2019-11-08 07:10:42 +11:00
dependabot-preview[bot]
f29922312d Bump test-unit from 3.3.3 to 3.3.4
Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.3.3 to 3.3.4.
- [Release notes](https://github.com/test-unit/test-unit/releases)
- [Commits](https://github.com/test-unit/test-unit/compare/3.3.3...3.3.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-07 19:20:30 +00:00
dependabot-preview[bot]
1b8863b63d Bump wkhtmltopdf-binary from 0.12.4 to 0.12.5
Bumps [wkhtmltopdf-binary](https://github.com/zakird/wkhtmltopdf_binary_gem) from 0.12.4 to 0.12.5.
- [Release notes](https://github.com/zakird/wkhtmltopdf_binary_gem/releases)
- [Changelog](https://github.com/zakird/wkhtmltopdf_binary_gem/blob/master/CHANGELOG)
- [Commits](https://github.com/zakird/wkhtmltopdf_binary_gem/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-07 19:19:47 +00:00
dependabot-preview[bot]
5def2f6f5f Bump roadie-rails from 1.1.1 to 1.3.0
Bumps [roadie-rails](https://github.com/Mange/roadie-rails) from 1.1.1 to 1.3.0.
- [Release notes](https://github.com/Mange/roadie-rails/releases)
- [Changelog](https://github.com/Mange/roadie-rails/blob/master/Changelog.md)
- [Commits](https://github.com/Mange/roadie-rails/compare/v1.1.1...v1.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-07 19:18:56 +00:00
Transifex-Openfoodnetwork
b5e69c883b Updating translations for config/locales/fr.yml 2019-11-07 23:50:03 +11:00
Transifex-Openfoodnetwork
5f0ad3fd71 Updating translations for config/locales/fr.yml 2019-11-07 23:46:53 +11:00
Pau Perez
a6ba956355 Update all locales with the latest Transifex translations 2019-11-07 12:47:10 +01:00
Luis Ramos
76cffe4c7f Merge pull request #4301 from Matt-Yorkley/ruby-2.2.10
Use Ruby 2.2.10
2019-11-07 10:17:54 +00:00
Pau Perez
5095df251e Don't test existence of a field used in next spec
If the next example doesn't find the quick_search field it will fail so
no need to duplicate it with the consequent costly test setup.
2019-11-06 18:28:59 +01:00
Pau Pérez Fabregat
26477a8d4b Merge pull request #4421 from openfoodfoundation/transifex
Transifex
2019-11-06 18:04:23 +01:00
Luis Ramos
52ab6c52bf Merge pull request #4057 from luisramos0/remove_spree_api_2
Remove dependency to spree_api - step 2 - routes and views
2019-11-06 13:23:32 +00:00
Luis Ramos
413e93fe40 Merge pull request #4431 from Matt-Yorkley/fix_migration_clash
Fix migration mismatch
2019-11-06 09:49:15 +00:00
Matt-Yorkley
9e1b2eb4ca Fix migration mismatch
It looks like this was probably changed whilst resolving a merge conflict somewhere. The number doesn't match the last migration file, and it's breaking the ofn-install CI build (as well as migrations on fresh servers).
2019-11-05 22:58:14 +00:00
Luis Ramos
1ceae6cf8d Merge pull request #4225 from HugsDaniel/4106-edit-product-missing-translations
Add missing translations on product edit page
2019-11-05 19:30:08 +00:00
Transifex-Openfoodnetwork
5183d93601 Updating translations for config/locales/en_DE.yml 2019-11-05 23:45:05 +11:00
Luis Ramos
247854b7fe Merge pull request #4423 from openfoodfoundation/dependabot/bundler/i18n-js-3.4.1
Bump i18n-js from 3.4.0 to 3.4.1
2019-11-04 11:47:13 +00:00
dependabot-preview[bot]
85bd803785 Bump i18n-js from 3.4.0 to 3.4.1
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.4.0...v3.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-01 19:39:31 +00:00
luisramos0
75dfde2552 In the Edit OC page, the list of supplied products should only include checkboxes for normal variants: removed html to display product checkbox and also master variants
Two rules we can use to make this more simple: all products have variants (at least what is called the standard variant) and master variants cannot be added to OCs
2019-11-01 17:18:48 +00:00
luisramos0
10f0906689 Remove obsolete view, this code is now in app/assets/javascripts/templates/admin/panels/exchange_supplied_products.html.haml 2019-11-01 17:18:48 +00:00
Transifex-Openfoodnetwork
c6543edc85 Updating translations for config/locales/en_GB.yml 2019-11-02 01:42:11 +11:00
Transifex-Openfoodnetwork
a91d0973d4 Updating translations for config/locales/en_GB.yml 2019-11-02 01:39:02 +11:00
Kristina Lim
61c581ae52 Update all locales with the latest Transifex translations 2019-11-01 20:38:13 +08:00
Luis Ramos
db8e2891d4 Merge pull request #4417 from Matt-Yorkley/shopfront_patchination
Ensure variants returned in #variant_relation are DISTINCT
2019-11-01 12:16:01 +00:00
Luis Ramos
a947d8df6c Merge pull request #4397 from luisramos0/delete_option_types_page
Remove option types menu entry
2019-11-01 12:14:59 +00:00
Maikel
818d41ffac Merge pull request #4418 from AndrewCleve/readme-grammar-fix
Improve readability of README.md
2019-11-01 16:48:12 +11:00
Maikel
14f67053c8 Merge pull request #4400 from coopdevs/task-to-remove-enterprise-limit
Task to remove limit of ent. that can be created
2019-11-01 15:57:12 +11:00
luisramos0
76e32b126f Add a few more missing translation keys for product images and variants display as and display name 2019-11-01 10:40:02 +11:00
luisramos0
c234cfb890 Add missing translation in the new variant page 2019-11-01 10:40:02 +11:00
luisramos0
38bda1697d Add missing translations in the product variants list page 2019-11-01 10:40:02 +11:00
luisramos0
5fb9ebc594 Add missing translations for variants edit page 2019-11-01 10:40:02 +11:00
luisramos0
acbd4b076d Move product page tabs to a separate translations key namespace 2019-11-01 10:40:01 +11:00
luisramos0
123f7aa68e Use root translation keys for basic actions 2019-11-01 10:39:09 +11:00
luisramos0
2c4af84a81 Move product seo translation keys to specific namespace 2019-11-01 10:39:09 +11:00
luisramos0
34ed16ff30 Add missing translation keys to product properties list 2019-11-01 10:39:09 +11:00
Hugo Daniel
0b20b80219 Add missing translations on product edit page 2019-11-01 10:38:06 +11:00
Luis Ramos
bef745378e Merge pull request #4395 from luisramos0/delete_prototypes
Delete prototypes tables and all references in pages
2019-10-31 20:06:38 +00:00
lin-d-hop
472aef0904 Fixing spec 2019-10-31 18:28:13 +00:00
luisramos0
a6cb5903d6 Delete prototypes tables and all references in pages 2019-10-31 13:23:42 +00:00
Luis Ramos
d1b36aded0 Merge pull request #4359 from daningenthron/daningenthron/required-fields-new-order-cycle
Add asterisks to required fields in New Order Cycle form
2019-10-31 12:50:48 +00:00
Luis Ramos
9c3c74aa93 Merge pull request #4394 from luisramos0/fix_product_sub_menu
Merge duplicated product_sub_menu partials
2019-10-31 12:48:27 +00:00
Matt-Yorkley
67a5a1cdc2 Fix incorrectly ordered entries with duplicate product names in OC and custom taxon ordering applied 2019-10-31 12:14:14 +00:00
Matt-Yorkley
9723e2cd49 Add failing spec for taxon ordering issue 2019-10-31 12:07:16 +00:00
Pau Pérez Fabregat
4af014df6b Merge pull request #4342 from JacksonBates/edit-button-new-window
makes edit button action open a new tab
2019-10-31 11:45:11 +01:00
Pau Pérez Fabregat
be6c64db75 Merge pull request #4354 from agustinariq/3832-WYSIWYG-highlight-links
#3832 - Added color to links in WYSIWYG editor
2019-10-31 11:44:11 +01:00
AndrewCleve
1aebc30128 Improve readability of README.md
Made minor changes to grammar to improve consistency and readability.
2019-10-30 19:43:38 -07:00
lin-d-hop
c1f427b0e3 Modifications for variable consistency etc 2019-10-30 19:06:49 +00:00
Matt-Yorkley
f8209ac7d5 Ensure results in #products_relation are DISTINCT 2019-10-30 19:04:28 +00:00
Matt-Yorkley
6d50176e6b Ensure results in #variants_relation are DISTINCT 2019-10-30 17:13:52 +00:00
Pau Pérez Fabregat
d6d2c19dc7 Merge pull request #4398 from Matt-Yorkley/db_indexes
Add order_cycle_id and distributor_id indexes to spree_orders table
2019-10-30 16:36:23 +01:00
Pau Pérez Fabregat
f897478736 Merge pull request #4402 from coopdevs/task-to-remove-unused-enterprise
Task to remove an unused enterprise
2019-10-30 16:34:28 +01:00
Pau Pérez Fabregat
064b86da5d Merge pull request #4407 from luisramos0/fix_sample_data
Add tax category to sample products
2019-10-30 15:37:53 +01:00
Pau Pérez Fabregat
f7b58300f9 Merge pull request #4362 from openfoodfoundation/dependabot/bundler/activerecord-import-1.0.3
Bump activerecord-import from 1.0.2 to 1.0.3
2019-10-30 15:13:47 +01:00
luisramos0
0fe4edfbf5 Make product_tag_rules_filterer_spec a bit more flexible and not test for the order of the elements 2019-10-30 11:06:25 +00:00
luisramos0
f45eb35eb1 Make user_registrations_controller_spec keep I18n.locale as it was before the spec, so that other specs wont fail 2019-10-30 10:43:46 +00:00
Luis Ramos
1a0e99dce2 Merge pull request #4414 from openfoodfoundation/dependabot/bundler/fuubar-2.5.0
Bump fuubar from 2.4.1 to 2.5.0
2019-10-30 10:12:19 +00:00
lin-d-hop
c477f8c230 Update end date on delivery report to ensure all of todays orders are included 2019-10-29 19:47:38 +00:00
dependabot-preview[bot]
d7caf91de1 Bump fuubar from 2.4.1 to 2.5.0
Bumps [fuubar](https://github.com/thekompanee/fuubar) from 2.4.1 to 2.5.0.
- [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.4.1...releases/v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-29 19:30:45 +00:00
Luis Ramos
1e2ab27cda Merge pull request #4327 from kristinalim/feature/4315-prefill_dates_in_orders_and_fulfillment_report
4315 Set default date range for Orders and Fulfillment report
2019-10-29 11:11:59 +00:00
Luis Ramos
3e7bd7dc19 Merge pull request #4376 from luisramos0/ghosts
Remove product from Order Cycles if product supplier changes
2019-10-28 21:17:48 +00:00
luisramos0
c60261a847 Make taxonomies edit page use api route instead of spree_api route that is now gone. 2019-10-28 16:01:23 +00:00
luisramos0
11fea650d6 Remove inexistent routes api/enterprises/managed and api/enterprises/acessible
The :managed endpoint was delete here 1d92d6cc33
2019-10-28 16:01:23 +00:00
luisramos0
92f1fa3b52 Remove dead route api/orders/managed 2019-10-28 16:01:23 +00:00
luisramos0
ad52022927 Add feature spec to cover api api generation in admin user edit form 2019-10-28 16:01:22 +00:00
luisramos0
9cffe48c70 Do not use Spree.t in spree admin users 2019-10-28 16:01:22 +00:00
luisramos0
d006ded439 Convert spree admin users api fields partial from erb to haml 2019-10-28 16:01:22 +00:00
luisramos0
b2e5ff46a8 Bring missing admin user edit form api_fields partial from spree_api and insert into the form (there was a deface override in spree_api injecting it before) 2019-10-28 16:01:22 +00:00
luisramos0
f46e0a2a31 Remove outdated comment, action managed has already been removed 2019-10-28 16:01:22 +00:00
luisramos0
dd66df6379 Remove dead routes api/order_cycles, these endpoints were removed in PR 4059 because they were unused, implemented in rabl and not correctly named for the future 2019-10-28 16:01:22 +00:00
luisramos0
d7b9dc1190 Fix some rubocop issues 2019-10-28 16:00:36 +00:00
luisramos0
5b6efaf687 Delete now unused rabl template authorise_api 2019-10-28 16:00:36 +00:00
luisramos0
8aab9bacbe Delete now irrelevant authorize_api endpoint and logic
OFN API is now authenticating all users, if no session and no key is provided an anonymous user will be created so that user can access public endpoints, authorization is then done at each individual endpoint. This makes this spree api auth call irrelevant
2019-10-28 16:00:36 +00:00
luisramos0
66fdbe4379 Remove spree_api dependency. Spree_api will keep being a dependency until we remove spree_backend as a dependency but now ofn works without spree_api 2019-10-28 16:00:36 +00:00
luisramos0
abcc22c34b Merge Spree::Api::BaseController with Api::BaseController. All api controllers inherit from Api::BaseController now. We can probably simplify this controller even more now 2019-10-28 16:00:36 +00:00
luisramos0
0d34b607c3 Move spree/api/base_controller#find_product to api/product_controller where it is used exclusively
Also, product_scope stops being an override
2019-10-28 16:00:36 +00:00
luisramos0
f840179573 Remove .json from Spree.routes.orders_api. This path is only used to compose the order shipments path and thus cannot have the .json 2019-10-28 16:00:36 +00:00
luisramos0
b5a521476b Remove unused method from api/base_controller 2019-10-28 16:00:36 +00:00
luisramos0
7c64777a50 Remove requires_authentication check from api/base_controller. OFN api does not require auth, it always generates an anonymous user for public endpoints 2019-10-28 16:00:36 +00:00
luisramos0
c98b4b276b Adapt spree/admin/shared/_routes.html.erb to new location of the api/taxons routes AND move spree/api/orders route to ofn api/orders route 2019-10-28 16:00:36 +00:00
luisramos0
f1138709aa Add spree_api translation keys, mostly from api standard errors and api fields in admin/users 2019-10-28 16:00:36 +00:00
luisramos0
b29983ac60 Add AMS versions of the error responses in api/base_controller and cover not_found case with a unit test 2019-10-28 16:00:36 +00:00
luisramos0
91188c5724 Adapt api/base_controller_spec from spree/api/base_controller_spec 2019-10-28 16:00:36 +00:00
luisramos0
bf291ec318 Move spree/api/base_controller_spec to api/base_controller_spec 2019-10-28 16:00:36 +00:00
luisramos0
5846593637 Remove dependency to spree_api rabl responders, we should only use AMS from now on 2019-10-28 16:00:36 +00:00
Luis Ramos
688dad2334 Merge pull request #4384 from chaserx/4378_display_customer_name_on_orders_table
adds the full_name of the customer ordering beneath email
2019-10-28 15:52:54 +00:00
Luis Ramos
6d419d60ae Merge pull request #4405 from openfoodfoundation/dependabot/bundler/bugsnag-6.12.2
Bump bugsnag from 6.12.1 to 6.12.2
2019-10-28 11:37:30 +00:00
luisramos0
0dc8ae1561 Merging find_product and find_variant into one single method
This fixes rubocop issue, class has too many lines
2019-10-27 20:09:42 +00:00
luisramos0
f396f6bebd Add tax category to sample products 2019-10-27 19:59:35 +00:00
luisramos0
07fcc8f361 Refactor ExchangeVariantDeleter.new.delete out of update_product_only_attributes into correct place update_product
Also extracted find_product from update_attributes and find_variant out of create_or_update_variant to make code simpler
2019-10-27 19:13:57 +00:00
Pau Pérez Fabregat
237cd5438b Merge pull request #4373 from openfoodfoundation/dependabot/bundler/i18n-js-3.4.0
Bump i18n-js from 3.3.0 to 3.4.0
2019-10-25 13:47:25 +02:00
Pau Pérez Fabregat
4e366d0f2e Merge pull request #4390 from Matt-Yorkley/3831_flaky_spec
Fix flaky product import spec
2019-10-25 13:42:54 +02:00
dependabot-preview[bot]
fb3af77d0b Bump bugsnag from 6.12.1 to 6.12.2
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby) from 6.12.1 to 6.12.2.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases)
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.12.1...v6.12.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-24 19:19:06 +00:00
Luis Ramos
1fa6e4bea8 Merge pull request #4385 from chaserx/4304_fixes_missing_translation
adds missing :spree to i18n scopes
2019-10-24 17:06:50 +01:00
Luis Ramos
498a2b7462 Merge pull request #4386 from andrewjprice/missing-translations-inventory-page
Missing translations inventory page
2019-10-24 17:06:43 +01:00
Pau Perez
80edfe469c Task to remove limit of ent. that can be created
It does so by updating a user's enterprise_limit attribute to the
maximum integer the database supports.

This is used at least in Katuma to remove the limitation of the number
of enterprises a user can create. This is the agreement the community
reached for the pricing plans.

Eventually, this logic could be triggered with a button from the UI but
for now this is for internal usage only.
2019-10-24 15:53:43 +02:00
Pau Perez
b2616d317f Task to remove an unused enterprise
Note this task is still rather naive and only covers the simple case
where an enterprise was created but never used and thus, does not have
any associated entities like orders.

This is enough for the case I have at hand where a hub's manager created
an enterprise while he wanted to create a user account #ux. He ended up
with an enterprise named after him and now he asked us to clean that up.
2019-10-24 15:23:54 +02:00
Matt-Yorkley
0ac0bdc381 Update all locales with the latest Transifex translations 2019-10-23 21:20:11 +01:00
Matt-Yorkley
1a756cbc6b Merge pull request #4387 from openfoodfoundation/transifex
Transifex
2019-10-23 21:17:20 +01:00
Matt-Yorkley
34466c8218 Add order_cycle_id and distributor_id indexes to spree_orders table 2019-10-23 18:29:34 +01:00
Matt-Yorkley
00e869f40c Merge pull request #4393 from mkllnk/4392-rescue-network-fails
Avoid asking the cloud if an image exists
2019-10-23 16:55:49 +01:00
luisramos0
42cd9a5152 Remove menu entry option types because this page is not really usable
We keep the underlying data structures because option types and option values are used internally to keep units in OFN: weight, volume and items, but otherwise, custom option types are no longer possible in OFN
2019-10-23 12:57:47 +01:00
luisramos0
cc342387cc Make all calls to content_for use dash not equals when setting content_for 2019-10-23 12:42:29 +01:00
luisramos0
6715f872e3 Merge duplicated product_sub_menu partials and make all references point to the one located in the spree folder (we keep this one because we still have some views in spree backend referencing this partial 2019-10-23 12:26:18 +01:00
Transifex-Openfoodnetwork
e849c4867b Updating translations for config/locales/nb.yml 2019-10-23 18:58:07 +11:00
Maikel Linke
ada34d27ca Avoid asking the cloud if an image exists
https://github.com/openfoodfoundation/openfoodnetwork/issues/4392

Amazon's DNS is failing at the moment and some users can't access the
admin panel because of this error.

While `exists?` asks the storage server if the file is actually there,
`file?` just checks if we have the file name stored in the database
and the file should be there. It's much faster and less error prone.
2019-10-23 11:36:20 +11:00
Dan Ingenthron
40c329ba68 Distinguish between simple create form and full interface in OC feature spec 2019-10-22 17:41:38 -05:00
Dan Ingenthron
3c7af90dfa Revert I18n change and reflect correct required fields on OC form 2019-10-22 17:41:38 -05:00
Dan Ingenthron
241e581779 Add required fields to order cycle spec 2019-10-22 17:41:38 -05:00
Dan Ingenthron
85dede84cc Update order cycle forms & en.yml to include asterisks 2019-10-22 17:41:37 -05:00
Transifex-Openfoodnetwork
0288dfc992 Updating translations for config/locales/ar.yml 2019-10-23 07:18:46 +11:00
luisramos0
3372339907 Fix default stock translation by using t filter instead of t function 2019-10-22 17:29:04 +01:00
Matt-Yorkley
f7bb609546 Fix flaky product import spec 2019-10-22 12:02:11 +01:00
Luis Ramos
02c0b89fa0 Merge pull request #4345 from Matt-Yorkley/shopfront_pagination
Shopfront pagination
2019-10-21 16:02:12 +01:00
luisramos0
f57c9d4a25 Fix rubocop issue in product_set.update_product_only_attributes: method has too many lines 2019-10-21 15:20:53 +01:00
luisramos0
783c3c9e90 Add spec to product set to cover case where product and variants attributes are both provided and the product supplier is not, in that case, ExchangeVariantDeleter would not execute and update_product_only_attributes would return nil cancelling update_product_variants from being executed. Now, update_product_only_attributes always returns true if product.save suceeeds, no matter what ExchangeVariantDeleter returns 2019-10-21 14:45:27 +01:00
luisramos0
44753d0320 Add spec coverage for case in product_set where variants_attributes are used 2019-10-21 13:27:21 +01:00
luisramos0
dd7d5803ba Add new context to spec so that some basic setup can be shared with new specs that will be added, it's mostly indentation here 2019-10-21 13:01:39 +01:00
Luis Ramos
c9e23154d8 Merge pull request #4352 from tkusuki/fix-translation-in-enterprise-welcome-email
Add missing translation in non English enterprise welcome email
2019-10-21 11:41:53 +01:00
Rachel Arnould
279b633513 Add welcome board to the contributing page 2019-10-21 12:19:01 +02:00
Transifex-Openfoodnetwork
9d0ac79983 Updating translations for config/locales/pt_BR.yml 2019-10-21 11:29:14 +11:00
Andrew
deb17f47a7 Add default_stock to en.yml and _products_variants 2019-10-19 16:33:31 -07:00
Chase Southard
61ee0f04a6 adds missing :spree to i18n scopes 2019-10-19 13:55:11 -04:00
Chase Southard
353804a3fa adds the full_name of the customer ordering beneath email 2019-10-19 12:32:59 -04:00
Andrew
598426a5e9 Add Save Changes button translation 2019-10-18 22:18:54 -07:00
Matt-Yorkley
7b0c55e15a Ensure producer properties are included in properties results 2019-10-18 21:15:13 +01:00
Matt-Yorkley
cbe2477d04 Fix property filters and improve test coverage 2019-10-18 21:15:13 +01:00
Matt-Yorkley
c730958fe4 Restrict search params passed to ProductsRenderer 2019-10-18 21:15:13 +01:00
Matt-Yorkley
37e5e1923c Improve filter buttons UX 2019-10-18 21:15:13 +01:00
Matt-Yorkley
542c1bf684 #slice :params in controller and rename to :args in service context 2019-10-18 21:15:13 +01:00
Matt-Yorkley
06c896b93b Add spec for Api::ProductSerializer 2019-10-18 21:15:13 +01:00
Matt-Yorkley
6433d69d02 Add comments on scoping ProductsRenderer results 2019-10-18 21:15:13 +01:00
Matt-Yorkley
bf8c632fce Refactor ProductsCtrl request params 2019-10-18 21:15:13 +01:00
Matt-Yorkley
b3c89a9d6c Move OpenFoodNetwork::ProductsRenderer (lib) to ProductsRenderer (service) and refactor 2019-10-18 21:15:13 +01:00
Matt-Yorkley
d45403f1d4 Add specs for Api::OrderCyclesController 2019-10-18 21:15:13 +01:00
Matt-Yorkley
f2affe80cd Reduce assignment branching and complexity for ProductsRenderer#products 2019-10-18 21:15:13 +01:00
Matt-Yorkley
573a69477f Fix filters not updating on OC change 2019-10-18 21:15:13 +01:00
Matt-Yorkley
c6ce516129 Fix prices not updating with new exchange fees when changing OC 2019-10-18 21:15:13 +01:00
Matt-Yorkley
2539b84b33 Fix product.meta_keywords not searchable 2019-10-18 21:15:13 +01:00
Matt-Yorkley
dd6d0d25da Fix problematic feature specs 2019-10-18 21:15:13 +01:00
Matt-Yorkley
c54cff10d4 Adjust API endpoint params 2019-10-18 21:15:13 +01:00
Matt-Yorkley
ab330e882e Remove product cache 2019-10-18 21:15:11 +01:00
luisramos0
a50ae3f8ce Clarify the API of product_set class by making all other methods to private 2019-10-18 10:37:23 +01:00
luisramos0
9f3b4100c3 Improve code by incorporating code review feedback 2019-10-18 10:26:03 +01:00
luisramos0
b625ea0c61 Extract to class ExchangeVariantDeleter 2019-10-17 19:13:45 +01:00
luisramos0
8857404ddf Remove product variants from all Order Cycles if supplier is changed 2019-10-17 19:12:24 +01:00
luisramos0
49f98422fd Remove product from Order Cycles if supplier changes as with a new supplier the rules/permissions to add a product to an Order Cycle may be different 2019-10-17 17:47:15 +01:00
Maikel Linke
20cabe6f12 Update from Transifex 2019-10-17 17:11:10 +11:00
Maikel
fe849b8dfd Merge pull request #4367 from openfoodfoundation/transifex
Transifex
2019-10-17 17:07:23 +11:00
Luis Ramos
167b44c30f Merge pull request #4365 from kristinalim/fix/4308-eager_load_associations_in_orders_and_fulfillment_reports
4308 Eager-load associations in Orders and Fulfillment reports
2019-10-16 21:39:30 +01:00
Luis Ramos
ad247e2116 Merge pull request #4268 from luisramos0/add_order_endpoint
Add api/orders/{order_number} API endpoint
2019-10-16 21:22:27 +01:00
Luis Ramos
e46875376e Merge pull request #4168 from mkllnk/4160-product-report-filters
4160 Fix product report filters
2019-10-16 14:47:55 +01:00
Jackson Bates
4d49dc3689 adds line breaks to methods for readability 2019-10-16 23:01:38 +11:00
Luis Ramos
d7223c508a Merge pull request #4289 from luisramos0/spree_be_config_general
Move general_settings, mail_methods and image_settings from spree_backend to OFN
2019-10-16 12:08:36 +01:00
Kristina Lim
a91a23aa39 Eager-load associations for Orders and Fulfillment report subtypes 2019-10-16 19:06:35 +08:00
luisramos0
04bf5a8742 Convert images views from erb to haml 2019-10-16 11:58:08 +01:00
Jackson Bates
8d30dc997f adds better description to specs and refactors editProductUrl and confirm_unsaved_changes 2019-10-16 21:55:52 +11:00
luisramos0
6bc0d505e4 Fix some rubocop issues 2019-10-16 10:40:16 +01:00
luisramos0
9a0f1adfd2 Reorganize/simplify before filters 2019-10-16 10:40:09 +01:00
Luis Ramos
370f66e36b Merge pull request #4364 from kristinalim/refactor/4308-refactor_orders_and_fulfillment_report_types
4308 Refactor Orders and Fulfillment report subtypes
2019-10-16 10:30:24 +01:00
Luis Ramos
f7cdcf02e0 Merge pull request #4343 from openfoodfoundation/dependabot/bundler/oauth2-1.4.2
Bump oauth2 from 1.4.1 to 1.4.2
2019-10-16 10:29:25 +01:00
luisramos0
1eafb1a3fe Bring specs from spree_backend to payment methods controller spec 2019-10-15 18:49:35 +01:00
luisramos0
cf40bfa58e Simbolize keys in opts hash in xero report so that opts access works again 2019-10-15 18:05:40 +01:00
Matt-Yorkley
8e03f402b1 Use Ruby 2.2.10 2019-10-15 14:59:24 +01:00
Pau Pérez Fabregat
1ee43fb495 Merge pull request #4358 from openfoodfoundation/dependabot/bundler/rspec-rails-3.9.0
Bump rspec-rails from 3.8.2 to 3.9.0
2019-10-15 10:25:23 +02:00
dependabot-preview[bot]
5a84a3688b Bump i18n-js from 3.3.0 to 3.4.0
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.3.0...v3.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-15 04:57:00 +00:00
Transifex-Openfoodnetwork
e139d24639 Updating translations for config/locales/en_CA.yml 2019-10-15 12:06:18 +11:00
luisramos0
ec3c3aa644 Bring images views from spree_backend 2019-10-15 00:02:40 +01:00
luisramos0
0f128f43f9 Merge images controller decorator with the controller brought from spree_backend 2019-10-15 00:02:16 +01:00
luisramos0
ea9f3ad6a0 Bring images controller from spree_backend so we can merge it with ofn's decorator 2019-10-15 00:00:54 +01:00
luisramos0
e48ac64d37 Prepare spec to integrate some specs coming from spree_backend 2019-10-14 23:17:43 +01:00
luisramos0
1c257cca3f Merge payment methods controller brought from spree_backend with its decorator that was in OFN 2019-10-14 23:14:09 +01:00
luisramos0
c51e4d657a Bring payment method controller from spree_backend 2019-10-14 23:09:23 +01:00
Luis Ramos
0dfe749496 Merge pull request #4356 from kristinalim/fix/4256-set_dalli_value_max_size
4256 Configure dalli store value max bytes from env variable
2019-10-14 18:41:00 +01:00
Luis Ramos
d6eade6fa3 Merge pull request #4363 from jonleighton/fix-docker-setup
Fix error during first run of docker-compose
2019-10-14 13:38:04 +01:00
Luis Ramos
109aed684e Merge pull request #4344 from openfoodfoundation/dependabot/bundler/ddtrace-0.28.0
Bump ddtrace from 0.27.0 to 0.28.0
2019-10-14 12:39:52 +01:00
Luis Ramos
35d76ac991 Merge pull request #4298 from luisramos0/variant_edit
Make unit description visible in the variant edit page even for products which variant_unit is items
2019-10-13 19:54:41 +01:00
Luis Ramos
1ab9e9d7a5 Merge pull request #4299 from luisramos0/drop_order_ship_method_id
Remove unused field orders.shipping_method_id
2019-10-13 19:54:13 +01:00
Luis Ramos
e5e716e150 Merge pull request #4336 from openfoodfoundation/dependabot/bundler/rubyzip-1.3.0
[Security] Bump rubyzip from 1.2.2 to 1.3.0
2019-10-13 19:53:48 +01:00
Luis Ramos
b6510c3ab6 Merge pull request #4262 from daningenthron/daningenthron/default-shipping-category
Prefill shipping category forms with default values
2019-10-13 19:52:43 +01:00
Transifex-Openfoodnetwork
a158a986c6 Updating translations for config/locales/en_US.yml 2019-10-11 13:06:17 +11:00
Kristina Lim
c7643db66f Remove unnecessary Orders and Fulfillment lines in .rubocop_manual_todo.yml 2019-10-10 21:05:06 +08:00
Kristina Lim
eb8c22aa06 Disable violated cops in Order and Fulfillment report subtypes 2019-10-10 21:01:46 +08:00
Kristina Lim
d0656485d7 Make report_klass in OrdersAndFulfillmentsReport compact 2019-10-10 21:01:46 +08:00
Kristina Lim
640cc1b6d3 Address Metrics/LineLength in Orders and Fulfillments reports 2019-10-10 21:01:45 +08:00
Kristina Lim
d65d17a9f3 Freeze report type string in Order and Fulfillment reports 2019-10-10 21:01:45 +08:00
Kristina Lim
bbea00e431 Delegate methods in Orders and Fulfillment report to report object 2019-10-10 21:01:45 +08:00
Kristina Lim
3cecba70e8 Refactor and memoize report object in Orders and Fulfillment report 2019-10-10 21:01:44 +08:00
Kristina Lim
8bbff09066 Refactor report class in Orders and Fulfillment report 2019-10-10 21:01:44 +08:00
Kristina Lim
a7a89d7ccb Add attr reader for report type in Orders and Fulfillment report 2019-10-10 21:01:44 +08:00
Kristina Lim
3ccf76ff5f Add smoke test for Customer Totals report 2019-10-10 21:01:34 +08:00
Kristina Lim
6004208496 Move specific logic for Customer Totals report to class 2019-10-10 20:05:35 +08:00
Kristina Lim
3ce9c712cf Add smoke test for Distributor Totals by Supplier report 2019-10-10 20:05:35 +08:00
Kristina Lim
bfb0032fd2 Move specific logic for Distributor Totals by Supplier report to class 2019-10-10 20:05:29 +08:00
Kristina Lim
fe37516ead Add smoke test for Supplier Totals by Distributor report 2019-10-10 19:58:49 +08:00
Kristina Lim
289b75e143 Move specific logic for Supplier Totals by Distributor report to class 2019-10-10 19:57:41 +08:00
Kristina Lim
09f0f8c33f Move "order_cycle_supplier_totals" report type to constant 2019-10-10 19:54:29 +08:00
Kristina Lim
8bc1718978 Add smoke test for Supplier Totals report 2019-10-10 19:50:28 +08:00
Kristina Lim
cbfce69a6d Move specific logic for Supplier Totals report to class 2019-10-10 19:48:59 +08:00
Kristina Lim
4e0ecdd44c Rename params in OrdersAndFulfillmentsReport to options 2019-10-10 15:57:51 +08:00
Jon Leighton
23ab9a4bed Fix error during first run of docker-compose
Prior to this commit, the db container would create a database named
“ofn” (the same as $POSTGRES_USER).

Then, when the web container started, it would run `rake db:reset`. This
would load the Rails environment, which ends up requiring some model
files, which eventually end up trying to connect to the
“open_food_network_dev” database, which doesn’t exist. Therefore setting
up the database fails, and it’s impossible to boot the web container.

As a side note, I’m not convinced that bootstrapping the database as
part of the container’s command is the best strategy (if for no other
reason that this will wipe my database every time I run `docker-compose
up`). But this commit doesn’t change that.

What it does is add the $POSTGRES_DB environment variable so that the db
container creates the “open_food_network_dev” database (which is blank).
Then, when `rake db:reset` runs, it’ll successfully connect to this
(empty) database while loading the environment, before deleting and recreating it.

Note that I had to manually delete the `openfoodnetwork_postgres` volume
in order to reset my local state, after making this change.
2019-10-10 12:17:22 +11:00
Maikel Linke
f623446e3e Avoid additional query in inventory reports 2019-10-10 11:11:14 +11:00
Maikel Linke
6944fe1e46 Make order cycle filter chainable with other filters 2019-10-10 10:06:36 +11:00
Maikel Linke
7c9e3d7f06 Spec combination of all variant filters 2019-10-10 10:06:36 +11:00
dependabot-preview[bot]
614dc5d255 Bump activerecord-import from 1.0.2 to 1.0.3
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/zdennis/activerecord-import/releases)
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.2...v1.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-09 21:47:12 +00:00
Matt-Yorkley
da7456e6e0 Remove old shop/products route, action, and spec 2019-10-09 17:27:00 +01:00
Matt-Yorkley
f134cd9473 Extract tag_rule filtering into separate service 2019-10-09 17:26:58 +01:00
Dan Ingenthron
bdcadf9fc6 Update changes to reflect new non-Spree shipping method controller 2019-10-08 18:37:16 -05:00
Dan Ingenthron
9b7139fd45 Add default shipping category during object creation; revert forms 2019-10-08 18:37:16 -05:00
Dan Ingenthron
543e275d2e Add custom shipping category to pass package spec 2019-10-08 18:37:16 -05:00
Dan Ingenthron
560fa6b949 Update shipping category factory with default 2019-10-08 18:37:16 -05:00
Dan Ingenthron
dbf34da87b Rubocop fixes 2019-10-08 18:37:16 -05:00
Dan Ingenthron
d6022062e1 Use default for create product spec; auto-fill field 2019-10-08 18:37:16 -05:00
Dan Ingenthron
b082d3301b Add prechecked category to shipping method spec 2019-10-08 18:37:16 -05:00
Dan Ingenthron
48cd542138 Service spec 2019-10-08 18:37:15 -05:00
Dan Ingenthron
e2d341c9c2 Add default category to seeds 2019-10-08 18:37:15 -05:00
Dan Ingenthron
89873a2640 Add and auto-check default category in shipping method create 2019-10-08 18:37:15 -05:00
Dan Ingenthron
b4be2cc2d4 Add default shipping category service and update create product form 2019-10-08 18:37:15 -05:00
Dan Ingenthron
35f89a9750 Update spec to prefill shipping category in Create form 2019-10-08 18:37:15 -05:00
Dan Ingenthron
592a53b6f5 Remove blank option from shipping category dropdown 2019-10-08 18:37:15 -05:00
dependabot-preview[bot]
eab9d42eb0 Bump rspec-rails from 3.8.2 to 3.9.0
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.2 to 3.9.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.2...v3.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-08 20:56:10 +00:00
Kristina Lim
cf05369ca9 Configure dalli store value max bytes from env variable 2019-10-08 17:58:43 +08:00
Matt-Yorkley
e96252f2ed Add tag_rules logic to main query before pagination 2019-10-08 10:11:24 +01:00
Matt-Yorkley
06e1f56ae9 Extract filter list fetching into a separate endpoint 2019-10-08 10:11:24 +01:00
Matt-Yorkley
fe0de98821 Add pagination in Angular and views 2019-10-08 10:11:22 +01:00
luisramos0
5077b0e625 Update all locales with the latest Transifex translations 2019-10-08 10:02:54 +01:00
Luis Ramos
1299c0b5eb Merge pull request #4339 from openfoodfoundation/transifex
Transifex
2019-10-08 09:40:54 +01:00
luisramos0
a2bc61cb4d Remove unused field orders.shipping_method_id 2019-10-08 09:09:19 +01:00
Pau Pérez Fabregat
057572a445 Merge pull request #4321 from luisramos0/fix_pt_br
Delete old pt-BR translations file (it's now correctly called pt_BR)
2019-10-08 08:49:12 +02:00
Pau Pérez Fabregat
3403ab4162 Merge pull request #4340 from openfoodfoundation/sigmundpetersen-patch-1
Delete ISSUE_TEMPLATE.md
2019-10-08 08:48:47 +02:00
Thais Kusuki
d997b8f5ee Change translations from enterprise_mailer to lazy lookup 2019-10-07 23:29:11 -03:00
agustina
cf3f321632 Added color to links in WYSIWYG editor 2019-10-07 12:15:37 -03:00
Luis Ramos
9a036d18b7 Merge pull request #4271 from luisramos0/no_obsolete_master
Remove logic related to master variants in Exchanges and migrate data
2019-10-07 15:22:53 +01:00
luisramos0
f2b57057cd Add migration to delete all master variants from exchanges and replace them with standard variants 2019-10-07 14:53:44 +01:00
luisramos0
95bc8fa984 Remove logic from OrderCycleDistributedProducts related to obsolete master variants in OCs, this is a condition that will never happen now since we ensure products always have a standard variants
A migration will be added as well to clean up any very old master variants available in order cycles
2019-10-07 14:53:44 +01:00
Luis Ramos
54c44c33eb Merge pull request #4324 from Matt-Yorkley/reports_memoize
Reports memoization
2019-10-07 13:20:03 +01:00
Luis Ramos
8a732568e7 Merge pull request #4325 from kristinalim/feature/4312-remove_find_variant_in_orders_and_fulfillment_report
4312 Use association instead of OrderAndFulfillmentsReport#find_variant
2019-10-07 11:38:37 +01:00
Thais Kusuki
797a3ad091 Add missing translation in non English enterprise welcome email 2019-10-05 12:50:12 -03:00
Pau Pérez Fabregat
f4523f0305 Merge pull request #4350 from luisramos0/docker
Update ruby version in dockerfile and in getting started
2019-10-04 16:21:22 +02:00
Transifex-Openfoodnetwork
56a7a49ea2 Updating translations for config/locales/es.yml 2019-10-04 21:23:11 +10:00
Transifex-Openfoodnetwork
7d1ae3bf67 Updating translations for config/locales/es.yml 2019-10-04 21:20:03 +10:00
Transifex-Openfoodnetwork
b9aa4e11da Updating translations for config/locales/ca.yml 2019-10-04 21:19:57 +10:00
Matt-Yorkley
01d1e8243c Add pagination to ProductsRenderer 2019-10-04 10:38:43 +01:00
Matt-Yorkley
a1a5c3b7fe Add new Angular OrderCycleResource 2019-10-04 10:38:41 +01:00
Matt-Yorkley
bc826f73a1 Add temporary placeholder for API endpoint 2019-10-03 18:11:40 +01:00
Luis Ramos
96428c11c6 Merge pull request #4334 from Matt-Yorkley/products_renderer
Products renderer
2019-10-03 13:47:04 +01:00
Luis Ramos
c15660da0e Merge pull request #4269 from luisramos0/spree_be_config
Move shipping_methods and shipping categories from spree_backend to OFN
2019-10-03 13:45:17 +01:00
Jackson Bates
7c264af0c2 updates specs for new edit button behaviour 2019-10-03 22:32:43 +10:00
Transifex-Openfoodnetwork
9ea05b0794 Updating translations for config/locales/de_DE.yml 2019-10-03 20:48:44 +10:00
luisramos0
c5b939c8ee Update ruby version in dockerfile and in getting started 2019-10-02 23:45:23 +01:00
luisramos0
c5a17bcde0 Fix rubocop issues in feature specs related to configuration 2019-10-02 21:26:10 +01:00
luisramos0
b712ec7f13 Transpec feature specs brought from spre_backend 2019-10-02 21:26:09 +01:00
luisramos0
32a7f13dd2 Bring feature specs for configuration pages from spree_backend 2019-10-02 21:26:09 +01:00
luisramos0
713769b497 Fix rubocop issues in mail_methods_controller_spec 2019-10-02 21:26:09 +01:00
luisramos0
495de37620 Fix more rubocop issues in image_settings_controller_spec 2019-10-02 21:26:09 +01:00
luisramos0
05d24cf11a Transpec image_setting_controller_spec 2019-10-02 21:26:09 +01:00
luisramos0
edd84530af Fix simle rubocopo issues in image_settings ctrl spec 2019-10-02 21:26:09 +01:00
luisramos0
6677543de0 bring 2 specs from spree_backend to cover image_settings page and mail_methods page 2019-10-02 21:26:09 +01:00
luisramos0
30aa31252b Fix simple rubocop issues in helpers 2019-10-02 21:26:09 +01:00
luisramos0
b83d74a609 Bring general_settings_helper from spree_backend 2019-10-02 21:26:09 +01:00
luisramos0
d31b50be3d Bring spree/admin configuration routes to ofn 2019-10-02 21:26:09 +01:00
luisramos0
42e3f2f2f4 Convert spree/admin/mail_methods from erb to haml 2019-10-02 21:25:23 +01:00
luisramos0
96737da128 Add spree_backend mail methods views that are missing in ofn 2019-10-02 21:25:23 +01:00
luisramos0
7f9f0d840c Merge decorators into controllers and remove decorators 2019-10-02 21:25:23 +01:00
luisramos0
686840e262 Fix basic rubocop issues in recently added controllers from spree_backend 2019-10-02 21:25:23 +01:00
luisramos0
2377b833ee Bring general settings and image settings controllers that are overrides in ofn to ofn so we can merge them with their decorators in a second step 2019-10-02 21:25:23 +01:00
luisramos0
3f3c33bce6 Fix basic rubocop issues in newly added controller 2019-10-02 21:25:23 +01:00
luisramos0
e35eff95bb Add mail_methods controller from spree_backend related to config 2019-10-02 21:25:23 +01:00
Luis Ramos
e6408161db Merge pull request #4291 from luisramos0/spree_be_config_taxons
Move taxons and taxonomies from spree_backend to OFN
2019-10-02 21:13:12 +01:00
Luis Ramos
4540b32d3a Merge branch 'master' into spree_be_config_taxons 2019-10-02 15:35:15 +01:00
Luis Ramos
9f8d2fddbc Merge pull request #4292 from luisramos0/spree_be_config_tax
Move tax_rates, tax categories and tax settings from spree_backend to OFN
2019-10-02 15:33:32 +01:00
Luis Ramos
14047c620a Merge branch 'master' into spree_be_config_tax 2019-10-02 15:31:25 +01:00
Luis Ramos
2be1c231f7 Merge pull request #4290 from luisramos0/spree_be_config_zones
Move zones, countries and states from spree_backend to OFN
2019-10-02 14:30:59 +01:00
Luis Ramos
c34646724c Merge pull request #4254 from luisramos0/swagger
Update API swagger docs to reflect current API state
2019-10-02 10:31:13 +01:00
Luis Ramos
b731635270 Merge pull request #4303 from luisramos0/missing_translation
Add missing translation for order.shipment.state "on hand" (with a space between on and hand)
2019-10-02 10:27:33 +01:00
Transifex-Openfoodnetwork
c9a62fad4c Updating translations for config/locales/nb.yml 2019-10-02 16:50:07 +10:00
Transifex-Openfoodnetwork
70169d477c Updating translations for config/locales/nb.yml 2019-10-02 16:47:01 +10:00
Transifex-Openfoodnetwork
d95646ea98 Updating translations for config/locales/en_NZ.yml 2019-10-02 14:29:29 +10:00
Transifex-Openfoodnetwork
d50bf928e1 Updating translations for config/locales/de_DE.yml 2019-10-02 10:58:44 +10:00
Luis Ramos
3f7aff4b8b Merge pull request #4305 from luisramos0/new_product_translations
Make translations in new product page relative and specific to the page
2019-10-01 22:38:49 +01:00
dependabot-preview[bot]
de9476a8a5 Bump ddtrace from 0.27.0 to 0.28.0
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.27.0 to 0.28.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.27.0...v0.28.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-01 21:12:18 +00:00
Sigmund Petersen
5fded022d4 Update README.md
Slack invite link changed
2019-10-01 23:09:47 +02:00
dependabot-preview[bot]
bce41a2247 Bump oauth2 from 1.4.1 to 1.4.2
Bumps [oauth2](https://github.com/oauth-xx/oauth2) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/oauth-xx/oauth2/releases)
- [Changelog](https://github.com/oauth-xx/oauth2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/oauth-xx/oauth2/compare/v1.4.1...v1.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-01 21:04:45 +00:00
Pau Pérez Fabregat
1f644f4020 Merge pull request #4281 from Matt-Yorkley/memcached-apm
Add memcached APM
2019-10-01 18:46:22 +02:00
Matt-Yorkley
cc11d4e5f0 Remove unused user parameter from OrdersAndFulfillmentsReport 2019-10-01 15:59:51 +01:00
Pau Pérez Fabregat
5ecac77aa5 Merge branch 'master' into memcached-apm 2019-10-01 16:58:01 +02:00
Matt-Yorkley
a5d2579c69 Pluck line_item ids instead of all line_items 2019-10-01 15:51:45 +01:00
Matt-Yorkley
112adb11db Pass permissions object into OrdersAndFulfillMentsReport 2019-10-01 15:51:43 +01:00
Transifex-Openfoodnetwork
5fdc11bdc7 Updating translations for config/locales/fr.yml 2019-10-01 23:59:19 +10:00
Matt-Yorkley
c038b485b1 Rename service and methods to remove use of "shop" term 2019-10-01 14:43:47 +01:00
Jackson Bates
4c4bdd78e7 makes edit button action open a new tab 2019-10-01 22:13:28 +10:00
Luis Ramos
19eb93012c Merge pull request #4326 from kristinalim/feature/4310-remove_shipments_count
4310 Do not count order shipments in Order#shipping_method
2019-10-01 11:17:42 +01:00
Luis Ramos
d998ec8453 Merge pull request #4331 from openfoodfoundation/dependabot/bundler/uglifier-4.2.0
Bump uglifier from 4.1.20 to 4.2.0
2019-10-01 11:11:35 +01:00
Luis Ramos
0c93665030 Merge pull request #4335 from Matt-Yorkley/remove_deprecations
Remove deprecation warnings from VariantStock methods
2019-10-01 10:59:57 +01:00
Luis Ramos
c4d298d732 Merge branch 'master' into remove_deprecations 2019-10-01 10:57:10 +01:00
dependabot-preview[bot]
36883bc051 [Security] Bump rubyzip from 1.2.2 to 1.3.0
Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.2 to 1.3.0. **This update includes a security fix.**
- [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.2...v1.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-01 09:55:53 +00:00
Luis Ramos
8c252fc160 Merge pull request #4341 from openfoodfoundation/dependabot/bundler/webmock-3.7.6
Bump webmock from 3.7.5 to 3.7.6
2019-10-01 10:53:54 +01:00
Pau Pérez Fabregat
c2f8803d72 Merge pull request #4297 from luisramos0/inv_levels
Remove all usages of Spree Config track_inventory_levels
2019-10-01 10:35:20 +02:00
dependabot-preview[bot]
07967275d8 Bump webmock from 3.7.5 to 3.7.6
Bumps [webmock](https://github.com/bblimke/webmock) from 3.7.5 to 3.7.6.
- [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/v3.7.5...v3.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-30 22:02:54 +00:00
Sigmund Petersen
c7db1b7fc0 Delete ISSUE_TEMPLATE.md
This ISSUE_TEMPLATE.md file is the old way of handling templates on Github. OFN is now using the new method for handling templates, so this file can be removed. 
This template still comes up as 'Default template' when opening an issue from the Zenhub board. This gives 2 almost equal template choices which is confusing.
2019-09-30 21:18:51 +02:00
Rachel Arnould
fa57d71a23 Merge pull request #4332 from openfoodfoundation/RachL-patch-2
Update story template
2019-09-30 20:06:12 +02:00
Rachel Arnould
be5e7bd18d Merge pull request #4330 from openfoodfoundation/RachL-patch-1
Update bug template
2019-09-30 20:05:51 +02:00
Transifex-Openfoodnetwork
5cfc2613ac Updating translations for config/locales/en_GB.yml 2019-10-01 04:01:28 +10:00
Transifex-Openfoodnetwork
903eb23122 Updating translations for config/locales/en_GB.yml 2019-10-01 03:58:19 +10:00
Luis Ramos
d162e8c087 Merge pull request #4300 from daningenthron/daningenthron/add-a-new-card
Translation: "Add new credit card"
2019-09-30 13:27:25 +01:00
Luis Ramos
75a56c2be5 Merge pull request #4293 from jasonk357/4031-change-user-email-alert
Improve user email change flash alert message
2019-09-30 13:19:40 +01:00
Luis Ramos
07a5963554 Merge pull request #4311 from mkllnk/rails3-deprecations
Replace deprecated validates_presence_of
2019-09-30 13:19:25 +01:00
luisramos0
a6888cf0be Update all locales with the latest Transifex translations 2019-09-30 13:15:45 +01:00
Luis Ramos
ef35db6db2 Merge pull request #4296 from luisramos0/subs_line_items
Make subscription line items handle soft deleted variants
2019-09-30 13:07:10 +01:00
Rachel Arnould
375d4fbffd Add workaround item 2019-09-30 11:02:36 +02:00
Matt-Yorkley
6153789055 Eager-load serialized objects in variant query 2019-09-29 20:44:48 +01:00
Matt-Yorkley
032741c54f Refactor ProductsRenderer variants queries
This removes another N+1 and allows pagination applied to the inital query to also affect the returned variants
2019-09-29 17:41:58 +01:00
Matt-Yorkley
e9acf6e0de Refactor #load_products and memoize 2019-09-29 14:30:04 +01:00
Matt-Yorkley
d5e90c3c6c Extract #load_products logic into a new service 2019-09-29 00:10:47 +01:00
Kristina Lim
bb56e9a5b9 Set default date range for Orders and Fulfillment report 2019-09-28 02:39:41 +08:00
Matt-Yorkley
7e7429446d Remove deprecation warnings from VariantStock methods 2019-09-27 17:28:16 +01:00
Matt-Yorkley
535e389fb4 Query variant stock including overrides
This allows the results to be properly filtered and paginated whilst showing the correct stock, and removes a big N+1
2019-09-27 17:25:52 +01:00
Matt-Yorkley
cecebb82f4 Move distributed products relation out from OrderCycleDistributedProducts 2019-09-27 17:25:50 +01:00
Pau Pérez Fabregat
49665ae360 Merge pull request #4167 from luisramos0/last_dedeface
Move app_wrapper deface to spree/layouts/admin view
2019-09-27 09:21:28 +02:00
Pau Pérez Fabregat
7e5c194515 Merge pull request #4295 from coopdevs/enable-datadog-analytics
Enable trace & search analytics in Datadog
2019-09-27 09:17:03 +02:00
Matt-Yorkley
fe0b3172c7 Move scoper to method 2019-09-27 01:52:45 +01:00
Matt-Yorkley
5b27ed6b9f Remove unnecessary #deleted? check
It should be included in te default product scope
2019-09-27 01:52:29 +01:00
Matt-Yorkley
bef4741e31 Enable analytics in all APM services 2019-09-26 22:38:20 +01:00
Rachel Arnould
d604328bfb Update story template 2019-09-26 21:25:01 +02:00
dependabot-preview[bot]
2af3de51c7 Bump uglifier from 4.1.20 to 4.2.0
Bumps [uglifier](https://github.com/lautis/uglifier) from 4.1.20 to 4.2.0.
- [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/v4.1.20...v4.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-26 19:21:05 +00:00
Rachel Arnould
d0c77a8dc4 Update bug template 2019-09-26 21:20:50 +02:00
Kristina Lim
8fc4ca6f65 Do not use OrderAndFulfillmentsReport#find_variant 2019-09-26 11:45:05 +08:00
Kristina Lim
721a0d3a98 Do not count order shipments in Order#shipping_method 2019-09-26 11:01:06 +08:00
JASON KNOEPFLER
c46fe7b675 encapsulate new unconfirmed email logic 2019-09-25 19:41:33 -07:00
luisramos0
bb372984e1 Deleting old pt-BR translations file, it's now called pt_BR with underscore 2019-09-25 11:26:06 +01:00
Luis Ramos
2489a2f5f5 Merge pull request #4294 from openfoodfoundation/transifex
Transifex
2019-09-25 11:22:58 +01:00
Transifex-Openfoodnetwork
a6698230fe Updating translations for config/locales/en_NZ.yml 2019-09-25 20:13:57 +10:00
luisramos0
50731e929e Remove some attributes from test as they are already verified subsequently 2019-09-25 09:54:33 +01:00
luisramos0
baa09b88f7 Fix issue with nil current_order where shipping_method serializer requires a current_order to calculate the shipping fees 2019-09-25 09:52:10 +01:00
Luis Ramos
2f3509bf9b Merge pull request #4287 from luisramos0/mini_racer
Replace therubyracer with mini_racer.
2019-09-24 19:48:50 +01:00
Dan Ingenthron
e8f9ace8e6 Correct translation key on add card link 2019-09-24 13:42:31 -05:00
Luis Ramos
04270b6cec Merge pull request #4286 from luisramos0/transpec
Finish transpec
2019-09-24 19:33:26 +01:00
Matt-Yorkley
1155931ea9 Merge pull request #4280 from luisramos0/knapsack
Update knapsack report
2019-09-24 19:26:27 +01:00
Maikel Linke
efd450606e Replace deprecated validates_presence_of
This syntax has been deprecated in Rails 3:
https://guides.rubyonrails.org/3_0_release_notes.html#patches-and-deprecations
2019-09-24 19:16:05 +10:00
luisramos0
2f60a85593 Improve spec/controllers/api/orders_controller_spec, make it more readable 2019-09-23 23:50:42 +01:00
luisramos0
78cf35807a Improve preloading of order query to avoid N+1 queries 2019-09-23 23:50:39 +01:00
luisramos0
f3bc038c05 Make translations in new product page relative and specific to the page 2019-09-23 17:02:30 +01:00
luisramos0
7817a40a35 Add missing translation for shipment state on hand with space between on and hand 2019-09-23 16:33:59 +01:00
Transifex-Openfoodnetwork
a18f6f5b8f Updating translations for config/locales/fr_CA.yml 2019-09-24 01:01:41 +10:00
Transifex-Openfoodnetwork
403653381c Updating translations for config/locales/en_CA.yml 2019-09-24 00:59:20 +10:00
luisramos0
eb85dccac1 Remove single letter variable names 2019-09-22 21:07:32 +01:00
luisramos0
f32454b404 Add feature spec to validate unit_description is editable for products with unit items, regression for #3649 2019-09-22 21:02:32 +01:00
luisramos0
591efecde6 Make unit description field visible in the variant edit page even for products which variant_unit is items 2019-09-22 16:42:03 +01:00
luisramos0
24afa21885 Revert "Change products controller to clear variants unit description if variant_unit is items"
This reverts commit 1a4e83d633.
2019-09-22 16:31:26 +01:00
luisramos0
cd6d34663e Remove all usages of Spree Config track_inventory_levels, this is always true in OFN since v2.0.0 2019-09-22 15:25:24 +01:00
luisramos0
c66e5fe1e9 Make subscription line items handle soft deleted variants
This ensures subscription list page works. The variant can be removed from the subscription by the user in the edit subscription page
2019-09-22 14:59:59 +01:00
JASON KNOEPFLER
4ec8fcd3a6 Assign flash message var from conditional return 2019-09-21 08:10:58 -07:00
Pau Perez
88893a2968 Enable trace & search analytics in Datadog
This will enrich the quality of the reported traces for all web
frameworks in our stack. That means not only memcached as we did in
https://github.com/openfoodfoundation/openfoodnetwork/pull/4266 but
PostgreSQL and Rails too.

After enabling, the Trace Search & Analytics page populates which allows
us to search traces and add APM queries to dashboards.
2019-09-21 14:09:27 +02:00
JASON KNOEPFLER
62599e8dfc Edit user email feature spec 2019-09-20 15:28:25 -07:00
Transifex-Openfoodnetwork
b97c428f72 Updating translations for config/locales/pt_BR.yml 2019-09-21 04:00:00 +10:00
Transifex-Openfoodnetwork
42b074f02e Updating translations for config/locales/pt_BR.yml 2019-09-21 03:56:52 +10:00
JASON KNOEPFLER
07e0951490 Change users#update email change flash alert 2019-09-20 10:35:25 -07:00
luisramos0
fc433ff8f0 Refactor ship methods controller destroy action: remove single action before_filter 2019-09-20 16:29:36 +01:00
luisramos0
8e33437fbb MErge ship method controller decorator with the controller that came from spree 2019-09-20 15:59:24 +01:00
luisramos0
a5103c737d Fix rubocop issues in ship methods controller from spree 2019-09-20 15:58:05 +01:00
luisramos0
37c8f42244 Bring shipping methods and categories controllers from spree_backend 2019-09-20 15:56:24 +01:00
luisramos0
0e8765636b Bring tax_settings from spree_backend to ofn 2019-09-20 15:46:33 +01:00
luisramos0
6855e5c8f4 Fix rubocop issues in feature spec 2019-09-20 15:43:55 +01:00
luisramos0
a96b56239c Transpec feature specs brought from spre_backend 2019-09-20 15:43:55 +01:00
luisramos0
4f9eee2682 Fix feature specs added from spree_backend in the configuration area 2019-09-20 15:43:55 +01:00
luisramos0
44761315c2 Bring feature specs for configuration pages from spree_backend 2019-09-20 15:43:55 +01:00
luisramos0
0d18b1a032 Bring spree/admin configuration routes to ofn 2019-09-20 15:43:55 +01:00
luisramos0
cc0dabcd1e Convert spree/admin/tax_rates from erb to haml 2019-09-20 15:36:58 +01:00
luisramos0
e79c672263 Convert spree/admin/tax_categories from erb to haml 2019-09-20 15:36:54 +01:00
luisramos0
bc6f7934e0 Add spree_backend views related to admin/configuration menu that are missing in ofn 2019-09-20 15:35:49 +01:00
luisramos0
89029f46f9 Fix basic rubocop issues in newly added controller 2019-09-20 15:32:34 +01:00
luisramos0
144369e55f Add tax related controllers from spree_backend related to config 2019-09-20 15:31:30 +01:00
luisramos0
3833cbbf73 Fix rubocop issues in feature spec 2019-09-20 15:24:26 +01:00
luisramos0
5b703a02cd Transpec feature spec brought from spree_backend 2019-09-20 15:24:26 +01:00
luisramos0
1d4aebd3f9 Fix feature spec added from spree_backend 2019-09-20 15:24:15 +01:00
luisramos0
845a764320 Bring taxonomies feature spec from spree_backend 2019-09-20 15:24:06 +01:00
luisramos0
c66579a22f Fix simple rubocop issues in helper 2019-09-20 15:24:06 +01:00
luisramos0
9291bf5c82 Bring taxons_helper from spree 2019-09-20 15:24:06 +01:00
luisramos0
4781ab93ef Bring spree/admin configuration routes to ofn 2019-09-20 15:24:06 +01:00
luisramos0
def9ab7c47 Convert spree/admin/taxons from erb to haml 2019-09-20 15:24:06 +01:00
luisramos0
2a68d34fb0 Convert spree/admin/taxonomies from erb to haml 2019-09-20 15:24:06 +01:00
luisramos0
2ce56aef2c Add spree_backend views related to admin/configuration taxonomies that are missing in ofn 2019-09-20 15:23:45 +01:00
luisramos0
20f965731d Fix basic rubocop issues in recently added controller from spree_backend 2019-09-20 15:14:34 +01:00
luisramos0
8378dce752 Bring taxons config controller that is overriden in ofn to ofn so we can merge them with their decorator in a second step 2019-09-20 15:13:45 +01:00
luisramos0
d7a4e3a896 Add taxonomies controller from spree_backend 2019-09-20 15:12:38 +01:00
luisramos0
7d9de0ca70 Fix rubocop issues in feature specs 2019-09-20 15:07:34 +01:00
luisramos0
f9c6f09cd4 Transpec feature specs brought from spre_backend 2019-09-20 15:06:02 +01:00
luisramos0
4a83eca832 Fix feature specs added from spree_backend in the configuration area 2019-09-20 15:05:21 +01:00
luisramos0
4954db64b3 Bring feature specs for configuration pages from spree_backend 2019-09-20 15:04:45 +01:00
luisramos0
b2c4b97d94 Bring spree/admin configuration routes to ofn 2019-09-20 15:02:01 +01:00
luisramos0
32c1eecece Convert spree/admin/zones from erb to haml 2019-09-20 15:01:06 +01:00
luisramos0
6d8c7a4bee Fix minor detail in states and countries views 2019-09-20 14:57:48 +01:00
luisramos0
bd2045cad7 Convert spree/admin/states from erb to haml 2019-09-20 14:55:36 +01:00
luisramos0
e1c3d2442a Convert spree/admin/countries from erb to haml 2019-09-20 14:55:10 +01:00
luisramos0
3df65d0463 Add spree_backend views related to admin/configuration menu that are missing in ofn 2019-09-20 14:54:55 +01:00
luisramos0
822a17f732 Fix basic rubocop issues in newly added controllers 2019-09-20 14:50:38 +01:00
luisramos0
ffde0307e2 Add controllers from spree_backend related to config 2019-09-20 14:50:01 +01:00
luisramos0
9e57807dc2 Replace therubyracer with mini_racer.
This is being replaced to increase the reliability and speed of asset compilation.
2019-09-20 11:22:07 +01:00
luisramos0
052bac196b Fix problem in spec/features/consumer/shopping/shopping_spec introduced with transpec 2019-09-20 10:33:40 +01:00
luisramos0
00e789b95b Force use of expect over should in spec expectations 2019-09-20 10:29:56 +01:00
luisramos0
a004822019 Transpec spec/features/consumer/shopping/shopping_spec 2019-09-20 10:16:08 +01:00
luisramos0
49f7b4c8e2 Transpec spec/features/consumer/shopping/cart_spec.rb 2019-09-20 10:11:02 +01:00
luisramos0
8b503b51ca Fix typo in spec name 2019-09-20 10:03:52 +01:00
luisramos0
4e431ecf18 Transpec spec/features/consumer/shopping/products_spec.rb 2019-09-20 10:02:27 +01:00
luisramos0
81f8b127db Transpec spec/features/consumer/authentication_spec.rb and spec/features/consumer/producers_spec.rb 2019-09-20 09:53:23 +01:00
luisramos0
f9f81086fd Transpec features/consumer/shopping/variant_overrides_spec 2019-09-20 09:02:43 +01:00
Luis Ramos
9807b432f9 Merge pull request #4272 from openfoodfoundation/dependabot/bundler/webmock-3.7.5
Bump webmock from 3.7.4 to 3.7.5
2019-09-20 08:42:12 +01:00
luisramos0
6b0f3cd4f3 Transpec spec/performance/shop_controller_spec 2019-09-19 20:36:33 +01:00
luisramos0
3c412b7b7d Transpec spec/controllers/api/taxonomies_controller_spec, spec/controllers/api/taxons_controller_spec and spec/models/enterprise_spec 2019-09-19 20:34:30 +01:00
luisramos0
c4e6c0af2b Transpec features/consumer/registration_spec 2019-09-19 20:18:24 +01:00
Matt-Yorkley
e6387197ec Add memcached APM 2019-09-19 19:48:16 +01:00
Luis Ramos
746c4f03f6 Merge pull request #4261 from jasonk357/3979-malformed-referer-error
Guard against malformed request referer
2019-09-19 17:29:18 +01:00
Kristina Lim
3535c4d564 Merge pull request #4240 from Matt-Yorkley/backorder_to_the_future_2
Disentangle on_demand and backordered
2019-09-20 00:05:27 +08:00
luisramos0
37abdb7727 Update knapsack report 2019-09-19 16:58:06 +01:00
luisramos0
bdb3dd5aaf Fix long lines in app/serializers 2019-09-19 16:32:09 +01:00
luisramos0
25fbab2e37 Use memoized order method 2019-09-19 16:32:09 +01:00
luisramos0
4d37aaac64 Use have_http_status and remove check for error message, that's something for the base_controller test to test 2019-09-19 16:32:09 +01:00
luisramos0
19e28cb14a Make spec/controllers/api/orders_controller_spec more simple assuming adjustments will always come in the same order 2019-09-19 16:32:09 +01:00
luisramos0
a44a251d96 Remove duplicated attributes tag from all serializers to create consistency 2019-09-19 16:32:09 +01:00
luisramos0
2921ee19e1 Add api/order/{order_number} ednpoint and its new order detailed serializer 2019-09-19 16:32:09 +01:00
luisramos0
6796d91a07 Add some basic attributes to address and order serializers that will be used in the order show api endpoint 2019-09-19 16:32:09 +01:00
luisramos0
69afcf7510 Improve readability in order permissions 2019-09-19 16:32:09 +01:00
dependabot-preview[bot]
47056e3cc1 Bump webmock from 3.7.4 to 3.7.5
Bumps [webmock](https://github.com/bblimke/webmock) from 3.7.4 to 3.7.5.
- [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/v3.7.4...v3.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-19 13:10:20 +00:00
Kristina Lim
311ee92e84 Update all locales with the latest Transifex translations 2019-09-19 17:08:17 +08:00
Kristina Lim
241e97d938 Merge pull request #4241 from openfoodfoundation/transifex
Transifex
2019-09-19 16:58:57 +08:00
Pau Pérez Fabregat
85b1ba8eae Merge pull request #4263 from coopdevs/index-frequent-spree-orders-query
Index spree_orders on various columns
2019-09-19 10:12:54 +02:00
Pau Pérez Fabregat
baa4783141 Merge pull request #4260 from jasonk357/4184-delivery-report-default-range
Add default date range to Delivery Report
2019-09-19 09:58:06 +02:00
Transifex-Openfoodnetwork
ce40fcaf7b Updating translations for config/locales/fr.yml 2019-09-19 07:44:00 +10:00
Luis Ramos
40438de7fe Merge pull request #4250 from Matt-Yorkley/ruby-2.1.9
Bump Ruby version from 2.1.5 to 2.1.9
2019-09-18 11:39:15 +01:00
Luis Ramos
29dcd96fca Merge pull request #4265 from openfoodfoundation/dependabot/bundler/simplecov-0.17.1
Bump simplecov from 0.17.0 to 0.17.1
2019-09-18 10:25:54 +01:00
Pau Pérez Fabregat
7fd6a7e654 Merge pull request #4270 from openfoodfoundation/dependabot/bundler/webmock-3.7.4
Bump webmock from 3.7.3 to 3.7.4
2019-09-18 10:11:11 +02:00
dependabot-preview[bot]
8f2a80f199 Bump webmock from 3.7.3 to 3.7.4
Bumps [webmock](https://github.com/bblimke/webmock) from 3.7.3 to 3.7.4.
- [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/v3.7.3...v3.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-17 19:21:37 +00:00
Pau Perez
ea41405209 Index spree_orders on various columns
The following query

```sql
SELECT spree_orders . *
FROM spree_orders
WHERE spree_orders . user_id = ?
AND spree_orders . completed_at IS ?
AND spree_orders . created_by_id = ?
ORDER BY created_at DESC LIMIT ?
```

performs quite badly even though LIMIT is always 1 because:

* ORDER BY requires sorting by a column which is not indexed therefore
a sequential scan is performed.
* Although `completed_at` is indexed, `user_id` and `created_by_id` are
not causing a sequential scan.

To make it worse this query is executed very often in the following
controllers among others also related to checkout:

* CartController#populate
* EnterprisesController#Shop
* LineItemsController#bought
* ShopController#products
* ShopController#order_cycle

In some cases this query alone accounts for 66.8% of the total time
of the endpoint.

Results

See by yourself. We move from 56.643ms to 0.077ms. Pretty neat.

```
openfoodnetwork=> explain analyze SELECT "spree_orders".* FROM "spree_orders" WHERE "spree_orders"."user_id" = 1 AND "spree_orders"."completed_at" IS NULL AND "spree_orders"."created_by_id" = 1 ORDER BY created_at DESC LIMIT 1;
                                                        QUERY PLAN
--------------------------------------------------------------------------------------------------------------------------
 Limit  (cost=11753.03..11753.04 rows=1 width=195) (actual time=56.580..56.580 rows=0 loops=1)
   ->  Sort  (cost=11753.03..11753.04 rows=1 width=195) (actual time=56.578..56.578 rows=0 loops=1)
         Sort Key: created_at DESC
         Sort Method: quicksort  Memory: 25kB
         ->  Seq Scan on spree_orders  (cost=0.00..11753.02 rows=1 width=195) (actual time=56.571..56.571 rows=0 loops=1)
               Filter: ((completed_at IS NULL) AND (user_id = 1) AND (created_by_id = 1))
               Rows Removed by Filter: 256135
 Planning time: 0.252 ms
 Execution time: 56.643 ms
(9 rows)

openfoodnetwork=> CREATE INDEX ON spree_orders (completed_at, user_id, created_by_id, created_at);
CREATE INDEX
openfoodnetwork=> explain analyze SELECT "spree_orders".* FROM "spree_orders" WHERE "spree_orders"."user_id" = 1 AND "spree_orders"."completed_at" IS NULL AND "spree_orders"."created_by_id" = 1 ORDER BY created_at DESC LIMIT 1;
mit  (cost=8.45..8.46 rows=1 width=195) (actual time=0.030..0.030 rows=0 loops=1)
   ->  Sort  (cost=8.45..8.46 rows=1 width=195) (actual time=0.029..0.029 rows=0 loops=1)
         Sort Key: created_at DESC
         Sort Method: quicksort  Memory: 25kB
         ->  Index Scan using spree_orders_completed_at_user_id_created_by_id_created_at_idx on spree_orders  (cost=0.42..8.44 rows=1 width=195) (actual time=0.021..0.021 rows=0 loops=1)
               Index Cond: ((completed_at IS NULL) AND (user_id = 1) AND (created_by_id = 1))
 Planning time: 0.199 ms
 Execution time: 0.077 ms
```
2019-09-17 17:02:14 +02:00
luisramos0
2683efdd3c Add missing update to db/schema by running db:migrate
This was missed in PR 4242
2019-09-17 15:27:56 +01:00
Luis Ramos
ed1c154b78 Merge pull request #4252 from luisramos0/remove_clear_ship_address
On checkout of pickup orders, set ship_address to shipping_address_from_distributor instead of empty Spree::Address.default
2019-09-17 13:18:20 +01:00
Pau Pérez Fabregat
4aba2730f7 Merge pull request #4230 from openfoodfoundation/dependabot/bundler/ddtrace-0.27.0
Bump ddtrace from 0.26.0 to 0.27.0
2019-09-17 13:11:12 +02:00
Pau Pérez Fabregat
07ae51560e Merge pull request #4259 from openfoodfoundation/dependabot/bundler/webmock-3.7.3
Bump webmock from 3.7.2 to 3.7.3
2019-09-17 09:32:21 +02:00
dependabot-preview[bot]
3c5c842bbf Bump simplecov from 0.17.0 to 0.17.1
Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.17.0 to 0.17.1.
- [Release notes](https://github.com/colszowka/simplecov/releases)
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md)
- [Commits](https://github.com/colszowka/simplecov/compare/v0.17.0...v0.17.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-16 21:08:17 +00:00
Luis Ramos
e7e4508555 Merge pull request #4242 from Matt-Yorkley/another_cartastrophe
Soft-delete price objects
2019-09-16 17:18:39 +01:00
Luis Ramos
9a3b5d0700 Merge pull request #4257 from daningenthron/daningenthron/payment-method-translation
Fix typo on 'no payment methods' translation keys
2019-09-16 13:18:46 +01:00
Luis Ramos
46353be9a3 Merge pull request #4237 from coopdevs/unobfuscate-bulk-management-action
Add implicit #bulk_management including filter
2019-09-15 12:15:11 +01:00
JASON KNOEPFLER
91a52ead58 Guard against malformed request referer 2019-09-14 09:13:44 -07:00
JASON KNOEPFLER
0f55049eda OrderCycleManagementReport sets default date range before querying for orders 2019-09-13 17:15:57 -07:00
Luis Ramos
83f1a7a9a9 Merge pull request #4258 from coopdevs/fix-test-example-name
Fix test example name
2019-09-13 23:04:45 +01:00
dependabot-preview[bot]
fac118fce2 Bump webmock from 3.7.2 to 3.7.3
Bumps [webmock](https://github.com/bblimke/webmock) from 3.7.2 to 3.7.3.
- [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/v3.7.2...v3.7.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-13 19:19:34 +00:00
Dan Ingenthron
5270cdaa32 Fixed typo on 'no payment methods' translation keys
Modified to remove edits to translation files. These will be updated via Transifex webhook.
2019-09-13 13:43:13 -05:00
luisramos0
caebcdf184 Add correct schemas for EnterpriseShopfront and Variant (not Api::Admin::VariantSerializer but Api::VariantSerializer) 2019-09-13 15:33:54 +01:00
luisramos0
c66a659e8e Fix /products payloads: product, variants and variant overrides 2019-09-13 14:55:18 +01:00
luisramos0
b8b107dd2d Fix api_key header name 2019-09-13 14:27:39 +01:00
Luis Ramos
ecf336fe51 Merge pull request #4244 from luisramos0/fix_truncate_data
Adapt db truncate task to ofn v2 by removing db tables from v1
2019-09-13 13:09:07 +01:00
Matt-Yorkley
a3efd13d46 Update existing Spree::InventoryItem records: change backordered state to on_hand. 2019-09-13 13:05:15 +01:00
Matt-Yorkley
2ff0169016 Replace hard-deleted prices with empty (0.00) price records 2019-09-13 12:55:24 +01:00
Pau Perez
08d37bbed7 Fix test example name
The name wasn't reflecting the method being tested.
2019-09-13 12:55:34 +02:00
Transifex-Openfoodnetwork
b71443ccd8 Updating translations for config/locales/ca.yml 2019-09-13 20:45:12 +10:00
Transifex-Openfoodnetwork
8fd3d9e03c Updating translations for config/locales/es.yml 2019-09-13 20:42:43 +10:00
Transifex-Openfoodnetwork
787727872f Updating translations for config/locales/ca.yml 2019-09-13 20:42:04 +10:00
Pau Pérez Fabregat
5bf72ae780 Merge pull request #4234 from coopdevs/remove-hidden-integrity-check
Remove integrity check for deleted variants in OCs
2019-09-13 11:27:41 +02:00
Pau Pérez Fabregat
290d00f17d Merge pull request #4232 from coopdevs/remove-guard
Remove Guard and Guard-related gems
2019-09-13 11:25:29 +02:00
Pau Perez
3d7bbbbb19 Remove unused Guardfile 2019-09-13 08:25:54 +02:00
luisramos0
3d32987227 Fix taxonomies to represent the endpoints in OFN 2019-09-12 19:52:13 +01:00
luisramos0
902e51e580 Add api/customers endpoints 2019-09-12 19:11:53 +01:00
luisramos0
743cb3b33a Add update product image endpoint and delete enterprise fees endpoint 2019-09-12 18:02:06 +01:00
luisramos0
74e49787f4 Add the remaining missing enterprises endpoints 2019-09-12 15:16:35 +01:00
luisramos0
afa8f97627 Add post and put on enterprises and fix details in shipments endpoints 2019-09-12 13:42:40 +01:00
luisramos0
6e677fecce Remove now inexistent endpoints /new 2019-09-12 13:19:43 +01:00
luisramos0
889a3e6d9d Improve file layout and move Order model to correct place 2019-09-12 13:15:40 +01:00
luisramos0
664be47ac3 Add endpoints for /orders/shipments 2019-09-12 13:08:39 +01:00
Sigmund Petersen
fd77f48aca Merge pull request #4253 from openfoodfoundation/RachL-patch-1
Update Slack invite link
2019-09-12 09:17:37 +02:00
Rachel Arnould
9a31b99de6 Update missing second link 2019-09-11 15:52:44 +02:00
luisramos0
0e4b5ad9ec Remove now gone orders/{order_number} endpoint and its models, may be readded in the near future but the models may be different as these docs refer to the now gone spree_api order rabl representation 2019-09-11 11:35:01 +01:00
luisramos0
5634f4af18 Move orders endpoints above in the file as they are the most important endpoints 2019-09-11 11:34:57 +01:00
luisramos0
0dede39617 Make list of /products/{product_id}/variants endpoints correct according to current code 2019-09-11 11:15:55 +01:00
Transifex-Openfoodnetwork
d98e302047 Updating translations for config/locales/nb.yml 2019-09-11 19:47:09 +10:00
luisramos0
377b4a3755 Do not add ng-controller if main_ng_ctrl_name is not set 2019-09-11 10:36:19 +01:00
luisramos0
0c809b2911 Remove now unused override app_wrapper 2019-09-11 10:35:39 +01:00
luisramos0
33472014f1 Do not add main_ng_app_name if it is not defined 2019-09-11 10:32:30 +01:00
luisramos0
d038c27f1f Fix app_wrapper_attr code by making the content_for tag be only the name of the ng-app and ng-ctrller 2019-09-11 10:32:30 +01:00
luisramos0
3d718d9738 Move admin layout body contents to a separate partial 2019-09-11 10:32:29 +01:00
Luis Ramos
500ef901fd Merge pull request #4164 from luisramos0/little_de_deface
Remove some unused deface overrides and move some others to their views
2019-09-11 10:26:56 +01:00
Matt-Yorkley
a15db65e69 Reload tested variant and price objects 2019-09-11 04:32:19 +01:00
Matt-Yorkley
64a501ee20 Don't index new deleted_at column for spree_prices 2019-09-11 04:29:02 +01:00
Matt-Yorkley
95fcff8bb1 Add migration to remove broken variants from open carts 2019-09-11 04:29:00 +01:00
luisramos0
a2e6b84db2 List the actual actions available in the api/products endpoint 2019-09-10 17:22:52 +01:00
luisramos0
d319f97733 Remove now unexisting endpoints zones, states and countries 2019-09-10 12:36:34 +01:00
Luis Ramos
c0bf7e2e75 Merge pull request #4236 from mkllnk/4222-checkout-paypal-error-handling
4233 Add missing Spree route for Paypal
2019-09-10 12:24:21 +01:00
Luis Ramos
1d177a164b Merge pull request #4247 from mkllnk/4243-inventory-pagination
4243 Restore old pagination API for inventory products
2019-09-10 11:35:04 +01:00
Rachel Arnould
d846c31db9 Update Slack invite link
Updated Slack invite link in README
2019-09-10 09:51:59 +02:00
Maikel Linke
efd01f8c9e Move new inventory spec to existing variant overrides spec
I decided to not share the same data setup with the other parts of the
spec because we don't need as much data and it's slow to create.
2019-09-10 10:05:23 +10:00
luisramos0
fb65c64c68 Keep the ship_address clearing logic (this time reusing the OrderUpdate method) thus making the restart_checkout process work for these cases (because order.ship_address is not empty)
OrderUpdater#shipping_address_from_distributor uses order.address_from_distributor to set order.ship_address when order is not delivery: this will clear the ship address as it was done previously without setting an empty address like Spree::Address.default
2019-09-09 22:05:20 +01:00
Transifex-Openfoodnetwork
b8d8ee4edc Updating translations for config/locales/en_GB.yml 2019-09-10 05:14:09 +10:00
Luis Ramos
936784404e Merge pull request #4112 from luisramos0/convert_shipments_rabl
Convert spree/api/shipments views from rabl to ams
2019-09-09 18:34:02 +01:00
Matt-Yorkley
11ea852211 Add migration to reset negative stock levels to zero 2019-09-09 17:49:58 +01:00
Matt-Yorkley
4656c35f71 Don't change on_demand variant's stock when updating shipments 2019-09-09 17:49:58 +01:00
Matt-Yorkley
254315b79e Don't mark on_demand items and shipments as "backordered" 2019-09-09 17:49:56 +01:00
luisramos0
cc7461e692 Remove clear_ship_address from checkout_controller because it is setting an empty address on order.ship_address which is breaking the reset_checkout process in some cases.
This logic is already repeated in the before_save hook in the OrderUpdater where the distributor address is put into the ship_address on order.finalize

In cases the order is not to be finalized we keep the ship_address sent from the client as we may need it to make the order workflow work properly
2019-09-09 17:48:17 +01:00
luisramos0
c4d5eec7fd Covering restart_checkout code with more tests to clarify behaviour with different order.ship_address objects
The edge case here is when ship_address is present but empty, on the checkout_controller we are going to move from using an empty ship_address to using a non-empty one. We keep the original case where this spec was testing with a nil order.ship_address
2019-09-09 17:48:04 +01:00
Luis Ramos
2dc85463ce Merge pull request #4226 from HugsDaniel/4090-missing-translations-order
Add missing translations for orders
2019-09-09 15:16:47 +01:00
Matt-Yorkley
aa3bd93ad0 Bump Ruby version to 2.1.9 2019-09-09 12:22:20 +01:00
Maikel Linke
24c8bb95cb Restore old pagination API for products
It's still used by the inventory page. This is an easy fix that I can
deploy without risk. A rewrite of the inventory pagination should
follow.
2019-09-09 14:53:04 +10:00
Maikel Linke
2e361baeaa Ignore block length cop for feature and scenario
They are typically long and that's okay, same with `describe` and `it`.
2019-09-09 14:53:04 +10:00
luisramos0
a98a0bd264 Adapt db truncate task to ofn v2 by removing db tables from v1 2019-09-08 14:05:49 +01:00
luisramos0
b4de8ef899 Make enterprises/index_spec a bit more resilient 2019-09-08 12:17:36 +01:00
luisramos0
f0586af1c7 Re-organized api/orders resource routes 2019-09-08 12:17:36 +01:00
luisramos0
e9b5551c0f Adpat shipment controller to move out of Spree namespace 2019-09-08 12:17:36 +01:00
luisramos0
7cec24f1d4 Move shipments route, controller and ctrl spec from spree/api to api 2019-09-08 12:17:36 +01:00
luisramos0
26f5ece7c0 Add a few relevant attributes to shipment serializer and fix some details in shipment controller spec 2019-09-08 12:15:33 +01:00
luisramos0
a21a4aba5d Convert spree/api/shipments from rabl to AMS and adapt its spec 2019-09-08 12:15:33 +01:00
Matt-Yorkley
f413ce2a27 Soft-delete price objects 2019-09-06 17:50:19 +01:00
Transifex-Openfoodnetwork
5847b1a51e Updating translations for config/locales/en_ZA.yml 2019-09-07 01:50:35 +10:00
Transifex-Openfoodnetwork
f51ebc63c3 Updating translations for config/locales/en_AU.yml 2019-09-07 01:47:27 +10:00
Pau Pérez Fabregat
908e1dfcaf Merge pull request #4202 from coopdevs/remove-skylight
Remove Skylight
2019-09-06 17:09:14 +02:00
Matt-Yorkley
5bc2c96248 Add specs for existing on_demand behaviour 2019-09-06 15:47:59 +01:00
Pau Perez
ab8c7bad76 Remove Skylight
Since we adopted Skylight to get response times across endpoints and
instances, we failed to get accurate numbers. Our Rails version is not
supported and thus Skylight fails to provide data for the slowest
endpoints, the ones we care about the most. Even with a supported one we
could potentially hit any limits on tracing and have the same problem.

Recently, we started paying for Datadog's APM and the experience,
although it's still early, has been better. It makes it possible to
correlate between services and other metrics which helps spotting the
underlying issues.

Therefore, having two agents running on the server consumes system
resources so we better get rid of Skylight's one.
2019-09-06 16:25:33 +02:00
Pau Perez
55883a0efc Add implicit #bulk_management including filter
OFN it's hard enough. No need to abuse implicitness making things very
hard to follow.

I've spent around 20min trying to find out where this controller action
was implemented until I realized Rails renders the matching view if no
controller action is defined.

Making it git-greppable makes it a bit easier next time.
2019-09-06 16:02:44 +02:00
Pau Pérez Fabregat
2e519957ec Merge pull request #4231 from openfoodfoundation/dependabot/bundler/webmock-3.7.2
Bump webmock from 3.7.1 to 3.7.2
2019-09-06 13:31:55 +02:00
Pau Pérez Fabregat
cd5b3c7393 Merge pull request #4229 from openfoodfoundation/dependabot/bundler/bugsnag-6.12.1
Bump bugsnag from 6.12.0 to 6.12.1
2019-09-06 13:08:47 +02:00
Maikel Linke
eb9f02f3bd Add missing Spree route for Paypal 2019-09-06 19:07:41 +10:00
Maikel Linke
a1f3e8205f Add spec for failing Paypal checkout
https://github.com/openfoodfoundation/openfoodnetwork/issues/4233
2019-09-06 19:05:59 +10:00
Pau Perez
410e23085e Remove integrity check for deleted variants in OCs
We have no way to see the output of this weird RSpec integrity check
thus, it's pointless. It only adds unnecessary load the server.

However, the issue it checks seems to still be happening although
not very often. UK's server has 70 occurrences the last one being from
early 2019 while FR's server returns 10.
2019-09-06 10:30:26 +02:00
Pau Perez
e2b3ee7b3f Remove Guard and Guard-related gems
Guard and the other Guard-related gems should be removed from our
Gemfile. We think is not worth the extra dependencies given the effort
it requires to keep them up-to-date.

This came up in a PR that was upgrading Guard: #4213.
2019-09-06 10:11:17 +02:00
Maikel Linke
242767dc73 Give variables meaningful names in checkout spec 2019-09-06 12:27:15 +10:00
Maikel Linke
8e8c77c5bd Convert specs to RSpec 3.8.0 syntax with Transpec
This conversion is done by Transpec 3.4.0 with the following command:
    transpec spec/features/consumer/shopping/checkout_spec.rb

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

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

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

For more details: https://github.com/yujinakayama/transpec#supported-conversions
2019-09-06 11:32:44 +10:00
Luis Ramos
e3ce2a7486 Merge pull request #4104 from luisramos0/convert_taxons_to_ams
Convert spree/api/taxons views from rabl to AMS
2019-09-06 00:04:10 +01:00
dependabot-preview[bot]
8524f49589 Bump webmock from 3.7.1 to 3.7.2
Bumps [webmock](https://github.com/bblimke/webmock) from 3.7.1 to 3.7.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/v3.7.1...v3.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05 19:17:24 +00:00
dependabot-preview[bot]
36f9cd9cbf Bump ddtrace from 0.26.0 to 0.27.0
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.26.0 to 0.27.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.26.0...v0.27.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05 19:16:35 +00:00
dependabot-preview[bot]
0fab4a3a8e Bump bugsnag from 6.12.0 to 6.12.1
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby) from 6.12.0 to 6.12.1.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases)
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.12.0...v6.12.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-05 19:15:41 +00:00
Luis Ramos
722884d8d8 Merge pull request #3895 from luisramos0/fees_based_on_final_weight
Make weight calculator use line_item.final_weight_volume rather than variant.weight
2019-09-05 19:24:56 +01:00
Pau Pérez Fabregat
23740ef908 Merge pull request #4227 from openfoodfoundation/2.4.0-minus-pr-4204
Revert PR #4204
2019-09-05 17:19:15 +02:00
Pau Pérez Fabregat
ba04208999 Merge pull request #4224 from kristinalim/feature/4210-fetch_and_scope_variants_once_in_products_renderer
4210 Fetch and scope variants for shop in ProductsRenderer only once
2019-09-05 17:12:31 +02:00
Kristina Lim
590ce67f38 Fetch and scope variants for shop in ProductsRenderer only once 2019-09-05 22:42:50 +08:00
Matt-Yorkley
e11ea929c3 Merge pull request #4223 from Matt-Yorkley/integrity
Lower integrity checker job interval
2019-09-05 15:36:12 +01:00
Hugo Daniel
f88d54b862 Add missing translations for orders 2019-09-05 15:13:10 +02:00
Matt-Yorkley
fc9f61ecf8 Revert PR #4204
Temporarily reverting these changes for a quick release
2019-09-05 13:23:59 +01:00
Matt-Yorkley
6d283ac839 Lower integrity checker job interval from hourly to daily 2019-09-05 12:54:37 +01:00
Luis Ramos
725807f66d Merge pull request #4155 from coopdevs/fix-styling-in-stripe-tests
Fix Rubocop violations in Stripe connect tests
2019-09-03 15:58:34 +01:00
Pau Pérez Fabregat
149df6569c Merge pull request #4212 from openfoodfoundation/dependabot/bundler/webmock-3.7.1
Bump webmock from 3.6.2 to 3.7.1
2019-09-03 11:16:01 +02:00
Pau Pérez Fabregat
7daa7032aa Merge pull request #4215 from openfoodfoundation/transifex
Transifex
2019-09-03 11:11:51 +02:00
Pau Pérez Fabregat
8b7119beea Merge pull request #4200 from openfoodfoundation/dependabot/bundler/bugsnag-6.12.0
Bump bugsnag from 6.11.1 to 6.12.0
2019-09-03 11:02:51 +02:00
Transifex-Openfoodnetwork
201e87bf12 Updating translations for config/locales/en_US.yml 2019-09-03 12:29:10 +10:00
Transifex-Openfoodnetwork
0fffd6b4e3 Updating translations for config/locales/en_US.yml 2019-09-03 12:26:02 +10:00
Matt-Yorkley
c516d40d4a Update all locales with the latest Transifex translations 2019-09-02 22:24:53 +01:00
Luis Ramos
07d4528276 Merge pull request #4174 from openfoodfoundation/dependabot/bundler/delayed_job_active_record-4.1.4
Bump delayed_job_active_record from 4.1.3 to 4.1.4
2019-09-02 22:24:04 +01:00
Luis Ramos
4ace780431 Merge pull request #4187 from openfoodfoundation/dependabot/bundler/knapsack-1.18.0
Bump knapsack from 1.17.2 to 1.18.0
2019-09-02 22:23:15 +01:00
dependabot-preview[bot]
b69c3fd826 Bump webmock from 3.6.2 to 3.7.1
Bumps [webmock](https://github.com/bblimke/webmock) from 3.6.2 to 3.7.1.
- [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/v3.6.2...v3.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-02 19:23:28 +00:00
dependabot-preview[bot]
51df8de64f Bump knapsack from 1.17.2 to 1.18.0
Bumps [knapsack](https://github.com/ArturT/knapsack) from 1.17.2 to 1.18.0.
- [Release notes](https://github.com/ArturT/knapsack/releases)
- [Changelog](https://github.com/ArturT/knapsack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ArturT/knapsack/compare/v1.17.2...v1.18.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-02 16:16:32 +00:00
Matt-Yorkley
d4a5829858 Merge pull request #4081 from Matt-Yorkley/products_pagination
Bulk Edit Products pagination
2019-09-02 17:14:14 +01:00
Matt-Yorkley
ff5fe66994 Fix route after big API refactor merge resolution 2019-09-02 16:29:03 +01:00
Matt-Yorkley
37e50a68e4 Fix timezone date parsing from Angular form fields 2019-09-02 16:29:00 +01:00
Matt-Yorkley
a72c662b97 Update per_page dropdown UX 2019-09-02 14:35:00 +01:00
Matt-Yorkley
ff2db0c5f8 Update spec routes, namespacing, and test content
Resolving new issues after a big merge
2019-09-02 14:35:00 +01:00
Matt-Yorkley
e9c60a33b9 Hide search in dropdown for per_page options 2019-09-02 14:35:00 +01:00
Matt-Yorkley
8e059d3c69 Define a limit on paginated queries with no supplied value for per_page 2019-09-02 14:35:00 +01:00
Matt-Yorkley
806ba94a2e Clarify dependency on kaminari gem 2019-09-02 14:35:00 +01:00
Matt-Yorkley
4bec583bff Refactor import_date_scope 2019-09-02 14:35:00 +01:00
Matt-Yorkley
90256f9c28 Add defaults and pages tests 2019-09-02 14:35:00 +01:00
Matt-Yorkley
eb284c1742 Use constants for defaults 2019-09-02 14:35:00 +01:00
Matt-Yorkley
b614e17f48 Add test coverage for #bulk_products endpoint and test all filtering functions 2019-09-02 14:34:54 +01:00
Pau Perez
1a450733a3 Use ApiHelper to DRY calls to JSON.parse in spec 2019-09-02 15:32:56 +02:00
Pau Perez
ffde7a38df Add spacing to increase readability 2019-09-02 15:32:56 +02:00
Pau Perez
8b4b0621db Fix Rubocop violations in Stripe connect tests 2019-09-02 15:32:56 +02:00
Matt-Yorkley
5259eaae5f Merge pull request #4204 from Matt-Yorkley/cartastrophe
Cartastrophe averted :)
2019-09-02 12:26:08 +01:00
Matt-Yorkley
b0ad0fccfa Add some defaults to avoid returning zero values when not supplied in query 2019-09-02 12:00:32 +01:00
Matt-Yorkley
2a83ad8689 Improve UX and consistency in orders pagination and page changing 2019-09-02 11:59:13 +01:00
Matt-Yorkley
c127110192 Make import_date query modification conditional 2019-09-02 11:59:13 +01:00
Matt-Yorkley
0470725112 Refactor pagination data hash 2019-09-02 11:57:32 +01:00
Matt-Yorkley
0623bab084 Don't respond to a successful update by querying 500 arbitrary products 2019-09-02 11:56:00 +01:00
Matt-Yorkley
4a0df684c7 Adjust specs 2019-09-02 11:56:00 +01:00
Matt-Yorkley
7dccb5ba90 Changing per_page should also reset the query 2019-09-02 11:56:00 +01:00
Matt-Yorkley
5a4be24df0 Add "filter results" button 2019-09-02 11:56:00 +01:00
Matt-Yorkley
5cb5967977 Fix cleared filters submitting "0" as value in queries 2019-09-02 11:56:00 +01:00
Matt-Yorkley
aeb8d30dae Fix server-side import_date filtering 2019-09-02 11:56:00 +01:00
Matt-Yorkley
1822fd97a6 Tidy up filters 2019-09-02 11:54:28 +01:00
Matt-Yorkley
4ff3e9fe10 Update Angular loading conditionals 2019-09-02 11:54:28 +01:00
Matt-Yorkley
a63994440d Add pagination to UI 2019-09-02 11:54:28 +01:00
Matt-Yorkley
f6d0de1454 Improve pagination data in bulk products 2019-09-02 11:54:28 +01:00
Matt-Yorkley
9b0e27a9d1 Add new ProductResource 2019-09-02 11:46:42 +01:00
Matt-Yorkley
415d88f302 Fix indentation in bulk product controller 2019-09-02 11:46:42 +01:00
Pau Pérez Fabregat
f9c98ea9a1 Merge pull request #4199 from openfoodfoundation/transifex
Transifex
2019-09-02 12:33:12 +02:00
Pau Pérez Fabregat
369a5a8a2f Merge pull request #4101 from luisramos0/remove_variants_rabl
Convert spree/api/products and spree/api/variants views from rabl to AMS
2019-09-02 12:14:26 +02:00
Matt-Yorkley
62341c6381 Unit test access to associated objects after soft-delete 2019-08-31 10:06:47 +01:00
Luis Ramos
fa1becb791 Merge pull request #4063 from luisramos0/dead_code
Remove dead code under views/spree/shared
2019-08-30 22:39:01 +01:00
Matt-Yorkley
50a1704994 Make prices soft-deletable 2019-08-30 20:11:32 +01:00
Matt-Yorkley
302538c370 Add failing spec for cart issue 2019-08-30 15:32:45 +01:00
Maikel
0f80b6ce12 Merge pull request #4197 from kristinalim/fix/4195-fix_invalid_date_in_firefox
4195 Specify API date format when converting date to string in JS
2019-08-30 08:36:17 +10:00
dependabot-preview[bot]
69fb8b2afe Bump bugsnag from 6.11.1 to 6.12.0
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby) from 6.11.1 to 6.12.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases)
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.11.1...v6.12.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-29 19:17:20 +00:00
Transifex-Openfoodnetwork
1df8fc903e Updating translations for config/locales/en_ZA.yml 2019-08-30 04:22:54 +10:00
Transifex-Openfoodnetwork
9a2dcb89af Updating translations for config/locales/en_ZA.yml 2019-08-30 04:22:46 +10:00
Transifex-Openfoodnetwork
1661591f6c Updating translations for config/locales/ca.yml 2019-08-29 23:12:46 +10:00
Transifex-Openfoodnetwork
6dde720039 Updating translations for config/locales/es.yml 2019-08-29 23:10:30 +10:00
Transifex-Openfoodnetwork
a54b725d6d Updating translations for config/locales/ca.yml 2019-08-29 23:09:39 +10:00
Luis Ramos
265e76e8ca Merge pull request #4074 from HugsDaniel/defacepocalypse
[Defacepocalypse] De-deface product properties index
2019-08-28 22:18:18 +01:00
luisramos0
192bff4fed Move taxons and taxonomies api routes to api out of spree routes 2019-08-28 22:06:56 +01:00
luisramos0
92a270165e Add missing api taxonomies controller only for the required jstree action 2019-08-28 22:06:56 +01:00
luisramos0
9f5c9916ba Add back required api actions (create, update and destroy) and add AMS serializers for the jstree action 2019-08-28 22:06:56 +01:00
luisramos0
d08de4bdf9 Add extra fields to taxon serializer to be used in the api 2019-08-28 22:06:56 +01:00
luisramos0
45bdb85bf3 Add missing method and skip_authorization_check to taxons controller 2019-08-28 22:06:56 +01:00
luisramos0
ece0652ca3 Adapt spree/admin/shared/_routes.html.erb to new location of the api/taxons routes 2019-08-28 22:06:56 +01:00
luisramos0
7a652fd67b Adapt api/taxons controller to new namespace outside Spree: remove Spree module and add Spree namespace to Taxons and Taxonomy classes 2019-08-28 22:06:56 +01:00
luisramos0
4ca8feeef1 Move api/taxons route and controller out of spree namespace into /api and move the ctrl spec as well 2019-08-28 22:06:56 +01:00
luisramos0
367932a767 Make spree/api/taxons_controller use AMS serializer instead of rabl 2019-08-28 22:06:56 +01:00
luisramos0
e591658f48 Keep only used api/taxons index action, delete all others as not required right now 2019-08-28 22:06:56 +01:00
Kristina Lim
1516069888 Specify API date format when converting date to string in JS 2019-08-29 02:44:14 +08:00
Luis Ramos
cd263b761c Merge pull request #4055 from luisramos0/remove_spree_api
Remove dependency to spree_api - step 1 - controllers and routes
2019-08-28 15:34:08 +01:00
Maikel
c952ad16ad Merge pull request #4163 from luisramos0/swagger
Add swagger.yaml to codebase
2019-08-28 14:46:51 +10:00
Maikel
ca09c58f26 Merge pull request #3985 from jonleighton/string-to-text
Convert several fields from string to text
2019-08-28 11:53:49 +10:00
Maikel Linke
e876a25d59 Fix flaky proxy order spec 2019-08-28 10:48:57 +10:00
Maikel Linke
2a780151be Update all locales with the latest Transifex translations 2019-08-28 09:54:31 +10:00
Maikel
9d2009d2af Merge pull request #4188 from openfoodfoundation/transifex
Transifex
2019-08-28 09:43:02 +10:00
Maikel
f887533dda Merge pull request #4157 from mkllnk/4138-update-products
4138 Avoid infinite loop when updating products
2019-08-28 09:42:28 +10:00
Transifex-Openfoodnetwork
bef3f154d6 Updating translations for config/locales/fr_CA.yml 2019-08-28 09:12:59 +10:00
Transifex-Openfoodnetwork
6fb775d5ed Updating translations for config/locales/en_CA.yml 2019-08-28 09:05:39 +10:00
Transifex-Openfoodnetwork
b5a8563725 Updating translations for config/locales/en_GB.yml 2019-08-27 23:28:34 +10:00
Transifex-Openfoodnetwork
1a9ade6de9 Updating translations for config/locales/en_GB.yml 2019-08-27 23:25:26 +10:00
Maikel Linke
48df853ff5 Skip cascading callbacks when touching distributors 2019-08-27 10:44:19 +10:00
Maikel Linke
2137a2addb Add spec for current bug
https://github.com/openfoodfoundation/openfoodnetwork/issues/4138
2019-08-27 10:44:19 +10:00
Transifex-Openfoodnetwork
e6a7239716 Updating translations for config/locales/en_AU.yml 2019-08-27 10:09:05 +10:00
Transifex-Openfoodnetwork
25bed92f2e Updating translations for config/locales/en_AU.yml 2019-08-27 10:08:32 +10:00
Maikel
909cd407dd Merge pull request #4149 from openfoodfoundation/transifex
Transifex
2019-08-27 09:58:31 +10:00
Luis Ramos
f2d25748b1 Merge pull request #4078 from HugsDaniel/defacepocalypse-variants
[Defacepocalypse] De-deface variants
2019-08-25 22:51:15 +01:00
Luis Ramos
6396e6e970 Merge pull request #4152 from openfoodfoundation/dependabot/bundler/stripe-4.24.0
Bump stripe from 4.19.0 to 4.24.0
2019-08-25 22:49:47 +01:00
Luis Ramos
e52f813dae Merge pull request #4159 from luisramos0/fix_prod_set
Add bugsnag notifications to both product_set and products_controller when stock update fails
2019-08-25 22:49:06 +01:00
Luis Ramos
9ab2eec30c Merge pull request #4185 from kristinalim/fix/4176-fix_saving_of_shipping_method
4176 Fix saving of shipping method when automatically advancing subscription order state
2019-08-25 22:48:39 +01:00
Luis Ramos
f96b37dae3 Merge pull request #4162 from luisramos0/checkout_cache
Checkout is not refreshing products cache
2019-08-25 21:52:55 +01:00
Kristina Lim
5b68b2f707 Fix ship method when advancing subscription order 2019-08-22 21:32:41 +08:00
Kristina Lim
ff634bd870 Test ship method when advancing subscription order 2019-08-22 21:30:21 +08:00
Hugo Daniel
7d21d88dc9 Force hide the select2 close cross 2019-08-22 10:32:07 +02:00
dependabot-preview[bot]
31b62d6296 Bump delayed_job_active_record from 4.1.3 to 4.1.4
Bumps [delayed_job_active_record](https://github.com/collectiveidea/delayed_job_active_record) from 4.1.3 to 4.1.4.
- [Release notes](https://github.com/collectiveidea/delayed_job_active_record/releases)
- [Commits](https://github.com/collectiveidea/delayed_job_active_record/compare/v4.1.3...v4.1.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-20 19:14:59 +00:00
Transifex-Openfoodnetwork
5e68604f11 Updating translations for config/locales/nb.yml 2019-08-20 17:42:09 +10:00
Transifex-Openfoodnetwork
c4edd3a683 Updating translations for config/locales/fr.yml 2019-08-20 17:41:25 +10:00
Transifex-Openfoodnetwork
574781e901 Updating translations for config/locales/nb.yml 2019-08-20 17:39:01 +10:00
Transifex-Openfoodnetwork
8ea4f933da Updating translations for config/locales/fr.yml 2019-08-20 17:38:12 +10:00
Transifex-Openfoodnetwork
1e9820f291 Updating translations for config/locales/fr.yml 2019-08-20 17:35:05 +10:00
Luis Ramos
34ed86cf2d Merge pull request #4132 from Matt-Yorkley/import_launch
Product Import beta
2019-08-19 17:17:16 +01:00
luisramos0
8a4e5b445f Delete unused frontend auth toekn script override and move the backend one to the head partial 2019-08-18 21:53:56 +01:00
luisramos0
2394eda2ac Remove unused sidebar override 2019-08-18 21:47:21 +01:00
luisramos0
f97a3a030a Remove unused nav_bar sessions route and override 2019-08-18 21:44:22 +01:00
luisramos0
ec645f8fa8 Remove unused login override of nav_bar 2019-08-18 21:43:18 +01:00
luisramos0
56a54db602 Remove admin login_nav override and move it to admin layout file 2019-08-18 21:39:19 +01:00
luisramos0
4c3d15b42b Remove users menu entry override and file and add it directly to the tabs view together with all the other entries 2019-08-18 21:36:50 +01:00
luisramos0
5f4429646d Move override to the view that is now in our code base (from spree_auth_devise originally) 2019-08-18 21:33:23 +01:00
luisramos0
f37db456f8 Delete dead overrides of spree frontend code 2019-08-18 21:32:53 +01:00
Kevin Christianson
2dfcedad56 Add swagger.yaml 2019-08-18 18:26:44 +01:00
Kristina Lim
706168f2f0 Refresh variant cache when changing stock movements 2019-08-18 16:22:12 +08:00
Kristina Lim
3ecb5c0c75 Flush background jobs in failing spec 2019-08-18 18:16:28 +10:00
luisramos0
249a3c4e18 Make product set raise error and inform the user something went wrong and keep bugsnag notification so we can get more information about what's going on 2019-08-17 19:19:46 +01:00
luisramos0
2b8ebba233 Fix some rubocop issues in product_set and admin/products_controller 2019-08-17 19:15:32 +01:00
luisramos0
758394464b Add bugsnag notification to products_controller create and update when on_hand or on_demand update fails with exception 2019-08-17 19:15:32 +01:00
luisramos0
d3c624ae10 Add bugsnag notification to product_set create_variant when on_hand or on_demand update fails with exception 2019-08-17 19:15:31 +01:00
luisramos0
163c65849e Make product set a bit more robust by not failing to update on_hand when variant is not valid. This will make the overall set update work 2019-08-17 19:14:25 +01:00
luisramos0
99ff714913 Enable cache on checkout spec to test cache after checkout 2019-08-16 20:17:14 +01:00
luisramos0
c2f302450f Add spec to checkout to validate product is removed from shopfront just after all available quantity is checked out 2019-08-16 19:35:57 +01:00
luisramos0
9186bcd455 Dry out some code in checkout_spec 2019-08-16 19:35:08 +01:00
Transifex-Openfoodnetwork
3d074b530f Updating translations for config/locales/nb.yml 2019-08-15 19:16:43 +10:00
Transifex-Openfoodnetwork
20783db373 Updating translations for config/locales/en_GB.yml 2019-08-15 19:14:53 +10:00
Luis Ramos
d5b37a5171 Merge pull request #4079 from HugsDaniel/defacepocalypse-payments
[Defacepocalypse] De-deface payments
2019-08-14 19:30:33 +01:00
luisramos0
b9ddb39edc Re-add taxons jstree action to make taxonomies config page work again 2019-08-14 16:31:34 +01:00
Luis Ramos
3efe2f878d Merge pull request #4156 from coopdevs/fix-styling-in-paypal-tests
Fix Rubocop violations in PayPal tests
2019-08-14 15:59:14 +01:00
Luis Ramos
064fee79b3 Merge pull request #4151 from Matt-Yorkley/datadog_apm
Enable (optional) APM with Datadog
2019-08-14 15:58:48 +01:00
Luis Ramos
d13f182801 Merge pull request #4154 from Matt-Yorkley/fix_deployments2
Adjust user creation syntax
2019-08-14 15:56:32 +01:00
Luis Ramos
ee34935223 Fix a typo in docker.md 2019-08-14 13:55:58 +01:00
Pau Perez
0b7ce0d6db Fix Rubocop violations in PayPal tests 2019-08-14 13:33:53 +02:00
Matt-Yorkley
9dd02044a5 Fix "can't modify frozen string" error in validation callbacks 2019-08-14 10:24:30 +01:00
Matt-Yorkley
d8a7190f43 Adjust user creation syntax
#skip_confirmation! can't be chained...
2019-08-14 09:22:11 +01:00
Matt-Yorkley
e5e0fcc887 Enable DelayedJob APM 2019-08-14 08:20:47 +01:00
Pau Pérez Fabregat
53496ff9eb Merge branch 'master' into transifex 2019-08-14 09:08:40 +02:00
Pau Pérez Fabregat
6635a89af7 Merge pull request #4153 from Matt-Yorkley/fix_deployments
Fix deployments
2019-08-14 08:59:23 +02:00
Transifex-Openfoodnetwork
c1248857b8 Updating translations for config/locales/en_CA.yml 2019-08-14 09:15:20 +10:00
Matt-Yorkley
8c95399292 Don't prompt if admin user already exists 2019-08-13 21:02:12 +01:00
Matt-Yorkley
14c1abb861 Skip confirmation email on initial admin user creation 2019-08-13 21:00:30 +01:00
dependabot-preview[bot]
e2d61f5e89 Bump stripe from 4.19.0 to 4.24.0
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 4.19.0 to 4.24.0.
- [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/v4.19.0...v4.24.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-13 19:18:17 +00:00
Transifex-Openfoodnetwork
5a1ef04c67 Updating translations for config/locales/en_ZA.yml 2019-08-14 04:57:27 +10:00
Transifex-Openfoodnetwork
e9e73ef0e4 Updating translations for config/locales/en_ZA.yml 2019-08-14 04:43:50 +10:00
Matt-Yorkley
be844253eb Enable (optional) Rails APM with Datadog 2019-08-13 18:57:49 +01:00
Transifex-Openfoodnetwork
001e3688da Updating translations for config/locales/en_GB.yml 2019-08-14 03:28:13 +10:00
luisramos0
b4ffd4dcc2 Update all locales with the latest Transifex translations 2019-08-13 18:25:23 +01:00
Transifex-Openfoodnetwork
e5a9606449 Updating translations for config/locales/en_GB.yml 2019-08-14 03:25:02 +10:00
Pau Pérez Fabregat
9eabbb8dab Merge pull request #4140 from openfoodfoundation/transifex
Transifex
2019-08-13 12:00:48 +02:00
Hugo Daniel
1217811402 Refactor and remove empty lines 2019-08-13 11:03:04 +02:00
Pau Pérez Fabregat
d4f2fcb98a Merge pull request #4126 from Matt-Yorkley/cart_dropdown
Cart dropdown now closes when clicking outside it.
2019-08-13 10:57:56 +02:00
Matt-Yorkley
0b2417849c Merge pull request #4142 from mkllnk/seed-user
Seed user
2019-08-13 08:42:07 +01:00
Matt-Yorkley
3e8369c8f5 Merge pull request #4123 from Matt-Yorkley/navigation-css
Navigation css
2019-08-13 08:41:47 +01:00
Maikel Linke
cbaedcec92 Fix seeding of default user without asking 2019-08-13 09:47:54 +10:00
Hugo Daniel
bf2c1a0c1d Add ng directive for setting on demand 2019-08-09 14:42:39 +02:00
Matt-Yorkley
0284eebf35 Fix cart dropdown positioning 2019-08-09 11:50:33 +01:00
Maikel Linke
e4ba515109 Seed admin user without asking by default 2019-08-09 14:16:01 +10:00
Maikel Linke
af1f6f6c6d Skip confirmation when creating first admin user 2019-08-09 14:16:01 +10:00
Maikel Linke
b0e8ee42c1 Restore spree_auth_devise user seeding 2019-08-09 13:48:50 +10:00
Maikel
86aeb6a3c7 Merge pull request #4135 from coopdevs/remove-bugherd-tests
Remove bugherd specs
2019-08-09 12:53:23 +10:00
Matt-Yorkley
5d83414e9b Disable rubocop for spree tabs helper 2019-08-08 20:09:35 +01:00
Transifex-Openfoodnetwork
9820d7de38 Updating translations for config/locales/ca.yml 2019-08-09 02:36:02 +10:00
Pau Pérez Fabregat
910eca810a Merge pull request #4124 from Matt-Yorkley/order_email
Add SKU to order confirmation email
2019-08-08 18:35:20 +02:00
Transifex-Openfoodnetwork
6feaddf747 Updating translations for config/locales/es.yml 2019-08-09 02:33:35 +10:00
Transifex-Openfoodnetwork
10f6fb91f6 Updating translations for config/locales/ca.yml 2019-08-09 02:32:54 +10:00
Pau Pérez Fabregat
c7bd4b94b8 Merge pull request #4137 from openfoodfoundation/transifex
Transifex
2019-08-08 18:31:47 +02:00
Transifex-Openfoodnetwork
dd223a21f2 Updating translations for config/locales/nb.yml 2019-08-08 20:58:24 +10:00
Transifex-Openfoodnetwork
549366ff15 Updating translations for config/locales/fr.yml 2019-08-08 20:52:28 +10:00
Transifex-Openfoodnetwork
e92f60fb1c Updating translations for config/locales/fr.yml 2019-08-08 20:49:20 +10:00
Pau Pérez Fabregat
92b05c76a3 Merge pull request #4068 from luisramos0/replace_oc_rabl
Convert order_cycle.rabl to Api::OrderCycleSerializer
2019-08-08 12:23:09 +02:00
Hugo Daniel
fa6fa0be64 Add missing translation 2019-08-08 11:11:32 +02:00
Kristina Lim
752efac7cf Merge pull request #4051 from luisramos0/subs_unpause
Sync subscription (create/update orders) when subscription is unpaused
2019-08-08 01:09:09 +08:00
Pau Perez
2b1f1f748b Remove bugherd specs
I don't think these are worth the time it takes to execute them every
time but most importantly I believe we are not using Bugherd anymore.
2019-08-07 16:49:32 +02:00
Pau Pérez Fabregat
798cd9e778 Merge pull request #4114 from kristinalim/fix/4103-add_specs
4103 Add specs for referencing of shipments to deleted variants
2019-08-07 12:52:11 +02:00
Matt-Yorkley
2f5b0a5afb Remove product import FeatureFlag 2019-08-07 09:59:55 +01:00
Maikel
de2d4a5870 Merge pull request #4125 from Matt-Yorkley/variant_overrides
Variant overrides with on_demand
2019-08-07 10:25:32 +10:00
Matt-Yorkley
b3728568a8 Enable product import for non-superadmin users
This class_eval hack for premissions on the #tab method was really hard to find, and is obviously quite ugly, but refactoring it is maybe outside of the scope here...
2019-08-06 18:59:12 +01:00
Matt-Yorkley
6ba98b4b2c Add beta notice to Product Import 2019-08-06 17:02:38 +01:00
Matt-Yorkley
d3d6921a0f Use light grey colour with transparency. 2019-08-06 08:23:38 +01:00
Maikel
68393f1444 Merge pull request #4037 from luisramos0/subs_stock
Subscriptions - When editing subscriptions, check stock levels when changing orders in current OC
2019-08-06 15:16:00 +10:00
Maikel
229e6fa0a3 Merge pull request #4073 from luisramos0/kill_more_rabl
Replace update_prod_image.rabl with ImageSerializer in api/product_image_controller
2019-08-06 15:00:33 +10:00
Matt-Yorkley
8a069787d1 Cart dropdown now closes when clicking outside it. 2019-08-05 21:48:37 +01:00
Matt-Yorkley
29ed38a6cc Add unit tests for overriding #move 2019-08-05 17:01:56 +01:00
Matt-Yorkley
4c7d3a491a Don't decrement variant stock if override is on_demand 2019-08-05 17:01:56 +01:00
Matt-Yorkley
b0f90cf43c Add test for variant override with :on_demand 2019-08-05 17:01:54 +01:00
Pau Pérez Fabregat
02ec0634b3 Merge pull request #4120 from openfoodfoundation/dependabot/bundler/webmock-3.6.2
Bump webmock from 3.6.0 to 3.6.2
2019-08-05 15:13:31 +02:00
Pau Pérez Fabregat
64d21969f0 Merge pull request #4064 from luisramos0/convert_search_Rabl
Replace views/admin/variants/search.rabl with Api::Admin::VariantSerializer
2019-08-05 15:07:10 +02:00
Pau Pérez Fabregat
0995adeb59 Merge pull request #4085 from openfoodfoundation/dependabot/bundler/devise-encryptable-0.2.0
Bump devise-encryptable from 0.1.2 to 0.2.0
2019-08-05 15:01:46 +02:00
Pau Pérez Fabregat
073a3fe2b4 Merge pull request #4119 from openfoodfoundation/transifex
Transifex
2019-08-05 13:18:12 +02:00
Matt-Yorkley
c07df6a5a6 Fix table column alignments 2019-08-04 20:45:00 +01:00
Matt-Yorkley
a7d109833d Add SKU to order confirmation email 2019-08-04 20:43:55 +01:00
Matt-Yorkley
0364a14073 Add navigation bottom border on mobile view 2019-08-04 16:56:43 +01:00
Matt-Yorkley
ddc8d33356 Update border colour on navigation bar 2019-08-04 16:56:03 +01:00
luisramos0
006c6e6b7b Add comment to explain method in weight calculator 2019-08-02 21:02:33 +01:00
luisramos0
41aa4ff479 Improve code readability and fix rubocop complexity issue in weight calculator 2019-08-02 20:54:41 +01:00
luisramos0
0e8f167ab9 Fix spec in weight calculator tests 2019-08-02 20:44:11 +01:00
Kristina Lim
cd81dfaead Move deleted variant to let block in feature spec 2019-08-02 21:52:36 +08:00
Kristina Lim
25073ada84 Move order to a let block in feature spec 2019-08-02 21:52:33 +08:00
Kristina Lim
15b6f9dd5e Add specs testing edit order page still okay when variant deleted
Note that the wrapping example group also loads the edit order page
before this "before" block. This will be fixed in the next commit.
2019-08-02 21:45:39 +08:00
Kristina Lim
0377e02dc1 Add specs testing that shipments see deleted variants 2019-08-02 21:45:38 +08:00
dependabot-preview[bot]
f679708a4e Bump webmock from 3.6.0 to 3.6.2
Bumps [webmock](https://github.com/bblimke/webmock) from 3.6.0 to 3.6.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/v3.6.0...v3.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-01 19:15:26 +00:00
Transifex-Openfoodnetwork
0f748a3333 Updating translations for config/locales/en_GB.yml 2019-08-02 04:32:50 +10:00
Transifex-Openfoodnetwork
bdedaa06d8 Updating translations for config/locales/en_GB.yml 2019-08-02 04:29:40 +10:00
Pau Pérez Fabregat
6a41d9be87 Merge pull request #4092 from coopdevs/remove-admin-products-N+1
Remove N+1 while fetching distributors of OCs
2019-08-01 19:50:49 +02:00
luisramos0
4aa6c673ff Adapt api products and variants controllers to new namespace outside of Spree 2019-08-01 18:34:19 +01:00
luisramos0
aa3c1aa0fe Remove Spree module declaration from these files as they were moved out of the spree namespace 2019-08-01 14:30:11 +01:00
luisramos0
31bac9641f Move api products and variants routes and ctrl out of spree namespace 2019-08-01 14:28:55 +01:00
Pau Perez
3616a27566 Update all locales with the latest Transifex translations 2019-08-01 15:07:09 +02:00
Hugo Daniel
60bdde6349 Convert variants/new from erb to haml and import new.js.erb 2019-08-01 11:23:44 +02:00
Hugo Daniel
5faf33fabe Import variants/new.html.erb from spree_backend 2019-08-01 10:50:13 +02:00
Hugo Daniel
f3b1a5dd35 Convert variants/edit from erb to haml 2019-08-01 10:45:04 +02:00
Matt-Yorkley
5ae61017f5 Merge pull request #4091 from Matt-Yorkley/missing_css
Move CSS rule to SCSS and remove broken css file reference
2019-07-31 23:48:52 +01:00
Luis Ramos
61dffb8821 Merge pull request #4093 from openfoodfoundation/dependabot/bundler/redcarpet-3.5.0
Bump redcarpet from 3.4.0 to 3.5.0
2019-07-31 20:53:43 +01:00
Hugo Daniel
07ccbf7f98 Import variants/edit.html.erb from spree_backend 2019-07-31 16:55:47 +02:00
Luis Ramos
f9fabd088c Merge pull request #4075 from HugsDaniel/defacepocalypse-payment-methods
[Defacepocalypse] De-deface payment methods index
2019-07-31 15:49:48 +01:00
Hugo Daniel
a3af6617a9 Convert payments/show from erb to haml 2019-07-31 16:20:32 +02:00
Hugo Daniel
9f7fb654c8 Import payments/show.html.erb from spree_backend 2019-07-31 16:16:26 +02:00
Hugo Daniel
b4a6686eac Convert payments/_list from erb to haml 2019-07-31 16:15:38 +02:00
Hugo Daniel
ac13ff114c Import payments/_list.html.erb from spree_backend 2019-07-31 16:09:48 +02:00
Hugo Daniel
af9187947f Convert erb to haml 2019-07-31 16:02:48 +02:00
luisramos0
b7f7038934 Remove api/enterprises rabl template, it was only used as a member in the now removed rabl variants/products templates 2019-07-31 14:36:36 +01:00
Hugo Daniel
f0fdbf7cf4 Import payments/index from spree_backend 2019-07-31 14:33:38 +02:00
Hugo Daniel
74ab31c0e6 Import gateway.html.erb and convert to haml 2019-07-31 14:28:15 +02:00
luisramos0
6c054e6078 Add bulk_products and overridable to skip_authorization_check so these endpoints work with AMS 2019-07-31 12:18:27 +01:00
luisramos0
18974c68e1 Remove orphan price check from price model
This is a quick fix. This check is breaking product deletion in some situations and orphan Prices are not really a problem in the DB
2019-07-31 11:24:55 +01:00
luisramos0
78ab852141 Make spree/api/products_controller work with AMS 2019-07-31 11:23:43 +01:00
luisramos0
4497173213 Adapt spree/api/products_controller_spec to AMS serializer 2019-07-31 11:23:18 +01:00
luisramos0
4d74d246e8 Remove spree/api/products_controller index and new actions, not used 2019-07-31 10:32:45 +01:00
luisramos0
cc51537e93 Convert spree/api/products_controller from rabl to ams 2019-07-31 09:50:34 +01:00
luisramos0
07aececdcf Remove unused route api/products managed 2019-07-31 09:50:31 +01:00
luisramos0
c3fbf9cdf9 Remove unused pagination from index and respective specs, fix spec for search by sku by adding sku to the serializer and adapt a few specs to pass with AMS attrivbutes, 2019-07-31 09:40:19 +01:00
luisramos0
180598c603 Convert spree/api/variants_controller to AMS by changing base_controller, using render json instad of respond with, deleting rabl templates and adapting specs
Delete unused pagination spec
2019-07-31 09:40:19 +01:00
luisramos0
69a5527e24 Update/regenarate .rubocop_todo.yml 2019-07-31 09:36:48 +01:00
luisramos0
e4a6b3880f Fix some more simple rubocop issues 2019-07-31 09:36:48 +01:00
luisramos0
96ce4deb45 Transpec spec/support/api_helper.rb 2019-07-31 09:36:48 +01:00
luisramos0
a3c179bd3f Fix some more simple rubocop issues 2019-07-31 09:36:48 +01:00
luisramos0
a57504ba1f Bring api_helper.image from spree_api to support spree/api/products_controller_spec 2019-07-31 09:36:48 +01:00
luisramos0
25451eed6b Bring api spec helpers from spree_api into ofn/api_helper 2019-07-31 09:36:48 +01:00
luisramos0
50765563f8 Bring spree/api_helpers from spree_api 2019-07-31 09:35:46 +01:00
luisramos0
2ae75ce13e Add ControllerSetup from spree_api as it is used in spree/api/base_controller 2019-07-31 09:35:46 +01:00
luisramos0
18aa16650d Remove dependency to Spree::ApiConfiguration, overall requires_authentication? is true, exceptions will be endpoint specific 2019-07-31 09:35:46 +01:00
luisramos0
314ed50e0f Fix a rubocop issue in spree/api/products_controller 2019-07-31 09:34:20 +01:00
luisramos0
7346a49982 Move routes in ofn api namespace to separate routes file 2019-07-31 09:34:20 +01:00
luisramos0
5182286218 Add necessary spree api routes related to api keys for users and bring respective implementations from spree_api 2019-07-31 09:34:20 +01:00
luisramos0
a267848394 Remove unused api routes from views/spree/admin/shared/routes view 2019-07-31 09:32:33 +01:00
luisramos0
104bd31f9b Add necessary spree api routes: taxons, variants and shipments 2019-07-31 09:32:33 +01:00
luisramos0
8bc9985edb Transpec and fix rubocop issues in spree/api/variants_controller_spec 2019-07-31 09:32:33 +01:00
luisramos0
6dfc927730 Make spree/api/variant_controllers_spec pass 2019-07-31 09:32:33 +01:00
luisramos0
3771e26eba Bring tests from spree/api/variants_controller_spec from spree_api 2019-07-31 09:32:33 +01:00
luisramos0
fd21d35aee Transpec and fix rubocop issues in spree/api/shipments_controller_spec 2019-07-31 09:32:33 +01:00
luisramos0
1417b924d2 Bring and adapt tests from spree/api/shipments_controller_spec and mix them with exiting tests in OFN 2019-07-31 09:32:33 +01:00
luisramos0
2912c1b87d Transpec and fix rubocop issues in spree/api/product_controller_spec 2019-07-31 09:32:33 +01:00
luisramos0
e746a0db7d Bring tests from spree/api/products_controller_spec and add them to existing ones on the ofn side
Adapt these tests to have a green build
2019-07-31 09:32:33 +01:00
luisramos0
84a2886003 Improve auth code in spree/api/taxons_controller_spec 2019-07-31 09:32:33 +01:00
luisramos0
c668677b8a Bring spree/api/taxons_controller_spec from spree_api, adapt it, transpec it and fix rubocop issues 2019-07-31 09:32:33 +01:00
luisramos0
2490cbfccb Transpec and fix rubocop issues in spree/api/base_controller_spec 2019-07-31 09:32:33 +01:00
luisramos0
20a46a791c Bring and adapt spree/api/base_controller_spec from spree_api 2019-07-31 09:32:33 +01:00
luisramos0
0e4fe08ac4 Fix logical problem in spree/api/base_controller and in spree/checkout_controller
See this stack overflow post for more info: https://stackoverflow.com/questions/39629976/ruby-return-vs-and-return
2019-07-31 09:32:33 +01:00
luisramos0
cf0f716534 Fix easy rubocop issues in spree/api/taxons_controller 2019-07-31 09:32:33 +01:00
luisramos0
b70cfa5968 Bring spree/api/taxons controller from spree_api as it is needed in OFN admin 2019-07-31 09:32:33 +01:00
luisramos0
f77beb50ff Fix class scope in spree/api/products_controller, should not use Spree namespace here
Also, add missing dependency to spree/admin/products_controller_decorator
2019-07-31 09:32:33 +01:00
luisramos0
a941280982 Fix easy rubocop issues in spree/api/base_controller 2019-07-31 09:32:33 +01:00
luisramos0
9d40ee49e6 Bring spree/api/base_controller from spree_api 2019-07-31 09:32:33 +01:00
luisramos0
6abbdecb97 Fix the easy rubocop issues in the new spree api controllers 2019-07-31 09:32:33 +01:00
luisramos0
660ce92c27 Merge spree api controllers and its decorators 2019-07-31 09:32:33 +01:00
luisramos0
c5bcef6ae4 Delete unused spree/api/line_items_controller_decorator.rb 2019-07-31 09:32:33 +01:00
luisramos0
d26a0b6b73 Bring from spree_api the api controllers that are overriden in OFN so that we can merge the original and the override afterwards 2019-07-31 09:32:33 +01:00
luisramos0
9400516b56 Fix broken (was always green) bulk_product_update_spec updating image spec where the old src url was not stored and the expect command was wrong with != 2019-07-30 20:37:26 +01:00
luisramos0
6ebfb02d0e Update ImageSerializer with missing image size urls: mini/thumb_url, product/image_url that is used in the product image modal 2019-07-30 20:15:21 +01:00
Luis Ramos
75c7e0b939 Merge pull request #4089 from luisramos0/undeface-fix
Add doctype declaration in layouts/admin view
2019-07-30 19:29:17 +01:00
Luis Ramos
62eb2bba13 Merge pull request #4059 from luisramos0/kill_rabl
Convert 2 rabl templates to AMS and remove a few unused ones
2019-07-30 19:28:21 +01:00
Luis Ramos
3fa9e857a8 Merge pull request #4067 from luisramos0/oc_icon
Add icon to OC menu entry
2019-07-30 14:08:08 +01:00
luisramos0
11a77043eb Switch from Spree::Api::BaseController to Api::BaseController so that AMS is activated 2019-07-30 12:20:14 +01:00
luisramos0
58b43c7bc9 Remove update_product_image.v1.rabl and switch controller from respond_with to render json to switch from rabl to AMS 2019-07-30 12:19:42 +01:00
dependabot-preview[bot]
7da10db055 Bump redcarpet from 3.4.0 to 3.5.0
Bumps [redcarpet](https://github.com/vmg/redcarpet) from 3.4.0 to 3.5.0.
- [Release notes](https://github.com/vmg/redcarpet/releases)
- [Changelog](https://github.com/vmg/redcarpet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vmg/redcarpet/compare/v3.4.0...v3.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-29 19:16:07 +00:00
luisramos0
be41271038 Make spelling coherent, as we have serializers with Z we get rid of the few serialisers with S we have 2019-07-29 19:57:12 +01:00
luisramos0
04e13e1136 Change css styling from id to class to make rubocop happy. Keeping id name as it may be needed in spree autocomplete css or js code 2019-07-29 19:46:12 +01:00
luisramos0
8868b7eb12 Fix rubocop issue: use nested class/module definition 2019-07-29 19:05:39 +01:00
Pau Perez
c85d00fcb8 Remove N+1 while fetching distributors of OCs
What used to be done as

```sql
SELECT "order_cycles".* FROM "order_cycles"
WHERE (order_cycles.orders_open_at <= '2019-07-29 17:45:20.137294'
  AND order_cycles.orders_close_at >= '2019-07-29 17:45:20.137333')

SELECT DISTINCT "enterprises".* FROM "enterprises"
INNER JOIN "exchanges" ON "enterprises"."id" = "exchanges"."receiver_id"
WHERE "exchanges"."order_cycle_id" = 1
  AND "exchanges"."incoming" = 'f'
(...)
SELECT DISTINCT "enterprises".* FROM "enterprises"
INNER JOIN "exchanges" ON "enterprises"."id" = "exchanges"."receiver_id"
WHERE "exchanges"."order_cycle_id" = 4
  AND "exchanges"."incoming" = 'f'
```

it became

```sql
SELECT "order_cycles".* FROM "order_cycles"
WHERE (order_cycles.orders_open_at <= '2019-07-29 17:45:20.137294'
  AND order_cycles.orders_close_at >= '2019-07-29 17:45:20.137333')

SELECT "exchanges".* FROM "exchanges"
WHERE "exchanges"."incoming" = 'f'
  AND "exchanges"."order_cycle_id" IN (1, 2, 3, 4)

SELECT "enterprises".* FROM "enterprises"
WHERE "enterprises"."id" IN (3, 4, 5, 6)
```

I haven't got any perf numbers yet but each of the N+1 queries took as
long as the single `enterprises` query on my dev machine.

This should have a noticeable perf impact since the changed method
belongs to the `BaseController` seems to be executed in all HTML
requests as it gets called by

```ruby
before_filter :warn_invalid_order_cycles, if: :html_request?
```
2019-07-29 20:02:47 +02:00
luisramos0
2c6dab9c85 Add spec for Api::OrderCycleSerializer 2019-07-29 18:56:49 +01:00
Matt-Yorkley
7b2a146404 Move CSS rule to SCSS and remove broken css file reference 2019-07-29 18:16:36 +01:00
luisramos0
c45194473b Add spec to cover inject_current_order_cycle 2019-07-29 18:14:00 +01:00
luisramos0
3c0e6eeee2 Make inject_current_order_cycle render {} instad of null if current_order_cycle is null 2019-07-29 18:13:29 +01:00
luisramos0
ca5a5bf301 Convert oc.rabl to oc serializer and use it in both haml file and controller 2019-07-29 18:13:29 +01:00
luisramos0
ddf68444fb Move head scripts from admin layout to haed partial 2019-07-29 17:04:57 +01:00
luisramos0
4867649fc9 Remove dead code related to unused variable in spree: expand_variants 2019-07-29 17:04:57 +01:00
Pau Pérez Fabregat
35841066d1 Merge pull request #4086 from openfoodfoundation/transifex
Transifex
2019-07-29 17:33:19 +02:00
luisramos0
9bc81f236c Add doctype declaration as it is defined in spree layouts/admin so that html5 mode is enabled, otherwise html 4 mode is used by browsers and the observed layout problems happen 2019-07-29 13:46:35 +01:00
luisramos0
e26a54d897 Fix indentation problem in layouts/admin view
We move most entries inside wrapper as it should be and the last ones "admin_footer_scripts" and Spree.api_key inside the body tag as it should be
2019-07-29 13:33:11 +01:00
Transifex-Openfoodnetwork
ed1d637eb5 Updating translations for config/locales/es.yml 2019-07-29 19:06:20 +10:00
Transifex-Openfoodnetwork
831284c5c8 Updating translations for config/locales/es.yml 2019-07-29 19:03:13 +10:00
Transifex-Openfoodnetwork
e45b8f6981 Updating translations for config/locales/ca.yml 2019-07-29 19:02:24 +10:00
Transifex-Openfoodnetwork
d0f8f985fb Updating translations for config/locales/es.yml 2019-07-29 19:00:02 +10:00
Transifex-Openfoodnetwork
33eec61af8 Updating translations for config/locales/ca.yml 2019-07-29 18:59:14 +10:00
Transifex-Openfoodnetwork
00c324ae45 Updating translations for config/locales/fr.yml 2019-07-29 18:01:09 +10:00
Transifex-Openfoodnetwork
12a016d31d Updating translations for config/locales/fr.yml 2019-07-29 17:57:59 +10:00
dependabot-preview[bot]
8c7a7348f4 Bump devise-encryptable from 0.1.2 to 0.2.0
Bumps [devise-encryptable](https://github.com/plataformatec/devise-encryptable) from 0.1.2 to 0.2.0.
- [Release notes](https://github.com/plataformatec/devise-encryptable/releases)
- [Changelog](https://github.com/plataformatec/devise-encryptable/blob/master/Changelog.md)
- [Commits](https://github.com/plataformatec/devise-encryptable/compare/v0.1.2...v0.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-26 23:12:41 +00:00
Luis Ramos
af50bde088 Merge pull request #3786 from ja9-look/feature/sticky_header_on_scroll_mobile
sticky header for mobile
2019-07-26 11:22:33 +01:00
Luis Ramos
340b92e580 Merge pull request #3700 from luisramos0/2-0-without-auth-devise
Remove dependency to spree_auth_devise
2019-07-26 10:57:38 +01:00
luisramos0
f64653db14 Add icon to OC menu entry 2019-07-26 10:52:31 +01:00
Maikel
e6ef661f0d Merge pull request #4066 from luisramos0/reorg_spec_serializers
Organizing spec/serializers - put each file in the correct place
2019-07-26 16:23:23 +10:00
Hugo Daniel
3c2b6f4ed1 Remove data-hooks 2019-07-25 14:38:09 +02:00
Hugo Daniel
ec6f6056a8 Remove data-hooks 2019-07-25 14:34:06 +02:00
Hugo Daniel
6a621f47aa Remove data-hooks 2019-07-25 14:31:07 +02:00
Hugo Daniel
c464b21d76 Remove data-hooks 2019-07-25 14:27:53 +02:00
Hugo Daniel
c83d249147 Impor missing partials from spree to ofn and convert to haml 2019-07-25 14:23:24 +02:00
Kristina Lim
dae23d3c3b Remove unused inclusion of $window in OffcanvasCtrl 2019-07-25 20:22:51 +08:00
Hugo Daniel
aae5ae9f1e De-deface payments/new 2019-07-25 13:27:41 +02:00
Hugo Daniel
888e0e0bb4 Convert erb partials to haml 2019-07-25 13:22:55 +02:00
Hugo Daniel
a0b0fb05a6 Import payments/new from spree_backend to ofn 2019-07-25 13:22:32 +02:00
Hugo Daniel
a11562e4dd Fix incorrect indentation in variants table 2019-07-25 12:05:50 +02:00
Hugo Daniel
2d872c25bf Use Haml javascript tag to make autocomplete work 2019-07-25 11:20:51 +02:00
Hugo Daniel
986837d601 Import variants/_form.html.erb from spree_backend to ofn and de-deface it 2019-07-25 11:07:35 +02:00
Kristina Lim
def2693afc Move offcanvas JS to Angular controller 2019-07-25 17:01:46 +08:00
Luis Ramos
55f26f0a3d Merge pull request #4043 from luisramos0/bring_shipment
Bring spree/admin/orders/shipment and shipment_manifest partials from spree_backend and fix an authorization bug
2019-07-24 21:59:47 +01:00
Luis Ramos
7245d1eff4 Merge pull request #4049 from luisramos0/deface_admin_orders
De-deface admin orders adjustments page and customer details page
2019-07-24 21:59:08 +01:00
Hugo Daniel
353d6fbc5f Import variants/index from spree_backend to ofn and convert to Haml 2019-07-24 16:57:11 +02:00
Hugo Daniel
87ef0215b8 De-deface payment_methods/index 2019-07-24 14:49:29 +02:00
Hugo Daniel
4b6a02cb92 Convert payment_methods/index from ERB to Haml 2019-07-24 14:39:59 +02:00
Hugo Daniel
196a301133 Import payment_methods/index.html.erb from spree_backend to ofn 2019-07-24 14:38:20 +02:00
Hugo Daniel
0a88738faa Replace old ruby syntax with new 2019-07-24 14:37:00 +02:00
Hugo Daniel
4d6af57f79 De-deface product_properties/index 2019-07-24 13:17:45 +02:00
Hugo Daniel
110fd3ecdf Convert erb to haml 2019-07-24 13:12:58 +02:00
Hugo Daniel
1cb065f829 Import product_properties/index.html.erb from spree_backend to ofn 2019-07-24 13:09:04 +02:00
Hugo Daniel
1cfa499b0e De-deface _product_propery_fields 2019-07-24 13:01:50 +02:00
luisramos0
b9b8bc70dd Remove stock location name from shipment header in the order edit page 2019-07-24 11:50:17 +01:00
Hugo Daniel
3fc0d4a666 Convert _product_properties_fields from ERB to Haml 2019-07-24 12:40:24 +02:00
Hugo Daniel
de6c96d138 Import product_properties/_product_properties_fields.html.erb from Spree to OFN 2019-07-24 12:38:29 +02:00
Kristina Lim
d42da8737e Improve readability of selectors in page alert JS directive 2019-07-24 12:44:42 +08:00
Kristina Lim
6419edcb1f Integrate styles/animations for page alert, top bar, tab bar, off canvas 2019-07-24 12:44:42 +08:00
Kristina Lim
fca82375e8 Render home page alert as :page_alert outside main content 2019-07-24 12:44:42 +08:00
Kristina Lim
ca0f746cf1 Fix animation and layout for offcanvas menu
Uses strategy from this forum comment:
http://foundation.zurb.com/forum/posts/547#comment_8840
2019-07-24 12:43:44 +08:00
Kristina Lim
a93cf46f50 Fix syntax of existing animations for offcanvas 2019-07-24 12:37:42 +08:00
luisramos0
ffb8edef0b Fix rubocop css issues 2019-07-23 22:37:10 +01:00
luisramos0
74a030f6db Organizing spec/serializers - put each file in the correct place acccording to its namespace 2019-07-23 22:17:28 +01:00
luisramos0
7a8b5e89be Add specs to cover the most important new fields in api/admin/variant_serializer 2019-07-23 22:11:00 +01:00
luisramos0
90690cd238 Move api/admin/variant_serializer_spec to the correct folder under /spec 2019-07-23 22:03:40 +01:00
luisramos0
90c621ac07 Improve translations, css and add button aligment in subscriptions_line_items variant autocomplete 2019-07-23 21:38:29 +01:00
luisramos0
2d5eccbf97 Add :in_stock, :stock_location_id, :stock_location_name to admin variant serializer, these are needed for the variant_autocomplete js code from spree 2019-07-23 21:38:29 +01:00
luisramos0
7e6259da31 Replace admin/variants/search rabl template with existing admin variant serializer with a few added attributes
This commit fixes a bug as the image of the variatn was not being rendered, we need to fetch the image of the product, not the image of the variant.
2019-07-23 21:37:45 +01:00
Luis Ramos
1f75c7e5e4 Merge pull request #4047 from luisramos0/undeface
De-deface some admin configuration pages and the general admin layout and menu
2019-07-23 18:36:09 +01:00
luisramos0
11974689ef Remove dead code under views/spree/shared 2019-07-23 16:42:00 +01:00
Kristina Lim
e1fce8304d Update weight calculator and add specs 2019-07-23 23:24:00 +08:00
Kristina Lim
0d6ba90ea1 Round off fee from Calculator::Weight to nearest cent 2019-07-24 00:42:42 +10:00
luisramos0
a1e6e4c38f Fix rubocop issues 2019-07-23 14:35:24 +01:00
Luis Ramos
77fb73f802 Merge pull request #4065 from coopdevs/get-latest-spree-revision
Brings in the latest Spree fork's Git commit
2019-07-23 14:28:49 +01:00
Pau Perez
9f7376a5ae Brings in the latest Spree fork's Git commit
This successfully closes #3903 by bringing in the changes done in
https://github.com/openfoodfoundation/spree/pull/41.
2019-07-23 14:56:33 +02:00
luisramos0
5739a82c19 Remove unused admin variants search rabl template 2019-07-23 12:30:00 +01:00
Luis Ramos
eae373ef4b Merge pull request #4061 from openfoodfoundation/revert-3938-get-last-spree-fork-patch
Revert "Handle soft deleted variants in order edit"
2019-07-22 21:06:10 +01:00
Luis Ramos
465332d5f9 Revert "Handle soft deleted variants in order edit" 2019-07-22 21:05:41 +01:00
Luis Ramos
e98b89625f Merge pull request #3938 from openfoodfoundation/get-last-spree-fork-patch
Handle soft deleted variants in order edit
2019-07-22 21:05:12 +01:00
luisramos0
cf61254c9e Remove unnecesary rabl template 2019-07-22 18:42:20 +01:00
luisramos0
1d92d6cc33 Remove unused api endpoint order_cycles and also action enterprises/managed and respective views 2019-07-22 17:35:41 +01:00
luisramos0
6b32764c99 Remove unused taxon.rabl from views/json 2019-07-22 16:29:54 +01:00
Pau Perez
be4fbc4d23 Update Gemfile to get spree from a feature branch
This allows us to test
https://github.com/openfoodfoundation/spree/pull/41. If it passes
testing I will then revert it back to the `2-0-4-stable` branch but
updating the target commit in the Gemfile.lock.
2019-07-22 15:40:31 +02:00
luisramos0
ea72a10b9a Remove unused rabl files from views/json 2019-07-22 12:14:10 +01:00
luisramos0
9b567a6710 Remove injection_json that renders json partials, we only use ams serializers now, not rabl partials 2019-07-21 23:55:59 +01:00
luisramos0
a8ce31fa90 Replace views/json/_flash.rabl with an ams injector with serializer 2019-07-21 22:56:15 +01:00
luisramos0
4c964fea0d Replace views/json/_current_user.rabl with an ams injector with serializer 2019-07-21 22:48:36 +01:00
luisramos0
6d7c41c04b Bring db/default/users from spree_auth_devise, this is necessary to create the first user in the DB 2019-07-20 20:48:49 +01:00
Luis Ramos
a6a695660f Merge pull request #4002 from luisramos0/more_rails4
Adapting queries in permissions to Rails 4
2019-07-19 15:17:01 +01:00
Luis Ramos
0058ef5e04 Merge pull request #4048 from idanceinbetween/4034
Add grey line below nav bar, change logo img max height 44px
2019-07-19 12:13:14 +01:00
Luis Ramos
4831bae9cb Merge pull request #3953 from mkllnk/3727-first-credit-card-default
First stored credit card becomes default again
2019-07-19 12:12:09 +01:00
Luis Ramos
f7679780de Merge pull request #4032 from luisramos0/subs_oc_date_issue
3544 Add date format to moment date conversion
2019-07-18 19:52:49 +01:00
luisramos0
f2ac354e00 Make features/admin/orders_spec test a bit more reliable by expecting element to be there before using it 2019-07-18 14:29:38 +01:00
Maikel
88ffa46ce7 Merge pull request #4045 from openfoodfoundation/transifex
Transifex
2019-07-18 16:35:41 +10:00
Maikel
869431c68d Merge pull request #3926 from mkllnk/report-missing-payments
Add rake task to report lost payments
2019-07-18 15:01:14 +10:00
luisramos0
3d6fd10e59 Add warning about creation of orders when unpausing a subscription 2019-07-17 12:14:36 +01:00
luisramos0
81482683cf Extract method in subs controller 2019-07-17 12:08:51 +01:00
luisramos0
57f1742f24 Save subscription form on subs unpause so that proxy orders and orders are synced 2019-07-17 12:08:48 +01:00
Maikel
a1f8530489 Merge pull request #3962 from luisramos0/first_view_spec
First 2 view specs in OFN
2019-07-17 10:57:58 +10:00
luisramos0
a75a0da981 Remove unused deface in spree/admin/orders/show, this action doesnt exist in ofn v2 2019-07-16 21:12:48 +01:00
luisramos0
5744240f91 Move customer_details/_form defaces to the view 2019-07-16 21:12:09 +01:00
luisramos0
873c56a642 Move customer_details/edit/replace_customer_search deface to view 2019-07-16 21:09:48 +01:00
luisramos0
f53a75660f Convert spree/admin/orders/customer_details view from erb to haml 2019-07-16 21:05:19 +01:00
luisramos0
50dcbe0b57 Bring spree/admin/order/customer_details from spree_backend 2019-07-16 21:03:35 +01:00
luisramos0
f9861fee79 De-deface spree/admin/adjustments/_adjustments_table by moving deface content to the view 2019-07-16 21:01:08 +01:00
luisramos0
d8ae97f923 Move spree/admin/adjustments/_form/add_tax_rate deface to view 2019-07-16 20:53:24 +01:00
luisramos0
9f5db217fe Convert spree/admin/adjustments views from erb to haml 2019-07-16 20:51:55 +01:00
luisramos0
c1c5dcac09 Bring spree/admin/adjustments pages from spree_backend 2019-07-16 20:51:55 +01:00
luisramos0
6064f096a7 Fix a pre-existing problem in orders_tab by moving the links in to the li elements 2019-07-16 20:16:32 +01:00
luisramos0
a62fa755f5 Remove page_title_classes as it is breaking the rendering of the classes attribute and it is no longer used 2019-07-16 20:16:32 +01:00
luisramos0
fa25991f0f Fix problem in previous de-deface, move sections around in general settings page to keep order. No changes in code, just moving 2019-07-16 20:16:32 +01:00
luisramos0
6f2be1dfa6 Fix issue in layouts/admin view, make classes compute correctly 2019-07-16 20:16:32 +01:00
luisramos0
c81a9fd032 Fix error in js tag in head 2019-07-16 20:16:32 +01:00
luisramos0
665d0cc86b Fix error related to missing _hamlout method by replacing code with standard haml 2019-07-16 20:16:32 +01:00
luisramos0
a34d8a3f20 Revert "Move app_wrapper deface to spree/layouts/admin view"
This reverts commit bb18f6ecf3c1d0ecf7c010623215d161a6102f2b.
2019-07-16 20:16:32 +01:00
luisramos0
6e35701dd6 Remove unused add_enterprise_fees_to_admin_configurations_menu deface, this menu entry is already in the view 2019-07-16 20:16:32 +01:00
luisramos0
9991458d2a Remove spree/admin/shared/_order_details defaces, these are only used in admin/order/show which is a view that is not used in ofn anymore, only admin/order/edit is used 2019-07-16 20:16:32 +01:00
luisramos0
a843fd73b7 Remove admin/shared/_order_tabs/add_customer_name, this is already in the order tabs view 2019-07-16 20:16:32 +01:00
luisramos0
9765b1e908 Move admin/shared/_head/replace_spree_title deface to head view 2019-07-16 20:16:32 +01:00
luisramos0
5ccadc1f7d Convert spree/admin/shared/_head view from erb to haml 2019-07-16 20:16:32 +01:00
luisramos0
539805e2c2 Bring spree/admin/shared/head partial from spree_backend 2019-07-16 20:16:32 +01:00
luisramos0
fac64ef5bf Remove layouts/spree_application/inside_head deface, this view is in spree_frontend which is not used in ofn anymore 2019-07-16 20:16:32 +01:00
luisramos0
a17a0a62bc Move spree/layouts/bare_admin/add_login_nav deface to layout/bare_admin view 2019-07-16 20:16:32 +01:00
luisramos0
1e91de106f Move admin html head deface to layout admin view and remove repeated (in shared/head partial) content type tag 2019-07-16 20:16:32 +01:00
luisramos0
73252132a6 Move add_i18n_script deface to layout/admin view 2019-07-16 20:16:32 +01:00
luisramos0
e3c383c61c Convert spree/admin/shared/_tabs.html from erb to haml and move menu entries from layouts/admin to the tabs view 2019-07-16 20:16:32 +01:00
luisramos0
aafb134be7 Move spree/layouts/admin/ tabs deface to spree/layout/admin view 2019-07-16 20:16:32 +01:00
luisramos0
70a1996435 Move add_currency_config deface to spree/layout/admin view 2019-07-16 20:16:31 +01:00
luisramos0
1712cb2617 Move app_wrapper deface to spree/layouts/admin view
In admin layout, only adds a div after the body tag.
2019-07-16 20:16:31 +01:00
luisramos0
25df057d05 Move spree/layouts/admin/add_analytics deface to spree/layouts/admin view 2019-07-16 20:16:31 +01:00
luisramos0
24a9991162 Convert views/spree/layouts/admin.html from erb to haml 2019-07-16 20:16:31 +01:00
luisramos0
156ff2da89 Bring spree/layouts/admin from spree_backend to de-deface it 2019-07-16 20:16:31 +01:00
luisramos0
e36b4ed01a Move temp_controller_list deface to shipping_categories index view 2019-07-16 20:16:23 +01:00
idanceinbetween
41b775b173 Remove multiline 2019-07-16 20:10:18 +01:00
idanceinbetween
35570feba0 Comment out new changes 2019-07-16 20:04:50 +01:00
idanceinbetween
1d8cfe59a2 Change hex value to variable 2019-07-16 19:37:08 +01:00
idanceinbetween
abd3efe82a Replace lightgray to hex 2019-07-16 19:32:19 +01:00
idanceinbetween
389b53cb71 Add grey line below nav bar, change logo img max height 44px 2019-07-16 19:14:10 +01:00
luisramos0
4f60273198 Move temperature_controlled_form_element deface to shipping_categories form view 2019-07-16 14:50:16 +01:00
luisramos0
856fa8685a Convert spree/admin/shipping_categories views from erb to haml 2019-07-16 14:48:47 +01:00
luisramos0
9ac4c0ba30 Bring spree/admin/shipping categories from spree_backend so we can de-deface it 2019-07-16 14:46:26 +01:00
luisramos0
2709f237f5 Move image_format deface to image settings view 2019-07-16 14:44:38 +01:00
luisramos0
9db4edcd0d Convert spree/admin/image_settings/edit.html from erb to haml 2019-07-16 14:43:20 +01:00
luisramos0
22c9f33f4c Bring image_settings view from spree_backend 2019-07-16 14:39:14 +01:00
luisramos0
24ea2a4398 Move number_localization deface to general settings view 2019-07-16 14:28:47 +01:00
luisramos0
8178f5388c Move legal settings deface to general settings view 2019-07-16 14:27:32 +01:00
luisramos0
c0c5e9d7dd Move embedded_shopfronts deface to general settings view 2019-07-16 14:26:33 +01:00
luisramos0
19f8f5c6fa Convert general_settings/edit.html from erb to haml 2019-07-16 14:15:51 +01:00
luisramos0
83a306c31b Convert class attributes to . notation in haml 2019-07-16 14:09:48 +01:00
luisramos0
d6020cdb6f Bring general_settings/edit.html.erb from spree_backend to de-deface it 2019-07-16 13:57:35 +01:00
luisramos0
3b467dbae8 Adapt line_item_syncer to the case where item is not added to the completed order because of insufficient stock and the subscription quantity is updated for that item afterwards 2019-07-16 12:08:08 +01:00
Kristina Lim
77c78f35d3 Update all locales with the latest Transifex translations 2019-07-16 18:53:24 +08:00
luisramos0
306390440a Revert "Swith line_item_syncer.create_new_items from deleting line item in the case of stock issue, to simply set the quantity to zero. This makes things easier later as the line item is already present if the user tries to change quantity of the subscription_line_item"
This reverts commit d153e58933.
2019-07-16 11:00:21 +01:00
luisramos0
267131626e Fix typo and add test case to cover out of stock case 2019-07-16 10:58:25 +01:00
Luis Ramos
2280b15664 Merge pull request #4035 from kristinalim/fix/4033-remove_line_item_adjustments_when_line_item_removed
4033 Remove line item adjustments when line item removed
2019-07-16 09:54:33 +01:00
Transifex-Openfoodnetwork
f843a0b4d9 Updating translations for config/locales/en_AU.yml 2019-07-16 17:08:24 +10:00
Transifex-Openfoodnetwork
965a274332 Updating translations for config/locales/en_AU.yml 2019-07-16 17:05:40 +10:00
Transifex-Openfoodnetwork
cb2a842746 Updating translations for config/locales/en_AU.yml 2019-07-16 17:05:17 +10:00
luisramos0
a6655623d0 New admin orders edit view spec and workaround (current_ability) to make view specs work 2019-07-15 21:59:36 +01:00
luisramos0
2a2d05ad39 First view spec in OFN testing the print invoice button display in the orders list page 2019-07-15 21:59:36 +01:00
luisramos0
e8127d81dc Change how we display variant name in order edit page, use VariantAndLineItemNaming helper method 2019-07-15 18:37:19 +01:00
luisramos0
cd7906a57b Move translations from Spree.t to root and add them to en.yml 2019-07-15 17:48:10 +01:00
luisramos0
02c573f146 Remove logic that hides item split, because the partial is now in the ofn codebase, we can now simply remove the split-item button 2019-07-15 17:11:41 +01:00
luisramos0
112017a158 Remove variants/split partial from orders/shipments partial
In OFN we have one shipment per order so it doesnt make sense to split items between shipments
2019-07-15 17:07:33 +01:00
luisramos0
4a07d67037 Convert spree/admin/orders/_shipment partial from erb to haml 2019-07-15 16:42:45 +01:00
luisramos0
54156dfd32 Convert spree/admin/orders/_shipment_manifest partial from erb to haml 2019-07-15 16:42:19 +01:00
luisramos0
ee20d35487 Fix authorization issue in shipment actions, authorization was being done on a struct (shipment manifest), now it's done on the shipment itself
This is similar to https://github.com/spree/spree/pull/5624
2019-07-15 15:38:46 +01:00
luisramos0
be18244abc Bring views/spree/admin/orders/_shipment and views/spree/admin/orders/_shipment_manifest from spree backend 2019-07-15 15:37:24 +01:00
luisramos0
02099ebdae Remove details about stock in line_item_syncer so that we avoid confusing the user with stock numbers, this way the user will know what is the problem and can check stock levels and the order for more details 2019-07-14 21:40:57 +01:00
luisramos0
d153e58933 Swith line_item_syncer.create_new_items from deleting line item in the case of stock issue, to simply set the quantity to zero. This makes things easier later as the line item is already present if the user tries to change quantity of the subscription_line_item 2019-07-14 20:59:42 +01:00
luisramos0
c2a59a374c Fix rubocop issues by simplifying method 2019-07-14 17:21:15 +01:00
luisramos0
2a1011921b Reuse line_item_syncer.add_order_update_issue in line_item_syncer.update_item_quantities to add stock info to the update_quantity order issues 2019-07-14 16:43:46 +01:00
luisramos0
df27ee0d3e Refactor line_item_syncer.add_order_update_issue out of line_item_syncer.create_new_items 2019-07-14 16:06:09 +01:00
luisramos0
c2851015ce Fix deleting created item (destroy doesnt work before save) and add order_update_issue with message so that user can understand what happened 2019-07-14 15:58:00 +01:00
luisramos0
d0c246c345 Fix some rubocop issues 2019-07-14 12:28:32 +01:00
Kristina Lim
e58546a412 Move offcanvas menu content to separate partial 2019-07-14 13:52:47 +08:00
luisramos0
6aed9ba549 Make line_item_syncer delete new line items if stock is insufficient 2019-07-13 22:57:13 +01:00
luisramos0
4f2bc33ec3 Change line_item_syncer to verify stock if order is already complete, this will happen for orders in the current OC when a subscription is changed 2019-07-13 20:56:34 +01:00
luisramos0
0f3404ca27 Rename order_syncer.future_and_undated_orders to explicitly include completed orders from current OC: orders_in_order_cycles_not_closed 2019-07-12 22:20:09 +01:00
Kristina Lim
2c279fd02d Remove line item adjustments if line item deleted 2019-07-13 03:58:01 +10:00
Kristina Lim
8a048cc155 Add proof line item adjustments remain after line item removal 2019-07-13 01:43:07 +08:00
Luis Ramos
b3c378e8c1 Merge pull request #4029 from Matt-Yorkley/js_render_blocking2
Js render blocking 2
2019-07-12 16:34:31 +01:00
Luis Ramos
39475be792 Merge pull request #4030 from Matt-Yorkley/line_item_errors
LineItems can always access soft-deleted variants
2019-07-12 16:33:36 +01:00
luisramos0
9e2e460ac5 Add date format to moment date conversion. This conversion was not working on firefox 2019-07-12 12:01:18 +01:00
luisramos0
18006ea9c8 Change devise config to speed up password encryption in tests 2019-07-12 10:12:53 +01:00
luisramos0
71b648e9fa Add some tests to features/admin/users_spec from spree_auth_devise 2019-07-12 10:02:40 +01:00
luisramos0
eacd76bfa4 Add spec to features/admin/products_spec from spre_auth_devise 2019-07-11 19:47:17 +01:00
luisramos0
791ff842aa Add some tests to models/spree/user_spec from spre_auth_devise 2019-07-11 19:39:31 +01:00
luisramos0
ac0123734a Add some tests from spree/users_controller_spec from spree_auth_devise 2019-07-11 18:33:18 +01:00
luisramos0
7cab99efdf Run transpec on users_controller 2019-07-11 18:07:23 +01:00
luisramos0
5378bb7b34 Add adapted version of spree/admin/users_controller_spec from spree_auth_devise 2019-07-11 17:45:56 +01:00
luisramos0
942824cd74 Improve comments in UserMailer 2019-07-11 16:37:30 +01:00
Pau Pérez Fabregat
bdeb56bfaf Merge pull request #4028 from openfoodfoundation/transifex
Transifex
2019-07-11 17:28:38 +02:00
Matt-Yorkley
fb4e573cfa Add a soft-deleted test in line_item_spec 2019-07-11 16:07:30 +01:00
Transifex-Openfoodnetwork
e65df31bc3 Updating translations for config/locales/nl_BE.yml 2019-07-12 00:29:50 +10:00
Transifex-Openfoodnetwork
ce1ac57522 Updating translations for config/locales/de_DE.yml 2019-07-11 23:53:17 +10:00
Transifex-Openfoodnetwork
09ff57d462 Updating translations for config/locales/en_BE.yml 2019-07-11 23:50:31 +10:00
Transifex-Openfoodnetwork
542cf0cf4f Updating translations for config/locales/fr_BE.yml 2019-07-11 23:43:29 +10:00
Transifex-Openfoodnetwork
f4113745ce Updating translations for config/locales/fr.yml 2019-07-11 23:11:32 +10:00
Transifex-Openfoodnetwork
6d197c53e0 Updating translations for config/locales/en_ZA.yml 2019-07-11 21:40:38 +10:00
Matt-Yorkley
b2c6e6271c LineItems can always access soft-deleted variants 2019-07-11 11:33:34 +01:00
Luis Ramos
cdd36eeefc Merge pull request #3674 from Matt-Yorkley/spree2/import_description
Allow import to proceed when updating a product and `description` is set
2019-07-10 21:09:30 +01:00
Matt-Yorkley
97148f6f57 Send embedded Stripe javascript to :injection_data 2019-07-10 19:28:20 +01:00
Matt-Yorkley
6219b3f0c3 Revert "Revert "Fix JS render-blocking in Darkswarm""
This reverts commit ffeca41e
2019-07-10 17:14:08 +01:00
Transifex-Openfoodnetwork
d66cac7a26 Updating translations for config/locales/ca.yml 2019-07-10 21:20:51 +10:00
Transifex-Openfoodnetwork
07c11b9b1f Updating translations for config/locales/es.yml 2019-07-10 21:18:28 +10:00
Transifex-Openfoodnetwork
6a232a1f36 Updating translations for config/locales/ca.yml 2019-07-10 21:17:43 +10:00
Maikel
1a61357be8 Merge pull request #4024 from openfoodfoundation/transifex
Transifex
2019-07-10 11:17:12 +10:00
Maikel
b2eeb5d687 Merge pull request #4025 from openfoodfoundation/revert-3988-js_render_blocking
Revert "Fix JS render-blocking in Darkswarm"
2019-07-10 11:00:17 +10:00
Maikel
ffeca41ef4 Revert "Fix JS render-blocking in Darkswarm" 2019-07-10 10:24:25 +10:00
Transifex-Openfoodnetwork
68c0936766 Updating translations for config/locales/en_GB.yml 2019-07-10 04:39:47 +10:00
Luis Ramos
23b6267e30 Merge pull request #3916 from luisramos0/schedules_of_coordinator
OC schedules are now filtered to schedules of OCs with same coordinator
2019-07-09 14:21:34 +01:00
Luis Ramos
6872ccfb72 Merge pull request #3963 from luisramos0/hide_invoices
Hide invoices feature
2019-07-09 14:20:50 +01:00
luisramos0
b1b791e4ee Update all locales with the latest Transifex translations 2019-07-09 14:19:35 +01:00
Luis Ramos
1779b759f7 Merge pull request #4017 from openfoodfoundation/transifex
Transifex
2019-07-09 14:15:38 +01:00
Transifex-Openfoodnetwork
3ebbf5a55d Updating translations for config/locales/fr.yml 2019-07-09 22:42:05 +10:00
Luis Ramos
83ce2ac3dc Merge pull request #3988 from Matt-Yorkley/js_render_blocking
Fix JS render-blocking in Darkswarm
2019-07-09 12:30:30 +01:00
Luis Ramos
aaf850a095 Merge pull request #4010 from luisramos0/fuubar_upgrade
Apply 2.1.1 hotfix to master
2019-07-09 12:24:54 +01:00
Luis Ramos
3e9bf8aa1f Merge pull request #3964 from openfoodfoundation/hand-soft-deleted-products-in-orders-and-fulfillment-report
Handle soft deleted products in orders and fulfillment report
2019-07-09 12:19:28 +01:00
luisramos0
95832c96ac Delete redundant spec, this case is now covered in a view spec 2019-07-09 09:15:38 +01:00
Jon Leighton
4398ea12b8 Convert several fields from string to text
See discussion here:
https://github.com/openfoodfoundation/openfoodnetwork/pull/3751#issuecomment-503416955

Fixes #3192.

I have also done a pass over the schema to identify other fields which
would benefit from being a text rather than a string. However, I ignored
all `spree_*` tables because I didn’t want to mess up the ‘default’
Spree schema.
2019-07-09 13:11:30 +10:00
Luis Ramos
8a700307d2 Merge pull request #3992 from Matt-Yorkley/cart_button_bug
Fix display bug in cart button on mobile menu
2019-07-08 18:33:36 +01:00
luisramos0
86accc227e Convert erb files brought from spree_auth_devise to haml 2019-07-08 18:09:03 +01:00
Luis Ramos
1756ddd0e9 Merge pull request #3989 from Matt-Yorkley/preload_primary_font
Preload primary font to speed up page rendering
2019-07-08 17:43:15 +01:00
Luis Ramos
fe71781d70 Merge pull request #3791 from jazzdragon/1766-registration-scroll
1766 registration scroll
2019-07-08 15:10:35 +01:00
Luis Ramos
ec65951ef3 Merge pull request #3959 from jonleighton/issue-1848
Edit tooltip text to make it readable
2019-07-08 15:09:11 +01:00
luisramos0
1681e8a572 Remove unused auth config 2019-07-08 14:06:01 +01:00
luisramos0
e897eb0439 Remove Spree::BaseController.class_eval, these methods are already in the application helper through spree::application_helpers
We can ignore the difference in spree_logout_path as spree.logout_path is the user_sessions#destroy route
2019-07-08 13:59:26 +01:00
luisramos0
36e3362fc1 Adding missing translation that is now being used after being brought from spree_auth_devise 2019-07-08 13:23:18 +01:00
luisramos0
10e123a9c4 Move spree/authentication_helpers injection from spree initializers directly to the application_controller
Also, switch from using send to public_send making rubocop happier
2019-07-08 13:11:57 +01:00
luisramos0
0101dcdd93 Remove unused Spree::Dash from controllers brought from spree_auth_devise 2019-07-08 13:10:52 +01:00
luisramos0
9416f61fb3 Remove spree/checkout_controller.completion_route only used in spree/checkout_controller.update which is never used in OFN. Checkout update happpens in the checkout_controller.update 2019-07-08 13:04:38 +01:00
luisramos0
8efd69c3d1 Remove unnecessary checkout registration code, it's not used in OFN 2019-07-08 12:57:17 +01:00
luisramos0
dcbdfbb081 Fix rubocop issues in multiple files copied from spree_auth_devise, mostly hash rockets 2019-07-08 11:22:56 +01:00
luisramos0
92968c5efe Merge spree/users_sessions_controller into spree/users_sessions from spree_auth_devise 2019-07-07 22:06:18 +01:00
luisramos0
c8ac64566f Merge spree/users_controller_decorator into spree/user_controller 2019-07-07 22:04:04 +01:00
Transifex-Openfoodnetwork
633c7737e4 Updating translations for config/locales/en_ZA.yml 2019-07-08 04:04:48 +10:00
luisramos0
05a72be273 Move handle_asynchronously :send_reset_password_instructions to after send_reset_password_instructions declaration
This was as it was before the merge of user_decorator and user, the declaration was in the original class and the handle_asynchronously part was in the decorator which was loaded after the main user class from spree_auth_devise, this commit restores the order and fixes a spec in authentication_spec
2019-07-07 17:53:12 +01:00
luisramos0
b1cd950051 Add missing translation keys from spree_auth_devise 2019-07-07 17:12:54 +01:00
luisramos0
f557996817 Add deface overrides from spree_auth_devise for the users menu tab, the admin top bar and the shared login bar (maybe dead code this last one) 2019-07-06 22:53:20 +01:00
luisramos0
1a64a737d4 Add ActionController::Metal frorm spree_auth_devise for api authentication 2019-07-06 10:50:48 +01:00
luisramos0
7c0087cb30 Remove reference to empty spree_auth css and js files from spree_auth_devise 2019-07-06 00:02:40 +01:00
luisramos0
17448699f9 Bring devise initializer from spree_auth_devise and fix spree initializer details 2019-07-05 22:45:59 +01:00
luisramos0
a413f22e12 Remove unnecessary dependency to spree/users helper 2019-07-05 22:37:07 +01:00
luisramos0
893952f46b Merge user_mailer_decorator into user_mailer 2019-07-05 22:31:06 +01:00
luisramos0
061e3cd722 Add user mailer from spree_auth_devise 2019-07-05 22:29:51 +01:00
luisramos0
a83790951d Add model auth_config from spree_auth_devise 2019-07-05 21:58:29 +01:00
luisramos0
4e33529845 Merge user_decorator.rb into user.rb 2019-07-05 21:58:28 +01:00
luisramos0
a2a8b330b7 Add User class from spree_auth_devise as is 2019-07-05 21:58:28 +01:00
luisramos0
9669016573 Add required views from spree_auth_devise 2019-07-05 21:58:28 +01:00
luisramos0
2755cb9ec7 Add users_tab partial from spree_auth_devise 2019-07-05 21:58:28 +01:00
luisramos0
fdcc4c2447 Remove dependency to spree auth devise 2019-07-05 21:58:07 +01:00
Pau Perez
f42bf72b32 Fix rubocop violations
It's not affordable to fix the failed Metrics cops in the scope of this
bug fix, but now, with a separate class, it'll be easier.
2019-07-05 18:19:58 +02:00
Pau Perez
8ab77b077b Fix spec
This needs to be revisited. I'm not sure it's the most appropriate spec
as it seems to be testing just part of story.
2019-07-05 18:19:58 +02:00
Pau Perez
9b03833df0 Extract orders & fulfillments default report clasts 2019-07-05 18:19:58 +02:00
Pau Perez
fada30435f DRY some procs from report 2019-07-05 18:19:58 +02:00
luisramos0
fc0ffda8ec Bring routes and controllers from spree_auth_devise 2019-07-05 15:08:42 +01:00
Luis Ramos
397729ed3d Merge pull request #4001 from pacodelaluna/3990-display-enterprise-id-in-profile
Display enterprise ID in profile
2019-07-05 11:14:43 +01:00
luisramos0
88312b8e4a Make OrdersHelper.invoice_links simpler 2019-07-05 11:08:51 +01:00
luisramos0
9be3ff90f7 Make OrdersHelper.complete_order_links simpler 2019-07-05 11:06:49 +01:00
luisramos0
a5b5e5de32 Remove trailing backslash 2019-07-05 10:58:53 +01:00
luisramos0
e66dea7e03 Improve query in filter_schedules_by_enterprise_id. Makes join to OCs explicity. 2019-07-05 10:37:27 +01:00
Maikel
4c5ed2fa45 Merge pull request #3999 from openfoodfoundation/transifex
Transifex
2019-07-05 11:59:40 +10:00
Maikel
40c0e69f11 Merge pull request #4000 from Matt-Yorkley/v2_migrations
Fix failing migration by clearing schema cache
2019-07-05 10:56:26 +10:00
Transifex-Openfoodnetwork
f3837fb6af Updating translations for config/locales/en_GB.yml 2019-07-05 05:08:46 +10:00
Pau Perez
db7b7bbde2 Fix finding supplier for a deleted product 2019-07-04 18:52:56 +02:00
luisramos0
ef61310bad Fix long lines in order_cycle_permissions and permissions 2019-07-04 17:17:58 +01:00
luisramos0
91da0114e3 Upgrade fuubar to 241 to skip yanked 240 2019-07-04 16:09:36 +01:00
Pau Perez
ee301c5e2f Address Code Climate (rubocop) issues 2019-07-04 17:01:06 +02:00
Pau Perez
4a67ffab25 Add a test case for reports with deleted products 2019-07-04 17:01:06 +02:00
Pau Perez
4d060815d0 Extract unscoping logic into method
DRYies out the code a bit.
2019-07-04 17:01:06 +02:00
Pau Perez
f91bd03c25 Add clarifying comment to report 2019-07-04 17:01:06 +02:00
Pau Perez
7de4ec2a90 Fix orders and fulfillments report
It bypasses the default_scope to retrieve deleted variants in the orders
and fulfillment report.
2019-07-04 17:01:06 +02:00
Pau Perez
812d8cac4a Make complex method a bit more readable 2019-07-04 17:01:06 +02:00
Transifex-Openfoodnetwork
d1faed282f Updating translations for config/locales/es.yml 2019-07-05 00:22:01 +10:00
Transifex-Openfoodnetwork
26195314eb Updating translations for config/locales/ca.yml 2019-07-05 00:09:05 +10:00
François Turbelin
912483660f Put the uid under the permalink 2019-07-04 09:51:32 +02:00
François Turbelin
d12a7c2c76 Apply last suggestions 2019-07-04 09:43:35 +02:00
luisramos0
dee1c3d139 Fix typo in order_cycle_permissions.rb 2019-07-03 22:58:33 +01:00
François Turbelin
101cff02c6 Add locale keys 2019-07-03 23:06:50 +02:00
luisramos0
bb9c54a445 Use enterprises.id instead of :id to remove ambiguous column errors 2019-07-03 22:03:40 +01:00
François Turbelin
5ce2af454e Clean id field 2019-07-03 23:00:36 +02:00
luisramos0
e5f396f975 Fix Permissions.related_enterprises_granted by adding explicit reference to table 2019-07-03 20:18:01 +01:00
luisramos0
a57a93d414 Adapt permissions.rb and order_cycle_permissions to rails 4 2019-07-03 20:18:01 +01:00
luisramos0
a82b1d8129 Adapt exchange.involving scope to rails 4 2019-07-03 20:18:00 +01:00
luisramos0
5184fa540c Adapt enterprise_relationship permitting and permitted_by scopes to rails 4 2019-07-03 20:18:00 +01:00
Luis Ramos
951787d456 Merge pull request #3987 from mkllnk/3978-optimise-products-cache
3978 Optimise products cache
2019-07-03 19:59:07 +01:00
Luis Ramos
b35743b6e4 Merge pull request #3968 from mkllnk/3924-rescue-failing-shipment
Rescue checkout on shipping id conflict
2019-07-03 19:56:24 +01:00
Luis Ramos
4fc30ba50e Merge pull request #3994 from openfoodfoundation/dependabot/bundler/knapsack-1.17.2
Bump knapsack from 1.17.1 to 1.17.2
2019-07-03 19:55:20 +01:00
François Turbelin
97a401a307 Display enterprise ID in profile 2019-07-03 18:10:59 +02:00
Pau Pérez Fabregat
232e3b8262 Merge pull request #3993 from openfoodfoundation/dependabot/bundler/simplecov-0.17.0
Bump simplecov from 0.16.1 to 0.17.0
2019-07-03 16:28:56 +02:00
Pau Pérez Fabregat
b3b66d5825 Merge pull request #3970 from mkllnk/444-feature-toggle-use-env
Toggle features via env instead of initializer
2019-07-03 16:27:01 +02:00
Pau Pérez Fabregat
1b532f995c Merge pull request #3919 from mkllnk/db-mirror-script
Db mirror script
2019-07-03 16:24:01 +02:00
Pau Pérez Fabregat
f5544494f0 Merge pull request #3997 from mkllnk/remove-ng-test-script
Remove obsolete Javascript test script
2019-07-03 16:23:41 +02:00
Pau Pérez Fabregat
2de32b54ba Merge pull request #3995 from mkllnk/how-to-not-archive-branches
Remove obsolete script to archive branches
2019-07-03 16:23:15 +02:00
Pau Pérez Fabregat
b6e2dadbb3 Merge pull request #3996 from mkllnk/remove-backup-script
Remove obsolete backup script
2019-07-03 16:22:36 +02:00
Matt-Yorkley
473e635d54 Merge pull request #3982 from luisramos0/mobile_bug
Fixes menu problem with long shop names
2019-07-03 13:30:41 +01:00
Transifex-Openfoodnetwork
3e11cdb5c1 Updating translations for config/locales/fr.yml 2019-07-03 22:14:43 +10:00
Transifex-Openfoodnetwork
842e8da2c3 Updating translations for config/locales/fr.yml 2019-07-03 22:11:35 +10:00
Matt-Yorkley
24f8e6d2ec Fix failing migration by clearing schema cache 2019-07-03 12:59:10 +01:00
Maikel
568d58405d Merge pull request #3986 from openfoodfoundation/transifex
Transifex
2019-07-03 18:46:14 +10:00
Maikel Linke
b23489fa40 Remove obsolete Javascript test script
This script has been replaced by a rake task a long time ago:

  bundle exec rake karma:run   # to run the specs once
  bundle exec rake karma:start # to run the spec after each change

We don't need it any more and it doesn't work on my machine.
2019-07-03 14:50:33 +10:00
Maikel Linke
503658f930 Remove obsolete backup script
This script doesn't work anymore. It was written for old an Australian
production server. We have automatic backups now. And if we wanted to
take a backup manually, we should probably give it a meaningful name,
not using a script.
2019-07-03 14:46:56 +10:00
Maikel Linke
24bf5f0fea Remove obsolete script to archive branches
Apparently, there was a practice to archive branches by tagging them
"archive/branch-name" and then deleting them. We don't practice that
anymore and I would suggest to not start doing it again. Our setup is a
bit different now.

We now use our own forks for feature branches and can have our own,
individual archiving practices in our forks. There is no need to have a
central graveyard of people's "work after progress".

The old feature branches we used to have in the central repository got
archived in another fork:
https://github.com/openfoodfoundation/openfoodnetwork-archive/

Branches associated to pull requests should be deleted after the pull
request has been closed. Github keeps a reference to those branches in
the pull request which is like an archive.

Special branches we still have and delete from time to time:

- transifex: Created for new translations, deleted afterwards.
- dependabot/*: Dependabot always creates pull requests. See above.
- 1-31-1-stable etc: They only live as long as they are supported.

I would also like to delete the old `archive/*` tags. They are in the
openfoodnetwork-archive repository and could confuse developers in the
main repository. Let's keep it clean.
2019-07-03 14:36:16 +10:00
Matt-Yorkley
9d86249bcb Merge pull request #3954 from openfoodfoundation/improve-database-yml
DRY and make database.yml more flexible
2019-07-02 21:43:49 +01:00
Kristina Lim
3e37c8a3f1 Change underscores in CSS classes to hyphens
These were triggering a warning from scss-lint.
2019-07-03 04:43:35 +08:00
Kristina Lim
691d7d735b Reduce padding between top bar menu items 2019-07-03 04:35:44 +08:00
Kristina Lim
6d1dd76590 Cap width of hub name in top bar and wrap 2019-07-03 04:30:06 +08:00
Kristina Lim
356e00bfbb Add space for tab bar in medium and below screens 2019-07-03 04:02:28 +08:00
Kristina Lim
5534109122 Undo setting of margin for home tagline 2019-07-03 04:02:22 +08:00
Janine Luk
ac8790ecb3 sticky header for mobile 2019-07-03 03:57:11 +08:00
Matt-Yorkley
2eb8121644 Update Docker config 2019-07-02 20:36:21 +01:00
Matt-Yorkley
b685e0d3a7 Add ENV var for db host 2019-07-02 20:34:16 +01:00
Matt-Yorkley
1dd3d86a2b Add prefixes to ENV vars 2019-07-02 20:34:16 +01:00
Pau Perez
7ee41902f2 DRY and make database.yml more flexible
This enables us to fix
https://github.com/openfoodfoundation/ofn-install/issues/387 and brings the
needed flexibility so things like
https://github.com/openfoodfoundation/openfoodnetwork/pull/3887 or any CI don't
require a custom version. That's what ENV vars are for!

For instance, I no longer need to mess with my LXC setup to connect to the DB.
I just need to have 2 env vars.
2019-07-02 20:34:16 +01:00
dependabot-preview[bot]
490ced4a92 Bump knapsack from 1.17.1 to 1.17.2
Bumps [knapsack](https://github.com/ArturT/knapsack) from 1.17.1 to 1.17.2.
- [Release notes](https://github.com/ArturT/knapsack/releases)
- [Changelog](https://github.com/ArturT/knapsack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ArturT/knapsack/compare/v1.17.1...v1.17.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-02 19:21:44 +00:00
dependabot-preview[bot]
a682115fb1 Bump simplecov from 0.16.1 to 0.17.0
Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.16.1 to 0.17.0.
- [Release notes](https://github.com/colszowka/simplecov/releases)
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md)
- [Commits](https://github.com/colszowka/simplecov/compare/v0.16.1...v0.17.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-02 19:19:31 +00:00
Kristina Lim
653067f58c Omit text for top bar items with icon in large
This affects only top bar menu items for:

* Language
* Profile

This does not update the "Log in" menu item, because the currently
selected icon might not be self explanatory.
2019-07-03 01:49:36 +08:00
Kristina Lim
06ed9c838e Remove extra left padding from top bar menu items 2019-07-03 01:49:35 +08:00
Matt-Yorkley
726d87de6b Fix display bug in cart button on mobile menu 2019-07-02 16:47:22 +01:00
Matt-Yorkley
fbb97c3db8 Fix JS render-blocking in Darkswarm 2019-07-02 13:43:20 +01:00
Matt-Yorkley
cea8cbd924 Preload primary font to speed up page rendering 2019-07-02 13:23:03 +01:00
Maikel Linke
73372a58ef Remove unused and dangerous Exchange#eql? override
The `eql?` override has been added in very early commits but was
actually not used except in a test. It also caused performance problems
since each call to `eql?` would issue two database queries. A developer
would unknowingly trigger these when using `exchanges.uniq`. A mistake
that could have happened again in the future.

I moved the implementation to the test that was actually using it and
made a second test a bit more explicit.
2019-07-02 18:42:02 +10:00
Maikel Linke
287d6a926a Document Exchange 2019-07-02 18:42:02 +10:00
Maikel Linke
04b07a1ff5 Further optimise querying affected exchanges
The implementation queried the database for each incoming variant that
was changed. This rewrite combines ActiveRecord relations so that it
creates only one query. This saves another 5-10% of execution time when
updating enterprise fees on production instances.
2019-07-02 18:42:01 +10:00
Maikel Linke
0da7c93bc6 Collect affected exchanges more efficiently
When an incoming exchange of an order cycle changes, the ProductsCache
queries all affected outgoing exchanges to update them. It was creating
a big collection of exchanges with duplicates and then calling `uniq`.
That call was hitting a custom implementation of `eql?` which is very
inefficient. And since `Exchange.eql?` is ignoring the order cycle id,
it was probably filtering too many exchanges from the collection.

Fixed bug: If two order cycles sell exactly the same variants to the
same shop, the two outgoing exchanges are seen as equal. When the
variants change, ProductsCache would only update one of those two
exchanges, leaving one order cycle out of sync. This case is very rare.
It only happens if there is a shop with two active order cycles selling
exactly the same.

The new uniqueness test looks only at the attributes that are later used
to refresh the cache. I measured a page speed improvement from 90
seconds to 3 seconds (30 times faster).
2019-07-02 18:29:50 +10:00
Maikel Linke
bfe41d4cbc Extract method to simplify 2019-07-02 18:29:50 +10:00
Maikel Linke
3e6e0b73ee Style products cache
The `private` modifier doesn't affect class methods. Class methods have
to be declared as private separately. Also using more guard clauses,
brackets and linebreaks.
2019-07-02 18:29:49 +10:00
Maikel
592a468448 Merge pull request #3960 from mkllnk/test-spec-stability
Remove retries from previously flaky specs
2019-07-02 13:50:16 +10:00
Transifex-Openfoodnetwork
f09b1fc1a8 Updating translations for config/locales/en_ZA.yml 2019-07-02 01:13:09 +10:00
Ecksi
bdbd869b06 Modify English tool tip text in yml file
Modify GB English tool tip text in yml file

Modify US English tool tip text in yml file
2019-06-28 10:59:50 +10:00
Maikel
8b42bd205a Merge pull request #3977 from openfoodfoundation/transifex
Transifex
2019-06-27 09:29:09 +10:00
Transifex-Openfoodnetwork
6108a74fec Updating translations for config/locales/fr.yml 2019-06-27 00:47:45 +10:00
Luis Ramos
5ecab7a0c2 Merge pull request #3971 from Matt-Yorkley/basket_errors
Avoid `undefined method 'order'` errors when removing lineitems from basket
2019-06-26 15:33:26 +01:00
Luis Ramos
d8785bdaba Merge pull request #3932 from luisramos0/shpfront_message
Improve message in private shopfront when user is not logged in or not a customer
2019-06-26 15:31:06 +01:00
Luis Ramos
00841cb537 Merge pull request #3923 from luisramos0/prod_image_error
User friendly error when creating a product with an image in an unsupported format
2019-06-26 15:30:18 +01:00
luisramos0
61c8859da8 Fix problem in array concatenation in orders helper and cover it with specs 2019-06-26 14:17:41 +01:00
luisramos0
e33ce235c4 Hide invoice links in order edit page if invoices are disabled 2019-06-26 14:17:41 +01:00
luisramos0
ec2f99a467 Refactor OrderHelper.order_links: extract some logic from order_links to make it more simple and pass rubocop tests 2019-06-26 14:17:41 +01:00
luisramos0
67b5f08b07 Refactor OrderHelper.order_links: extract links object to separate methods 2019-06-26 14:17:41 +01:00
luisramos0
95170bacd5 Show print invoices button in orders list page only if invoices are enabled in the backoffice 2019-06-26 14:17:25 +01:00
Maikel
eebc49f27c Merge pull request #3887 from pacodelaluna/add-docker-configuration-for-dev-setup
Add docker configuration for quick local setup
2019-06-26 21:23:34 +10:00
luisramos0
8b0296eae6 Use a single query to get filter_schedules_by_enterprise_id 2019-06-26 11:38:03 +01:00
François Turbelin
b6120a9105 Fix docker-compose application yml file 2019-06-26 11:03:20 +02:00
Maikel Linke
5d3dbca9c3 Toggle features via env instead of initializer
A FeatureToggle could be switched via a class_eval in an initializer.
The initializer was installed via ofn-install. We want to get rid of
custom, untracked initializers. Here I'm changing the FeatureToggle
class to use environment variables instead.

This change needs to be followed up with a change in ofn-install to use
the new environment variable. It affects only Australian production.
2019-06-26 11:43:22 +10:00
Maikel Linke
5bbd63bcd8 Add spec for rescuing order saving shipment 2019-06-26 11:32:01 +10:00
Maikel Linke
980b4a86ab Move shipment rescue to its own method 2019-06-26 10:48:51 +10:00
Luis Ramos
118ed79070 Merge pull request #3904 from luisramos0/subs_stock
Fix ofn-on-hand directive and fix usage of variant.on_hand in subscriptions order factory
2019-06-25 20:25:06 +01:00
François Turbelin
623d1e0285 Add missing file 2019-06-25 20:05:55 +02:00
François Turbelin
2dcced8810 Put back application example file as it was 2019-06-25 17:59:37 +02:00
Matt-Yorkley
5100ad6b51 Improve #line_items_for logic and add more tests 2019-06-25 15:33:42 +01:00
luisramos0
7e2bead54d Make finalizedquantity optional in the ofn-on-hand directive and extract avaiable quantity to a separate method for clarity 2019-06-25 14:50:03 +01:00
luisramos0
2b6e6c62dd Simplify order_factory_spec by extracting copy pasted code to method 2019-06-25 14:50:03 +01:00
luisramos0
05a15d9441 Extract method to remove some copy pasted code in order_factory_spec 2019-06-25 14:50:03 +01:00
luisramos0
567196fe0e Fix line item verification of stock on the browser side by adding logic to handle completed orders with some reserved stock
The shopping/orders_spec is now validating this edge case by using all stock available in one of the line items
2019-06-25 14:50:03 +01:00
luisramos0
7bd32d4967 Fix usage of variant.on_hand in subscriptions order factory, we now take on_demand into account
This fixes a problem introduced in 12eab1bfa9 (diff-c3c4192f302cc77e9a8547012fe86ddb), since then variant.on_hand does not return infinity if variant is on_demand
2019-06-25 14:47:47 +01:00
Luis Ramos
9b6f1a5e11 Merge pull request #3958 from Matt-Yorkley/pi_encoding
Improve handling of invalid characters in uploaded CSV files
2019-06-25 14:44:32 +01:00
François Turbelin
84389d1392 Fix setup script with new application YAML file 2019-06-25 14:38:38 +02:00
François Turbelin
da3b467d47 Use https to fetch Postgres repo 2019-06-25 14:09:59 +02:00
François Turbelin
ceffae2efc Delete extra example file 2019-06-25 14:08:18 +02:00
Matt-Yorkley
f19a6f0dec Add tests for class_eval on Spree::Calculator private method #line_items_for 2019-06-25 12:19:16 +01:00
Matt-Yorkley
0a155da273 Avoid undefined method 'order' errors when removing lineitems from basket 2019-06-25 11:13:56 +01:00
François Turbelin
c0d02c8d42 Fix errors while relauching container 2019-06-25 12:05:26 +02:00
François Turbelin
e68d72c0dd Update DOCKER.md 2019-06-25 11:47:54 +02:00
Matt-Yorkley
034e8b180a Use let for CSV data 2019-06-25 10:24:53 +01:00
Matt-Yorkley
ead0e1c08d Store attributes list in constant 2019-06-25 10:20:59 +01:00
Matt-Yorkley
8dfb628d88 Add test for ignoring non-updatable description field in validations when updating 2019-06-25 10:19:05 +01:00
Matt-Yorkley
85b3d7dac5 Move attribute check to method 2019-06-25 10:19:05 +01:00
Matt-Yorkley
84040fd2a6 Allow import to proceed when updating a product and description is set 2019-06-25 10:19:05 +01:00
François Turbelin
5dcf456c90 Remove old Rake task for sample data 2019-06-25 11:18:48 +02:00
François Turbelin
79ec3d5a3f Remove extra copy on Docker file 2019-06-25 11:18:48 +02:00
François Turbelin
e893197c49 Use example files instead of extra Docker ones 2019-06-25 11:18:48 +02:00
Matt-Yorkley
60e67ae1a4 Run all setup steps on startup
It's a bit dirty, but it works :)
2019-06-25 11:18:48 +02:00
Matt-Yorkley
53a0f70aa0 Add default login details via ENV vars 2019-06-25 11:18:48 +02:00
Matt-Yorkley
64d6ae445b Change postgres repo from precise to bionic 2019-06-25 11:18:48 +02:00
Matt-Yorkley
5712f67673 Remove phantomjs from dependencies 2019-06-25 11:18:48 +02:00
François Turbelin
9c45444ea6 Clean database.docker.yml file 2019-06-25 11:18:48 +02:00
François Turbelin
4e41a73c4f Enhance Dockerfile 2019-06-25 11:18:48 +02:00
François Turbelin
75267268d7 Update Postgres to 9.5 2019-06-25 11:18:48 +02:00
François Turbelin
7455053879 Update DOCKER.md file 2019-06-25 11:18:48 +02:00
François Turbelin
c5addb8c1d Fix comment spacings, gloupsss 2019-06-25 11:18:48 +02:00
François Turbelin
e5d4b216ba Add DOCKER.md file as documentation 2019-06-25 11:18:48 +02:00
François Turbelin
b4fe44510b Tune up the Rake task 2019-06-25 11:18:48 +02:00
François Turbelin
9df5d78f27 Add a Rake task in order to setup dev env 2019-06-25 11:18:48 +02:00
François Turbelin
f9d72e10d5 Add Docker configuration 2019-06-25 11:18:48 +02:00
Maikel
723499332a Merge pull request #3006 from mkllnk/i18n-error-detection
Raise error on missing translation keys
2019-06-25 16:13:15 +10:00
Maikel Linke
6a06e0ac3b Raise error on missing translation keys 2019-06-25 15:06:56 +10:00
Luis Ramos
5600102729 Merge pull request #3876 from luisramos0/3804_insuf_stock
3804 Fix editing cart when variant on_demand but its on_hand value is zero or negative
2019-06-24 22:24:15 +01:00
luisramos0
a6ea975848 Fix editing cart when variant on_demand but on_hand is zero or negative 2019-06-24 22:07:46 +01:00
Luis Ramos
57917a498b Merge pull request #3946 from luisramos0/missing_translatiojns
Fix last missing translations covered by specs
2019-06-24 20:52:59 +01:00
Luis Ramos
b30da27e92 Merge pull request #3950 from openfoodfoundation/dependabot/bundler/stripe-4.19.0
Bump stripe from 4.18.1 to 4.19.0
2019-06-24 20:44:57 +01:00
Maikel Linke
1e1e88fe51 Rescue checkout on shipping id conflict
Helps to investigate https://github.com/openfoodfoundation/openfoodnetwork/issues/3924

A better solution would be to move the update of shipments out of the
after_save callback and deal with it in controllers. Unfortunately,
that's a big and tricky task.

Since this exception is causing a lot of pain for some Australian
farmers, I introduced more logging here to understand the problem
better. The issue was observed in OFN v1 and may disappear with v2. But
we don't know that and should monitor it.
2019-06-21 16:05:54 +10:00
Maikel
e4c3c1664a Merge pull request #3943 from jonleighton/issue-2112
Bring back ‘Shop for X products at:’ title
2019-06-21 15:06:21 +10:00
Maikel
5b0c8bbaef Merge pull request #3836 from Matt-Yorkley/fast_and_furious2
Improve /shops, /producers, and /groups performance
2019-06-21 15:02:19 +10:00
Maikel
71f396a44f Merge pull request #3896 from luisramos0/clear_unit_desc
Clear product.variants.unit_description if product.variant_unit is items
2019-06-21 15:00:06 +10:00
Maikel
eb162f6b29 Merge pull request #3934 from openfoodfoundation/dependabot/bundler/activerecord-import-1.0.2
Bump activerecord-import from 1.0.1 to 1.0.2
2019-06-21 14:59:03 +10:00
Maikel
5aea361d87 Merge pull request #3709 from luisramos0/2-0-prepare-4-rails-4
Start upgrade to Rails 4
2019-06-21 14:58:24 +10:00
Maikel
3721c017fa Merge pull request #3670 from luisramos0/2-0-without-spree-fe-assets
[Spree Upgrade] Remove dependency to spree frontend - routes and controllers
2019-06-21 14:57:03 +10:00
Maikel
12f0ed9955 Merge pull request #3940 from luisramos0/zones
Remove matching of shipping method zone to user address on checkout
2019-06-21 14:43:40 +10:00
Maikel
4c4881430c Merge pull request #3908 from kristinalim/fix/3843-unit_type_in_product_import
3877,3843 Improve handling of units and unit type in product import
2019-06-21 14:43:01 +10:00
luisramos0
bcc02f35e7 Add new preference to invoice settings: enable invoices 2019-06-19 13:29:30 +01:00
Matt-Yorkley
08b2b19d5e Improve handling of invalid characters in uploaded CSV files 2019-06-19 09:29:59 +01:00
Maikel Linke
cccd35fdf3 Remove retries from previously flaky specs
It's not acceptable to have flaky specs that only pass once in three
tries. Our specs might be more stable now that we use Chrome as test
browser. Otherwise we have to find out why these specs are not stable.
It might be an important bug that happens only sometimes.
2019-06-19 16:48:04 +10:00
Maikel Linke
d8ece7cd8b First stored credit card becomes default again
A user can store their credit card when checking out. Due to a bug in
https://github.com/openfoodfoundation/openfoodnetwork/pull/3840 it
didn't become the default card any more. This behaviour is now restored.
If there is not default card yet, a new card added during checkout
becomes the default card.
2019-06-19 15:43:38 +10:00
Maikel Linke
ee65d70eec Deal with empty payments sequence
The task was crashing when there were no payments in the query range.
2019-06-19 09:58:47 +10:00
Matt-Yorkley
ab1ed53507 Merge pull request #3955 from openfoodfoundation/remove-travis-leftover
No need to keep old and used Travis config file
2019-06-18 16:48:13 +01:00
luisramos0
160b535e2f Make weight calculator compute 0 for variants with unit different from weight 2019-06-18 15:21:13 +01:00
luisramos0
e8eeb3d5dc Further improve weight calculator code 2019-06-18 13:28:16 +01:00
luisramos0
2b3865855d Simplify shipping_method.include? method 2019-06-18 11:42:34 +01:00
luisramos0
1da18d3386 Fix enterprise model scopes by making ready_for_checkout return enterprises and not ids again and by making not_ready_for_checkout select the id field from the ready_for_checkout scope 2019-06-18 10:52:56 +01:00
luisramos0
b025df1798 Fix a few more rubocop issues 2019-06-18 10:52:56 +01:00
luisramos0
178924af5d Fix long lines in order_cycle model 2019-06-18 10:52:45 +01:00
luisramos0
bb1f7fde2f Remove unused routes related to taxons
t/products was already an old route 4 years ago and t/*id is not currently working in master
2019-06-18 10:49:20 +01:00
luisramos0
c61e7a1672 Remove unused routes
This fix is in spree 2.1 here: ba420fe70e
2019-06-18 10:49:20 +01:00
luisramos0
3c964933b1 Remove stub of a deleted method #deadcode 2019-06-18 10:49:20 +01:00
luisramos0
e7b625edcf Remove spree locale route
This route is not used, ofn code uses query param locale that is picked up in base controller set_locale
2019-06-18 10:49:20 +01:00
luisramos0
eab6cc563b Fix rubocop issues 2019-06-18 10:49:20 +01:00
luisramos0
8daf9b9247 Revert fix in previous commit (orders/populate route used in product import view) and adding a simple fix by setting the product import route to use in the form 2019-06-18 10:49:20 +01:00
luisramos0
5ba0f906a1 For some reason we need the orders populate route to make product import routes work 2019-06-18 10:49:20 +01:00
luisramos0
35c8236c21 Add missing datepicker/cal.gif to ofn assets 2019-06-18 10:49:20 +01:00
luisramos0
b397a8e661 Remove spree_frontend and spree_sample from ofn's gemfile
spree_frontend will only be removed from gemfile.lock when spree_auth_devise is removed from OFN
2019-06-18 10:49:20 +01:00
luisramos0
61def8f2e7 Convert match routes to get routes to be compatible with rails 4 2019-06-18 10:49:20 +01:00
luisramos0
4ff0bf8162 Change gemfile to depend on the different spree gems, not spree as a whole 2019-06-18 10:49:20 +01:00
luisramos0
02b9fca620 Remove unused spree checkout and spree cart routes 2019-06-18 10:49:19 +01:00
luisramos0
40f7d07e27 Remove unnecessary method from spree storecontroller and spree orderscontroller 2019-06-18 10:47:34 +01:00
luisramos0
c56486d7ae Remove unnecessary methods from spree checkoutcontroller 2019-06-18 10:47:34 +01:00
luisramos0
56db90f49e Remove unused checkout controller update action and order controller populate action
Additionally, remove routes of these actions as well as routes already defined in routes.rb (checkout and cart)
2019-06-18 10:47:34 +01:00
luisramos0
a8b4037885 Remove dependency to coupon code logic in checkoutcontroller, ofn doesnt have that feature 2019-06-18 10:47:34 +01:00
luisramos0
fc145d472d Add home controller to ofn codebase from spree frontend 2019-06-18 10:47:34 +01:00
luisramos0
5037cce6f5 Add all the code missing from checkout, order and store controllers to ofn controllers 2019-06-18 10:47:34 +01:00
luisramos0
c399491314 Move spree frontend routes to ofn and transform decorators with class_eval to controller classes 2019-06-18 10:47:34 +01:00
luisramos0
c15c5435ff Fix long lines in exchange model 2019-06-18 10:45:01 +01:00
luisramos0
0cdb49818d Remove distinct from enterprise.ready_for_checkout scope
Adapt use of enterprise scope not_ready_for_checkout to rails 4 by adding enterprises table alias to selected field id
2019-06-18 10:40:49 +01:00
luisramos0
9548f5c5f7 Adapt order_cycle scopes to rail 4 2019-06-18 10:40:49 +01:00
luisramos0
ba91abd20e Adapt exchanges.with_any_variant scope to rails 4 2019-06-18 10:40:49 +01:00
luisramos0
0d07bf2a3b Adapt enterprise.distributing_products scope to rails 4 2019-06-18 10:40:49 +01:00
luisramos0
07a6e62d09 Adapt query in product destroy process to rails 4 2019-06-18 10:40:49 +01:00
luisramos0
e9667ab289 Adapt product.managed_by scope to rails 4 2019-06-18 10:40:49 +01:00
Pau Perez
d003ba81e3 No need to keep old and used Travis config file
If we ever want to come back to Travis we just need to do a git revert.
Meanwhile, no need to care about it.
2019-06-18 11:12:14 +02:00
Luis Ramos
a783f4609a Merge pull request #3942 from jonleighton/exit-if-no-nodenv
Exit script/setup if node is not found
2019-06-17 22:10:44 +01:00
dependabot-preview[bot]
756b3ec73b Bump stripe from 4.18.1 to 4.19.0
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 4.18.1 to 4.19.0.
- [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/v4.18.1...v4.19.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-17 19:19:17 +00:00
Luis Ramos
d9b47ad1b3 Merge pull request #3944 from openfoodfoundation/transifex
Transifex
2019-06-17 16:39:25 +01:00
luisramos0
0235a04530 Add missing translation key in user sessins controller 2019-06-17 15:48:52 +01:00
luisramos0
043abdef39 Add missing translations in the account confirmation process 2019-06-17 15:48:52 +01:00
luisramos0
b372e131a1 Add missing translation key in Spree.
This was fixed in spree 2.1, 7de7fcd502
2019-06-17 15:48:52 +01:00
luisramos0
642d3cbfbd Fix translation key namespace in subs order confirm email subject 2019-06-17 15:48:52 +01:00
Transifex-Openfoodnetwork
930de1b6a2 Updating translations for config/locales/en_ZA.yml 2019-06-17 20:33:27 +10:00
Pau Pérez Fabregat
e3db218e7c Merge pull request #3941 from luisramos0/enza
Add en_ZA.yml copied from en_GB.yml as requested by instance manager
2019-06-17 11:54:09 +02:00
Jon Leighton
fcff302d55 Bring back ‘Shop for X products at:’ title
Fixes #2112

It looks like this bug was accidentally introduced during a refactor in
e5ca494db8. The `bo-html` attribute was
replaced with `ng-html`, but it appears that it should actually have
used `ng-bind-html`
(https://docs.angularjs.org/api/ng/directive/ngBindHtml) because the
former is not a valid AngularJS directive.

It was also necessary to bubble up the `.cta-container` class in order to
get the appropriate styling on the title.
2019-06-17 15:43:15 +10:00
Jon Leighton
150310bf67 Exit script/setup if node is not found
This mirrors what the script already does if ruby is not found
2019-06-17 11:26:54 +10:00
luisramos0
926fc5ee43 Add en_ZA.yml copied from en_GB.yml as requested by instance manager 2019-06-16 20:43:20 +01:00
luisramos0
ccc7a43a06 Bypass validation of shipping methods zone on checkout 2019-06-15 21:11:51 +01:00
luisramos0
e4fcaa5992 Fix typo in package.rb 2019-06-15 20:45:57 +01:00
Luis Ramos
b1d4461c77 Merge pull request #3936 from luisramos0/factories_refactor
Extract factories to separate files and fix rubocop issues
2019-06-14 22:28:55 +01:00
Pau Pérez Fabregat
45c77196b3 Merge pull request #3935 from mkllnk/update-rubocop-style
Update rubocop style
2019-06-14 19:52:22 +02:00
luisramos0
13d41dc1aa Remove duplicate modify entry in factories 2019-06-14 13:59:24 +01:00
luisramos0
5ca382be42 Remove spec/factories.rb from rubocop exceptions, it doesnt look like a problem any longer 2019-06-14 13:55:47 +01:00
luisramos0
3259db69f0 Remove unnecessary code, this code as been accepted in spree code base and included in spree v1.2 2019-06-14 13:43:30 +01:00
luisramos0
6efb71d903 Fix more rubocop issues in spec/factories 2019-06-14 13:42:27 +01:00
Luis Ramos
91401446a5 Merge pull request #3915 from mkllnk/3844-permalink-conflicts
Consider deleted products when creating permalinks
2019-06-14 13:20:35 +01:00
luisramos0
59593c824a Fix rubocop issues in different factories 2019-06-14 13:10:53 +01:00
luisramos0
79cf03b124 Fix rubocop issues in spec/factories 2019-06-14 13:01:08 +01:00
luisramos0
a6b3c26bbe Extract users factories to separate file 2019-06-14 12:50:26 +01:00
luisramos0
8345765ada Extract tag rules factories to separate file 2019-06-14 12:49:17 +01:00
luisramos0
03fb33ba86 Extract variant factory modify to separate file 2019-06-14 12:48:04 +01:00
luisramos0
2c8ce6e4e5 Extract products factories to separate file 2019-06-14 12:45:55 +01:00
luisramos0
3e10c703bf Extract shipments factories to separate file 2019-06-14 12:43:07 +01:00
luisramos0
42f8b2efed Fix static file path in order_cycle_factory 2019-06-14 12:30:36 +01:00
luisramos0
bd493c392a Extract shipping_methods factories to separate file 2019-06-14 12:25:10 +01:00
luisramos0
dc701f55b3 Extract calculators factories to separate file 2019-06-14 12:23:32 +01:00
luisramos0
06e3328ce2 Extract orders factories to separate file 2019-06-14 12:17:24 +01:00
luisramos0
91fcb7c7c4 Extract enterprises factories to separate file 2019-06-14 12:12:45 +01:00
luisramos0
42f2e78b10 Extract subscriptions factories to separate file 2019-06-14 12:10:54 +01:00
luisramos0
0501859c23 Extract order_cycle factories to separate file 2019-06-14 12:10:27 +01:00
luisramos0
a7c970054c Add rescue in product controller create action to avoid server error and send appropriate error message to client when product image upload fails 2019-06-14 10:20:28 +01:00
luisramos0
c97925aa4a Improve message in private shopfront when closed or when user is not logged in 2019-06-14 10:13:33 +01:00
Maikel
5e89c54144 Merge pull request #3931 from openfoodfoundation/RachL-patch-1-3
Update README.md
2019-06-14 14:20:22 +10:00
Maikel
2307df980c Merge pull request #3930 from openfoodfoundation/transifex
Transifex
2019-06-14 14:19:13 +10:00
Maikel Linke
b5f3f98f87 Make BlockLength style apply to all files except todo list 2019-06-14 11:49:27 +10:00
Maikel Linke
ac79e44d9a Fix current rubocop violations 2019-06-14 11:40:09 +10:00
Maikel Linke
bf8a31abda Add rake task to report lost payments
In rare cases, payment records can get lost through database rollbacks.
This new rake task tries to find log entries for lost transactions and
reports them as CSV.
2019-06-14 11:10:31 +10:00
Transifex-Openfoodnetwork
f0977f3c39 Updating translations for config/locales/nb.yml 2019-06-14 08:08:37 +10:00
dependabot-preview[bot]
16ad94f3a8 Bump activerecord-import from 1.0.1 to 1.0.2
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/zdennis/activerecord-import/releases)
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.1...v1.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-13 19:23:40 +00:00
luisramos0
6223a738a7 Fix rubocop issues in collapsible.css 2019-06-13 19:32:33 +01:00
luisramos0
a370216f54 Change default translation in the registration introduction so that it looks better when collapsed 2019-06-13 19:28:31 +01:00
luisramos0
473fb45132 Remove an extra break line to remove html space and make sure alignment is correct 2019-06-13 19:28:10 +01:00
luisramos0
ae0563a58f Merge branch 'master' into 1766-registration-scroll 2019-06-13 19:10:05 +01:00
Luis Ramos
2b593a59f5 Merge pull request #3900 from luisramos0/subs_trans
Missing translations in Subscriptions
2019-06-13 18:51:20 +01:00
Rachel Arnould
d3cb106ae4 Update README.md
In order to benefit from a free unlimited account at Browser stack, they asked us to 
*Give us a shoutout on your GitHub project page. Post an hyperlink and a line about how you use BrowserStack.*
2019-06-13 18:58:58 +02:00
Luis Ramos
ddfd14ebb3 Merge pull request #3905 from openfoodfoundation/dependabot/bundler/i18n-js-3.3.0
Bump i18n-js from 3.2.2 to 3.3.0
2019-06-13 17:33:50 +01:00
luisramos0
1db220e1e0 Remove unnecessary referer setting from products controller spec 2019-06-13 17:22:09 +01:00
Luis Ramos
29bc961e8a Merge pull request #3890 from luisramos0/transl_prod_page
Add missing translation keys to the create product page
2019-06-13 17:13:40 +01:00
Transifex-Openfoodnetwork
216e181c6e Updating translations for config/locales/en_GB.yml 2019-06-14 01:53:18 +10:00
Transifex-Openfoodnetwork
b65b94b6f9 Updating translations for config/locales/en_GB.yml 2019-06-14 01:50:11 +10:00
Luis Ramos
85ee1e7806 Merge pull request #3889 from luisramos0/tag_rules_transl
Fix missing translations in tag rules management page
2019-06-13 16:15:49 +01:00
Luis Ramos
7d24bcf868 Merge pull request #3798 from m-budryte/order_cycles_add_fee_remove_link
the translations for Remove in the exchange forms added
2019-06-13 16:15:28 +01:00
Luis Ramos
1df1ba9403 Merge pull request #3888 from luisramos0/translations
Add translation keys to actions in the order payments list page
2019-06-13 15:36:43 +01:00
Luis Ramos
e15ccdbd74 Merge pull request #3840 from mkllnk/3727-default-credit-cards
Make only reusable credit cards the default card
2019-06-13 14:13:32 +01:00
Luis Ramos
1a2703f630 Merge pull request #3886 from luisramos0/fees_translations
Make a few more things translatable in the Enterprise Fees management page
2019-06-13 14:12:16 +01:00
Luis Ramos
09a5426095 Merge pull request #3880 from kristinalim/fix/3792-optimize_order_cycle_variant_updates
3792 Optimize saving Order Cycle changes
2019-06-13 12:33:22 +01:00
Luis Ramos
bb7a2d7a5e Merge pull request #3252 from mllocs/fix/navbar-right-items-styles
Top navbar redesign and cleanup
2019-06-13 12:04:20 +01:00
Pau Pérez Fabregat
080689ccfa Merge pull request #3917 from luisramos0/subs_visible
Make subs radio button visible to all managers
2019-06-12 16:42:31 +02:00
Matt-Yorkley
41a36bb704 Update all locales with the latest Transifex translations 2019-06-12 13:54:41 +01:00
Luis Ramos
7cae7ca520 Merge pull request #3897 from openfoodfoundation/dependabot/bundler/fuubar-2.4.0
Bump fuubar from 2.3.2 to 2.4.0
2019-06-12 13:29:04 +01:00
Luis Ramos
05856c44dd Merge pull request #3906 from openfoodfoundation/dependabot/bundler/webmock-3.6.0
Bump webmock from 3.5.1 to 3.6.0
2019-06-12 13:28:36 +01:00
Luis Ramos
b02bf3b83c Merge pull request #3872 from luisramos0/rails4_where_scope
[Rails 4] Change all model scopes without a callable object to use a proc
2019-06-12 12:53:10 +01:00
Matt-Yorkley
48ebfbee90 Merge pull request #3902 from openfoodfoundation/transifex
Transifex
2019-06-12 10:02:40 +01:00
Matt-Yorkley
785595a951 Reduce initial queries on shop page by ~95% 2019-06-12 09:47:01 +01:00
Matt-Yorkley
0aa8b1a30e Make shop hidden ams injection consistent with other uses 2019-06-12 09:47:01 +01:00
Matt-Yorkley
874fb884b8 Refactor Angular controllers further 2019-06-12 09:47:01 +01:00
Matt-Yorkley
a91ae8947b Only query visible enterprises 2019-06-12 09:47:01 +01:00
Matt-Yorkley
11e83af0b6 Remove duplication of enterprise angular controllers
We can re-use the enterprise and producers controllers here in their respective groups tabs, no need for a third controller
2019-06-12 09:47:01 +01:00
Matt-Yorkley
9703d848ef Improve syntax in injection_helper 2019-06-12 09:47:01 +01:00
Matt-Yorkley
4155b17633 Remove tests that reference removed code 2019-06-12 09:47:01 +01:00
Matt-Yorkley
d5bd058754 Fix groups show page
It can definitely be cleaned up more in the future, but this should get us around a 90% reduction in page load times.
2019-06-12 09:47:01 +01:00
Matt-Yorkley
4ec46c2db6 Fix groups index page 2019-06-12 09:47:01 +01:00
Matt-Yorkley
aca1f92060 Adapt specs to new loading methods 2019-06-12 09:47:01 +01:00
Matt-Yorkley
1b8dfaf049 Fix HashNavigation reload bug 2019-06-12 09:47:01 +01:00
Matt-Yorkley
ae8f1a92e8 Remove "profiles" from /shops 2019-06-12 09:47:01 +01:00
Matt-Yorkley
698d3672a6 List only current taxons for active enterprises 2019-06-12 09:47:01 +01:00
Matt-Yorkley
ed97400a23 Improve producers performance 2019-06-12 09:47:01 +01:00
Matt-Yorkley
45d65baf8e Improve shops performance 2019-06-12 09:47:01 +01:00
Matt-Yorkley
e329b4bfb0 Improve queries for serializers 2019-06-12 09:47:01 +01:00
Pau Pérez Fabregat
99b82272cc Merge pull request #3883 from Matt-Yorkley/order_cycles_performance
Admin order cycles performance
2019-06-12 10:38:54 +02:00
Pau Pérez Fabregat
fd95ae7e41 Merge pull request #3847 from Matt-Yorkley/api_access
Allow unauthenticated access to OFN API endpoints
2019-06-12 09:45:11 +02:00
Maikel Linke
76d77ceb51 Update and generalise database mirror script
The old script was specfic to the use in Australia and out of date. The
new version isn't perfect but works well for me.
2019-06-12 10:19:56 +10:00
luisramos0
f23094df09 Fix file name of js unit test files in admin/order_cycles/controllers 2019-06-11 21:28:55 +01:00
luisramos0
9c539da811 Fix rubocop issue in schedules_controller.collection by extracting method 2019-06-11 21:28:55 +01:00
luisramos0
6cf705ea55 In the order cycle pages (both create and edit, both simple and normal), add OC coordinator to schedules request to the server and make the controller filter schedules of order cycles coordinated by that enterprise id. 2019-06-11 21:28:52 +01:00
Maikel Linke
d1901cbea4 Allow class_eval to have more than 25 lines 2019-06-11 18:01:41 +01:00
Maikel Linke
5c72c35060 Use better credit card factory for subs specs
The specs for subscriptions were creating simple one-time-use credit
cards. They should not be used for subscriptions. After this was fixed
in previous commits, these integration tests failed. Now we use a new
factory that mimics stored credit cards that can be used for
subscriptions.
2019-06-11 18:01:41 +01:00
Maikel Linke
b3b8cb778f Make only reusable credit cards the default card
https://github.com/openfoodfoundation/openfoodnetwork/issues/3727

When a user didn't have a default credit card and then checked out with
a credit card it became the default even when the user didn't intend to
store it. That lead to subscriptions trying to charge a one-time card
which fails.
2019-06-11 18:01:41 +01:00
luisramos0
d8a7f60f40 Make subs radio button visible to all managers 2019-06-11 17:21:13 +01:00
Maikel Linke
a10bb5acbd Consider deleted products when creating permalinks
https://github.com/openfoodfoundation/openfoodnetwork/issues/3844

Spree's implementation and our implementation to create a unique
permalink failed to notice conflicts with soft-deleted products. This
patch looks at deleted products as well.
2019-06-11 18:20:41 +10:00
Kristina Lim
cf11ef8ba2 Ignore parameter list length for ProductImport::EntryValidator
This can be done in a separate PR. More tests might be needed when
extracting to a class.
2019-06-10 04:20:04 +08:00
Kristina Lim
8c69ee67b8 Refactor code for validating variant in reference to existing product 2019-06-10 04:20:04 +08:00
Kristina Lim
70614de955 Require product import rows to match unit of preceding rows 2019-06-10 04:20:03 +08:00
Kristina Lim
5d282f7e9f Update code layout in ProductImporter method 2019-06-10 04:20:03 +08:00
Kristina Lim
73b388da87 Simplify product import all_entries method 2019-06-10 04:20:03 +08:00
Kristina Lim
38519b2bae Simplify building of product import entries for range 2019-06-10 04:19:50 +08:00
Kristina Lim
37101a6b64 Extract build_entries_from_rows for product import 2019-06-09 23:38:36 +08:00
dependabot-preview[bot]
e686c61962 Bump webmock from 3.5.1 to 3.6.0
Bumps [webmock](https://github.com/bblimke/webmock) from 3.5.1 to 3.6.0.
- [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/v3.5.1...v3.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-06 19:21:33 +00:00
dependabot-preview[bot]
93811a6d8f Bump i18n-js from 3.2.2 to 3.3.0
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.2.2 to 3.3.0.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-06 19:19:50 +00:00
Luis Ramos
568e3003ba Merge pull request #3882 from kristinalim/feature/3408-enable_enterprise_fee_summary_for_non_superadmin
3408 Remove feature flag for Enterprise Fee Summary
2019-06-06 16:28:36 +01:00
Transifex-Openfoodnetwork
ec898a8127 Updating translations for config/locales/en_US.yml 2019-06-06 23:03:05 +10:00
Transifex-Openfoodnetwork
ddab3ba074 Updating translations for config/locales/en_US.yml 2019-06-06 22:59:56 +10:00
Luis Ramos
e2b506294d Merge pull request #3870 from openfoodfoundation/dependabot/bundler/jwt-2.2.1
Bump jwt from 2.1.0 to 2.2.1
2019-06-05 20:48:38 +01:00
Luis Ramos
78f0164f5b Merge pull request #3881 from openfoodfoundation/dependabot/bundler/stripe-4.18.1
Bump stripe from 4.11.0 to 4.18.1
2019-06-05 20:48:12 +01:00
Transifex-Openfoodnetwork
2b9ff963da Updating translations for config/locales/en_GB.yml 2019-06-06 05:03:44 +10:00
Transifex-Openfoodnetwork
3100781f27 Updating translations for config/locales/en_GB.yml 2019-06-06 05:00:36 +10:00
Pau Pérez Fabregat
5028c9d283 Merge pull request #3899 from openfoodfoundation/transifex
Transifex
2019-06-05 12:28:12 +02:00
luisramos0
ff2901a9d1 Add address suburb translation key to fix edit subscription address page
Keeping these in the root of the translations file so that they can be used in other places later
2019-06-04 20:59:45 +01:00
luisramos0
9944f3e1e6 Make translations of tooltips in subscriptions list page work again 2019-06-04 20:59:45 +01:00
luisramos0
cfcf73b6a1 Make save and saving messages translatable in subscriptions items panel 2019-06-04 20:59:45 +01:00
luisramos0
eb42e81afc Make some text entries translatable in create subscription pages: title in step 1 details and 4 review and date placeholders in step 1 details 2019-06-04 20:59:45 +01:00
luisramos0
64af81a4a2 Make search_by_email text translatable in subscriptions list page 2019-06-04 20:59:42 +01:00
Transifex-Openfoodnetwork
215f6e92f2 Updating translations for config/locales/fr.yml 2019-06-05 02:44:40 +10:00
Luis Ramos
fd64e53f61 Merge pull request #3841 from luisramos0/2-0-fix-ship-methods-translations
Move shipping methods translations to lazy lookups
2019-06-04 15:15:31 +01:00
Luis Ramos
4dcf309910 Merge pull request #3884 from luisramos0/3879_ship_cats
Remove matching of product shipping category with shipping method's category on checkout
2019-06-03 22:53:13 +01:00
dependabot-preview[bot]
1b92b126c8 Bump fuubar from 2.3.2 to 2.4.0
Bumps fuubar from 2.3.2 to 2.4.0.
2019-06-03 19:17:54 +00:00
Matt-Yorkley
98d1cbec8c Update all locales with the latest Transifex translations 2019-06-02 18:06:51 +01:00
Kristina Lim
2c52c1a6fc Remove unused argument from Spree::Ability method 2019-06-02 01:30:46 +08:00
luisramos0
1a4e83d633 Change products controller to clear variants unit description if variant_unit is items 2019-06-01 16:56:17 +01:00
luisramos0
4551149532 Improve code of weight calculator 2019-05-31 19:55:39 +01:00
luisramos0
82955b9fe5 Make weight calculator use line_item.final_weight_volume rather than variant.weight for cases where the final weight is set manually in the BOM 2019-05-31 19:55:17 +01:00
luisramos0
9078a1edaa Add missing translation keys to the create product page: fields names displayed in error messages 2019-05-30 23:50:51 +01:00
luisramos0
32c107ab5a move translation to use relative path so that the new translation key is used 2019-05-30 23:26:23 +01:00
Masha
fbf52dd1f9 removed translations that are not required, left exchange_form.remove key but reference a global remove in the table 2019-05-30 23:08:05 +01:00
Masha
436a2ba0a2 went much shorted way 2019-05-30 23:08:05 +01:00
Masha
412fffba1d the translations for Remove in the exchange forms added 2019-05-30 23:08:05 +01:00
Pau Pérez Fabregat
ada640b159 Merge pull request #3850 from lin-d-hop/update-readme
Update outdated things on the README
2019-05-30 23:56:36 +02:00
luisramos0
5024da4123 Make tag rules type descriptions in the management page translatable 2019-05-30 20:39:58 +01:00
luisramos0
6620243603 Make the submit button on the add tag rule dialog translatable 2019-05-30 20:22:02 +01:00
luisramos0
48361b146c Add translation keys to actions in the order payments list page 2019-05-30 20:13:17 +01:00
luisramos0
1d4529092f Make fee type options in enterprise fees page translatable 2019-05-30 00:46:20 +01:00
luisramos0
6e08310744 Make the fields in the column calculator values in the enterprise fees page translatable for all fields of all current calculators 2019-05-29 21:57:03 +01:00
luisramos0
5719455731 Make enterprise fees name placeholder translatable 2019-05-29 21:33:30 +01:00
luisramos0
c5a95dee79 Remove matching of product shipping category with shipping method's category to allow users to checkout products with categories not supported by the shipping methods.
See issue #3884 for more details.
2019-05-29 14:43:19 +01:00
Matt-Yorkley
563f9a4f5f Remove another N+1 2019-05-29 12:28:56 +01:00
Luis Ramos
187fbd788b Merge pull request #3873 from Matt-Yorkley/branding
Use OFN logo in admin area
2019-05-29 10:12:48 +01:00
Matt-Yorkley
2dd4c1ccaf Cut OC edit #for_order_cycle queries in half 2019-05-29 10:01:46 +01:00
Matt-Yorkley
8733036fb0 Remove 2 N+1s, reduce queries in #visible action ~90% 2019-05-29 10:01:44 +01:00
Matt-Yorkley
c0a40c616b Use devise's check_authorization and skip_authorization_check 2019-05-28 22:02:18 +01:00
Luis Ramos
88f109da67 Merge pull request #3868 from luisramos0/delete-en-us
Remove unused en-US locale file
2019-05-28 20:06:07 +01:00
Kristina Lim
ecea0600b6 Remove feature flag for Enterprise Fee Summary 2019-05-29 02:50:41 +08:00
Kristina Lim
93850d4317 Merge pull request #3846 from luisramos0/transpec_features
Transpec spec/features
2019-05-29 01:17:30 +08:00
luisramos0
79f16e0ea3 Run transpec in spec/features/consumer/external_services_spec.rb 2019-05-28 17:04:06 +01:00
luisramos0
7397ab4fd8 Run transpec in spec/features/admin/payment_method_spec.rb 2019-05-28 17:04:06 +01:00
luisramos0
ec7e92202b Run transpec in spec/features/admin/enterprise_user_spec.rb and spec/features/admin/overview_spec.rb 2019-05-28 17:04:06 +01:00
luisramos0
9a21ca38e1 Run transpec in a few more spec/features/admin specs 2019-05-28 17:04:06 +01:00
luisramos0
d2f62f86a9 Run transpec in a few spec/features/admin specs 2019-05-28 16:59:51 +01:00
luisramos0
80537e7e01 Run transpec in spec/features/admin/image_settings_spec.rb 2019-05-28 16:57:11 +01:00
luisramos0
7f43a66fb3 Run transpec in spec/features/admin/adjustments_spec 2019-05-28 16:57:11 +01:00
luisramos0
f2bfb9bedb Fix rubocop issues in adjustment_decorator, line_item_decorator and product_decorator 2019-05-28 16:50:59 +01:00
luisramos0
ced6264846 Fix rubocop issues in enterprise model 2019-05-28 16:30:50 +01:00
luisramos0
f58d9ec790 Fix rubocop issues in exchange model 2019-05-28 16:10:40 +01:00
luisramos0
06c0b1375b Fix rubocop issues in enterprise_relationship model 2019-05-28 16:07:10 +01:00
luisramos0
ffbd79d3dd Change all model scopes without a callable object to use a proc 2019-05-28 15:55:13 +01:00
Kristina Lim
99f163d294 Make code style changes for spec file 2019-05-28 21:32:25 +08:00
Kristina Lim
75fdfb3c6a Remove some usage of guard clauses for OC update 2019-05-28 21:32:25 +08:00
Kristina Lim
56a2347ea0 Extract removal of unauthorized OC exchange attributes to method 2019-05-28 21:29:20 +08:00
Kristina Lim
ea8d189d6c Bulk update OC variant changes in OC form 2019-05-28 21:27:43 +08:00
Kristina Lim
bc6f14105e Require spec_helper.rb in spec file for OC form applicator 2019-05-28 21:26:33 +08:00
Kristina Lim
9def777d02 Install activerecord-import gem 2019-05-28 21:26:32 +08:00
dependabot-preview[bot]
0b6eaa8d02 Bump jwt from 2.1.0 to 2.2.1
Bumps [jwt](https://github.com/jwt/ruby-jwt) from 2.1.0 to 2.2.1.
- [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/v2.1.0...v2.2.1)
2019-05-28 13:10:44 +00:00
dependabot-preview[bot]
df2553eac5 Bump stripe from 4.11.0 to 4.18.1
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 4.11.0 to 4.18.1.
- [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/v4.11.0...v4.18.1)
2019-05-28 13:10:43 +00:00
Luis Ramos
6a0925539f Merge pull request #3842 from luisramos0/rubocop-line-length
Fix a few rubocop warnings manually and run rubocop autocorrect
2019-05-28 14:08:16 +01:00
luisramos0
d10f9a1a43 Rebuilding rubocop_todo auto after all the fixes 2019-05-28 12:57:29 +01:00
luisramos0
07854cf372 Fix a few problems introduced by rubocop auto correct 2019-05-28 12:57:29 +01:00
luisramos0
86b0d71c7e Result of rubocop auto-correct and rebuilding rubocop_manual_todo 2019-05-28 12:57:29 +01:00
luisramos0
4a67acf954 Removing a few rubocop warnings 2019-05-28 12:55:17 +01:00
Luis Ramos
31098218d2 Merge pull request #3856 from Drumstickx/master
Fixed sql injection vulnerability in users_and_enterprises_report.
2019-05-28 10:32:27 +01:00
Luis Ramos
9ccf502365 Merge pull request #3797 from lin-d-hop/variant-master-price
Remove non-functional Price field from Edit Product screen
2019-05-28 10:30:05 +01:00
Luis Ramos
de5eeeb6f2 Merge pull request #3812 from openfoodfoundation/dependabot/bundler/unicorn-5.5.1
Bump unicorn from 5.5.0 to 5.5.1
2019-05-27 13:06:58 +01:00
dependabot-preview[bot]
09d4ab9f0d Bump unicorn from 5.5.0 to 5.5.1
Bumps [unicorn](https://bogomips.org/unicorn/) from 5.5.0 to 5.5.1.

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-27 09:22:42 +00:00
Pau Pérez Fabregat
2d3bd7f471 Merge pull request #3828 from eelcodevlieger/webdrivers
Webdrivers
2019-05-27 11:20:04 +02:00
Pau Pérez Fabregat
018b019f10 Merge pull request #3865 from mkllnk/438-aus-locale
Add Australian English locale
2019-05-27 11:11:04 +02:00
Pau Pérez Fabregat
6aa039876d Merge pull request #3809 from openfoodfoundation/dependabot/bundler/jquery-rails-3.0.4
Bump jquery-rails from 3.0.0 to 3.0.4
2019-05-27 10:40:44 +02:00
Pau Pérez Fabregat
6b08e2ab2c Merge pull request #3864 from openfoodfoundation/disable-harmful-rake-tasks-in-production
Disable harmful rake tasks in production
2019-05-27 10:36:07 +02:00
Matt-Yorkley
099914be40 Use OFN logo in admin area 2019-05-27 02:20:04 +01:00
luisramos0
4143c50b1f Move joyride translations to the correct path 2019-05-24 23:54:00 +01:00
luisramos0
dc32d282a6 Fix some rubocop issues in menu css file 2019-05-24 23:54:00 +01:00
luisramos0
2654db7c82 Add new menu style as per design 2019-05-24 23:53:56 +01:00
dependabot-preview[bot]
1a9ad4fcbc Bump jquery-rails from 3.0.0 to 3.0.4
Bumps [jquery-rails](https://github.com/rails/jquery-rails) from 3.0.0 to 3.0.4.
- [Release notes](https://github.com/rails/jquery-rails/releases)
- [Changelog](https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/jquery-rails/compare/v3.0.0...v3.0.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-24 20:40:14 +00:00
Luis Ramos
655c54f367 Merge pull request #3835 from openfoodfoundation/dependabot/bundler/i18n-js-3.2.2
Bump i18n-js from 3.2.1 to 3.2.2
2019-05-24 21:38:16 +01:00
luisramos0
0dc0776705 Separate mobile menu cart code from large menu cart code 2019-05-24 15:17:41 +01:00
luisramos0
ec9d50c824 Add new cart icon and extract cart joyride from cart haml file 2019-05-24 15:16:36 +01:00
luisramos0
60c08347a5 Extract language selector from large menu haml file, add language name and clean up the code that generates the shopping@ label 2019-05-24 15:12:31 +01:00
Luis Ramos
b6a456cb67 Merge pull request #3863 from mkllnk/quiet-cron
Make inserting delayed jobs from cron quiet
2019-05-24 14:50:19 +01:00
Luis Ramos
db0c874622 Merge pull request #3669 from luisramos0/2-0-without-spree-fe-views
[Spree Upgrade] Remove dependency to spree frontend - views and assets
2019-05-24 14:37:34 +01:00
luisramos0
97f09c672a Remove unused en-US locale file 2019-05-24 10:11:44 +01:00
Pau Pérez Fabregat
1d72d461df Merge pull request #3866 from openfoodfoundation/transifex
Transifex
2019-05-24 10:10:10 +02:00
luisramos0
5858a83239 Simplify spec_helper config to make file downloads work in headless chrome 2019-05-23 20:31:52 +01:00
Luis Ramos
4a321f200f Merge pull request #3783 from kristinalim/fix/3782-missing_translation
3782 Fix missing translation in subscription update modal
2019-05-23 18:45:20 +01:00
Luis Ramos
ae1d260729 Merge pull request #3810 from openfoodfoundation/dependabot/bundler/deface-1.0.2
Bump deface from 1.0.0 to 1.0.2
2019-05-23 18:42:51 +01:00
luisramos0
15360971b0 Move signed_* files to views/shared/menu and add new logged in and profile icons 2019-05-23 15:58:02 +01:00
Luis Ramos
12282ad906 Merge pull request #3794 from m-budryte/replace_&_with_OR
& replaced by OR when multiple property filters are selected
2019-05-23 14:35:51 +01:00
Transifex-Openfoodnetwork
a4d59b72b0 Updating translations for config/locales/nb.yml 2019-05-23 20:35:12 +10:00
Transifex-Openfoodnetwork
6b2e10860e Updating translations for config/locales/nb.yml 2019-05-23 20:32:02 +10:00
Maikel Linke
c93e51b73e Update source locale description
The Australian instance has been using the source locale. But now we
added an Australian English locale via Transifex.

The I18n wiki page moved as well.
2019-05-23 20:14:59 +10:00
Transifex-Openfoodnetwork
3c162984f1 Updating translations for config/locales/en_AU.yml 2019-05-23 19:57:49 +10:00
Transifex-Openfoodnetwork
207fe7b64e Updating translations for config/locales/en_AU.yml 2019-05-23 19:54:40 +10:00
Pau Pérez Fabregat
7c9299bdb5 Merge pull request #3852 from openfoodfoundation/transifex
Transifex
2019-05-22 16:35:27 +02:00
Pau Perez
4c19c1a0a5 Disable harmful rake tasks in production
No need to check whether you are running that `bundle exec rake db:reset`
command on staging or production anymore 😱.

As described in https://github.com/adamcooke/rails-safe-tasks

> This gem provides an extra layer of safety between you and deleting all your
> production data by accident.

> It restricts the use of various rake tasks (including db:drop, db:reset etc...)
> when you are running your application in a production environment.
2019-05-22 15:30:43 +02:00
Maikel Linke
38e9976ce4 Make inserting delayed jobs from cron quiet
`config/schedule.rb` defines entries for cron jobs. Every five minutes
it insert several delayed jobs via `script/enqueue`. A recent upgrade of
Postgresql (a year or two ago) made that script noisy. Every time we
insert a delayed job with that script it outputs:

  INSERT 0 1

Standard output like this is seen as error message by cron an forwarded
to the unix user's local mailbox in `/var/mail/openfoodnetwork`. This
file grows over time and accumulates tens of thousands of error
messages, hiding any important failures.

This patch makes inserting delayed jobs quiet. A failure is still
reported.
2019-05-22 03:36:07 +10:00
Matt-Yorkley
74d7db9fba Allow unauthenticated access to enterprise API endpoints 2019-05-21 17:13:00 +01:00
Drumstickx
414ae58cbd Rubocop changes. 2019-05-21 16:48:02 +02:00
Drumstickx
c162654757 Reduce code duplication. 2019-05-21 16:46:40 +02:00
Drumstickx
29f68ed5d8 Rubocop changes. 2019-05-21 14:51:52 +02:00
luisramos0
115b5dadef Remove more dead code from usersregistration (signup calls are always ajax) 2019-05-21 12:39:29 +02:00
luisramos0
d9438cb082 Add spinner.gif from spree_frontend, this makes ofn completely independent of spree_frontend assets 2019-05-21 12:39:29 +02:00
luisramos0
ffd883e84d Remove dead code from usersregistration (signup calls are always ajax) and remove application.html.erb (spree frontend default layout) because this usersregistration was the last bit of OFN code to use it 2019-05-21 12:39:29 +02:00
luisramos0
25fd6f2e78 Move empty check template from spree_frontend, it is required from the checkout page
This makes ofn code completely independent from spree_frontend views
2019-05-21 12:39:29 +02:00
luisramos0
a0c56f31c7 Move Google Analytics script from spree_frontend to ofn: this is one of the very last dependencies to spree_frontend code 2019-05-21 12:39:29 +02:00
Transifex-Openfoodnetwork
85c41c1f12 Updating translations for config/locales/pt.yml 2019-05-21 20:18:30 +10:00
Transifex-Openfoodnetwork
d252916858 Updating translations for config/locales/pt.yml 2019-05-21 20:15:53 +10:00
Transifex-Openfoodnetwork
09a9b64d28 Updating translations for config/locales/pt.yml 2019-05-21 20:15:20 +10:00
Transifex-Openfoodnetwork
31c1c82310 Updating translations for config/locales/fr.yml 2019-05-21 20:10:37 +10:00
Transifex-Openfoodnetwork
a66c2314ef Updating translations for config/locales/fr.yml 2019-05-21 20:07:31 +10:00
Drumstickx
2f83d02168 Reduce code duplication. 2019-05-19 22:36:55 +02:00
Drumstickx
0e6a576e33 Fix user_id IS NOT NULL check. 2019-05-19 22:05:34 +02:00
Drumstickx
4204943a7c Styling. 2019-05-19 22:04:44 +02:00
Drumstickx
1246c3b6b9 Styling. 2019-05-19 18:57:09 +02:00
Drumstickx
ec2db4dd2a Fixed sql injection vulnerability in users_and_enterprises_report. 2019-05-19 17:58:57 +02:00
Transifex-Openfoodnetwork
ec343fda3b Updating translations for config/locales/en_GB.yml 2019-05-15 05:58:11 +10:00
Transifex-Openfoodnetwork
ff3e8c29a7 Updating translations for config/locales/en_GB.yml 2019-05-15 05:55:01 +10:00
lin-d-hop
f19244cebd Update outdated things on the README 2019-05-14 15:25:05 +01:00
Pau Pérez Fabregat
59d4e3d9e2 Merge pull request #3848 from luisramos0/pr_3813
Get PR 3813 to master (it was only on the hotfix branch 2-0-1)
2019-05-13 19:15:24 +02:00
luisramos0
189865fd80 Make stock locations backorderable_default false.
This is required because when the default stock location is created, the backorderable_default column doesnt exist and when this column is created, the initial default is true. This is why we need to force it to false here. This column is the default value for on_demand which must be false.
2019-05-10 22:00:24 +01:00
Pau Pérez Fabregat
7e9a149c8d Merge pull request #3837 from luisramos0/transpec
transpec!!!
2019-05-10 14:59:41 +02:00
Pau Pérez Fabregat
f113ac61d7 Merge pull request #3839 from coopdevs/report-cache-diff-in-new-tab
Report cache diff in new tab
2019-05-10 14:38:33 +02:00
Pau Perez
9a98a7c974 Report cache diff to Bugsnag in a new tab
This will allow us to see the difference between the cache entry and the
actual shopfront. Otherwise, there is no way to see what wasn't
refreshed in the cache.
2019-05-10 13:13:20 +02:00
luisramos0
07e9043e34 Move shipping methods translations to lazy lookups 2019-05-10 11:44:49 +01:00
Luis Ramos
f844ff275b Merge pull request #3799 from idanceinbetween/product-description-field-text-formatting-3757
added buttons to form and updated sanitizer to allow extra formatting
2019-05-10 10:48:55 +01:00
Maikel
50ca1f7173 Merge pull request #3824 from mkllnk/aus-content-updates
Aus content updates
2019-05-10 10:40:09 +10:00
luisramos0
6996353d05 Run transpec for spec/controllers 2019-05-10 01:20:40 +01:00
luisramos0
df459a21a4 Run transpec for spec/lib 2019-05-10 01:08:34 +01:00
luisramos0
e7c6892ab8 Run transpec for spec/mailers 2019-05-09 23:47:32 +01:00
luisramos0
2c6ca7e169 Run transpec for spec/helpers 2019-05-09 23:43:51 +01:00
luisramos0
0075ffbc02 Run transpec for spec/support 2019-05-09 23:39:30 +01:00
luisramos0
9cfba8ad19 Revert transpec in ability_spec.rb:461 so that spec is green again 2019-05-09 23:33:43 +01:00
luisramos0
6dcc0b1d68 Run transpec for spec/jobs 2019-05-09 23:29:11 +01:00
luisramos0
fe017713ae Run transpec in spec/serializers 2019-05-09 22:43:07 +01:00
luisramos0
04801e5c2e Run transpec in spec/models 2019-05-09 22:25:29 +01:00
Luis Ramos
59e7cb313d Merge pull request #3815 from amers185/add_social_links
Add extra (Instagram) social media links to emails sent to customers and users [Looking for feedback/direction on completing solution]
2019-05-09 21:14:42 +01:00
dependabot[bot]
ef3ea0701e Bump i18n-js from 3.2.1 to 3.2.2
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.2.1...v3.2.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-09 19:19:16 +00:00
Luis Ramos
6d62f4c4b4 Merge pull request #3817 from kristinalim/fix/1218-remove_oc_debug_information
1218 Remove OC "Debug Information" which appears in non-production environments
2019-05-09 16:05:18 +01:00
Luis Ramos
19881927e3 Merge pull request #3699 from HugsDaniel/3688-missing-translation-edit-sub
Add review & edit sub keys
2019-05-09 16:04:38 +01:00
Luis Ramos
24c96fab8b Merge pull request #3795 from lin-d-hop/translation-oc-spinner
Add translation to order cycle spinner
2019-05-09 16:03:53 +01:00
Luis Ramos
b821188f5d Merge pull request #3826 from luisramos0/knapsack
Add new knapsack report to get the build jobs more balanced
2019-05-09 16:00:38 +01:00
Maikel
7d163632a4 Merge pull request #3827 from openfoodfoundation/transifex
Transifex
2019-05-09 17:39:26 +10:00
Maikel Linke
a97792cbc3 Remove story from code comment 2019-05-09 11:57:13 +10:00
Eelco de Vlieger
d498ecf901 Issue 3450 - webdrivers update.
Ran `bundle install` to update Gemfile.lock (suggestion by semaphoreci check)
Moved webdrivers gem down in the list to be in better alphabetical order (suggested by codeclimate check)
2019-05-08 22:28:31 +01:00
Transifex-Openfoodnetwork
5ea9d8cf8b Updating translations for config/locales/de_DE.yml 2019-05-09 06:29:23 +10:00
Transifex-Openfoodnetwork
9abd60ef1e Updating translations for config/locales/de_DE.yml 2019-05-09 06:26:14 +10:00
luisramos0
ca5eddd27e Add new knapsack report to get the build jobs more balanced 2019-05-08 19:59:17 +01:00
Eelco de Vlieger
2900dd89d8 issue 3450 - update webdrivers version - version 3.9 was released yesterday, which caused a test error, so setting version to latest 3.8.1 for now 2019-05-08 19:50:36 +01:00
Eelco de Vlieger
5667c00587 issue 3450 - add webdrivers dependency (+ spec helper setup) and remove chromedriver-helper dependency
https://github.com/openfoodfoundation/openfoodnetwork/issues/3450
2019-05-08 19:10:14 +01:00
eelcodevlieger
295e814988 Merge pull request #1 from openfoodfoundation/master
sync
2019-05-08 18:59:26 +01:00
Masha
5eacf05a45 used string interpolation for clarity 2019-05-08 15:05:15 +01:00
Masha
d5ff733f0b spaces location swapped 2019-05-08 15:05:13 +01:00
Masha
5470f8d758 new translation key for products_or created 2019-05-08 15:03:28 +01:00
Masha
94cbac00a5 & replaced by OR when multiple property filters are selected 2019-05-08 15:00:59 +01:00
luisramos0
77178ca595 Add href and target attributes to product serializer sanitizer to allow links with target in product descriptions 2019-05-08 14:46:57 +01:00
idanceinbetween
7790401d59 added buttons to form and updated sanitizer to allow extra formatting 2019-05-08 14:45:05 +01:00
Pau Pérez Fabregat
a45782f59b Merge pull request #3814 from coopdevs/test-bulk-update-error
Test empty variants_attrs in bulk_update
2019-05-08 15:43:09 +02:00
Maikel
a0f60a9bfe Merge pull request #3806 from openfoodfoundation/transifex
Transifex
2019-05-08 15:50:50 +10:00
Maikel Linke
a3adbd9fc8 Replace connect-learn banner with custom content
The connect and learn banner is only used in Australia at the moment. We
would like to have customisable content here. Now every instance can
choose to place a custom alert banner at the top. Unfortunately, custom
banners are not translated into other languages. That's why I kept the
standard register call. For example, the register call is in use where
it is displayed in French and Italian. Completely switching to custom
content would break the translation.

Translations in custom content are an existing feature request,
"multi-lang 2.0".
2019-05-08 11:38:49 +10:00
Luis Ramos
4c767cd5b4 Merge pull request #3802 from kristinalim/fix/order_cycle_optimizations
3760 Optimizations related to OCs
2019-05-07 21:12:44 +01:00
Luis Ramos
6658f85f59 Merge pull request #3758 from jazzdragon/3292-link-popup-text-translation
3292 link popup text translation
2019-05-07 21:11:31 +01:00
Luis Ramos
dffa50468b Merge pull request #3801 from Matt-Yorkley/need_for_speed
Fix /maps performance
2019-05-07 21:08:34 +01:00
Kristina Lim
12b28fdc32 Remove "Debug Information" in edit OC page 2019-05-08 01:33:58 +08:00
Pau Pérez Fabregat
fc38906e60 Merge pull request #3672 from Matt-Yorkley/spree2/pi_shipping_category
[Spree Upgrade] shipping_category now required for products
2019-05-07 16:12:05 +02:00
Matt-Yorkley
fc8b220b4c Add specs for endpoint and serializers 2019-05-07 10:27:04 +01:00
Transifex-Openfoodnetwork
13985e28f4 Updating translations for config/locales/pt.yml 2019-05-07 19:01:37 +10:00
Transifex-Openfoodnetwork
8f62cf2bce Updating translations for config/locales/pt.yml 2019-05-07 19:01:29 +10:00
Kristina Lim
c3d4288692 Fix translation for closed/closes in subscription update modal 2019-05-07 14:52:03 +08:00
Syed Usama Amer
f71df770d0 added social links 2019-05-06 23:28:14 -05:00
Maikel Linke
38c9ecd44f Update pricing copy for Australian business model 2019-05-07 14:24:31 +10:00
Maikel Linke
0cf964e1bd Update About URL 2019-05-07 11:23:48 +10:00
Matt-Yorkley
6a8a67560b Fix API authentication 2019-05-07 00:36:08 +01:00
Matt-Yorkley
6bdc5d4438 Fix maps performance 2019-05-07 00:36:08 +01:00
Pau Perez
f940397781 Test empty variants_attrs in bulk_update
This covers the scenario we saw in
https://app.bugsnag.com/katuma/katuma/errors/5cd0595bece0b7001984f64c?event_id=5cd0595b0038be3b070d0000&i=sk&m=nw.
There is some other context we might be missing that makes it not
possible to reproduce.

I guess then, that this is an isolated case that does not prevent us
from deploying v2.0.0.
2019-05-06 22:23:37 +02:00
dependabot[bot]
010953cc6b Bump deface from 1.0.0 to 1.0.2
Bumps [deface](https://github.com/spree/deface) from 1.0.0 to 1.0.2.
- [Release notes](https://github.com/spree/deface/releases)
- [Changelog](https://github.com/spree/deface/blob/master/CHANGELOG.markdown)
- [Commits](https://github.com/spree/deface/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-06 19:16:37 +00:00
Kristina Lim
56bc497fe2 Simplify code for enterprise serializer for OCs 2019-05-06 23:49:55 +08:00
lin-d-hop
7b87e609c4 Set master variant price in products controller
Set master variant price in products controller

Code climate tidy up

Syntax improvement

Revert "Remove non-functional Price field from Edit Product screen"

This reverts commit 585072302c.

Syntax improvement

fixing revert

Revert "Remove non-functional Price field from Edit Product screen"

This reverts commit 585072302c.

fixing conflicts
2019-05-06 14:20:01 +01:00
Transifex-Openfoodnetwork
0e954e50d8 Updating translations for config/locales/nb.yml 2019-05-06 21:35:17 +10:00
Kristina Lim
7593168341 Update code style for Enterpise.not_ready_for_checkout
This was changed into multiple lines for readability.
2019-05-06 18:37:28 +08:00
Kristina Lim
c0a5bcce92 Update some comments in Enterprise and OrderCycle models 2019-05-06 18:35:01 +08:00
Kristina Lim
4430c88a95 Eager-load some data for admin order cycle pages 2019-05-06 15:41:29 +08:00
Kristina Lim
f14e7e97b1 Do not check need to warn of invalid OCs unless request is HTML 2019-05-06 15:41:29 +08:00
Kristina Lim
781afc1015 Change OC :suppliers and :distributors to associations 2019-05-06 13:43:44 +10:00
Kristina Lim
71bff0dd5b Reduce the number of queries in Enterprise.not_ready_for_checkout 2019-05-06 13:43:44 +10:00
lin-d-hop
10fba9b39f Add translation to order cycle spinner
lazy text
2019-05-05 19:12:53 +01:00
lin-d-hop
585072302c Remove non-functional Price field from Edit Product screen
Update initializer to override Product Price as required field.

Revert "Update initializer to override Product Price as required field."

This reverts commit 1bfca09c5cf9245fbc3d30a23e9d80ac545adcf5.
2019-05-05 16:41:54 +01:00
Matt-Yorkley
3323ac7650 Fix duplicate error messages 2019-05-05 13:30:38 +01:00
Pau Pérez Fabregat
b443f5ece9 Merge pull request #3789 from hughbric/remove_payment_enterprise_id_refs
references to payment_enterprise_id removed, new migration created
2019-05-05 12:30:19 +01:00
Matt-yorkley
bc349faf8c Fix on_hand failure 2019-05-05 12:00:46 +01:00
Matt-Yorkley
c04c54ebf6 Refactor importer setup and fix shipping_category usage 2019-05-05 12:00:46 +01:00
Matt-Yorkley
fd31a76fba Test shipping_category presence validation 2019-05-05 12:00:46 +01:00
Matt-Yorkley
dee9521f77 shipping_category now required for products 2019-05-05 12:00:46 +01:00
Luis Ramos
17f126d80c Merge pull request #3788 from stveep/3249-display-name-on-edit-variant-page
Add display_name and display_as to admin edit variant page
2019-05-05 11:31:27 +01:00
jazzdragon
37d15a1be3 Add classes to indicate collapsible is for medium screens or smaller 2019-05-04 20:12:12 -07:00
jazzdragon
623471290e Make sure styling doesn't get messed up if resizing down and back up 2019-05-04 19:52:08 -07:00
jazzdragon
a876f81f0a Make collapsible always visible on large screen 2019-05-04 19:48:30 -07:00
jazzdragon
271330d2fc Add collapsible elements and styles 2019-05-04 19:43:46 -07:00
stveep
7090281da5 Reorganise defaces so that display name fields come first 2019-05-04 21:48:32 +01:00
Pau Pérez Fabregat
958b144948 Merge pull request #3787 from eelcodevlieger/issue_3777-Make_all_map_icons_green
issue 3777 - Make all map icons green
2019-05-04 19:54:02 +02:00
Pau Pérez Fabregat
e3d9cab02b Merge pull request #3785 from kkoomin/3687-missing-translation-on-demand
changed string into translation key & add 'infinity' key
2019-05-04 19:01:39 +02:00
stveep
a959702905 Add display_name and display_as to admin edit variant page 2019-05-04 17:20:12 +01:00
Michael Hughes
9e56198092 references to payment_enterprise_id removed, new migration created 2019-05-04 16:32:48 +01:00
Eelco de Vlieger
4b2114c1e4 issue 3777 - Make all map icons green 2019-05-04 14:44:16 +01:00
kkoomin
f65ce82778 changed string into translation key & add 'infinity' key 2019-05-04 14:40:45 +01:00
Luis Ramos
6f0d155508 Merge pull request #3742 from openfoodfoundation/2-0-stable
Merge 2-0-stable to master
2019-05-04 00:06:27 +01:00
Luis Ramos
4afa0cdca1 Merge pull request #3589 from kristinalim/fix/2788-ship_address_changed
2788 [Subscriptions] Fix address issues when syncing subscriptions and orders
2019-05-03 23:48:32 +01:00
Luis Ramos
4f0930b77c Merge pull request #3717 from luisramos0/2-0-update-aws-sdk
[Spree Upgrade] Update to spree revision that depends on aws-sdk 1.11.1
2019-05-03 23:47:30 +01:00
luisramos0
53788625db Update to spree revision that depends on aws-sdk 1.11.1 making ofn gemfile.lock compatile with ofn/spree 2-0-4 gemspec 2019-05-03 13:16:25 +01:00
Luis Ramos
22a60e4fa9 Merge pull request #3769 from amers185/fix_rebase_error
Closes translation bug for enterprise fee settings
2019-05-03 12:53:52 +01:00
luisramos0
d7596b4066 Merge branch 'master' into fix_rebase_error 2019-05-03 12:10:57 +01:00
Pau Pérez Fabregat
969d3e863a Merge pull request #3768 from luisramos0/2-0-fix-on-demand
[Spree Upgrade] Migrate spree_variants.on_demand to spree_stock_items.backorderable
2019-05-03 10:52:16 +02:00
Luis Ramos
637e99367d Merge pull request #3747 from luisramos0/2-0-vo-ctrl-bug
[Spree Upgrade] Fix bug in Variant Overrides controller
2019-05-02 17:31:13 +01:00
luisramos0
4a9570b1a1 Merge branch '2-0-stable' into fix/2788-ship_address_changed 2019-05-02 16:17:53 +01:00
Luis Ramos
3b2e614c57 Merge pull request #3734 from luisramos0/2-0-validate-distribution
Removing a variant from OC will prevent user with that variant in the cart from checking out
2019-05-02 16:12:41 +01:00
Pau Pérez Fabregat
046d6ebdfc Merge pull request #3771 from luisramos0/2-0-stable-May2
[Spree Upgrade] LAST merge master into 2-0-stable 🎉
2019-05-02 14:26:24 +02:00
luisramos0
85cf4fa3e6 Merge branch 'master' into 2-0-stable-May2 2019-05-02 11:27:53 +01:00
Luis Ramos
edaf2479dc Merge pull request #3741 from luisramos0/2-0-stable-Apr15
[Spree Upgrade] Merging master into 2-0-stable (1st run in Apr2019)
2019-05-02 11:26:54 +01:00
luisramos0
f0f08f7cd3 Update all locales with the latest Transifex translations 2019-05-02 11:22:37 +01:00
Pau Pérez Fabregat
5f47a37fac Merge pull request #3763 from coopdevs/allow-passing-s3-region
Allow passing s3 region
2019-05-02 12:17:58 +02:00
luisramos0
340cbe5947 Eager load variants with variant overrides to avoid n+1 in the following line 2019-05-02 11:10:53 +01:00
luisramos0
116650595e Move test setup code to before block 2019-05-02 11:08:31 +01:00
luisramos0
42d1d3eff6 Migrate spree_variants.on_demand to spree_stock_items.backorderable 2019-05-02 10:59:27 +01:00
Pau Pérez Fabregat
2d77605e59 Merge pull request #3764 from Matt-Yorkley/s3_backups_without_images
Don't use s3 for images unless images bucket has been provisioned.
2019-05-01 17:55:01 +02:00
Syed Usama Amer
75a7745736 Closes translation bug for enterprise fee settings 2019-05-01 10:43:35 -05:00
Kristina Lim
19726061e4 Make Order#address_from_distributor public 2019-05-01 07:17:50 +08:00
Kristina Lim
92dc43d7a2 Make OrderUpdater#shipping_address_from_distributor public 2019-05-01 07:16:56 +08:00
Kristina Lim
0933d53134 Extract method OrderSyncer#update_ship_address_for 2019-05-01 07:16:56 +08:00
Kristina Lim
14d407879c Rename method OrderSyncer#update_ship_address_for
This method has become only a small part of the logic for updating the
order's ship address. This no longer follows the method naming
convention within OrderSyncer where update_*_for describes almost the
complete logic for updating the association.

This is renamed in preparation for extraction of the complete update
logic for ship_address. The new method will be named
update_ship_address_for.
2019-05-01 07:16:56 +08:00
Kristina Lim
6952f4ecd1 Improve readability of conditions in OrderSyncer 2019-05-01 07:16:55 +08:00
Kristina Lim
71f379a318 Uncomment passing specs for SubscriptionPlacementJob 2019-05-01 07:16:55 +08:00
Kristina Lim
b4b24931d9 Remove ignore for OrderSyncer spec file 2019-05-01 07:16:55 +08:00
Kristina Lim
46d63f43b9 Update check for pickup address manipulation
The way that the bill contact details and distributor address are set
for pickup orders has changed. At this point, after before_save_hook is
called, the bill contact details have already been set as well.
2019-05-01 07:16:54 +08:00
Kristina Lim
78aa9da2cf Uncomment and update OrderSyncer failing specs
This still achieves a logic issue before the Spree upgrade, where
switching from pick-up to delivery affects whether simultaneous changes
to shipping address are ignored or not.

This behaviour can be fixed in a separate PR.
2019-05-01 07:16:54 +08:00
Kristina Lim
bdf4132e01 Fix order shipment references in OrderUpdater 2019-05-01 07:16:54 +08:00
Pau Pérez Fabregat
88cbf5bd36 Merge pull request #3753 from openfoodfoundation/dependabot/bundler/whenever-0.11.0
Bump whenever from 0.10.0 to 0.11.0
2019-04-30 18:38:52 +02:00
Matt-Yorkley
732d0f7cf4 Don't use s3 for images unless images bucket has been provisioned.
Sets the "use_s3" (for images) option based on presence of `s3_images_bucket` from ofn-install instead of presence of s3 keys, for instances that use s3 for backups but not for images.
2019-04-30 17:06:42 +01:00
Pau Perez
d5b08c602a Allow passing a specific AWS region to S3 settings
This solves the error showed below when executed `bundle exec rake
db2fog:backup RAILS_ENV=staging` on Katuma staging

```
Excon::Error::BadRequest: Expected(200) <=> Actual(400 Bad Request)
excon.error.response
  :body          => "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Error><Code>AuthorizationHeaderMalformed</Code><Message>The authorization header is malformed; the region 'us-east-1' is wrong; expecting 'eu-central-1'</Message><Region>eu-central-1</Region><RequestId>3DE2763883FC601D</RequestId><HostId>1E6UapnblBqVZM0SeeLrdPNDd+VaQ0nxCWwrQ9mi8HjRo2xevAUwtSq5V3fxhsj4Cj9ynnDroco=</HostId></Error>"
```
2019-04-30 13:31:36 +02:00
Pau Perez
f36646d0a3 Store S3 keys in Config before calling db2fog
This ensures that Db2fog always picks up the latest value of the S3_*
env vars and not the one that was persisted last time. Now you can do
things like `S3_BUCKET=xxx bundle exec rake db2fog:backup` if you had
to.
2019-04-30 13:31:36 +02:00
Pau Pérez Fabregat
010f058618 Merge pull request #3744 from openfoodfoundation/dependabot/bundler/oj-3.7.12
Bump oj from 3.7.11 to 3.7.12
2019-04-30 11:53:44 +02:00
Pau Pérez Fabregat
6c9101dffa Merge pull request #3745 from openfoodfoundation/transifex
Transifex
2019-04-30 11:46:17 +02:00
luisramos0
d7e706e6e7 Make text area translations run immeditaly on setup with the t function instead of sending the translation expression down to the textAngular code 2019-04-29 13:40:52 +01:00
jazzdragon
7a27973ae3 Add translation and references in taTranslations (not working in alert) 2019-04-27 19:22:15 -07:00
jazzdragon
b42426a3b8 Add test for existing input alert text 2019-04-27 18:52:23 -07:00
jazzdragon
f6c0071554 Add reference comment 2019-04-27 17:01:07 -07:00
jazzdragon
35de9077da Add config for taTranslations (no functional change) 2019-04-27 16:57:02 -07:00
dependabot[bot]
2c536c29c5 Bump whenever from 0.10.0 to 0.11.0
Bumps [whenever](https://github.com/javan/whenever) from 0.10.0 to 0.11.0.
- [Release notes](https://github.com/javan/whenever/releases)
- [Changelog](https://github.com/javan/whenever/blob/master/CHANGELOG.md)
- [Commits](https://github.com/javan/whenever/compare/v0.10.0...v0.11.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-23 19:18:23 +00:00
Pau Pérez Fabregat
380a9c561e Merge pull request #3725 from coopdevs/add-specs-for-cache-variant-deletion
Add specs for the cache refresh on variant removal
2019-04-19 19:02:04 +02:00
Maikel
99a4878bdf Merge pull request #3653 from mkllnk/2520-spree2-order-subscription
2520 Remove `process_payments!` override
2019-04-19 07:34:30 +10:00
Maikel
736ac49581 Merge pull request #3701 from luisramos0/2-0-fix-order-edit-issues
[Spree Upgrade] Fix two issues in admin orders edit page
2019-04-19 07:33:26 +10:00
luisramos0
a68b5eaf22 Fix bug in Variant Overrides controller. It was validating authorization for variant overrides of deleted variants 2019-04-17 15:31:19 +01:00
luisramos0
3d420d5727 Merge branch 'master' into 2-0-stable-Apr15 2019-04-16 21:14:11 +01:00
Transifex-Openfoodnetwork
225b159b9b Updating translations for config/locales/en_BE.yml 2019-04-17 02:23:46 +10:00
Transifex-Openfoodnetwork
e07ae3d931 Updating translations for config/locales/en_BE.yml 2019-04-17 02:20:37 +10:00
Luis Ramos
6b84edb6d9 Merge pull request #3736 from kristinalim/feature/enable_newrelic_test_mode
Install and set up newrelic_rpm gem for development environment
2019-04-16 15:35:36 +01:00
Luis Ramos
c5720bede5 Merge pull request #3697 from coopdevs/add-delayed-job-web
Add delayed job web
2019-04-16 15:33:59 +01:00
Luis Ramos
eeac75ade1 Merge pull request #3689 from luisramos0/2-0-fix-split-button-bug
[Spree Upgrade] Fix split button reappearing when editing line item quantity
2019-04-16 15:28:43 +01:00
Luis Ramos
67a7e26757 Merge pull request #3695 from luisramos0/2-0-emails-transl
[Spree Upgrade] Fix translation missing in order confirmation email subject and bring cancel email to ofn
2019-04-16 13:44:24 +01:00
Luis Ramos
29000ebe0d Merge pull request #3651 from luisramos0/2-0-enterprise-fee-report
[Spree Upgrade] Fix Enterprise fee report specs
2019-04-16 12:36:53 +01:00
Maikel Linke
278190a25c Update specs for Spree v2 payment requirement
This pull request removed the override of `process_payments!` which was based on v1. Spree v2 has an additional check: An order in payment state requires a payment. Some specs didn't care and didn't create payments before transitioning to `complete`.
2019-04-16 10:30:14 +10:00
Maikel Linke
8b9a814131 Remove obsolete Spree 2 backport on Order 2019-04-16 10:30:14 +10:00
Maikel Linke
6f12eee8ae Reduce the override of Order for subscriptions
Orders belonging to subscriptions get completed without payment. That
requires overriding Spree's functionality.

In Spree 2, an order in payment state without pending orders is invalid.
Instead we skip the payment state by not requiring a payment for
automatically generated orders until the order cycle is closed.
2019-04-16 10:30:14 +10:00
dependabot[bot]
2a025be032 Bump oj from 3.7.11 to 3.7.12
Bumps [oj](https://github.com/ohler55/oj) from 3.7.11 to 3.7.12.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.11...v3.7.12)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-15 19:14:59 +00:00
luisramos0
a1905e43f7 Move a group of translations related to customers to the js translations namespace 2019-04-15 18:12:04 +01:00
luisramos0
9662323261 Move a group of translations related to schedules to the js translations namespace 2019-04-15 17:42:45 +01:00
Hugo Daniel
abdf3b5480 Add edit subcription translation key 2019-04-15 16:27:18 +01:00
luisramos0
e8ccb55f47 Use rspec 3 syntax in order_cycle_distributed_variants_spec and checkout_controller_spec 2019-04-15 12:39:52 +01:00
Pau Pérez Fabregat
ffbea7d3fd Merge pull request #3712 from openfoodfoundation/transifex
Transifex
2019-04-15 12:58:30 +02:00
Pau Pérez Fabregat
6d0ecdc4a6 Merge pull request #3721 from Matt-Yorkley/subs_styles
Subs styles
2019-04-15 12:53:27 +02:00
luisramos0
8f39a18ca3 Merge branch 'master' into 2-0-stable-Apr15 2019-04-15 11:46:31 +01:00
Transifex-Openfoodnetwork
f76fada066 Updating translations for config/locales/es.yml 2019-04-15 19:15:24 +10:00
Transifex-Openfoodnetwork
1b01c44ce4 Updating translations for config/locales/es.yml 2019-04-15 19:12:19 +10:00
Transifex-Openfoodnetwork
10c917a693 Updating translations for config/locales/ca.yml 2019-04-15 17:08:06 +10:00
Transifex-Openfoodnetwork
418d80bdc0 Updating translations for config/locales/ca.yml 2019-04-15 17:05:00 +10:00
luisramos0
fce3d69345 Add flash and warning to the cart page when item becomes unavailable 2019-04-13 21:39:41 +01:00
luisramos0
d602375ac7 Redirect user to cart page if some item in the order is unavailable 2019-04-13 20:31:05 +01:00
Luis Ramos
1e85bf6a68 Merge pull request #3641 from luisramos0/2-0-update-spree-2-0-4-revision
[Spree Upgrade] Update spree revision to include last package_factory fix
2019-04-12 22:16:15 +01:00
Pau Pérez Fabregat
e0fd2fbaa9 Merge pull request #3726 from Matt-Yorkley/db2fog_patch
Db2fog patch
2019-04-12 14:26:46 +02:00
Kristina Lim
53bd421389 Add newrelic.yml to .gitignore 2019-04-12 13:57:50 +08:00
Kristina Lim
6f5a024be2 Update script/setup to create default newrelic.yml 2019-04-12 13:57:50 +08:00
Kristina Lim
d983e400cd Add config/newrelic.yml.example for newrelic_rpm gem 2019-04-12 13:57:50 +08:00
Kristina Lim
c5e4b283f1 Install latest newrelic_rpm gem with test mode 2019-04-12 13:57:47 +08:00
Luis Ramos
0f00f48f13 Merge pull request #3634 from luisramos0/2-0-fix-sample-data
[Spree Upgrade] Fix new sample data in v2
2019-04-11 23:07:15 +01:00
luisramos0
59ec52babe Refactor order_cycle_distributed_variants, better method names and simpler code 2019-04-11 22:15:24 +01:00
luisramos0
44b0592223 Move OrdercycleDistributedVariants from lib/open_food_network to app/services 2019-04-11 21:37:08 +01:00
luisramos0
96ee527f0c Rename distribution_change_validator to order_cycle_distributed_variants 2019-04-11 21:14:01 +01:00
Transifex-Openfoodnetwork
45ca63e751 Updating translations for config/locales/fr_BE.yml 2019-04-12 01:14:59 +10:00
Transifex-Openfoodnetwork
b6989c6d6e Updating translations for config/locales/nl_BE.yml 2019-04-12 01:05:30 +10:00
luisramos0
46278e3edd Set distributor in order and shipping methods so that refreshing shipment rates suceeds 2019-04-10 22:16:09 +01:00
luisramos0
5791eba9bd Enhance orders edit page spec to verify that shipping method can be edited and that shipping methods of other distributors are not listed 2019-04-10 22:16:09 +01:00
luisramos0
c852c616d5 Update spree revision to include last package_factory fix and update spree dependencies 2019-04-10 22:16:09 +01:00
Luis Ramos
ddd3443a86 Merge pull request #3659 from mkllnk/missing-translation
Fix "What's this?" on admin dashboard
2019-04-10 22:05:19 +01:00
Luis Ramos
4bf9320be8 Merge pull request #3666 from mkllnk/1830-v2-edit-shipping-fees
Close adjustments so that updates are effective
2019-04-10 21:58:22 +01:00
Luis Ramos
83a4771cdd Merge pull request #3720 from Matt-Yorkley/spree2/translations
Subs: missing translations
2019-04-10 21:47:47 +01:00
Luis Ramos
984155013c Merge pull request #3648 from luisramos0/2-0-fix-ui-issue
[Spree Upgrade] Fix "back to list" button overlap and remove configurations menu from payments methods list
2019-04-10 21:46:40 +01:00
Luis Ramos
97c920f1b0 Merge pull request #3667 from mkllnk/3477-display-eligible-adjustments
3477 Render only eligible adjustments on the order page
2019-04-10 21:44:16 +01:00
Matt-Yorkley
7373fff190 Define default s3_protocol as 'https' 2019-04-10 19:23:16 +01:00
Matt-Yorkley
4912a9e258 Ensure ENV vars in applications.yml actually update stored Spree::Config preferences 2019-04-10 19:10:31 +01:00
Matt-Yorkley
2ac981a9a3 Make db2fog tasks conditional 2019-04-10 17:17:43 +01:00
Matt-Yorkley
37cbfcb692 Use ENV var for backups bucket 2019-04-10 17:17:17 +01:00
Pau Perez
f20a15e955 Add specs for the cache refresh on variant removal
This is failing in `master` but thanks to the VariantDeleter it does work
in v2. This specs prove it.
2019-04-10 16:16:00 +02:00
Matt-Yorkley
14fd821283 Rename states SCSS file for clarity 2019-04-10 13:12:44 +01:00
Matt-Yorkley
e486a94fb4 Add missing translations in subscriptions 2019-04-10 12:16:31 +01:00
Matt-Yorkley
9e0f35d635 Re-adjust buttons. Much better! 2019-04-10 12:15:21 +01:00
Matt-Yorkley
e13db873b0 Fix subs panel button vertical alignment 2019-04-10 12:15:21 +01:00
Matt-Yorkley
896a45c399 Fix subs state buttons 2019-04-10 12:15:21 +01:00
Matt-Yorkley
3968cfd238 Fix chevron horizontal position 2019-04-10 12:15:21 +01:00
Matt-Yorkley
3578d82cbf Merge pull request #3718 from luisramos0/2-0-fix-build
[Spree Upgrade] Add order distributor to shipping method in reports_spec
2019-04-10 12:14:00 +01:00
luisramos0
e4c54a4954 Add order distributor to shipping method in reports_spec 2019-04-09 23:26:14 +01:00
Luis Ramos
4478d51aee Merge pull request #3668 from luisramos0/2-0-stable-Mar29
[Spree Upgrade] Merging master into 2-0-stable (4th run in Mar2019)
2019-04-09 17:46:36 +01:00
Luis Ramos
449e58723d Merge pull request #3591 from luisramos0/2-0-fix-migrations
[Spree Upgrade] Fix Migrations to 2.0
2019-04-09 13:16:34 +01:00
Transifex-Openfoodnetwork
029e8eb848 Updating translations for config/locales/de_DE.yml 2019-04-09 20:50:31 +10:00
Luis Ramos
ef2e00ae31 Merge pull request #3604 from luisramos0/2-0-fix-splitters
[Spree Upgrade] Override default spree splitters config
2019-04-09 09:19:00 +01:00
Transifex-Openfoodnetwork
44e6adbe34 Updating translations for config/locales/en_GB.yml 2019-04-09 00:21:57 +10:00
Transifex-Openfoodnetwork
fde3d72a66 Updating translations for config/locales/en_GB.yml 2019-04-09 00:18:48 +10:00
Pau Pérez Fabregat
6e727e12e2 Merge pull request #3711 from openfoodfoundation/transifex
Transifex
2019-04-08 15:15:28 +02:00
Transifex-Openfoodnetwork
0261baaed3 Updating translations for config/locales/pt.yml 2019-04-08 21:06:43 +10:00
Transifex-Openfoodnetwork
4a69fdef27 Updating translations for config/locales/pt.yml 2019-04-08 21:06:39 +10:00
Transifex-Openfoodnetwork
5e672dc7d4 Updating translations for config/locales/pt.yml 2019-04-08 21:03:32 +10:00
Pau Pérez Fabregat
ffce31ca45 Merge pull request #3710 from coopdevs/pull-Transifex-translations
Update locales with latest Transifex translations
2019-04-08 12:56:23 +02:00
Pau Perez
860414fa31 Update locales with latest Transifex translations 2019-04-08 12:27:19 +02:00
Pau Pérez Fabregat
fa31ca5a95 Merge pull request #3686 from openfoodfoundation/transifex
Transifex
2019-04-08 12:23:36 +02:00
luisramos0
e9491cecab Fix flaky spec by having only one variant with display name small bag 2019-04-06 10:14:19 +01:00
luisramos0
258a9efa0d Adapt product_importer_spec to ofn v2 where there’s no product.count_on_hand and on_hand does not default to infinity if product.on_demand 2019-04-05 22:09:46 +01:00
luisramos0
bb4cec1186 Fix order_and_distributor_report_spec by setting ofn shipping method the ofn v2 way 2019-04-05 22:06:44 +01:00
Transifex-Openfoodnetwork
f5ab89eb03 Updating translations for config/locales/it.yml 2019-04-06 07:38:45 +11:00
luisramos0
ecc60f3b61 Merge branch 'master' into 2-0-stable-Mar29 2019-04-05 15:47:46 +01:00
Pau Pérez Fabregat
0c75a070c6 Merge pull request #3650 from kristinalim/fix/2786-address_subscription_confirm_job_failing_specs
3487,2786 [Spree Upgrade] Address spec failures for SubscriptionConfirmJob
2019-04-05 15:45:41 +02:00
Pau Perez
3e7e24d700 Make VariantController specs aware of destroy call
In v2 we no longer rely on `Variant#delete` but `Variant#destroy` so
stubbed calls needed fixing.
2019-04-05 15:38:10 +02:00
Transifex-Openfoodnetwork
80fd367da0 Updating translations for config/locales/en_US.yml 2019-04-06 00:27:12 +11:00
Transifex-Openfoodnetwork
231fa28713 Updating translations for config/locales/en_US.yml 2019-04-06 00:24:05 +11:00
Pau Pérez Fabregat
10165c4246 Merge pull request #3680 from kristinalim/fix/3285-db_migration_bang_shipping_rates
[Spree Upgrade] Bang version of create in DB migration for shipping rates
2019-04-05 15:11:41 +02:00
luisramos0
5989a654d1 Remove stock location from stock levels table and fix Spree.t entry bug 2019-04-05 14:01:27 +01:00
Pau Pérez Fabregat
1b55d04963 Merge pull request #3673 from Matt-Yorkley/spree2/css
Spree2/css
2019-04-05 14:57:57 +02:00
Pau Pérez Fabregat
67376a29a6 Merge pull request #3694 from Matt-Yorkley/db2fog
Fix outdated db2fog initializer
2019-04-05 12:26:07 +02:00
Transifex-Openfoodnetwork
74b7418f59 Updating translations for config/locales/fr.yml 2019-04-05 04:39:15 +11:00
Transifex-Openfoodnetwork
545f2fefa4 Updating translations for config/locales/fr.yml 2019-04-05 04:36:07 +11:00
Pau Perez
aa3f0ac577 Reuse #superadmin? in Delayed Job Web route
This moves #superadmin? to the user decorator so it can be reused
outside FeatureFlags.
2019-04-04 16:00:27 +02:00
Pau Perez
bf20376667 Add Delayed Job Web for superadmins only
This adds https://github.com/ejschmitt/delayed_job_web to enable async
job management such as retries, removal of failed jobs, etc.

Only superadmins can access this web UI though. Therefore any sysadmin
that needs to use it should have access to the appropriate instance
superadmin credentials in Bitwarden.
2019-04-04 16:00:27 +02:00
luisramos0
87327f7aa9 Fix specs testing order cancelation email. The email template now needs a order distributor for the signoff part 2019-04-04 13:41:07 +01:00
Pau Pérez Fabregat
07888b355a Merge pull request #3679 from mkllnk/3477-missing-v2-translation
Add missing translation for order form in v2
2019-04-04 14:25:05 +02:00
Transifex-Openfoodnetwork
8d69180c8c Updating translations for config/locales/es.yml 2019-04-04 23:23:06 +11:00
Transifex-Openfoodnetwork
4b60a75eae Updating translations for config/locales/ca.yml 2019-04-04 23:22:59 +11:00
Matt-Yorkley
9b45269cbb Fix name of Spree::Config preference 2019-04-04 13:06:05 +01:00
luisramos0
cf3b2308e1 Fix translation problem in the subject of order confirmation emails 2019-04-04 12:55:36 +01:00
luisramos0
6e49cf9f87 Bring cancel email from spree so it gets the normal ofn style 2019-04-04 12:31:12 +01:00
Matt-Yorkley
7522594b85 Fix outdated db2fog initializer 2019-04-04 12:02:57 +01:00
Maikel Linke
84501b9e41 Move feature spec to controller spec
It reduces the runtime (3s instead of 10s).
2019-04-04 17:01:44 +11:00
Maikel Linke
7b116c0982 Remove unnecessary condition from spec 2019-04-04 16:51:18 +11:00
Maikel Linke
72458da465 Comply to code convention using I18n.t in specs 2019-04-04 16:26:52 +11:00
Pau Pérez Fabregat
ec00544130 Merge pull request #3665 from mkllnk/stripe-version
Relax stripe version requirement
2019-04-03 17:02:40 +02:00
Pau Pérez Fabregat
c515a8f115 Merge pull request #3537 from Matt-Yorkley/pi/on_demand_error
Fix nil values in on_hand column
2019-04-03 11:56:06 +02:00
Pau Pérez Fabregat
b288cb00c1 Merge pull request #3654 from mkllnk/3237-spec-overrides-in-inventory-report
Test inventory report to use variant overrides
2019-04-03 11:55:33 +02:00
Maikel Linke
d31b5efac6 Simplify orders helper 2019-04-03 11:15:54 +11:00
Maikel Linke
7035d57267 Better helper naming and spec cover 2019-04-03 11:13:56 +11:00
luisramos0
ea52600fc5 Fix split button reappearing when editing line item quantity 2019-04-02 21:58:29 +01:00
Transifex-Openfoodnetwork
898966fbea Updating translations for config/locales/pt.yml 2019-04-03 03:20:34 +11:00
Transifex-Openfoodnetwork
b8f8ea964e Updating translations for config/locales/pt.yml 2019-04-03 03:17:29 +11:00
Transifex-Openfoodnetwork
1874f55fa4 Updating translations for config/locales/pt.yml 2019-04-03 03:14:14 +11:00
luisramos0
5e64c9f392 Fix deface override to remove configurations menu from payment methods list, this is necessary because non-admin users do get to this page through enterprises management" 2019-04-02 16:58:50 +01:00
luisramos0
5c69d6c9dc Fix page action in the backoffice when translations are long 2019-04-02 16:58:45 +01:00
luisramos0
112a57d330 Remove association between adjustments and shipments that are going to be deleted in AddUniquenessOfOrderIdToSpreeShipments 2019-04-02 12:31:39 +01:00
luisramos0
40124b7421 Improve downloads_helper clear_downloads method 2019-04-02 11:39:52 +01:00
luisramos0
7cc5940e19 Load DownloadsHelper only for feature specs 2019-04-02 11:39:52 +01:00
luisramos0
e10264af86 Remove xfeature from enterprise fees summmary report spec 2019-04-02 11:39:52 +01:00
luisramos0
d9304916cc Add chrome driver config to make testing csv downloads with headless chrome possible 2019-04-02 11:39:52 +01:00
luisramos0
c36f7e003b Adapt assertions to new csv file download logic 2019-04-02 11:39:52 +01:00
luisramos0
4f803eba7e Add around blocks to clear downloads directory before and after every test 2019-04-02 11:39:52 +01:00
luisramos0
4795832db5 Add spec DownloadsHelper to support testing csv downloads with headless chrome 2019-04-02 11:39:52 +01:00
luisramos0
c291601d9f Fix rubocop warnings in enterprise_fee_summary report spec 2019-04-02 11:39:52 +01:00
Kristina Lim
3035d14369 Use bang version of create! in DB migration script 2019-04-02 15:21:58 +08:00
Maikel Linke
8b6561addd Add missing translation for order form in v2
I saw the following error on the 2-0-stable branch:

  translation missing: en.spree.line_item_adjustments

In a pending PR I change all three translations in the view file to use
lazy lookup. This commit backports the addition to the locale so that it
can be translated via Transifex before we release v2.
2019-04-02 17:52:24 +11:00
Maikel Linke
0c846758dd Add missing translation to order form
I saw the following error:

  translation missing: en.spree.line_item_adjustments

In this commit I change all three translations in the view file to use
lazy lookup.
2019-04-02 17:47:36 +11:00
Maikel Linke
2a6236823f Move adjustment filtering from view to helper 2019-04-02 17:25:33 +11:00
Maikel Linke
11c12787f6 Move adjustment selection to helper 2019-04-02 17:02:05 +11:00
Maikel Linke
d78c709ad2 Remove unused variables from view 2019-04-02 16:58:08 +11:00
Maikel Linke
500cf925ad Fix HTML validity and element finding in spec
The fixed partial was used twice on the same page. So the used element
id appeared twice on the page which is invalid HTML. It also confused
the spec.

Now we look at the actually displayed text to select the correct
element.
2019-04-02 16:50:44 +11:00
Luis Ramos
9c99e64f1f Merge pull request #3316 from luisramos0/2-0-phase2-reports
[Spree Upgrade] Phase 2 - Reports ready - all specs running and green (except enterprise fee report)
2019-04-01 21:46:31 +01:00
Luis Ramos
d48d2a748b Merge pull request #3662 from SDBowen/add_shipping_method
Add shipping method name to orders detail report
2019-04-01 15:37:57 +01:00
Matt-Yorkley
668a37f564 Fix "clear all" button spacing in inventory 2019-04-01 12:18:19 +01:00
Matt-Yorkley
4a0e5a42a3 Fix admin menu items different heights 2019-04-01 12:11:29 +01:00
Matt-Yorkley
082be15df2 Fix admin menu mixed font weights 2019-04-01 12:00:29 +01:00
Matt-Yorkley
fa91a66de6 Fix button padding after Spree 2 font changes increased the vertical height 2019-04-01 11:48:18 +01:00
Matt-Yorkley
3ad2c9f7c4 Fix 'clear all' button width on Order Cycles page 2019-04-01 11:41:46 +01:00
Kristina Lim
d866fad46e Persist variants in customer totals specs
This is to properly record the on hand quantity.
2019-03-31 18:32:09 +08:00
luisramos0
bc8bca074c Switch object in the ability to access reports. This adapts to this change in Spree: 3685569db4
Adapt NavigationHelper to return the controller object for reports so that Reports tab works correctly.
2019-03-29 22:16:39 +00:00
luisramos0
1fc4b7fd2a Add manual shipping adjustment
For some reason this adjustment is not being added to order through the callbacks as it was before. See PR #3371
2019-03-29 22:16:39 +00:00
luisramos0
d713c755e6 Uncomment report specs so we can make them work in v2 2019-03-29 22:16:38 +00:00
luisramos0
527cfc1601 Merge branch 'master' into 2-0-stable-Mar29 2019-03-29 13:48:49 +00:00
Maikel Linke
f630738b2c Fix HTML syntax in admin view 2019-03-29 18:42:06 +11:00
Maikel Linke
5760aed6a6 Render only eligible adjustments on the order page
https://github.com/openfoodfoundation/openfoodnetwork/issues/3477

The admin orders edit form was displaying adjustments even if they were
"not eligible". For example, an additional fee with amount `0` is not
eligible. They were already hidden in the adjustments view and we are
hiding them in reports.
2019-03-29 18:41:38 +11:00
Maikel Linke
fabca84001 Close adjustments so that updates are effective
Spree 2.0 keeps shipping fee adjustments open unless they are manually
closed. But open adjustments cannot be edited.
To preserve updates, like changing the amount of the shipping fee
we close the adjustment first.
2019-03-29 17:23:15 +11:00
Maikel
7348987567 Merge pull request #3315 from luisramos0/2-0-phase2-pi
[Spree Upgrade] Phase 2 - Product Import ready - all specs running and green
2019-03-29 15:16:35 +11:00
Maikel
6e31f0078a Merge pull request #3639 from coopdevs/fix-variant-cache-refreshing-on-delete
Fix variant cache refreshing on delete
2019-03-29 15:12:46 +11:00
Maikel Linke
29f32604f2 Relax stripe version requirement
We are using the latest version of the `stripe` gem. We don't depend on
any particular version. I'm proposing to drop our dependency declaration
on a particular version and just track the current used version in
Gemfile.lock. That means fewer code changes when updating, which happens
quite frequently with this gem.
2019-03-29 13:40:51 +11:00
Maikel
973ae3d43a Merge pull request #3656 from openfoodfoundation/dependabot/bundler/stripe-4.11.0
Bump stripe from 4.10.0 to 4.11.0
2019-03-29 13:39:08 +11:00
sdbowen
0f7ef2671f Add shipping method name to orders detail report
Added column allows users to see the shipping method of each order.
2019-03-28 16:08:10 -06:00
luisramos0
3742c70910 Add backup process to AddUniquenessOfOrderIdToSpreeShipments so that the deleted duplicated shipments can be recovered if something goes wrong 2019-03-28 18:49:38 +00:00
Maikel
fed2b60743 Merge pull request #3644 from kevinchristianson/master
Fixed producer profile translation bug
2019-03-28 15:51:45 +11:00
Maikel
6978e3fdb6 Merge pull request #3658 from mkllnk/3582-shipping-method-spec
Wait for entered tag before submitting
2019-03-28 13:46:56 +11:00
Maikel
74aea76c4c Merge pull request #3609 from luisramos0/2-0-delete-acct-invoices-last-bit
[Spree Upgrade] Finish up deleting account invoices
2019-03-28 13:42:01 +11:00
Kristina Lim
f0746eb643 Use :performing_deliveries in spec 2019-03-28 02:04:13 +08:00
luisramos0
b780823970 Fix specs to adapt to the fact that for the order workflow to get to delivery, the shipping method must be linked to the order distributor otherwise it's ignored when creating the order shipment 2019-03-27 14:10:51 +00:00
Luis Ramos
4455073f6d Merge pull request #3647 from luisramos0/fix-shipment-state-translation
Add missing translation key for order shipment state canceled
2019-03-27 13:02:14 +00:00
Maikel Linke
bcebb99967 Fix "What's this?" on admin dashboard
When a user has no enterprises, the admin dashboard displays a "What's
this?" hint in the right corner of the enterprises tab. The link text
and the tooltip were both broken (missing translation).
2019-03-27 11:04:08 +11:00
Maikel Linke
ef882b8293 Wait for entered tag before submitting
The changed spec was failing from time to time. This change seems to
make it stable. It may be worth moving tag entering into a helper that
verifies that the tag was entered (waits for it).
2019-03-27 10:58:00 +11:00
dependabot[bot]
6c97bb6cac Bump stripe from 4.10.0 to 4.11.0
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 4.10.0 to 4.11.0.
- [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/v4.10.0...v4.11.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-26 19:25:43 +00:00
luisramos0
249e2bc9e1 Merge branch '2-0-stable' into 2-0-fix-sample-data 2019-03-26 15:50:16 +00:00
luisramos0
ae66e864a5 Improve models/spree/order/checkout_spec: AR is here to help you :-D 2019-03-26 15:37:36 +00:00
luisramos0
428656e92e Add distributor to shipping method in factory completed_order_with_fees so that shipping method is not discarded during order processing in package.shipping_methods 2019-03-26 15:37:36 +00:00
luisramos0
beb19cdc8a Override default spree splitters config (was Shipping Category and Backordered) to use only Base splitter, this splitter does not split the orders into multiple shipments
In OFN we cannot split the orders because one order can only have one shipment

Additionally, add spec to validate that the order workflow now works with products with different shipping categories
2019-03-26 15:37:35 +00:00
Pau Pérez Fabregat
a8f81ae7a2 Merge pull request #3652 from kristinalim/fix/3410-address_proxy_orders_controller_failing_specs
3410 [Spree Upgrade] Address spec failures for Admin::ProxyOrdersController
2019-03-26 15:55:13 +01:00
luisramos0
5ce762a600 Uncomment product import specs so we can make them work in v2 2019-03-26 11:34:04 +00:00
Luis Ramos
c68b0d768a Merge pull request #3640 from luisramos0/2-0-stable-Mar22
[Spree Upgrade] Merging master into 2-0-stable (3rd run in Mar2019)
2019-03-26 10:42:27 +00:00
luisramos0
f35972cee9 Remove deleted menu entry product distributions 2019-03-26 09:08:52 +00:00
luisramos0
010007a2c7 Merge branch '2-0-stable' into 2-0-stable-Mar22 2019-03-26 09:07:48 +00:00
Luis Ramos
9a771ecbb8 Merge pull request #3613 from luisramos0/2-0-update-variants-stock
[Spree Upgrade] Add on_hand and on_demand to the variants create and edit pages
2019-03-26 08:55:34 +00:00
Maikel
d963df2c87 Merge pull request #3632 from openfoodfoundation/dependabot/bundler/oj-3.7.11
Bump oj from 3.7.10 to 3.7.11
2019-03-26 16:28:36 +11:00
Maikel
84246fedc9 Merge pull request #3631 from openfoodfoundation/dependabot/bundler/stripe-4.10.0
Bump stripe from 4.9.0 to 4.10.0
2019-03-26 16:28:08 +11:00
Maikel
6ad42fcceb Merge pull request #3636 from openfoodfoundation/transifex
Transifex
2019-03-26 16:27:50 +11:00
Maikel Linke
9d4589632b Test inventory report to use variant overrides 2019-03-26 16:13:50 +11:00
Maikel
9e3734fc3e Merge pull request #3646 from kristinalim/fix/3528-product_sku_in_report
3528 Scope Customer Totals report also by variant (not just product) and use variant SKU
2019-03-26 12:05:14 +11:00
Kristina Lim
db6dab2e54 Address failing specs for ProxyOrdersController 2019-03-26 00:56:02 +08:00
Transifex-Openfoodnetwork
a2f3110b06 Updating translations for config/locales/en_CA.yml 2019-03-26 03:33:01 +11:00
Transifex-Openfoodnetwork
e504783929 Updating translations for config/locales/fr_CA.yml 2019-03-26 03:06:18 +11:00
Kristina Lim
2aad5baac5 Make code style changes for SubscriptionConfirmJob specs 2019-03-25 22:22:11 +08:00
Kristina Lim
18fe35e130 Address spec failures for SubscriptionConfirmJob 2019-03-25 21:55:38 +08:00
Transifex-Openfoodnetwork
a4bc739d48 Updating translations for config/locales/de_DE.yml 2019-03-25 16:40:06 +11:00
Kristina Lim
807cdb4746 Code style changes for Customer Totals report 2019-03-25 07:46:32 +08:00
Kristina Lim
4a95578db2 Use name helpers in Customer Totals report 2019-03-25 07:46:31 +08:00
Kristina Lim
79d0b63069 Add Spree::Address#full_name_reverse 2019-03-25 07:46:31 +08:00
Kristina Lim
7c7d61fbc5 Simplify some logic for Customer Totals report
Line items belong to a single order.
2019-03-25 07:46:30 +08:00
Kristina Lim
c088fb9a49 Use shorter syntax for Customer Totals report 2019-03-25 07:46:30 +08:00
Kristina Lim
46e7090d11 Group report by variant and use variant SKU
This groups the Customer Totals report by variant too (among others,
including by product), and then changes the report to use the variant
SKU not the product SKU.

This adds a spec for customer totals grouping and details, which
replaces the test specific to the SKU column.
2019-03-25 07:45:32 +08:00
Maikel Linke
7bc735eea3 Cover report content with specs 2019-03-25 04:47:13 +08:00
Maikel Linke
fdd8c06823 Style reports spec 2019-03-25 04:47:13 +08:00
Maikel Linke
856603cadd Convert specs to RSpec 3.8.0 syntax with Transpec
This conversion is done by Transpec 3.4.0 with the following command:
    transpec spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb

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

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

* 1 conversion
    from: obj.stub(:message)
      to: allow(obj).to receive(:message)

For more details: https://github.com/yujinakayama/transpec#supported-conversions
2019-03-25 04:47:13 +08:00
Maikel Linke
0a243ac9ca Give spec vars proper names 2019-03-25 04:47:12 +08:00
Maikel Linke
6ee27cd166 Fix spec to test the right report
Probably a copy&paste error. The PackingReport had exactly the same
spec.
2019-03-25 04:47:12 +08:00
Maikel Linke
dac4d4ff1a DRY report spec 2019-03-25 04:47:07 +08:00
luisramos0
2c97eaa62e Add missing translation key for order shipment state canceled 2019-03-24 15:33:14 +00:00
Transifex-Openfoodnetwork
b979a09478 Updating translations for config/locales/en_US.yml 2019-03-23 23:42:22 +11:00
Transifex-Openfoodnetwork
f050086d47 Updating translations for config/locales/pt.yml 2019-03-23 23:28:49 +11:00
Transifex-Openfoodnetwork
dc198b7b5d Updating translations for config/locales/pt.yml 2019-03-23 23:28:43 +11:00
Usama
698c71f039 Fixed producer profile translation bug 2019-03-22 18:25:40 -05:00
luisramos0
a8c0eef3d3 Improve admin variants controller create action, it doesn't try to set on_hand and on_demand if there are previous errors in the variant 2019-03-22 23:23:10 +00:00
luisramos0
78ea16c684 Remove unnecessary data-hooks from stock management deface override 2019-03-22 21:30:25 +00:00
luisramos0
01f82e5214 Move OrderSyncer spec to xdescribe until it is fixed as part of spree upgrade phase 2. This is a subscriptions specific spec 2019-03-22 13:06:45 +00:00
luisramos0
287ea6038a Remove distributors from product in completed_order_with_fees factory. This setter is no longer available after product distributions has been deleted 2019-03-22 11:50:24 +00:00
luisramos0
c1d14686a6 Merge branch 'master' into 2-0-stable-Mar22 2019-03-22 10:55:17 +00:00
Luis Ramos
6cd07cd107 Merge pull request #3605 from kristinalim/fix/2788-improve_specs_for_order_syncer
[Subscriptions] (v1) Fix assertions in specs for OrderSyncer
2019-03-22 10:31:01 +00:00
Luis Ramos
8d2d5a8708 Merge pull request #3579 from luisramos0/sanitize_data
Add sanitize and truncate data tasks
2019-03-22 10:29:57 +00:00
Pau Pérez Fabregat
846e6fdd90 Merge pull request #3560 from kristinalim/fix/2788-shipping_method_id_in_shipments
2696,2788 [Spree Upgrade] Fix use of shipping method ID for subscriptions
2019-03-22 11:08:23 +01:00
Pau Pérez Fabregat
deec4f83f8 Merge pull request #3633 from mkllnk/remove-product-distribution-from-sample-data
Remove usage of ProductDistribution which is dead
2019-03-22 10:54:59 +01:00
Pau Pérez Fabregat
4595ea033f Merge pull request #3624 from mkllnk/2873-spec-register-link
Add spec for registration link on Spree pages
2019-03-22 10:47:43 +01:00
Pau Pérez Fabregat
5b06f580e2 Merge pull request #3614 from mkllnk/3335-localized-number-for-weight-calculator
Support international decimals in weight calculator
2019-03-22 10:35:37 +01:00
Pau Pérez Fabregat
87f0ddabe7 Merge pull request #3548 from luisramos0/2-0-remove-unused-new-v2-features
[Spree Upgrade] Remove unused spree v2 features
2019-03-22 10:35:15 +01:00
Pau Perez
96b8c8ac2c Refresh products cache also on Variant#delete
Note that, as explained in
https://apidock.com/rails/v3.2.13/ActiveRecord/Relation/delete, `delete` does
not trigger callbacks and so it skips the products cache logic.

If we still want to avoid instantiating the AR object, we need to explicitly
call that logic for the cache to be up-to-date.
2019-03-22 09:57:15 +01:00
Pau Perez
b293e00777 Test that we refresh the cache on variant destroy
These tests prove that
https://github.com/openfoodfoundation/openfoodnetwork/issues/3629 is
indeed is a bug because we don't refresh the cache when deleting
a variant.
2019-03-22 09:38:24 +01:00
Pau Perez
fbc3fc6a51 Test spree/admin/variants_controller #destroy 2019-03-22 09:18:31 +01:00
Transifex-Openfoodnetwork
2ba10c416a Updating translations for config/locales/nb.yml 2019-03-22 07:41:18 +11:00
Kristina Lim
c222971e26 Clean up setup data for some OrderSyncer specs 2019-03-22 03:30:50 +08:00
Kristina Lim
0c2a75a227 Randomize bill and ship address of sample subscriptions
This also fixes some phone references in OrderSyncer specs.
2019-03-22 02:47:12 +08:00
Kristina Lim
7be669e1dd Add address factory with randomized attributes
Randomizing all addresses generated will be explored separately.
2019-03-22 02:45:50 +08:00
Kristina Lim
d047e04e33 Customize addresses for subscriptions in specs
This forces us to write correct assertions when adding specs affected by
subscription addresses.
2019-03-22 01:58:27 +08:00
Transifex-Openfoodnetwork
f0d985753f Updating translations for config/locales/fr.yml 2019-03-22 03:23:47 +11:00
Transifex-Openfoodnetwork
310b4a08b7 Updating translations for config/locales/fr.yml 2019-03-22 03:20:40 +11:00
luisramos0
e2f5515412 Fix sample data by setting on_demand in the product variant, setting product.on_demand is not possible in v2 2019-03-21 13:13:50 +00:00
luisramos0
88335c7f6c Fix sample data in v2 by adapting to the fact that shipping methods can now have multiple zones 2019-03-21 13:12:44 +00:00
luisramos0
98a262f86e Fix sample data in v2 by setting a Default shipping category in both products and shipping methods 2019-03-21 13:12:03 +00:00
Maikel Linke
42ee4b9f42 Remove usage of ProductDistribution which is dead
Sample data was failing since:
https://github.com/openfoodfoundation/openfoodnetwork/pull/3570
2019-03-21 13:11:05 +00:00
Kristina Lim
94606025c9 Separate call and call! for AdvanceOrderService 2019-03-21 20:34:51 +08:00
luisramos0
61433ee395 Make anonimize and truncate tasks respect rubocop rules 2019-03-21 11:16:56 +00:00
Maikel Linke
0b7192b82a Remove usage of ProductDistribution which is dead
Sample data was failing since:
https://github.com/openfoodfoundation/openfoodnetwork/pull/3570
2019-03-21 17:37:16 +11:00
Maikel Linke
3803094409 Add more examples to LocalizedNumber spec 2019-03-21 12:49:19 +11:00
Maikel Linke
3ef6878233 Avoid global state change by using config stub 2019-03-21 12:49:19 +11:00
Maikel Linke
1ea2f37c18 Support international decimals in weight calculator
A previous pull request added support for flexible decimal characters
when editing money amounts.
https://github.com/openfoodfoundation/openfoodnetwork/pull/1831

This pull request applies the same principle to the weight calculator
which was missed in the previous pull request.
2019-03-21 12:49:19 +11:00
Maikel
130ba64f2f Merge pull request #3619 from openfoodfoundation/dependabot/bundler/dalli-2.7.10
Bump dalli from 2.7.9 to 2.7.10
2019-03-21 12:47:29 +11:00
Maikel
f1ac33f304 Merge pull request #3590 from mkllnk/3576-bulk-order-spec
3576 Fix bulk order management race condition
2019-03-21 12:40:41 +11:00
Maikel Linke
d62908fd2d Add spec for registration link on Spree pages
The `registration_path` helper resolves to `/signup` in Spree
controllers due to spree_auth_device > config > routes.rb.
We worked around that in:
https://github.com/openfoodfoundation/openfoodnetwork/pull/3174

Here we add a spec for this so that we can test more easily if we
remove that workaround or detect it's accidental removal.
2019-03-21 10:06:15 +11:00
dependabot[bot]
6b01eba293 Bump oj from 3.7.10 to 3.7.11
Bumps [oj](https://github.com/ohler55/oj) from 3.7.10 to 3.7.11.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.10...v3.7.11)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-20 19:23:20 +00:00
dependabot[bot]
ee79f97aa0 Bump stripe from 4.9.0 to 4.10.0
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 4.9.0 to 4.10.0.
- [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/v4.9.0...v4.10.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-20 19:22:18 +00:00
Kristina Lim
d3c2d1859c Update all locales with the latest Transifex translations 2019-03-21 01:56:45 +08:00
Kristina Lim
b942dc1074 Merge pull request #3628 from openfoodfoundation/transifex
Transifex
2019-03-21 01:52:58 +08:00
Transifex-Openfoodnetwork
08894c242c Updating translations for config/locales/en_GB.yml 2019-03-21 04:04:33 +11:00
Transifex-Openfoodnetwork
eeb8f12b4e Updating translations for config/locales/en_GB.yml 2019-03-21 04:01:27 +11:00
Transifex-Openfoodnetwork
79eb89ac0b Updating translations for config/locales/en_GB.yml 2019-03-21 03:58:20 +11:00
Luis Ramos
61c778eeac Merge pull request #3555 from luisramos0/2-0-fix-order-state-translations
[Spree Upgrade] Improve order state translations in v2
2019-03-20 12:26:35 +00:00
Luis Ramos
59af77eb0e Merge pull request #3620 from mkllnk/3520-customers-spec
Fix flaky spec by waiting for modal animation
2019-03-20 12:02:11 +00:00
luisramos0
3841656979 Rename data sanitize task to data anonymize 2019-03-20 11:58:26 +00:00
luisramos0
fefced5400 Improve sanitize data: keep customers connected to users and let addresses' city and zipcode remain as they are 2019-03-20 11:49:55 +00:00
luisramos0
804375d1aa Delete obsolete pending delayed jobs related to the deleted account invoices feature 2019-03-20 11:24:57 +00:00
luisramos0
78d7222364 Drop account invoices and billable periods tables, the feature has been deleted 2019-03-20 11:19:48 +00:00
luisramos0
c0c14b16b6 Remove dynamic monthly pricing description that would come from the deleted business model configurations 2019-03-20 11:19:04 +00:00
Maikel
0f5e6474b8 Merge pull request #3602 from luisramos0/2-0-shipments-stock-location
[Spree Upgrade] Add migrations necessary to successfully migrate data to v2
2019-03-20 21:36:45 +11:00
Pau Pérez Fabregat
98a2e87587 Merge pull request #3610 from luisramos0/2-0-stable-Mar16
[Spree Upgrade] Merging master into 2-0-stable (2nd run in Mar2019)
2019-03-20 09:33:07 +01:00
Pau Pérez Fabregat
4f82808243 Merge pull request #3617 from luisramos0/edit-variants-specs
Add spec to cover editing on_hand and on_demand values in the variants edit page
2019-03-20 09:13:56 +01:00
Pau Pérez Fabregat
2a3a935c16 Merge pull request #3570 from luisramos0/byebye-prod-distributions
Delete dead feature product distributions
2019-03-20 09:01:23 +01:00
Maikel Linke
a66eb7fe1d Add spec for registration link on Spree pages
The `registration_path` helper resolves to `/signup` in Spree
controllers due to spree_auth_device > config > routes.rb.
We worked around that in:
https://github.com/openfoodfoundation/openfoodnetwork/pull/3174

Here we add a spec for this so that we can test more easily if we can
remove that workaround or detect it's accidental removal.
2019-03-20 15:02:30 +11:00
Maikel Linke
aef5cebeed Fix flaky spec by waiting for modal animation
Without waiting, `fill_in` can fail randomly:
https://github.com/teamcapybara/capybara/issues/1890
2019-03-20 12:15:01 +11:00
dependabot[bot]
b0854b6d51 Bump dalli from 2.7.9 to 2.7.10
Bumps [dalli](https://github.com/petergoldstein/dalli) from 2.7.9 to 2.7.10.
- [Release notes](https://github.com/petergoldstein/dalli/releases)
- [Changelog](https://github.com/petergoldstein/dalli/blob/master/History.md)
- [Commits](https://github.com/petergoldstein/dalli/compare/v2.7.9...v2.7.10)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-18 19:21:33 +00:00
luisramos0
21a10d0206 Add on_hand and on_demand back to variants form (both variant create and edit pagei), this is where they used to be in spree v1
The admin variants controller create action is adapted (same as in the admin ProductsController). This is necessary because variant.on_hand and on_demand cannot be mass assigned on creation in v2, see VariantStock for more details.

For now we are hiding the new stock management page that comes in spree v2 as we don't need the complexity added by the management of stock per stock location (only one stock location in ofn v2 for now)
2019-03-18 19:02:48 +00:00
luisramos0
9194a711ea De-deface product tabs
We do not include stock management from v2 because we will use the variants edit page to manage on_hand and on_demand
2019-03-18 18:47:25 +00:00
luisramos0
90a14d426b Add spec to cover editing on_hand and on_demand values in the variants edit page 2019-03-18 17:04:59 +00:00
luisramos0
9fff795162 Fix typo in en.yml in key new_shipping_category 2019-03-18 17:04:59 +00:00
luisramos0
b148b9ae46 Remove delete addresses SQL from truncate task 2019-03-18 12:04:37 +00:00
Pau Pérez Fabregat
fb29a7c7c2 Merge pull request #3606 from openfoodfoundation/dependabot/bundler/oj-3.7.10
Bump oj from 3.7.9 to 3.7.10
2019-03-18 12:12:13 +01:00
luisramos0
22a051e720 Enable products cache by default only in staging and production
We keep tests running by default without cache, keeping it as it was before 10a79d5a65

Additionally, cached_products_renderer no longer depends on Rails.env, so here we remove that dependency from it's spec.
2019-03-17 15:03:15 +00:00
luisramos0
60ee17204b Merge branch 'master' into 2-0-stable-Mar16 2019-03-16 16:17:38 +00:00
Kristina Lim
7505dd0410 Make order sync for shipping methods readable 2019-03-15 07:59:54 +11:00
dependabot[bot]
d7b25d63f9 Bump oj from 3.7.9 to 3.7.10
Bumps [oj](https://github.com/ohler55/oj) from 3.7.9 to 3.7.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/compare/v3.7.9...v3.7.10)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-14 19:25:55 +00:00
Kristina Lim
3ab00d862e Create subscriptions with set up shipping methods
The shipping methods are updated to their target settings after the
subscription order has been created, so the order is created with the
"require_ship_address" factory default which is "true".

The shipping method setting at time of order creation has implications
on whether a shipment is set up for the order or not.
2019-03-15 03:15:55 +08:00
Kristina Lim
ba100a6522 Specify order addresses in some OrderSyncer specs
This is to check that we are using the correct address data in
assertions.

This also clarifies the scenario for one of the specs.
2019-03-15 03:15:55 +08:00
Kristina Lim
7200e2c2c2 Specify hub address in some OrderSyncer specs
This fixes some assertions from using the same subscription shipping and
billing addresses, and distributor address.

One of the specs also pass because the subscription shipping address
matches the distributor address. This commit makes that scenario
clearer.
2019-03-15 03:15:55 +08:00
Kristina Lim
ad935e8d66 Require spec_helper.rb for OrderSyncer specs 2019-03-15 03:15:54 +08:00
Pau Pérez Fabregat
75abd4586e Merge pull request #3583 from coopdevs/handle-deleted-oc-refreshing-cache
Handle deleted order cycle when refreshing cache
2019-03-14 20:11:14 +01:00
Pau Pérez Fabregat
33b74bef0e Merge pull request #3599 from coopdevs/add-nl_BE-belgium
Bring in latest nl_BE translations
2019-03-14 18:59:57 +01:00
Pau Pérez Fabregat
baacea9f6a Merge pull request #3595 from coopdevs/instrument-products-cache
Instrument products cache
2019-03-14 18:58:43 +01:00
Pau Perez
e60437c6a2 Refactor test to execute public API instead 2019-03-14 18:53:11 +01:00
Pau Perez
b9636b975a Refactor test to stop using .any_instance
Although might be useful in very particular cases its use is discourage
by RSpec itself. See https://relishapp.com/rspec/rspec-mocks/docs/working-with-legacy-code/any-instance
2019-03-14 18:53:11 +01:00
Pau Perez
bc34d04c31 Do not retry when refreshing cache on deleted OC 2019-03-14 18:53:11 +01:00
luisramos0
cb78f8f8c8 Fetch latest nl_BE translations from transifex with correct menu links 2019-03-13 23:29:40 +00:00
Pau Perez
fede58289b Move Cache::Store config to new initializer
I don't know why but `Rails.logger` is still nil when evaluated from
`configure` block in `config/environments/development.rb`. The only way
I found to make ActiveSupport's cache to use the default logger is from
an initializer.

Note that `ActiveSupport::Cache::Store` uses `debug` level and so we
need to set the dev logger in that same level to see its messages. If
you want to debug in staging as well, you'll need to modify the log
level manually.
2019-03-13 19:08:46 +01:00
Pau Perez
15a95a3bf5 Use :file_store cache store in development
:memory_store uses the process' memory and therefore, what the
background job writes is not reachable for the rails server process when
it reads from the cache. See
https://github.com/openfoodfoundation/openfoodnetwork/wiki/Products-cache#development.
2019-03-13 19:08:46 +01:00
Pau Perez
10a79d5a65 Decouple CachedProductsRenderer from the Rails env
This way we don't need to touch the class implementation to enable the
products cache in development. Just change the default value in
`app/models/spree/app_configuration_decorator.rb`.
2019-03-13 19:08:46 +01:00
Pau Pérez Fabregat
13b2115a29 Merge pull request #3581 from coopdevs/cache-stylistic-improvements
Cache stylistic improvements
2019-03-13 19:05:38 +01:00
luisramos0
8965dedfd7 Add sanitize and truncate tasks to support loading live data into other environments safely 2019-03-13 16:08:07 +00:00
luisramos0
0bfeabbb3e Add migration to create default shipping category and set it in shipping methods and products that do not have a shipping category yet
This is a modified version of this spree migration: af16cf1d74
2019-03-13 15:36:21 +00:00
luisramos0
f914a6d869 Add migration to set default stock location on all shipments without stock location
This is a modified version of this spree migration: https://github.com/spree/spree/commit/219e09b
2019-03-13 14:38:56 +00:00
luisramos0
786ba15174 Remove unused translation 2019-03-13 12:24:40 +00:00
luisramos0
7a2bc384d5 Re-add spec removed in product distributions removal but now adapted to use order cycles 2019-03-13 12:24:40 +00:00
luisramos0
34d7070c6c Delete spec used to test product distributions (removed feature) 2019-03-13 12:24:40 +00:00
luisramos0
b62e350fab Improve reports controller decorator by removing some copy pasted code and deleting some code repeated across data_load and the main action methods 2019-03-13 12:24:40 +00:00
luisramos0
2401b947b9 Make load sample data rake task work without product distributions 2019-03-13 12:24:40 +00:00
luisramos0
05d42d475e Make reports and subscriptions specs work without product.distributors attribute 2019-03-13 12:24:40 +00:00
luisramos0
2de6c46834 Make order.order_cycle required in cart_service. There’s no more exception for that without product_distributions. 2019-03-13 12:24:40 +00:00
luisramos0
4768ca27c7 Remove all dependencies to product distributions including the validation to avoid deleting fees with product distributions 2019-03-13 11:50:35 +00:00
luisramos0
3117dbf624 Remove product distributions from order model 2019-03-13 11:50:35 +00:00
luisramos0
a022cebfc8 Remove product distributions from enterprise model and controller 2019-03-13 11:49:13 +00:00
luisramos0
ed9321e92d Remove product distributions from product model and controller 2019-03-13 11:47:50 +00:00
luisramos0
86f9b3d663 Delete product_distributions: drop table and remove models, controllers and BO edit page 2019-03-13 11:47:50 +00:00
Kristina Lim
8782f2087c Use service in admin/payments#create
This separates logic for bang and non-bang versions of
Spree::Order#next.

The different conditions used in both methods (state == "completed" vs
order.completed?) have implications in whether a transition is attempted
or not.
2019-03-13 17:00:31 +11:00
Kristina Lim
0e691815ea Use service in admin/orders/customer_details#update 2019-03-13 12:45:57 +08:00
Kristina Lim
abaf90fc41 Copy more actions advancing order from Spree
This copies the following:

* admin/orders/customer_details#update
* admin/payments#create
2019-03-13 12:45:57 +08:00
Kristina Lim
56e2ee5366 Fix specs for OrderSyncer 2019-03-13 12:45:56 +08:00
Kristina Lim
0cfee37567 Fix setup records for SubscriptionPlacementJob specs 2019-03-13 12:45:56 +08:00
Kristina Lim
7c3433425f Fix setup records for OrderFactory specs 2019-03-13 12:45:55 +08:00
Kristina Lim
182fde58e5 Uncomment now passing tests related to subscriptions 2019-03-13 12:45:55 +08:00
Kristina Lim
a261d912ea Simplify order sync logic for shipping methods 2019-03-13 12:45:54 +08:00
Kristina Lim
9316096d4d Fix updating of the shipping method for an order 2019-03-13 12:45:54 +08:00
Kristina Lim
5b5d1967fd Fix queries for pending order shipment in OrderSyncer 2019-03-13 12:45:53 +08:00
Kristina Lim
54991f8191 Retain shipping method when transitioning order 2019-03-13 12:45:53 +08:00
Kristina Lim
7a8bf76123 Move transitioning of order in admin/orders#edit to service 2019-03-13 12:45:50 +08:00
Maikel Linke
d129665d43 Wait for orders being loaded in bulk order manage
The bulk order management page tried to wait for orders being loaded.
But instead of receiving a request object with an a promise to wait for
the page received a simple array without promise. As a result, the page
didn't wait for orders being loaded.

When loading of orders took longer than loading of line items they or at
least not all of them were enriched with distributors and order cycles
and the line items were missing some orders. That lead to random spec
failures.
2019-03-13 10:37:24 +11:00
luisramos0
7c39c45f79 Stop using inexistent en.order_state translations keys and use existing en.spree.order_state in haml code and new js.admin.orders.order_state in JS code 2019-03-12 19:42:08 +00:00
luisramos0
77655bfffb Rename resource content to contents so that it matches the name of the controller ContentsController. This makes the is_active logic work on the configuration menu
See the menu is_active code here: f55722b38d/backend/app/helpers/spree/admin/navigation_helper.rb (L145)
2019-03-12 19:11:37 +00:00
luisramos0
bd9eba9ef8 Fix add_uniqueness_of_order_id_to_spree_shipments by first removing shipments from orders with more than one shipment 2019-03-12 18:00:06 +00:00
luisramos0
0c8c4be2ee Fix migrate tax categories to line items migration
This is bringing 67186f8ca7 from spree v2.2
2019-03-12 17:59:55 +00:00
luisramos0
2295981375 Merge branch '2-0-stable' into 2-0-remove-unused-new-v2-features 2019-03-12 16:55:48 +00:00
Pau Pérez Fabregat
2dd55770fe Merge pull request #3569 from luisramos0/delete-more-overrides
Delete some more dead overrides and more dead code
2019-03-12 17:48:12 +01:00
Pau Pérez Fabregat
01baba336d Merge pull request #3575 from openfoodfoundation/dependabot/bundler/unicorn-5.5.0
Bump unicorn from 5.4.1 to 5.5.0
2019-03-12 17:30:56 +01:00
Pau Perez
c4fcc25faa Bring in latest nl_BE translations
As we didn't reach 100% translation Transifex does not sync the changes
into the repo. However, the Belgian instance still needs it.
2019-03-12 15:30:52 +01:00
Kristina Lim
ce5691d080 Copy admin/orders#edit from Spree controller
This method needs to be updated to use custom order advance logic in
service.
2019-03-12 18:31:27 +08:00
Kristina Lim
f42eb3dab1 Create shipment when creating a order for a subscription
A spec has been added to check that the attributes for the order states
after "cart" ("address", "delivery", "payment") are retained if the
order is transitioned to completion, BUT currently this is passing
because it is the only shipping method available.
2019-03-12 18:31:27 +08:00
Kristina Lim
0306cc7ca7 Set shipping method when creating order for subscription 2019-03-12 18:31:26 +08:00
Kristina Lim
5f571aad2f Set required ship address in order in spec
The ship address of the order is properly set in
ProxyOrder#initialise_order! through OrderFactory.

The source of these spec failures seem to be a matter of how the records
are set up for the tests.
2019-03-12 18:31:26 +08:00
Maikel Linke
7270a9e8e8 DRY date calculation in BOM js
This also minimises the risk of values changing in the meantime.
2019-03-12 18:59:14 +11:00
Maikel
6722f21cb0 Merge pull request #3593 from openfoodfoundation/transifex
Transifex
2019-03-12 16:01:28 +11:00
Maikel
b94c6c1fb6 Merge pull request #3580 from luisramos0/2-0-stable-Mar6
[Spree Upgrade] Merging master into 2-0-stable (1st run in Mar2019)
2019-03-12 11:44:41 +11:00
Maikel Linke
49a6b5224d Remove duplicate expectations from spec 2019-03-12 11:35:06 +11:00
Maikel Linke
af9e80e55d Load data after all callbacks are installed 2019-03-12 09:46:27 +11:00
Maikel Linke
0c6a5d730b Add spaces around HAML brackets 2019-03-12 09:12:10 +11:00
Maikel Linke
6f875e83ec Remove unconventional and unused ng:cloak selector 2019-03-12 09:10:39 +11:00
Maikel Linke
9e33ef8140 Style ng-cloak directive 2019-03-12 09:09:52 +11:00
Maikel Linke
30c1a8d924 Move ng-cloak CSS to components 2019-03-12 08:59:59 +11:00
Pau Perez
931cb89a9d Move new class to services and rename it 2019-03-11 18:28:25 +01:00
Transifex-Openfoodnetwork
46f16c060b Updating translations for config/locales/en_US.yml 2019-03-12 00:38:22 +11:00
Transifex-Openfoodnetwork
8afd5e7050 Updating translations for config/locales/nb.yml 2019-03-09 06:33:01 +11:00
Luis Ramos
f6ecf3de64 Merge pull request #3568 from luisramos0/2-0-improve-order-factories
[Spree Upgrade] Improve order factories
2019-03-08 09:43:26 +00:00
Maikel Linke
4574a770d3 Synchronise dereferencing and initilising
This seems to make the spec 4 times more reliable. Still failing from
time to time.
2019-03-08 17:36:25 +11:00
Maikel Linke
e00a3ee263 Use clearer and more reliable waiting in spec 2019-03-08 17:24:31 +11:00
Maikel Linke
52fd7b102e Unify visiting bulk order management
DRYing the code allows for easier refactor and more consistency.
2019-03-08 14:46:58 +11:00
Maikel Linke
37d37a6057 Speed up initial spec log in 2019-03-08 14:46:39 +11:00
Maikel Linke
2d7498b77b Hide elements before Angular is loaded
The "Loading orders" spinner is still visible from the beginning so that
it can be used as indicator for when the page is loaded.

Before, the "No orders found" message was visible between page load and
Angular initilisation.
2019-03-08 14:23:18 +11:00
Maikel
22bac3daaf Merge pull request #3588 from openfoodfoundation/transifex
Transifex
2019-03-08 11:31:36 +11:00
Maikel
608c322770 Merge pull request #3585 from mkllnk/1829-missing-translation-product-category
1829 missing translation product category
2019-03-08 10:10:09 +11:00
luisramos0
61f1bf5ec8 Fix shipping_methods edit page missing translation 2019-03-07 17:15:06 +00:00
Transifex-Openfoodnetwork
2eb3b7acea Updating translations for config/locales/fr.yml 2019-03-08 04:06:14 +11:00
Transifex-Openfoodnetwork
66d6936452 Updating translations for config/locales/en_GB.yml 2019-03-08 01:36:28 +11:00
Pau Pérez Fabregat
f125686016 Merge pull request #3511 from coopdevs/update-bugsnag-notifier-library
Update Bugsnag from 5.5.0 to 6.11.1
2019-03-07 11:30:04 +01:00
Maikel Linke
972ebb5fc9 Fix missing translation by using AR default
Using the default fixes a missing translation. The text is slightly
changed but should be okay as well:

- "^Tax Category is required"
+ "Tax category can't be blank"
2019-03-07 11:54:04 +11:00
Maikel Linke
5ed13d1539 Fix translation by using ActiveRecord's default
Our translations are not available when decorators are loaded. The
message for a missing product category was missing:
https://github.com/openfoodfoundation/openfoodnetwork/issues/1829

I moved the translation to ActiveRecord's default scope so that it can
be picked up automatically.
2019-03-07 11:37:54 +11:00
Matt-Yorkley
3f6a6f7f33 Merge pull request #3572 from openfoodfoundation/transifex
Transifex
2019-03-07 00:17:49 +00:00
Matt-Yorkley
59fd5ce478 Merge branch 'master' into transifex 2019-03-07 00:17:14 +00:00
Matt-Yorkley
4fe7d276b4 Update all locales with the latest Transifex translations 2019-03-07 00:04:09 +00:00
Maikel Linke
f033cfcc12 Remove obsolete Bugsnag option
It prevents the app from booting with the new Bugsnag version.
2019-03-07 10:04:20 +11:00
Pau Perez
8db6560fe7 Update Bugsnag from 5.5.0 to 6.11.1
This brings lots of fixes and a great dose of enhancements such as
a rewritten `Delayed::Job` integration.
2019-03-07 10:03:43 +11:00
Maikel
4780a2193f Merge pull request #3209 from mkllnk/2072-test-data
2072 New sample data for testing
2019-03-07 08:49:12 +11:00
Pau Pérez Fabregat
e850182f95 Merge pull request #3563 from kristinalim/fix/3562-fix_payment_fee_for_order_based_calculator
3562 Fix error calculating payment fee using order-based calculator
2019-03-06 19:31:49 +01:00
Pau Pérez Fabregat
9f8d90cc0a Merge pull request #3305 from coopdevs/improve-shops-performance-take-2
Improve shops performance take 2
2019-03-06 16:25:28 +01:00
Transifex-Openfoodnetwork
9922ce070e Updating translations for config/locales/es.yml 2019-03-07 02:22:03 +11:00
Pau Perez
347aa3c4ae Replace #valid_products_distributed_by by class 2019-03-06 15:06:00 +01:00
Pau Perez
adb40d6c73 Test just the public method
This one is the one calling the private method that was tested now. It
involves some refactoring of the specs as well.
2019-03-06 13:38:53 +01:00
Pau Perez
7c533c6347 Extract DistributedValidProducts from OrderCycle 2019-03-06 13:35:43 +01:00
luisramos0
2470830ec8 Fix jquery ui merge mistake, it should be jquery.ui.all in v2, not jquery-ui 2019-03-06 11:28:50 +00:00
luisramos0
9644fcf67c Improve payment method factory in sample data by removing constantize 2019-03-06 10:01:17 +00:00
Pau Perez
2b58aab197 Extract method from cache key generation 2019-03-06 10:49:56 +01:00
Pau Perez
bbfd35c861 Fix CacheSettingsController violations 2019-03-06 10:45:45 +01:00
luisramos0
b325cea6cb Merge branch 'master' into 2-0-stable-Mar6 2019-03-06 09:19:53 +00:00
Transifex-Openfoodnetwork
0e2d303701 Updating translations for config/locales/ca.yml 2019-03-06 20:00:41 +11:00
Pau Pérez Fabregat
7e06807a11 Merge pull request #3539 from Matt-Yorkley/subs/confirmation_email
Don't process proxy_order if the order has been cancelled
2019-03-05 17:38:29 +01:00
Pau Pérez Fabregat
3ddee83be5 Merge pull request #3404 from luisramos0/2-0-disable-cache
[Spree Upgrade] Add checkbox to disable products cache
2019-03-05 14:51:11 +01:00
Pau Pérez Fabregat
30bbc5ee6f Merge pull request #3472 from pacodelaluna/fix-datetime-picker
Fix datetime picker on Order Cycle form
2019-03-05 14:50:34 +01:00
Pau Pérez Fabregat
b330db3b4b Merge pull request #2947 from Matt-Yorkley/pi/submenu_link
Pi/submenu link
2019-03-05 14:49:02 +01:00
Transifex-Openfoodnetwork
03aaea2a08 Updating translations for config/locales/ca.yml 2019-03-05 21:52:24 +11:00
dependabot[bot]
6ecb9cc848 Bump unicorn from 5.4.1 to 5.5.0
Bumps [unicorn](https://bogomips.org/unicorn/) from 5.4.1 to 5.5.0.

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-04 19:18:03 +00:00
Luis Ramos
72e9c1d002 Merge pull request #3321 from luisramos0/2-0-delete-acct-invoices
[Spree Upgrade] Delete Accounts and Billing dead feature code until we decide we want to start using it again
2019-03-04 15:54:09 +00:00
Pau Pérez Fabregat
2369c54f9d Merge pull request #3552 from luisramos0/2-0-fix-stock-migration
[Spree Upgrade] Fix create default stock migration
2019-03-04 12:07:18 +01:00
Transifex-Openfoodnetwork
5ddb8fb1ae Updating translations for config/locales/nb.yml 2019-03-04 21:22:36 +11:00
Pau Perez
54e120889f Remove useless array wrapping on AR relation 2019-03-04 11:08:34 +01:00
luisramos0
5ab4ae88f5 Remove distribution change in order_spec, order distributor cannot be changed, if distributor or oc is changed, the order is emptied 2019-03-02 13:08:39 +00:00
luisramos0
7ac4a99bc7 Remove product distributions spe that needed distribution_change_validator. Product distributions will be removed soon, see https://github.com/openfoodfoundation/openfoodnetwork/issues/3525 2019-03-02 13:08:39 +00:00
luisramos0
d7bd944af3 Fix distribution_change_validator spec 2019-03-02 13:08:35 +00:00
luisramos0
351555d4e2 Remove unused methods from add_to_cart helper and distribution change validator 2019-03-02 12:55:08 +00:00
luisramos0
93e13742be Delete some more dead overrides. We are not using spree/checkout (except for /checkout/payment) nor spree/products 2019-03-01 23:56:03 +00:00
luisramos0
d840fa7b77 Improve order factories:
- Make order_with_totals_and_distribution shorter by inheriting from order_with_distributor
- Make completed_order_with_fees more correct by inheriting only from order_with_distributor: this removes the line_item_with_shipment of order_with_totals_and_distribution that was causing an extra shipping adjustment to be kept in the order. This adjustment was being tested in the order controller spec (fixed the explanation comment in the spec which was wrong, there was no enterprise fee in this order)
2019-03-01 20:00:58 +00:00
Pau Pérez Fabregat
6c83f67b86 Merge pull request #3556 from Matt-Yorkley/pi/template
Add description to CSV template
2019-03-01 11:37:58 +01:00
Maikel
a14c785e69 Merge pull request #3435 from Matt-Yorkley/bug/tmpfile
Use Dir::Tmpname.make_tmpname for threadsafe file naming
2019-03-01 10:20:26 +11:00
Maikel
54679f6651 Merge pull request #3535 from luisramos0/translations-for-v2
Move to master all en.yml entries added so far to v2 and add more missing v2 translations
2019-03-01 10:04:13 +11:00
luisramos0
e4edfe0b61 Merge branch 'master' into translations-for-v2 2019-02-28 21:32:34 +00:00
Pau Pérez Fabregat
88e6fa84a2 Merge pull request #3534 from luisramos0/registration_trans_all
Move registration process translations to lazy lookups to better organize the en.yml file
2019-02-28 17:15:09 +01:00
Pau Pérez Fabregat
aa635106ac Merge pull request #3531 from mkllnk/document-stock-validation-rules
Document stock validation of variant overrides
2019-02-28 17:14:45 +01:00
Pau Pérez Fabregat
89708de7c1 Merge pull request #3512 from kristinalim/fix/3478-scope_enterprise_fee_summary_to_eligible
3466,3478 [Enterprise Fee Summary] Scope report to eligible: true and non-zero adjustments
2019-02-28 17:14:15 +01:00
Pau Pérez Fabregat
6f0479c27d Merge pull request #3547 from openfoodfoundation/dependabot/bundler/combine_pdf-1.0.16
Bump combine_pdf from 1.0.15 to 1.0.16
2019-02-28 17:13:50 +01:00
Pau Pérez Fabregat
63312a6d5f Merge pull request #3554 from coopdevs/bring-bugsnag-initializer
Bring in Bugsnag initializer from ofn-install
2019-02-28 16:41:59 +01:00
Kristina Lim
36e4a22b58 Use delegate for Payment#line_items 2019-02-28 09:52:56 +08:00
Kristina Lim
bd58667747 Remove stock check done for payment fees 2019-02-28 09:24:29 +08:00
Maikel Linke
958e98debd Document stock validation of variant overrides 2019-02-28 12:21:26 +11:00
Kristina Lim
ce658e9dfa Fix error computing payment fee when order-based 2019-02-28 12:17:45 +11:00
Kristina Lim
dfc8cc0f9e Add failing test for calculation of payment fee 2019-02-28 12:17:44 +11:00
Maikel
4ed0831e4c Merge pull request #3550 from openfoodfoundation/transifex
Transifex
2019-02-28 11:39:57 +11:00
Luis Ramos
f502ba0a1f Merge pull request #3504 from luisramos0/2-0-scoping
[Spree Upgrade] Add spec to order_cycle model covering variant scoping
2019-02-28 00:09:10 +00:00
Maikel
824beba066 Merge pull request #3505 from luisramos0/vo-false
Adapt scope_variant_to_hub to new VO rules where on_demand=nil means use_producer_settings
2019-02-28 10:26:23 +11:00
Maikel
c472d2fbbe Merge pull request #3498 from luisramos0/delete-dead-overrides
Remove dead overrides
2019-02-28 10:25:42 +11:00
luisramos0
03d242c061 Fix typo in sample_data zone creation (zonEable) and added clause to avoid re-adding the same country to the zone 2019-02-27 23:19:39 +00:00
Maikel
65ba9324de Merge pull request #3513 from luisramos0/2-0-remove-variant-count-on-hand
[Spree Upgrade] Remove variant.count_on_hand (keep variant.on_hand only)
2019-02-28 09:07:41 +11:00
luisramos0
ad5c379771 Make sample data zone read from the environment variable CHECKOUT_ZONE 2019-02-27 09:46:18 +00:00
luisramos0
d418ca1b1f Add mandatory payment method provider to sample data payment methods 2019-02-27 09:45:21 +00:00
Pau Pérez Fabregat
a04de6e3cd Merge pull request #3499 from openfoodfoundation/dependabot/bundler/stripe-4.9.0
Bump stripe from 4.5.0 to 4.9.0
2019-02-27 09:56:32 +01:00
Danni M
5b880f7bfe Update issue templates
Fixed headings on the story template
2019-02-27 10:41:39 +11:00
François Turbelin
82fbcd35a8 Update tests 2019-02-26 22:07:11 +01:00
Matt-Yorkley
9dd5b9dd6c Fix import button specificity in feature spec 2019-02-26 20:06:02 +00:00
Matt-Yorkley
25e2d2adda Update references to product_sub_menu view 2019-02-26 20:06:01 +00:00
Matt-Yorkley
777850259b Apply and delete overrides 2019-02-26 19:42:47 +00:00
Matt-Yorkley
f1e55507c3 Recreate product_sub_menu Spree view 2019-02-26 19:42:47 +00:00
Matt-Yorkley
32470f33ec Add description to CSV template 2019-02-26 19:36:44 +00:00
luisramos0
3f3581cdbc Add more missing translations for v2, remove unnecessary en.order_state and remove duplicated en.spree.payment_states and en.spree.shipment_states 2019-02-26 16:54:48 +00:00
Pau Perez
4d47276810 Bring Bugsnag initializer from ofn-install
This copies ofn-install's `roles/app/templates/bugsnag.rb.j2` to
`config/initializers/bugsnag.rb`. All tasks and templates
regarding Bugsnag can then be 🔥 from ofn-install.

As a result, it'll fix the issue that both Katuma and OFF are facing
where the `config/initializer/bugsnag.rb` symlink to
`shared/config/bugsnag.rb` does not exist thus, nothing gets notified to
Bugsnag since December 3rd (according to customer support).
2019-02-26 17:52:49 +01:00
luisramos0
4411e1ed43 Fix create default stock migration by adding a version of the code that works with the DB at that point in time, i.e., stock_locations without active column 2019-02-26 16:05:33 +00:00
luisramos0
7b05eebc5b Fix rubocop issue in db migration 2019-02-26 14:54:24 +00:00
luisramos0
a0594f7616 Re-add invoice settings controller removed by mistake 2019-02-26 14:14:17 +00:00
luisramos0
a36722cebf Merge branch '2-0-stable' into 2-0-remove-variant-count-on-hand 2019-02-26 12:47:11 +00:00
luisramos0
37685c8107 Move the code that hides the split order button from js to css 2019-02-26 12:34:07 +00:00
Pau Perez
a728da4f62 Cover product and producer props. in ctrl. spec 2019-02-26 12:09:26 +01:00
Pau Perez
915b5cf09e Inline also the active product properties query
This makes it easier to spot what are the differences and similarities
between active and non-active, which in turn, it'll help remove the N+1
the "active" branch causes.

Make it look `#distributed_producer_properties` with which seems to
share a lot.
2019-02-26 11:39:43 +01:00
Pau Perez
19cbda4128 Fix Rubocop violation 2019-02-26 11:39:43 +01:00
Pau Perez
24c031b3cd Extract #distributed_product_properties method 2019-02-26 11:39:43 +01:00
Pau Perez
6e9bb640f6 Add spacing between long scopes 2019-02-26 11:36:36 +01:00
Pau Perez
7b2d4f10ee Cover #distributed_properties \w a controller spec
This exercises the controller and the serializer ensuring the
integration works allowing to confidently refactor things further.
2019-02-26 11:36:36 +01:00
Pau Perez
e55fbf80fc Check property presentation attribute only in test
The PropertySerializer contains :id, :name and :presentation attributes
which leads to JSON objects like `{"id": 1, "name": "foo",
"presentation": "foo"}`. Because of this, we don't care about object
identity, just about their presentation attribute.
2019-02-26 11:36:36 +01:00
Pau Perez
d4635bd7cb Fetch Property instead of ProducerProps from query
By not having to treat producer properties differently we can filter and
fetch all properties from DB without having to process it with Ruby and
with a single query.
2019-02-26 11:36:36 +01:00
Pau Perez
92e2ed78d1 Test active distributor as well 2019-02-26 11:36:36 +01:00
Pau Perez
8eb35e491d Don't fetch rows by ids of DISTINCT records
There's no point on fetching the same records again by the resulting ids
of the previous query (nasty way of removing duplicates), when that
query has a DISTINCT.
2019-02-26 11:36:36 +01:00
Pau Perez
328cda66f5 Stop using PropertyMerge in serializer 2019-02-26 11:36:36 +01:00
Pau Perez
47a90e937b Have a duplicate product to test with 2019-02-26 11:36:36 +01:00
Pau Perez
8fef69387e Simplify test setup using factory transient attrs 2019-02-26 11:36:36 +01:00
Pau Perez
0782907f4d Setup a test order cycle with its exchanges 2019-02-26 11:36:36 +01:00
Pau Perez
64fb230297 Make it more obvious we talk about an enterprise 2019-02-26 11:36:36 +01:00
Pau Perez
a5f890cf36 Fix styling on method 2019-02-26 11:36:36 +01:00
Transifex-Openfoodnetwork
539544de28 Updating translations for config/locales/es.yml 2019-02-26 20:49:18 +11:00
Transifex-Openfoodnetwork
595fb75d82 Updating translations for config/locales/es.yml 2019-02-26 20:46:12 +11:00
luisramos0
15456577a3 Remove the button that enables user to split an order between stock locations
There's only one stock location in OFN so this feature is not useful at this point
2019-02-25 23:39:21 +00:00
luisramos0
ebf825e349 De-deface configuration menu
Remove stock locations and stock transfers from the menu
2019-02-25 23:38:50 +00:00
François Turbelin
e1953c279b Move jquery-ui-timepicker libs to vendor dir 2019-02-25 22:48:30 +01:00
François Turbelin
ab86332949 Tune up config and style 2019-02-25 22:22:27 +01:00
François Turbelin
68fd6de39b Update Jquery datetimepicker lib to v1.6.3 2019-02-25 22:22:27 +01:00
dependabot[bot]
a1647053cb Bump combine_pdf from 1.0.15 to 1.0.16
Bumps [combine_pdf](https://github.com/boazsegev/combine_pdf) from 1.0.15 to 1.0.16.
- [Release notes](https://github.com/boazsegev/combine_pdf/releases)
- [Changelog](https://github.com/boazsegev/combine_pdf/blob/master/CHANGELOG.md)
- [Commits](https://github.com/boazsegev/combine_pdf/compare/v1.0.15...v1.0.16)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-25 19:26:41 +00:00
luisramos0
8a59e06d36 Remove buttons 'open/close all adjustments' from order adjustments edit page
We may re-add this feature in the future, we are not introducing the capacity to open/close adjustments in OFN. See https://github.com/openfoodfoundation/openfoodnetwork/issues/1830 for context
2019-02-25 16:42:22 +00:00
luisramos0
0501db1782 Remove changes related to enterprise trials as they dont make sense without business models and account invoices 2019-02-25 14:37:16 +00:00
luisramos0
a870299ced Delete preferences and adjustments related to account invoices 2019-02-25 14:37:16 +00:00
luisramos0
36e2786a1e Delete Accounts and Billing dead feature code 2019-02-25 14:37:16 +00:00
Pau Pérez Fabregat
df77f6e051 Merge pull request #3536 from Matt-Yorkley/flaky/bom_spec
Wait for angular to load in BOM spec
2019-02-25 13:14:57 +01:00
Pau Pérez Fabregat
6004d09698 Merge pull request #3538 from Matt-Yorkley/flaky/shipping_methods_spec
Adjust expectations in flaky spec
2019-02-25 12:50:48 +01:00
Pau Pérez Fabregat
8a855edbda Merge pull request #3527 from luisramos0/2-0-fix-admin-edit-order-page
[Spree Upgrade] Fix edit ship method and tracking number in backoffice order page
2019-02-25 12:20:46 +01:00
Matt-Yorkley
6e77afbf35 Adjust expectations in flaky spec 2019-02-25 11:08:10 +00:00
Pau Pérez Fabregat
aed9c41b0d Merge pull request #3394 from mkllnk/3021-update-soft-delete
[Spree upgrade] 3021 update soft delete
2019-02-25 11:58:41 +01:00
Pau Pérez Fabregat
4e180f9f43 Merge pull request #3517 from openfoodfoundation/dependabot/bundler/oj-3.7.9
Bump oj from 3.7.8 to 3.7.9
2019-02-25 11:37:43 +01:00
Pau Pérez Fabregat
59962bbfb1 Merge pull request #3540 from openfoodfoundation/transifex
Transifex
2019-02-25 11:36:56 +01:00
Matt-Yorkley
bbfe71fd27 Improve readability and add code comment 2019-02-25 10:27:34 +00:00
Transifex-Openfoodnetwork
021220514e Updating translations for config/locales/ca.yml 2019-02-25 21:11:12 +11:00
luisramos0
963fddf159 Add missing translations
These translations are missing in v2 but some will also make v1 better
2019-02-24 22:29:44 +00:00
luisramos0
f40ff61f97 Move all en.yml entries added so far to v2 to master so that we can start the translation process now 2019-02-24 22:28:30 +00:00
Matt-Yorkley
627b101be9 Don't process proxy_order if the order has been cancelled 2019-02-24 12:06:58 +00:00
Matt-Yorkley
ea8be0ab95 Fine-tune angular helper 2019-02-23 21:45:33 +00:00
Matt-Yorkley
c4b646c583 Wait for angular to load in BOM spec 2019-02-23 16:12:37 +00:00
luisramos0
ee8fe4b6b4 Move registration process translations to lazy lookups to better organize the en.yml file 2019-02-22 14:37:45 +00:00
luisramos0
0b1ea1beda Rename VariantOverride.use_producer_settings to VariantOverride.use_producer_stock_settings 2019-02-22 09:57:21 +00:00
Pau Pérez Fabregat
439ea618df Merge pull request #3524 from luisramos0/2-0-stable-Feb20
[Spree Upgrade] Merging master into 2-0-stable (3rd run in Feb2019)
2019-02-22 09:01:40 +01:00
Pau Pérez Fabregat
632826a192 Merge pull request #3494 from luisramos0/break-oc-specs
Break order_cycle_spec.js in specific files and remove reference to product.count_on_hand in bulk_product_update_spec.js
2019-02-22 08:30:35 +01:00
luisramos0
45e5fed609 Improve scope_variant_to_hub code and spec by testing an invalid data state 2019-02-21 11:25:01 +00:00
Maikel
509e644cf7 Merge pull request #3526 from openfoodfoundation/transifex
Transifex
2019-02-21 16:05:21 +11:00
luisramos0
b73ca88811 Fix edit ship method and tracking number in backoffice order page
The data-hook is necessary to make spree js code work, in this case, activate click events on edit and save buttons
2019-02-20 23:57:57 +00:00
Transifex-Openfoodnetwork
4b21c9cb70 Updating translations for config/locales/en_CA.yml 2019-02-21 07:32:50 +11:00
luisramos0
5d51ad71b0 Merge branch 'master' into 2-0-stable-Feb20 2019-02-20 14:32:36 +00:00
Luis Ramos
34acaa4e03 Merge pull request #3425 from mkllnk/2783-product-importer-spec
Apply import defaults to variants of new products in Spree 2
2019-02-20 13:34:57 +00:00
Matt-Yorkley
f73221ed85 Use Dir::Tmpname.make_tmpname for threadsafe file naming 2019-02-20 13:10:47 +00:00
luisramos0
ef786adcfc Make variant_override.stock_overridden? simpler and add comment to explain relationship between count_on_hand and on_demand in a VO 2019-02-20 13:07:21 +00:00
Maikel
ec26948949 Merge pull request #3521 from openfoodfoundation/transifex
Transifex
2019-02-20 19:10:16 +11:00
Maikel
806226b404 Merge pull request #3496 from luisramos0/2-0-kill-allow-backorders
[Spree Upgrade] Remove allow_backorders from product stock verification
2019-02-20 13:09:05 +11:00
Transifex-Openfoodnetwork
aba4d742f6 Updating translations for config/locales/fr_CA.yml 2019-02-20 12:55:33 +11:00
luisramos0
5b4c986733 Add spec to cover variant scoping in order_cycle.items_bought_by_user 2019-02-20 00:05:28 +00:00
Maikel
e7e2d1d870 Merge pull request #3516 from openfoodfoundation/transifex
Transifex
2019-02-20 10:39:55 +11:00
Maikel Linke
8374c7dea4 Fix serializer spec for supplied products
In a previous commit we removed the now obsolete scope
Product.not_deleted. Calling Enterprise#supplied_products without
any scope does not issue a new SQL query but returns the products that
were present when the enterprise was loaded.

The fixed spec creates more products after loading the enterprise. So
the enterprise needs to be reloaded or the new products are not visible.
2019-02-20 08:45:58 +11:00
Transifex-Openfoodnetwork
7e59132bb2 Updating translations for config/locales/en_GB.yml 2019-02-20 06:50:52 +11:00
dependabot[bot]
47e154f2ac Bump oj from 3.7.8 to 3.7.9
Bumps [oj](https://github.com/ohler55/oj) from 3.7.8 to 3.7.9.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.8...v3.7.9)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-19 19:21:37 +00:00
Transifex-Openfoodnetwork
9688fe7540 Updating translations for config/locales/fr.yml 2019-02-20 06:15:01 +11:00
luisramos0
8ee14ccb4b Make variants_stock_levels return variants on_demand values 2019-02-19 11:56:02 +00:00
Maikel
f0a6f5ae3c Merge pull request #3514 from openfoodfoundation/transifex
Transifex
2019-02-19 15:40:30 +11:00
Transifex-Openfoodnetwork
0a50a74561 Updating translations for config/locales/en_US.yml 2019-02-19 15:23:20 +11:00
Maikel Linke
99f0be2f1c Remove unnecessary scope Variant.not_deleted
Spree made that scope default so that we don't need to define or call
it. There might be cases in which we were showing deleted variants and
now we are not, but I have not idea how to find them.

Related Spree commit:
- cd3add960e
2019-02-19 14:25:18 +11:00
Maikel Linke
b4d1e48693 Update soft-delete of variants
Spree changed their way of soft-deleting variants from calling `delete`
to calling `destroy`. We don't need our own implementation any more.
2019-02-19 14:25:18 +11:00
Maikel Linke
cdb49f88b0 Move Variant deletion into its own service
This keeps the override of Spree's model leaner. More importantly, it
prepares us for using `destroy` instead of `delete`.

In the past, `Product#delete` soft-deleted the product, but didn't
delete the variants. When we use `Product#destroy` to soft-delete the
product, it will also call destroy on the variants. If the model doesn't
allow the deletion of the last variant, it will fail. So when a product
is deleted we want to allow the deletion of all variants. But the user
should not be allowed to delete the last variant. That's why I'm moving
the check to the controller level.

Related commits:

- e6c7acdff3
- 2b47c9145a
- b9f19d5777 (diff-412c5af2ec1ba9f6643f6df5a673c1d4R105)
2019-02-19 14:25:18 +11:00
Maikel Linke
8f49f0006a Update products controller decorator with Spree
Spree changed the controller to deal with the updated soft-delete. This
commit brings these changes to our decorator.
2019-02-19 14:25:18 +11:00
Maikel Linke
5d828bd7ae Update soft-delete of products
Spree changed their way of soft-deleting products, variants and
some other models. `#destroy` is now soft-deleting and replaces
`#delete`.

This commit considers only products. Variants will follow in another
commit. The other models can be ignored, because we don't call `delete`
on them.
2019-02-19 14:25:18 +11:00
Maikel
bb4d42ef9d Merge pull request #3464 from openfoodfoundation/transifex
Transifex
2019-02-19 12:41:16 +11:00
Maikel
1b45033e33 Merge pull request #3506 from Matt-Yorkley/pi/parse_bom
Sanitize non-parsable BOM characters inserted by Excel
2019-02-19 11:24:11 +11:00
Maikel
be59a8ce32 Merge pull request #3434 from Matt-Yorkley/pi/fix_hash_merge
Fix hash merge for recording already created products by name
2019-02-19 11:21:49 +11:00
Maikel
b7abb72ed5 Merge pull request #3462 from luisramos0/delete-api-order-ctrl
Delete empty controller class eval and spec
2019-02-19 11:14:29 +11:00
Maikel
ae4d36b3ed Merge pull request #3451 from Matt-Yorkley/subs/currency
Use localized currency symbols in Subs pages
2019-02-19 09:55:36 +11:00
luisramos0
30967a5ffa Fix bulk product edit page. on_hand and on_demand should never be mixed on the server side, the UI can make the decision to show on_demand on the on_hand column if on_demand is true 2019-02-18 22:01:48 +00:00
luisramos0
12eab1bfa9 Merge variant_stock.count_on_hand into variant_stock.on_hand
variant.on_hand will not return infinity any longer if variant.on_demand is true. Clients of these methods will have to handle the combinations between on_hand and on_demand values
2019-02-18 22:00:16 +00:00
luisramos0
f0842fcbe5 Convert all calls to variant.count_on_hand to variant.on_hand 2019-02-18 21:54:07 +00:00
Matt-Yorkley
9705c249ac Sanitize no-parsable BOM characters inserted by Excel 2019-02-18 13:13:37 +00:00
luisramos0
5aee043b86 Remove allow_backorders from product stock verification because product.has_stock? already includes product.on_demand and in v2 allow_backorders becomes on_demand 2019-02-18 13:12:29 +00:00
Luis Ramos
8f192c39fb Merge pull request #3508 from luisramos0/2-0-green
[Spree Upgrade] Fix bulk_order_mgmt_spec - 2-0 build GREEN !!!
2019-02-18 13:05:17 +00:00
Kristina Lim
b0a82b0e21 Exclude $0 adjustments from report 2019-02-18 16:53:19 +08:00
Kristina Lim
36fd385f7d Add test showing $0 mandatory adjustments included 2019-02-18 16:53:19 +08:00
Kristina Lim
19f99255fa Exclude non-eligible entries from report 2019-02-18 16:53:18 +08:00
Kristina Lim
8ce7337c9d Add test showing $0 non-mandatory adjustments included 2019-02-18 16:53:18 +08:00
Kristina Lim
ca2c8e6ff2 Add test showing non-"eligible" entries included 2019-02-18 16:53:18 +08:00
Pau Pérez Fabregat
f5df10f5dc Merge pull request #3507 from openfoodfoundation/dependabot/bundler/selenium-webdriver-3.141.0
Bump selenium-webdriver from 3.12.0 to 3.141.0
2019-02-18 09:28:01 +01:00
luisramos0
a0bd290b6a Fix bulk_order_management spec by setting ship address on the stest order, this makes the order worflow work up to complete because the shipping methods will be validated against the address 2019-02-17 21:53:58 +00:00
Matt-Yorkley
09655b9f88 Fix nil values in on_hand column 2019-02-16 01:05:20 +00:00
dependabot[bot]
ed7015ae98 Bump selenium-webdriver from 3.12.0 to 3.141.0
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.12.0 to 3.141.0.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/compare/selenium-3.12.0...selenium-3.141.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-15 19:20:25 +00:00
Pau Pérez Fabregat
fb412cd9cd Merge pull request #3299 from luisramos0/2-0-admin-capture-payment
[Spree Upgrade] Fix order_with_totals_and_distribution factory by updating shipping fees
2019-02-15 18:37:43 +01:00
Pau Perez
4e35ea9149 Merge branch '2-0-stable' into 2-0-admin-capture-payment
* 2-0-stable:
  Perform delivery when checking deliveries in specs
2019-02-15 17:21:09 +01:00
Pau Pérez Fabregat
e67793b204 Merge pull request #3497 from coopdevs/fix-user-confirmation-spec
Perform delivery when checking deliveries in specs
2019-02-15 16:52:52 +01:00
luisramos0
75a79717cf Adapt scope_variant_to_hub to new VO rules where on_demand nil is seen as use_producer_settings 2019-02-15 14:05:24 +00:00
Transifex-Openfoodnetwork
9bf5531233 Updating translations for config/locales/nb.yml 2019-02-15 23:47:20 +11:00
Pau Pérez Fabregat
93c6271400 Merge pull request #3500 from openfoodfoundation/dependabot/bundler/bugsnag-5.5.0
Bump bugsnag from 4.1.0 to 5.5.0
2019-02-15 09:26:41 +01:00
Pau Pérez Fabregat
0a391783bc Merge pull request #3470 from kristinalim/fix/3426-intermittent_spec_failures
3426 [Flaky Spec] Address timing issues in enterprise users feature specs
2019-02-15 08:39:39 +01:00
Maikel Linke
6790e8895d Create sample payment methods with current environment 2019-02-15 16:44:55 +11:00
Maikel
d4589cc2f4 Merge pull request #3444 from mkllnk/3437-supplier-name-on-invoice
3437 supplier name on invoice
2019-02-15 16:31:29 +11:00
Matt-Yorkley
0c5cc23415 Fix hash merge for recording already created products by name 2019-02-14 21:38:18 +00:00
dependabot[bot]
7c5e58dd94 Bump bugsnag from 4.1.0 to 5.5.0
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby) from 4.1.0 to 5.5.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases)
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v4.1.0...v5.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-14 19:34:17 +00:00
dependabot[bot]
a369b48bf4 Bump stripe from 4.5.0 to 4.9.0
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 4.5.0 to 4.9.0.
- [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/v4.5.0...v4.9.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-14 19:30:48 +00:00
Pau Pérez Fabregat
6f2b894cfe Merge pull request #3403 from openfoodfoundation/dependabot/bundler/dalli-2.7.9
Bump dalli from 2.7.2 to 2.7.9
2019-02-14 20:12:06 +01:00
Pau Pérez Fabregat
43fff8f18d Merge pull request #3460 from openfoodfoundation/dependabot/bundler/spinjs-rails-1.4
Bump spinjs-rails from 1.3 to 1.4
2019-02-14 19:42:33 +01:00
luisramos0
4a35b53b43 Remove dead overrides 2019-02-14 18:00:25 +00:00
Pau Pérez Fabregat
34020f7bf6 Merge pull request #3377 from openfoodfoundation/dependabot/bundler/i18n-js-3.2.1
Bump i18n-js from 3.1.0 to 3.2.1
2019-02-14 18:26:49 +01:00
Pau Perez
f29707fea3 Perform delivery when checking deliveries in specs
Otherwise checking `ActionMailer::Base.deliveries.count` won't see any.
2019-02-14 18:24:33 +01:00
Kristina Lim
af95e3871f Move check for table presence out of helper 2019-02-15 01:15:58 +08:00
Pau Perez
e5dadd1ab1 Merge branch '2-0-stable' into 2-0-admin-capture-payment
* 2-0-stable: (121 commits)
  Stub default value for other calls to File.exist?
  Add specs for error cases in shipments_controller_spec
  Move features/admin/reports/enterprise_fee_summaries_spec to xdescribe (will be fixed as part of spree upgrade phase 2)
  Add missing translation to fix shipping methods spec
  Test tagging polymorphism on a payment method
  Workaround Rails inheritance bug in Spree::Gateway
  Improve method names in shipments_controller_spec
  Move ProductImporter spec to xdescribe until all its specs are green (spree upgrade phase 2)
  Make bulk invoices part of spree upgrade phase 2
  Make Api::ShipmentsController#create re-use order.shipment if it exists Improve code and add specs to this controller
  Decorate spree api shipments controller to scope variants as they are added/removed from shipments
  Delete all Spree::Admin::LineItemsController customizations as they are no longer used
  Update spec/controllers/spree/orders_controller_spec.rb
  Fix broken spec from refactored method
  Wait for button to disappear before checking flash
  Use flash matcher in shipping method feature specs
  Add RSpec matchers for flash messages
  Do not expect modal open when checking spinner gone
  Fix layout violation in Spree::Ability decorator
  Fix description for feature flag example groups
  ...
2019-02-14 17:41:54 +01:00
Pau Perez
caf4441fa3 Do not mutate config's state in specs 2019-02-14 17:01:43 +01:00
Pau Perez
609ff737ca Fix and simplify feature spec 2019-02-14 17:01:43 +01:00
Pau Perez
e9173f440f Associate shipment to appropriate order in specs 2019-02-14 17:01:43 +01:00
luisramos0
bf4ce90f98 Add product.on_hand and product.on_demand positive test, these should be returned if no variants are provided in the input
Also, removed product.count_on_hand negative test (there's no such attriubte in v2) and added product.on_hand, this should not be returned because a variant is provided
2019-02-14 15:58:15 +00:00
luisramos0
bfa0734cc6 Break order_cycle_spec.js in specific files like create controller, edit controller and services
Move bulk_product_update_spec.js to its apropriate place under /admin
2019-02-14 15:57:40 +00:00
Pau Pérez Fabregat
0a885af7a6 Merge pull request #3481 from mkllnk/simplify-stripe-creation-in-specs
Simplify specs with stripe factory
2019-02-14 09:42:05 +01:00
Pau Pérez Fabregat
fce92090db Merge pull request #3479 from luisramos0/2-0-stable-Feb12
[Spree Upgrade] Merging master into 2-0-stable (2nd run in Feb2019)
2019-02-14 09:40:28 +01:00
Transifex-Openfoodnetwork
a71c89f70e Updating translations for config/locales/en_GB.yml 2019-02-14 18:01:18 +11:00
Transifex-Openfoodnetwork
19568577f5 Updating translations for config/locales/es.yml 2019-02-14 18:01:18 +11:00
Transifex-Openfoodnetwork
71b24ba314 Updating translations for config/locales/ca.yml 2019-02-14 18:01:17 +11:00
Maikel
9058729a9d Merge pull request #3459 from openfoodfoundation/dependabot/bundler/rspec-rails-3.8.2
Bump rspec-rails from 3.8.1 to 3.8.2
2019-02-14 17:18:07 +11:00
Maikel Linke
87abfcd704 Simplify shopping spec 2019-02-14 11:42:46 +11:00
Pau Pérez Fabregat
2d2e25b9fa Merge pull request #3484 from coopdevs/fix-invoices-controller-spec
Stub default value for other calls to File.exist?
2019-02-13 20:32:13 +01:00
Luis Ramos
c6cd1b7ef2 Merge pull request #3471 from luisramos0/2-0-bulk-invoices-phase2
[Spree Upgrade] Make Bulk Invoices part of spree upgrade phase 2
2019-02-13 12:37:15 +00:00
Luis Ramos
576c203679 Merge pull request #3370 from mkllnk/3121-spree-gateway-inheritance
[Spree upgrade] Workaround Rails inheritance bug in Spree::Gateway
2019-02-13 12:27:59 +00:00
Pau Perez
59e27ffc0e Stub default value for other calls to File.exist?
This fixes the following error

```
 1) Spree::Admin::InvoicesController#poll when the file is available returns true
     Failure/Error: spree_get :poll, invoice_id: invoice_id

       #<File (class)> received :exist? with unexpected arguments
         expected: ("tmp/invoices/479186263.pdf")
              got: ("/home/pau/dev/openfoodnetwork/tmp/cache/paralleltests/3B7/CD1/spree%2Fapp_configuration%2Fredirect_https_to_http")
        Please stub a default value first if message might be received with other args as well.
     # ./spec/controllers/spree/admin/invoices_controller_spec.rb:28:in `block (4 levels) in <top (required)>'
     # -e:1:in `<main>'
```

`paralleltests` also relies on `File.exist?` and so stubbing it breaks
it unless we purposefully allow other calls.
2019-02-13 13:16:28 +01:00
Pau Pérez Fabregat
1b7edab3d6 Merge pull request #3441 from luisramos0/2-0-shipments-api
[Spree Upgrade] Adapt api shipments controller to OFN by scoping variants before each action
2019-02-13 12:36:08 +01:00
luisramos0
5ccbf7b3ca Add specs for error cases in shipments_controller_spec 2019-02-13 10:37:21 +00:00
luisramos0
728ed2c202 Move features/admin/reports/enterprise_fee_summaries_spec to xdescribe (will be fixed as part of spree upgrade phase 2) 2019-02-13 09:06:10 +00:00
luisramos0
ff2bf76e38 Add missing translation to fix shipping methods spec 2019-02-13 09:05:35 +00:00
Maikel Linke
5f5b0aaabf Simplify specs with stripe factory 2019-02-13 18:34:22 +11:00
Maikel Linke
612ea4c781 Simplify spec of invoice creation 2019-02-13 17:55:48 +11:00
Maikel
a36dc13192 Add issue templates for tech debt 2019-02-13 17:26:56 +11:00
Maikel Linke
3b9fdfa7ac Test tagging polymorphism on a payment method 2019-02-13 16:31:38 +11:00
Maikel Linke
9044bf60b9 Workaround Rails inheritance bug in Spree::Gateway
Due to a bug in ActiveRecord we need to load the tagging code in Gateway which
should have inherited it from its parent PaymentMethod.
We have to call it before loading the PaymentMethod decorator because the
tagging code won't load twice within the inheritance chain.

https://github.com/openfoodfoundation/openfoodnetwork/issues/3121
2019-02-13 14:47:44 +11:00
Pau Pérez Fabregat
bda5eb1b1f Merge pull request #3337 from kristinalim/feature-enterprise_fees_report-order_based_calculator_bug
3283 [Enterprise Fee Summary] Fix values when calculator is order-based
2019-02-12 20:07:57 +01:00
luisramos0
ba8096ff85 Improve method names in shipments_controller_spec 2019-02-12 17:31:58 +00:00
luisramos0
c652cfe4d5 Merge branch 'master' into 2-0-stable-Feb12 2019-02-12 16:03:33 +00:00
Kristina Lim
5e8a336e24 Initialize data representation classes with data
There is no more need to pass the summarizer.
2019-02-13 01:51:34 +11:00
Kristina Lim
ddc788ed5d Move data representation translations to class 2019-02-13 01:51:34 +11:00
Kristina Lim
bc95560598 Add descriptions for data representation classes 2019-02-13 01:51:33 +11:00
Kristina Lim
664943a6e5 Include UsingEnterpriseFee instead of inheriting 2019-02-13 01:51:33 +11:00
Kristina Lim
b9c144bb1f Prepare to change AssociatedEnterpriseFee to module
The superclasses will include this module, instead of inheriting the class.
2019-02-13 01:51:32 +11:00
Kristina Lim
373e3e1039 Simplify name of SQL data summarizer class 2019-02-13 01:51:32 +11:00
Kristina Lim
7a76355cfe Separate summarizing of SQL data by source 2019-02-13 01:51:32 +11:00
Kristina Lim
c4801aafd4 Fix Fee Calc on Transfer Through and Tax Category
For exchange fees with calculator that is order-based:

* "Fee Calc on Transfer Through" should show "Entire Orders through
  DISTRIBUTOR_NAME".
* For tax category:
  a. If the enterprise fee itself has a tax category, this is used.
  b. If the enterprise fee inherits the product's tax category, this is
     "Various".
  c. If the enterprise fee has no tax, this is blank.

For coordinator fees:

* "Fee Calc on Transfer Through" should be "All".
* For tax category: Same as abova.
2019-02-13 01:51:31 +11:00
Kristina Lim
8f65beeb0b Clarify method name in report scope 2019-02-13 01:51:31 +11:00
Kristina Lim
e550be9bda Add test for using order-based exchange fees
This is not filling the "Fee Calc on Transfer Through" column. This will
be addressed in another commit.
2019-02-13 01:51:31 +11:00
Kristina Lim
0212454041 Refactor SQL result summarizer for report 2019-02-13 01:51:30 +11:00
Kristina Lim
06ba5182b4 Add flat rate calculator traits to related factories 2019-02-13 01:51:30 +11:00
dependabot[bot]
0fc9ead934 Bump i18n-js from 3.1.0 to 3.2.1
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.1.0 to 3.2.1.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.1.0...v3.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-12 13:19:50 +00:00
Pau Pérez Fabregat
1f72eb9f68 Merge pull request #3378 from kevinchristianson/active-products-translation-fix
Add missing 'active products' translation on dashboard
2019-02-12 14:15:53 +01:00
Pau Pérez Fabregat
a0c144fd0c Merge pull request #3415 from openfoodfoundation/feature/enterprise_fee_summary
[Enterprise Fee Summary] Merge "Enterprise Fee Summary" report to master
2019-02-12 13:58:47 +01:00
Pau Pérez Fabregat
b6ca0ba24f Merge pull request #3456 from coopdevs/fix-last-orders-controller-spec
Fix orders controller spec
2019-02-12 12:47:15 +01:00
Pau Perez
24189ca88e Create shipping_rate earlier for callback to work
If the shipping_rate is not created at the time the `#after_save`'s
`#ensure_correct_adjustment` callback is executed its call to
`shipping_method.create_adjustment` won't be executed either.

As a result, the OrderUpdater wasn't able to see any adjustments related
to the shipment causing the order total to be outdated.
2019-02-12 12:11:55 +01:00
luisramos0
935c8cb0ce Move ProductImporter spec to xdescribe until all its specs are green (spree upgrade phase 2) 2019-02-12 10:38:03 +00:00
luisramos0
7c0b21eb83 Make bulk invoices part of spree upgrade phase 2 2019-02-12 10:37:22 +00:00
Pau Perez
ab0b759567 Merge branch '2-0-stable' into 2-0-admin-capture-payment
* 2-0-stable: (208 commits)
  Re implement orders ctrl update method so we can change redirection logic and add specs for it
  Improve readability in admin/orders_spec
  Add line items adjustments (order.price_adjustments) to the order edit page so that user is aware of adjustments included in the price like for example tax rates
  Adapt variants auto complete to spree v2 code with shipments
  Adapt customer search override to spree v2 and fix customer details spec in admin orders spec
  Fix distributor change spec in admin orders spec
  Fix admin orders spec non tax adjustments by adapting to new view
  Fix failing specs due to Spree 2's new order admin page Add missing form tag and OC and shops injectors on order form to make the OC field, the distributor field and the update button work
  Use Spree routes
  Fix shop accidentally becoming order coordinator
  Match date format in spec with import date filter
  Make in_stock? work for both variants and overrides by moving it from VariantStock to variant_decorator.
  Add unit test for VariantStock.can_supply?
  Remove rescue from products_reset_strategy in product import: if setting count_on_hand fails the import will raise a RuntimeError
  Change product import's product_reset_strategy from depending on the inexistent variant.count_on_hand DB field and instead make individual calls to variant.count_on_hand= defined in VariantStock. Also, added spec to test return value of the reset method: it should return number of updated records.
  Upgrade views to Spree 2 and apply overrides
  Updating translations for config/locales/en_US.yml
  Update name spaces for rake tasks to shorter 'ofn'.
  Refactor checking no preview image in specs
  Refactor checking of preview image path in specs
  ...
2019-02-12 11:12:40 +01:00
luisramos0
58ea28ebb4 Make Api::ShipmentsController#create re-use order.shipment if it exists
Improve code and add specs to this controller
2019-02-12 10:09:00 +00:00
luisramos0
77b390a836 Decorate spree api shipments controller to scope variants as they are added/removed from shipments 2019-02-12 10:09:00 +00:00
luisramos0
0f44beb477 Delete all Spree::Admin::LineItemsController customizations as they are no longer used 2019-02-12 10:09:00 +00:00
Pau Pérez Fabregat
a6c5e3423f Merge pull request #3474 from Matt-Yorkley/pi/broken_build
Fix broken spec from refactored method
2019-02-12 11:03:28 +01:00
Pau Pérez Fabregat
0cc2bd052e Merge pull request #3436 from luisramos0/2-0-orders-edit
[Spree Upgrade] Fix admin new order page flow (from order details to customer details)
2019-02-12 10:35:25 +01:00
Pau Pérez Fabregat
b51ad35cb1 Merge pull request #3445 from luisramos0/2-0-order-adjusts
[Spree Upgrade] Fix adjustments sections in admin order edit page
2019-02-12 10:16:30 +01:00
Pau Pérez Fabregat
92dca0cdfa Merge pull request #3194 from HugsDaniel/3109-fix-orders-new
[Spree Upgrade] Fix admin new order page
2019-02-12 09:58:29 +01:00
Luis Ramos
edd1da7d50 Update spec/controllers/spree/orders_controller_spec.rb
Fix typo in doc

Co-Authored-By: sauloperez <saulopefa@gmail.com>
2019-02-12 09:12:03 +01:00
Matt-Yorkley
097ffba323 Fix broken spec from refactored method 2019-02-11 23:57:13 +00:00
Pau Pérez Fabregat
4165ba5cdb Merge pull request #3463 from coopdevs/enable-catalan
Import Catalan translation from Transifex
2019-02-11 18:13:50 +01:00
Luis Ramos
dd44d6a0ca Merge pull request #3355 from luisramos0/2-0-pord-importer-spec
[Spree Upgrade] Phase 2 - Fix product_importer spec
2019-02-11 15:28:47 +00:00
Pau Perez
990de63728 Merge branch 'master' into active-products-translation-fix
* master: (46 commits)
  Wait for button to disappear before checking flash
  Use flash matcher in shipping method feature specs
  Add RSpec matchers for flash messages
  Do not expect modal open when checking spinner gone
  Update issue templates
  Update all locales with the latest Transifex translations
  Do not show table until first time dereferencing is done
  Remove unused have_no_selector argument in feature test
  Compile row ID with higher priority
  Compile edit link with higher priority
  Support selecting date in next months
  Improve sync between keyword filter and selecting all
  Wait for datepicker to associate and open before selecting date
  Update cancan permissions for second iteration of bulk invoices
  Fix shop accidentally becoming order coordinator
  Match date format in spec with import date filter
  Update name spaces for rake tasks to shorter 'ofn'.
  Refactor checking no preview image in specs
  Refactor checking of preview image path in specs
  Fix race condition in enterprise image feature specs
  ...
2019-02-11 16:12:52 +01:00
Pau Pérez Fabregat
9d065c8a0b Merge pull request #3233 from Matt-Yorkley/pi/inventories
Pi/inventories
2019-02-11 16:10:33 +01:00
Pau Pérez Fabregat
da09c8f86c Merge pull request #3467 from kristinalim/fix/3455-intermittent_spec_failure
3455 [Flaky Spec] Do not expect modal still open when checking that the spinner is gone
2019-02-11 15:58:22 +01:00
Pau Pérez Fabregat
b508d51406 Merge pull request #3469 from kristinalim/fix/3468-intermittent_spec_failures
3468 [Flaky Spec] Check for presence of flash div before trying to get its text
2019-02-11 15:54:33 +01:00
luisramos0
acc99fc9bb Improve readability of cached_product_renderer and respective spec 2019-02-11 11:46:04 +00:00
Kristina Lim
a876c2ab9f Address timing issues in enterprise roles specs 2019-02-11 13:02:40 +08:00
luisramos0
ad0e5bb093 Re implement orders ctrl update method so we can change redirection logic and add specs for it 2019-02-10 15:31:01 +00:00
Kristina Lim
0032a237a2 Wait for button to disappear before checking flash 2019-02-10 22:08:18 +08:00
Kristina Lim
175264f41f Use flash matcher in shipping method feature specs 2019-02-10 22:08:18 +08:00
Kristina Lim
e14c60c1c1 Add RSpec matchers for flash messages 2019-02-10 22:08:18 +08:00
Kristina Lim
f143540d0c Do not expect modal open when checking spinner gone
The element referenced in the following might no longer be visible:

  within "div.reveal-modal"
2019-02-09 22:40:40 +08:00
Kristina Lim
b6be8c48d1 Fix layout violation in Spree::Ability decorator 2019-02-08 21:26:39 +00:00
Kristina Lim
de30cf1198 Fix description for feature flag example groups 2019-02-08 21:26:39 +00:00
Kristina Lim
461b5725d1 Hide report link and resource from non-superadmins 2019-02-08 21:26:38 +00:00
Kristina Lim
1d3f4aa28a Add feature flag for enterprise fee summary 2019-02-08 21:26:38 +00:00
Kristina Lim
f59834ddc8 Use receiver as "Fee Calc on Transfer Through" for outgoing exchanges 2019-02-08 21:26:38 +00:00
Kristina Lim
ddf15f1d30 Add scenario test for enterprise fee summary
Add test for more complex scenario where there is a coordinator and
distributor fee for an incoming exchange, and a producer and coordinator
fee for an outgoing exchange.
2019-02-08 21:26:38 +00:00
Kristina Lim
c92d202612 Rename files for factories in spec/factories/
Make these follow the "#{SINGULAR_OBJECT}_factory.rb" convention.
2019-02-08 21:26:38 +00:00
Kristina Lim
625069cb5a Add :per_item factory trait to shipping and payment methods 2019-02-08 21:26:38 +00:00
Kristina Lim
d2e49b8b49 Move variant setup to new factory trait 2019-02-08 21:26:38 +00:00
Kristina Lim
f36d13a736 Rename helper for setting up incomplete order 2019-02-08 21:26:38 +00:00
Kristina Lim
ce030aeb07 Move order setup to new factory traits 2019-02-08 21:26:38 +00:00
Kristina Lim
a3aa594c42 Use enterprise fee factory trait where applicable 2019-02-08 21:26:38 +00:00
Kristina Lim
5dda3b67eb Use factory for tax category in entperprise fee summary tests 2019-02-08 21:26:38 +00:00
Kristina Lim
61ec43f868 Add enterprise fee factory trait for per item rate
We should not presume what is not default for an enterprise fee object.
2019-02-08 21:26:38 +00:00
Kristina Lim
53c458f817 Clean up setup data for enterprise fee summary tests 2019-02-08 21:26:38 +00:00
Kristina Lim
4a73b1d26c Do not include incomplete orders in report 2019-02-08 21:26:38 +00:00
Kristina Lim
eaa7800427 Do not assign I18n translation to constants
The preferred language could change dynamically.
2019-02-08 21:26:38 +00:00
Kristina Lim
6378afdddb Address Rubocop violation 2019-02-08 21:26:38 +00:00
Kristina Lim
c81be75530 Move engine libraries except Engine and Version to services 2019-02-08 21:26:38 +00:00
Kristina Lim
3e499faa7c Do not use ReportData::EnterpriseFeeTypeTotals 2019-02-08 21:26:38 +00:00
Kristina Lim
3f84d0008a Move some in OpenFoodNetwork to engine services
This removes the OpenFoodNetwork namespace from these too.
2019-02-08 21:26:38 +00:00
Kristina Lim
95e3a2f45d Move authorization to the ::Parameters class 2019-02-08 21:26:38 +00:00
Kristina Lim
c61a83faca Move routes for enterprise fee summary to engine 2019-02-08 21:26:38 +00:00
Kristina Lim
9e035efd50 Render enterprise fee report directly in renderer 2019-02-08 21:26:38 +00:00
Kristina Lim
c8b154b12a Separate enterprise fee summary action
Split the previous "index" action into "new" and "create" actions.
2019-02-08 21:26:38 +00:00
Kristina Lim
da914289ea Copy spree/admin/reports#index into application 2019-02-08 21:26:38 +00:00
Kristina Lim
a17fa8013f Clean up I18n scope in feature specs for report 2019-02-08 21:26:38 +00:00
Kristina Lim
c0e6b70131 Rename EnterpriseFeeSummaryReportController
Remove "Report" because this is redundant, and pluralize the resource
name.
2019-02-08 21:26:38 +00:00
Kristina Lim
207b6c7f30 Use shorthand for RSpec expect(subject).to 2019-02-08 21:26:38 +00:00
Kristina Lim
2063752b97 Improve specs for Enterprise Fee Summary
This also addresses a spec that has failed over the rebasing.
2019-02-08 21:26:38 +00:00
Kristina Lim
2bf38b3ea1 Improve code based on Rubocop recommendations 2019-02-08 21:26:38 +00:00
Kristina Lim
552bf1b9f7 Move report list to own class 2019-02-08 21:26:38 +00:00
Kristina Lim
b78e2b4720 Move lib files for enterprise fee summary to engine 2019-02-08 21:26:38 +00:00
Kristina Lim
0cdcd96bb5 Add skeleton for OrderManagement engine 2019-02-08 21:26:38 +00:00
Kristina Lim
dcb1d9fe25 Add feature tests for enterprise fee summary 2019-02-08 21:26:37 +00:00
Kristina Lim
edf0b0df76 Add navigation item for enterprise fee summary 2019-02-08 21:26:37 +00:00
Kristina Lim
d3e9a53120 Filter enterprise fee summary for user permissions 2019-02-08 21:26:37 +00:00
Kristina Lim
8ad53055c7 Allow non-admins to see enterprise fee summary
Relax controller permissions for enterprise fee summary. Even non-admin
enterprise users should be able to see these reports.

Filtering of data based on permissions is handled in:

* OrderManagement::Reports::EnterpriseFeeSummary::Authorizer and
* OrderManagement::Reports::EnterpriseFeeSummary::Permissions.
2019-02-08 21:26:37 +00:00
Kristina Lim
f81f4b7e4a Authorize filters before generating enterprise fee report 2019-02-08 21:26:37 +00:00
Kristina Lim
9ce313c7f5 Define filter authorizer for enterprise fee report 2019-02-08 21:26:37 +00:00
Kristina Lim
cd3e258b59 Rename report authorizers to reflect permissions 2019-02-08 21:26:37 +00:00
Kristina Lim
469988856d Define permissions for enterprise fee summary 2019-02-08 21:26:37 +00:00
Kristina Lim
5fce9d0a7d Add multi-distributor scope to shipping and payment methods 2019-02-08 21:26:37 +00:00
Kristina Lim
24ab2e7fb0 Add filtering to enterprise fee summary 2019-02-08 21:26:37 +00:00
Kristina Lim
2407531957 Make more code for report tests reusable 2019-02-08 21:26:37 +00:00
Kristina Lim
d573dc5023 Make order builder for enterprise fee summary flexible
This is in preparation for tests for filtering the report.
2019-02-08 21:26:37 +00:00
Kristina Lim
4a00aceba2 Include shipping fees in enterprise fee summary 2019-02-08 21:26:37 +00:00
Kristina Lim
1273cc085b Include payment fees in enterprise fee summary 2019-02-08 21:26:37 +00:00
Kristina Lim
7d74ddc85b Add HTML view for enterprise fee summary report 2019-02-08 21:26:37 +00:00
Kristina Lim
418050c1b8 Remove blank strings from array report parameters
Remove the blank strings that Rails multiple selects add by default to
make sure that blank lists are still submitted to the server as arrays
instead of nil.

https://api.rubyonrails.org/classes/ActionView/Helpers/FormOptionsHelper.html#method-i-select
2019-02-08 21:26:37 +00:00
Kristina Lim
6e03ab03f5 Extract general behaviour for report parameters 2019-02-08 21:26:37 +00:00
Kristina Lim
34dc16f8c9 Base filter options from initial authorizer object 2019-02-08 21:26:37 +00:00
Kristina Lim
bd2b4c0134 Add enterprise fee summary form without options
The objects will be filled in another commit. This simply sets up the
filters UI for now.
2019-02-08 21:26:37 +00:00
Kristina Lim
ec81e4221f Add basic action for enterprise fee summary 2019-02-08 21:26:37 +00:00
Kristina Lim
b7439d2574 Fix sort for nil cells in enterprise fee summary 2019-02-08 21:26:37 +00:00
Kristina Lim
5b6bbc3920 Add generation of CSV renderer filename 2019-02-08 21:26:37 +00:00
Kristina Lim
ed2b8e9b9f Add CSV renderer for enterprise fee summary report 2019-02-08 21:26:37 +00:00
Kristina Lim
00e70733b0 Add test data for enterprise fee summary report 2019-02-08 21:26:37 +00:00
Kristina Lim
e7ed625d5a Add processing of enterprise fee summary from DB 2019-02-08 21:26:37 +00:00
Kristina Lim
faf7079780 Specify sort order of enterprise fee totals data 2019-02-08 21:26:37 +00:00
Kristina Lim
3763cb98a3 Add data classes for Enterprise Fee Summary report 2019-02-08 21:26:37 +00:00
Kristina Lim
a097640464 Add basic form object for enterprise fee summary 2019-02-08 21:26:36 +00:00
Kristina Lim
519a7d2ee6 Add datetime and integer array validator matchers 2019-02-08 21:26:36 +00:00
Kristina Lim
f6e8f18d89 Add validator for integer arrays
Example usage:

    validates :related_post_ids, integer_array: true
2019-02-08 21:26:36 +00:00
Kristina Lim
de9cff6fc2 Add validator for datetime string
Example usage:

    validates :start_at, date_time_string: true
2019-02-08 21:26:36 +00:00
Pau Perez
f998748634 Clarify why we end up with 3 adjustments
And the second one is open.
2019-02-08 18:16:00 +01:00
Pau Perez
7359789903 Import Catalan translation from Transifex
Although we've started translating to Catalan and focused on it
recently, we never imported the file in the app thus the language menu
showed "English" for the "ca" locale and clicking on it switched to
English as well instead of Catalan.
2019-02-08 15:22:59 +01:00
luisramos0
3dc75c88d2 Delete empty controller class eval and spec. Useless left overs from 0ad2978926 2019-02-08 09:29:58 +00:00
Danni M
8ff5f9055b Update issue templates
I've created 3 types of templates based on those in the wiki and the default (bug) issue template. These can be edited or additional ones added at your leisure.

I also added the OFN software instance and version to the bugs template
2019-02-08 16:58:32 +11:00
Matt-Yorkley
f9ea93933e Use localizeCurrency filter in subscriptions 2019-02-07 22:58:49 +00:00
Matt-Yorkley
5582160e73 Add localizeCurrency filter to admin and inject currencyConfig data 2019-02-07 22:55:08 +00:00
luisramos0
1b4666fc6a Add checkbox to cache settings to disable products cache 2019-02-07 20:06:27 +00:00
dependabot[bot]
72cd0537fb Bump spinjs-rails from 1.3 to 1.4
Bumps [spinjs-rails](https://github.com/dnagir/spinjs-rails) from 1.3 to 1.4.
- [Release notes](https://github.com/dnagir/spinjs-rails/releases)
- [Commits](https://github.com/dnagir/spinjs-rails/compare/v1.3...v1.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-07 19:39:54 +00:00
dependabot[bot]
492b1c905f Bump rspec-rails from 3.8.1 to 3.8.2
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.1 to 3.8.2.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.1...v3.8.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-07 19:39:25 +00:00
Pau Pérez Fabregat
88247064c4 Merge pull request #3397 from luisramos0/2-0-subs-allow-backorders
[Spree Upgrade] Remove allow backorders from subscriptions specs
2019-02-07 20:32:49 +01:00
luisramos0
93aabf6741 Update all locales with the latest Transifex translations 2019-02-07 19:26:00 +00:00
Pau Pérez Fabregat
676fa3d84d Merge pull request #3433 from Matt-Yorkley/bi/user_permission
Update cancan permissions for second iteration of bulk invoices
2019-02-07 20:17:34 +01:00
Pau Perez
cde465edad Fix orders controller spec 2019-02-07 16:05:18 +01:00
Pau Pérez Fabregat
9613aa5a4d Merge pull request #3400 from luisramos0/2-0-ship-methods
[Spree Upgrade] Change app config to keep using ofn customized spree v1 shipping method calculators, not the new spree v2 ones
2019-02-07 15:41:06 +01:00
Pau Pérez Fabregat
fbde4a6c97 Merge pull request #3328 from luisramos0/2-0-pi-prod-reset
[Spree Upgrade] Phase 2 - Product Import - Adapt product_reset_strategy
2019-02-07 15:35:44 +01:00
Pau Pérez Fabregat
259a5b211b Merge pull request #3429 from luisramos0/2-0-in-stock
[Spree Upgrade] 3428 Fix in_stock? and shopping/variant_overrides_spec
2019-02-07 15:25:43 +01:00
Pau Pérez Fabregat
56425139c0 Merge pull request #3439 from luisramos0/2-0-stable-Feb5
[Spree Upgrade] Merging master into 2-0-stable (1st run in Feb2019)
2019-02-07 15:09:23 +01:00
luisramos0
fe0fb22814 Improve readability in admin/orders_spec 2019-02-07 13:45:04 +00:00
Luis Ramos
8c0683938a Merge pull request #3416 from kristinalim/fix/race_condition_in_bulk_order_management_feature_specs
3417,2962,3358 [Flaky Spec] Address some race conditions for bulk order management specs
2019-02-07 11:28:54 +00:00
luisramos0
3ed6aea9ab Add line items adjustments (order.price_adjustments) to the order edit page so that user is aware of adjustments included in the price like for example tax rates
This change happens in spree v2.2 together with other changes (like adding the, not yet available in v2.0, shipment_adjustments this way). See commit for more details: 636d87dd77
2019-02-07 11:14:45 +00:00
Maikel Linke
5ee3dbf9f2 Re-use renderer object 2019-02-07 10:12:06 +11:00
Luis Ramos
2d0df7ffdf Update app/controllers/spree/admin/orders_controller_decorator.rb
Co-Authored-By: mkllnk <maikel@email.org.au>
2019-02-07 09:19:19 +11:00
Kristina Lim
0030428647 Do not show table until first time dereferencing is done 2019-02-07 04:39:45 +08:00
Kristina Lim
428e58f8f7 Remove unused have_no_selector argument in feature test 2019-02-07 04:39:44 +08:00
Kristina Lim
35ecbe1584 Compile row ID with higher priority 2019-02-07 04:39:44 +08:00
Kristina Lim
ed5856afa4 Compile edit link with higher priority 2019-02-07 04:39:44 +08:00
Kristina Lim
fdede83086 Support selecting date in next months
This was causing failures when selecting tomorrow when running tests on
the last day of the month.
2019-02-07 04:39:43 +08:00
Kristina Lim
bb51f7e36b Improve sync between keyword filter and selecting all 2019-02-07 04:36:28 +08:00
Kristina Lim
3eedee313e Wait for datepicker to associate and open before selecting date 2019-02-07 04:36:24 +08:00
Pau Pérez Fabregat
8f63be9519 Merge pull request #2733 from kristinalim/fix-subscription_should_not_require_future_oc
Reduce restrictions for adding a variant to a subscription
2019-02-06 21:24:57 +01:00
Pau Pérez Fabregat
cd1f469588 Merge pull request #3389 from openfoodfoundation/dependabot/bundler/redcarpet-3.4.0
Bump redcarpet from 3.2.3 to 3.4.0
2019-02-06 21:23:21 +01:00
Pau Pérez Fabregat
433d10c42f Merge pull request #3386 from leandroalemao/fix-moment-deprecation-warning
[ISSUE-3348] LC: Fix moment.js deprecation warning
2019-02-06 21:22:58 +01:00
Pau Pérez Fabregat
b4ba9e65e1 Merge pull request #3367 from openfoodfoundation/dependabot/bundler/jwt-2.1.0
Bump jwt from 1.5.6 to 2.1.0
2019-02-06 21:22:37 +01:00
Pau Pérez Fabregat
6239397589 Merge pull request #3357 from openfoodfoundation/dependabot/bundler/stripe-4.5.0
Bump stripe from 3.3.2 to 4.5.0
2019-02-06 21:22:19 +01:00
Matt-Yorkley
2c3eeec2b9 Update cancan permissions for second iteration of bulk invoices 2019-02-06 18:19:53 +00:00
Luis Ramos
11304ef6fd Merge pull request #3371 from luisramos0/2-0-xero-invoices
[Spree Upgrade] Fix xero invoices report specs
2019-02-06 16:48:49 +00:00
Maikel Linke
4a3e5f1d0a Print supplier name on invoice 2019-02-06 15:07:05 +11:00
Maikel Linke
3aea16e9ba Cover alternative invoice template with specs 2019-02-06 15:06:44 +11:00
Maikel Linke
d97fa60c31 Remove code duplication and test PDF creation 2019-02-06 14:53:05 +11:00
Maikel Linke
7c5b430a37 Test execution of BulkInvoiceService#start_pdf_job
The spec just tested if a job was enqueued, but not if the job can
actually be executed. Unfortunately, this test is quite slow.
2019-02-06 11:26:22 +11:00
luisramos0
1b8445eb99 Merge branch 'master' into 2-0-stable-Feb5 2019-02-05 11:16:23 +00:00
Maikel Linke
cc46bfd002 Rename namespace to ofn 2019-02-05 16:30:46 +11:00
Maikel Linke
659aa269de Fix creation of sample payment methods on staging
Due to an unknown reason my chosen way of creating calculator and
assigning it to a payment method didn't work in staging environment even
though it was working in development.

Without diving deeper into the cause of this, I decided to change the
record assignments and fix the problem that way.
2019-02-05 16:24:30 +11:00
Maikel Linke
7a723d9061 Use new sample data during setup 2019-02-05 16:24:30 +11:00
Maikel Linke
c6393b6077 Warn about deprecation via ActiveSupport 2019-02-05 16:23:17 +11:00
Maikel Linke
c3029c612a Fix sample product creation and use bang methods
Mistakes like the missing fee when creating product distributions were
hidden, because I didn't use the bang methods to create records.
2019-02-05 16:23:17 +11:00
Maikel Linke
1d07327325 Add descriptions to enterprises 2019-02-05 16:23:17 +11:00
Maikel Linke
4b389ba357 Move sample data factories into their own files 2019-02-05 16:23:17 +11:00
Maikel Linke
3ab02d90df Move sample data address module to own file 2019-02-05 16:23:17 +11:00
Maikel Linke
bec9f5eb2e Move sample data logger to own module 2019-02-05 16:23:17 +11:00
Maikel Linke
fae05ff713 Deprecate old sample data task 2019-02-05 16:23:17 +11:00
Maikel Linke
876e73a989 Rewrite task to generate sample data
https://github.com/openfoodfoundation/openfoodnetwork/issues/2072

We need more and better structured sample data for dev testing and to
bootstrap staging data. This new task aims to replace
openfoodnetwork:dev:sample_data.
2019-02-05 16:23:17 +11:00
Maikel
a910468fc7 Merge pull request #3418 from Jefferson-Faseler/change-rake-tasks-namespace
Update Rake task namespace
2019-02-05 16:21:59 +11:00
Maikel Linke
dbfcbc6db9 Apply import defaults to variants of new products
Spree 2 doesn't have `Product#on_hand=` any more. We actually can't save
stock levels without saving the product first which creates a stock
item.

This hacky solution overwrites the attribute in the entry so that it
gets copied to the variant later on. I think a better solution needs
some refactoring as proposed in:
https://github.com/openfoodfoundation/openfoodnetwork/issues/2783#issuecomment-459601530
2019-02-05 15:41:19 +11:00
luisramos0
d598831d67 Adapt variants auto complete to spree v2 code with shipments 2019-02-04 18:59:41 +00:00
luisramos0
698ba4618d Adapt customer search override to spree v2 and fix customer details spec in admin orders spec 2019-02-04 18:58:02 +00:00
luisramos0
e5fdc89659 Fix distributor change spec in admin orders spec 2019-02-04 18:58:01 +00:00
luisramos0
c612df5174 Fix admin orders spec non tax adjustments by adapting to new view 2019-02-04 18:58:01 +00:00
Hugo Daniel
c823f942b4 Fix failing specs due to Spree 2's new order admin page
Add missing form tag and OC and shops injectors on order form to make the OC field, the distributor field and the update button work
2019-02-04 18:57:51 +00:00
Hugo Daniel
ae799eb2b6 Use Spree routes 2019-02-04 18:56:28 +00:00
Luis Ramos
5a4205d151 Merge pull request #3432 from kristinalim/fix/3327-intermittent_spec_failures
3327 [Flaky Spec] Fix shop accidentally becoming order coordinator
2019-02-03 19:32:40 +00:00
Luis Ramos
4b133bbc31 Merge pull request #3412 from kristinalim/fix/3059-race_condition_in_enterprise_image_specs
3059 [Flaky Spec] Fix race condition in enterprise image feature specs
2019-02-03 19:32:11 +00:00
Luis Ramos
a0b5509850 Merge pull request #3430 from kristinalim/fix/3420-intermittent_spec_failures
3420 [Flaky Spec] Fix date format in spec when single-digit day of month
2019-02-03 19:30:22 +00:00
Luis Ramos
8fdd1db2c3 Merge pull request #3380 from mkllnk/3379-payment-method-spec
Use patch to hide Paypal gateway password
2019-02-02 09:54:18 +00:00
Luis Ramos
2dce3373af Merge pull request #3385 from luisramos0/2-0-gemfilelock-fix
[Spree Upgrade] Fix conflicts in gemfile lock
2019-02-02 09:48:51 +00:00
Luis Ramos
6de23fcea1 Merge pull request #3374 from luisramos0/2-0-order-cycle-mgmt-report
[Spree Upgrade] Fix order_cycle_management_report shipping methods filter
2019-02-02 09:47:45 +00:00
Kristina Lim
3104862739 Fix shop accidentally becoming order coordinator
The original setup of the order calls:

  create(:simple_order_cycle)

Which picks an arbitrary distributor as coordinator:

  coordinator { Enterprise.is_distributor.first || ... }

There is a chance that any of the existing distributor enterprises
becomes coordinator, causing a test to intermittently fail.

This commit makes the relationship between the reference enterprises and
the order consistent.
2019-02-01 20:28:36 +00:00
Kristina Lim
4bff256f6d Match date format in spec with import date filter
This was failing if the current day of month only has one digit. The
test could not find the date in the import date filter.

Before this commit, the resulting string in the test replaced "  " with
" ", so "February  2" was being changed to "February 2". The import date
filter however uses two spaces in this case, even if the browser shows
only one (HTML inline text renders two spaces as just one).
2019-02-02 01:43:52 +08:00
Pau Pérez Fabregat
e1fb005e70 Merge pull request #3387 from kristinalim/fix/3384-product_import_timeout
3384 [Product Import] Process only one batch of rows at a time
2019-02-01 17:29:04 +01:00
luisramos0
e584fd2155 Make in_stock? work for both variants and overrides by moving it from VariantStock to variant_decorator.
Added tests for it in scope_hub_to_variant and improved VO shopping specs
2019-02-01 16:18:09 +00:00
luisramos0
5d82efa213 Add unit test for VariantStock.can_supply? 2019-02-01 16:16:04 +00:00
Isaac Haseley
09d3cea830 Lazy-load one more translation 2019-02-01 09:22:26 -06:00
luisramos0
80af7c770b Remove rescue from products_reset_strategy in product import: if setting count_on_hand fails the import will raise a RuntimeError 2019-02-01 08:32:45 +00:00
luisramos0
4b9be6f1a8 Change product import's product_reset_strategy from depending on the inexistent variant.count_on_hand DB field and instead make individual calls to variant.count_on_hand= defined in VariantStock.
Also, added spec to test return value of the reset method: it should return number of updated records.
2019-02-01 08:22:50 +00:00
Pau Pérez Fabregat
faea876ff0 Merge pull request #3361 from luisramos0/2-0-report-spec
[Spree Upgrade] Phase 2 - Fix some specs in reports_spec and in lettuce share report
2019-02-01 08:26:55 +01:00
Isaac Haseley
73a58435a8 Adopt one/other pluralization 2019-01-31 21:45:57 -06:00
Isaac Haseley
a18c98191a Better accomodate different sentence structures 2019-01-31 21:45:57 -06:00
Isaac Haseley
8543bb7cfb Add missing 'active products' translation on dashboard 2019-01-31 21:45:57 -06:00
Hugo Daniel
fa1525bdd3 Upgrade views to Spree 2 and apply overrides 2019-01-31 12:59:05 +01:00
Maikel
a9bac2c1af Merge pull request #3411 from openfoodfoundation/transifex
Transifex
2019-01-31 13:42:50 +11:00
Transifex-Openfoodnetwork
32c5c48709 Updating translations for config/locales/en_US.yml 2019-01-31 12:38:44 +11:00
Jefferson Faseler
d4d0489328 Update name spaces for rake tasks to shorter 'ofn'. 2019-01-30 17:14:00 -05:00
Kristina Lim
65438e2619 Refactor checking no preview image in specs 2019-01-31 05:04:18 +08:00
Kristina Lim
a3c808a172 Refactor checking of preview image path in specs 2019-01-31 05:02:57 +08:00
Kristina Lim
777712a0e9 Fix race condition in enterprise image feature specs 2019-01-31 04:52:40 +08:00
Transifex-Openfoodnetwork
24c12897de Updating translations for config/locales/fr_CA.yml 2019-01-31 07:42:29 +11:00
Transifex-Openfoodnetwork
bd43e06605 Updating translations for config/locales/fr_CA.yml 2019-01-31 07:41:40 +11:00
luisramos0
3595abc08a Fix seeds script for cases where default stock location already exists in the DB 2019-01-30 15:08:37 +00:00
luisramos0
f6e6f67e7d Switch Spree::Config test setup with a mock in reports_spec to keep global test setup untouched 2019-01-30 15:03:23 +00:00
Luis Ramos
cf744bb663 Merge pull request #3407 from openfoodfoundation/transifex
Transifex
2019-01-30 13:58:26 +00:00
Transifex-Openfoodnetwork
2b13516d3d Updating translations for config/locales/nb.yml 2019-01-30 19:20:56 +11:00
Transifex-Openfoodnetwork
1b50ba2729 Updating translations for config/locales/fr.yml 2019-01-30 19:16:54 +11:00
Maikel Linke
18b3363e65 Use patch to hide Paypal gateway password 2019-01-30 15:43:59 +11:00
Maikel
e8ac0e4a9f Merge pull request #3402 from openfoodfoundation/transifex
Transifex
2019-01-30 14:45:39 +11:00
Maikel
155b205ac2 Merge pull request #3401 from luisramos0/2-0-stable-jan-29th
[Spree Upgrade] Merging master into 2-0-stable (4th run in Jan2019)
2019-01-30 14:44:40 +11:00
Maikel
bef7684505 Merge pull request #3399 from kristinalim/fix/3381-address_failing_tests
3381 [Flaky Spec] Load enterprise users tab before inspecting table
2019-01-30 14:29:16 +11:00
luisramos0
6d2765e352 Convert if statement in case statement in product import entry validator 2019-01-29 23:53:37 +00:00
Maikel
f3ff7ca2fe Merge pull request #3366 from coopdevs/fix-orders-controller-spec
Fix orders controller spec
2019-01-30 10:27:17 +11:00
dependabot[bot]
8750310648 Bump dalli from 2.7.2 to 2.7.9
Bumps [dalli](https://github.com/petergoldstein/dalli) from 2.7.2 to 2.7.9.
- [Release notes](https://github.com/petergoldstein/dalli/releases)
- [Changelog](https://github.com/petergoldstein/dalli/blob/master/History.md)
- [Commits](https://github.com/petergoldstein/dalli/compare/v2.7.2...v2.7.9)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-29 19:14:15 +00:00
Transifex-Openfoodnetwork
f7b7e98fec Updating translations for config/locales/en_GB.yml 2019-01-30 05:12:58 +11:00
luisramos0
cc4825290b Fix type conversion problem in product import entry validator 2019-01-29 15:45:22 +00:00
luisramos0
dce2524353 Added now mandatory shipping_category_id to CSVs in tests in admin/product_import_spec 2019-01-29 14:55:19 +00:00
luisramos0
ab2397785b Adapted product import EntryProcessor and EntryValidator to new VariantStock logic where on_hand is set at variant level (not at product level) and only after saving the variant 2019-01-29 14:55:18 +00:00
luisramos0
2ffc5305d7 Adapted VariantStock to handle on_hand string values (product import is set on_hand with string values) 2019-01-29 14:55:18 +00:00
luisramos0
fc1004cb3a Added now mandatory shipping_category_id to CSVs in most tests in models/product_importer_spec 2019-01-29 14:55:18 +00:00
luisramos0
c07b90ffb0 Update all locales with the latest Transifex translations 2019-01-29 12:45:28 +00:00
luisramos0
729feb16f1 Merge branch 'master' into 2-0-stable-jan-29th 2019-01-29 12:38:34 +00:00
Pau Pérez Fabregat
2b3ffd8c82 Merge pull request #2833 from kristinalim/fix-variant_override_permissions
Add tests for permissions for variant overrides
2019-01-29 09:51:41 +01:00
Pau Pérez Fabregat
a5ed17f0f5 Merge pull request #3390 from openfoodfoundation/dependabot/bundler/oj-3.7.8
Bump oj from 3.7.4 to 3.7.8
2019-01-29 09:50:25 +01:00
Pau Perez
c50fa1224b Do not restore adjustments that got deleted
If something in the block deleted the adjustment update_attribute will
fail.
2019-01-29 09:40:54 +01:00
Pau Perez
59f39b14f4 Do not restore adjustments that aren't in the hash
This way we don't modify adjustments that get created as part of the
passed block. We don't know how this might be used in the future.
2019-01-29 09:40:54 +01:00
Pau Perez
f4b790eefa Restore adjustments state after updating
We don't know exactly if all adjustments are closed in all
circumstances, so it's better to be conservative until we figure out.
Chances are that non-completed orders have them open.
2019-01-29 09:40:54 +01:00
Pau Perez
8eab3c5ec1 Extract meaningful methods from controller action
This sets the ground for future refactorings while providing some more
readability and context.
2019-01-29 09:40:54 +01:00
Pau Perez
c9429760cd Trigger the appropriate callbacks from controller 2019-01-29 09:40:54 +01:00
Pau Perez
0b62b4621f Make expectation easier to reason about 2019-01-29 09:40:54 +01:00
Pau Perez
9d1d8513e7 Make controller req. params a bit more obvious 2019-01-29 09:40:54 +01:00
Pau Perez
f589d4125d Restore distributor in test that relies on it 2019-01-29 09:40:54 +01:00
Pau Perez
1bceb0748a Do not modify config's state in test 2019-01-29 09:40:53 +01:00
Pau Pérez Fabregat
c9a8ec84c0 Merge pull request #3359 from kevinchristianson/ready
Convert sass files to scss
2019-01-28 20:02:37 +01:00
luisramos0
8a86c0473d Change app config to keep using the same v1 shipping method calculators and not the ones spree v2 introduces, these are copy pasted versions that work with packages
See this commit for more details: 18e5b98f5c (diff-b0846898827183f530c113ad7b83b8ea)

Also:
- remove shipping method restriction on calculators to inherit from Spree::Shipping::ShippingCalculator so that OFN customized calculators keep working
- add shipping method serializer spec to test serialization of all shipping methods configured
2019-01-27 21:03:32 +00:00
Kristina Lim
2129ab991b Load enterprise users tab before inspecting table 2019-01-26 12:11:41 +08:00
luisramos0
bd24d3e27a Remove setting the now inexistent global config allow_backorders to false in subs specs because the default value for on_demand (set through stocklocation.backorderabl_default) is false in all specs 2019-01-25 22:12:13 +00:00
luisramos0
216afce6fe Add missing translations detected in features/admin/subscriptions_spec 2019-01-25 22:11:29 +00:00
Kristina Lim
5992bba97b Import color variables in new page SCSS partials
"admin/all.css" which imports these SCSS partials already imports the
color variables in "admin/variables", so actually there should be no
need to import the variables again.

However, "application.css" calls "require_tree", which means asset
precompilation through Sprockets would attempt to compile each of the
SCSS partials individually. When compiled individually, the color
variables are not available to these partials.

This is a quick solution to allow precompilation of "application.css" to
complete.
2019-01-26 03:29:19 +08:00
Kristina Lim
4a58aedf09 Use clearer translation for "No Upcoming OC" 2019-01-26 02:03:57 +08:00
Kristina Lim
c33808e8f5 Extract some actions in tests into methods 2019-01-26 02:03:56 +08:00
Kristina Lim
da4d6a092a Add spec helper for choosing today from datepicker 2019-01-26 02:03:56 +08:00
Kristina Lim
9965e95c65 Refactor methods in SubscriptionVariantsService 2019-01-26 02:03:55 +08:00
Kristina Lim
b691d727a7 Move OFN::SubscriptionService to SubscriptionVariantsService 2019-01-26 02:03:55 +08:00
Kristina Lim
c23002102c Add warning for unavailable subscription items 2019-01-26 02:03:55 +08:00
Kristina Lim
929290fc77 Reduce restrictions for creating subscriptions
Allow the following variants:

* Variants of permitted producers
* Variants of hub
* Variants that are in outgoing exchanges where the hub is receiver
2019-01-26 02:03:54 +08:00
Kristina Lim
57f6a7a3b9 Support clicking different text for select2 helper
Interaction with the variant autocomplete is not precise. The specs only
search for the product name, then click the first result that matches
the product name which they see.

This could have been the case because searching using the full variant
name does not match the variant. For example, searching "Some Product -
1kg" would not have results, while searching only "Some Product" (the
product name) would list "Some Product - 1kg".

Clicking the first match does not work in all scenarios.

This allows using a separate text for searching and for clicking.
2019-01-26 02:03:54 +08:00
Kristina Lim
d3f20289f8 Move setup of feature specs for creating subscriptions 2019-01-26 02:03:53 +08:00
Kristina Lim
35c0bcb3df Add tests for eligible variants for a subscription 2019-01-26 02:03:53 +08:00
Kristina Lim
28c70c7719 Fix nesting of specs for editing subscriptions 2019-01-26 02:03:53 +08:00
Kristina Lim
b9492d6483 Fix setup in tests for SubscriptionValidator 2019-01-26 02:03:49 +08:00
Kristina Lim
b6d8611359 Return early in JS if last batch 2019-01-25 09:06:25 +08:00
Kristina Lim
4425b0416d Rename import_data feature test method 2019-01-25 04:42:11 +08:00
Kristina Lim
b0efc3a2fa Add feature spec for large file import 2019-01-25 04:42:06 +08:00
dependabot[bot]
33ee46b224 Bump oj from 3.7.4 to 3.7.8
Bumps [oj](https://github.com/ohler55/oj) from 3.7.4 to 3.7.8.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.4...v3.7.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-24 19:16:56 +00:00
dependabot[bot]
5610f64c7a Bump redcarpet from 3.2.3 to 3.4.0
Bumps [redcarpet](https://github.com/vmg/redcarpet) from 3.2.3 to 3.4.0.
- [Release notes](https://github.com/vmg/redcarpet/releases)
- [Changelog](https://github.com/vmg/redcarpet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vmg/redcarpet/compare/v3.2.3...v3.4.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-24 19:14:52 +00:00
Kristina Lim
b67ba89aca Process batches of the import CSV one after another
Start the HTTP request for processing next batches only after the
previous batch has completed.

A con of this approach is that the user needs to keep their browser open
for later parts of the large CSV to be processed, but this is better
than a higher chance of requests timing out.
2019-01-25 00:33:13 +08:00
Kristina Lim
bf084cd8df Move import batch size outside method 2019-01-25 00:28:56 +08:00
leandroalemao
dfa11834e3 [ISSUE-3348] LC: Fix moment.js deprecation warning 2019-01-24 11:16:31 +00:00
luisramos0
9f0958d0a4 Fix conflicts in gemfile lock 2019-01-24 09:36:57 +00:00
Maikel
4cc6a8c966 Merge pull request #3350 from openfoodfoundation/dependabot/bundler/delayed_job_active_record-4.1.3
Bump delayed_job_active_record from 4.1.2 to 4.1.3
2019-01-24 11:58:32 +11:00
Maikel
66cb0e6a91 Merge pull request #3352 from openfoodfoundation/dependabot/bundler/foundation-rails-5.5.2.1
Bump foundation-rails from 5.5.0.0 to 5.5.2.1
2019-01-24 10:29:17 +11:00
Maikel
a3cd1dc945 Merge pull request #3344 from mkllnk/3279-moment-upgrade
Avoid deprecation warnings of momentjs
2019-01-24 10:28:41 +11:00
Maikel
937aaf67c3 Merge pull request #3250 from coopdevs/open-adjustments-for-update
[Spree Upgrade] Open adjustments to enable update
2019-01-24 10:25:16 +11:00
Kristina Lim
cf7f8b887f Add tests for permissions for variant overrides 2019-01-24 07:08:54 +11:00
luisramos0
40014b83bd Fix order_cycle_management_report shipping methods filter
The original fix to adapt to v2 was wrong and still using deprecated order.shipping_method_id, this new version is now filtering the correct shipping_method_id in shipping_rates
2019-01-23 16:43:17 +00:00
Pau Pérez Fabregat
7881f96cac Merge pull request #3341 from openfoodfoundation/dependabot/bundler/daemons-1.3.1
Bump daemons from 1.2.2 to 1.3.1
2019-01-23 16:09:28 +01:00
Pau Pérez Fabregat
8320dc75e8 Merge pull request #3002 from kevinchristianson/margin-fix
Fix bad spacing on account settings error page
2019-01-23 16:09:14 +01:00
luisramos0
908c32587b Fix xero invoices specs in reports_spec by removing the shipping adjustment as this is put in the order by the standard order callbacks when line items are added 2019-01-23 15:07:31 +00:00
Pau Pérez Fabregat
77fd0b228e Merge pull request #3360 from brases/wording_order_cofirmation
Fix wording in email template for orders confirmation
2019-01-23 13:35:00 +01:00
Maikel
2064ffe548 Merge pull request #3354 from luisramos0/knapsack
New Knapsack report
2019-01-22 10:58:13 +11:00
Maikel
06af79d1b0 Merge pull request #3339 from Matt-Yorkley/headless4
[Headless Chrome] Fix embedded_shopfront_spec unhandled alert
2019-01-22 10:46:42 +11:00
dependabot[bot]
ea7f62123b Bump jwt from 1.5.6 to 2.1.0
Bumps [jwt](https://github.com/jwt/ruby-jwt) from 1.5.6 to 2.1.0.
- [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.6...v2.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-21 19:14:44 +00:00
Pau Pérez Fabregat
2b95b5e797 Merge pull request #3347 from luisramos0/2-0-default-on-demand
[Spree Upgrade] Sets StockLocation.backorderable_default to false in test factories
2019-01-21 17:34:46 +01:00
luisramos0
0f26080d79 In lettuce share report spec, call method directly instead of using send 2019-01-21 15:00:37 +00:00
Pau Pérez Fabregat
d8710d283a Merge pull request #3320 from luisramos0/2-0-subs-mailer
[Spree Upgrade] Phase 2 - Subscriptions - Specify :mailer type in SubscriptionMailer spec
2019-01-21 15:09:56 +01:00
Pau Pérez Fabregat
8b1c1881f7 Merge pull request #3351 from openfoodfoundation/dependabot/bundler/diffy-3.3.0
Bump diffy from 3.1.0 to 3.3.0
2019-01-21 15:08:24 +01:00
Pau Pérez Fabregat
807c45a25c Merge pull request #3349 from coopdevs/fix-shipment-without-fee
Fix shipment without fee
2019-01-21 14:51:10 +01:00
Pau Pérez Fabregat
659c47340e Merge pull request #3353 from luisramos0/2-0-stable-jan-17th
[Spree Upgrade] Merging master into 2-0-stable (third run in Jan2019)
2019-01-21 11:06:57 +01:00
luisramos0
9b2fb56025 Fix reports_spec sales tax report test by calling count_on_hand setter, setting shipping_method in the right step in the checkout workflow and changing login method to match all other tests in this spec 2019-01-20 20:40:14 +00:00
luisramos0
4669c71b19 Fix lettuce_share_report_spec by adapting count_on_hand setter, it's not a db column anymore 2019-01-20 20:40:14 +00:00
luisramos0
5d86d3769e Improve variable names in lettuce_share_report_spec 2019-01-20 20:40:14 +00:00
Kevin Christianson
6b7273f685 Convert sass files to scss 2019-01-19 22:40:41 -06:00
nozakis
972bfd5e62 Fixed bad margins on the account settings error page. 2019-01-19 16:23:13 -06:00
Brases
3437257515 Fix wording in order confirmation email template
Fixes issue #3063 "Repeated translation in Order Confirmation Screen and Email".
Now "Ready for" (collection time) is not repeated in place of "Collection
details" (collection instructions)
2019-01-19 20:37:21 +00:00
luisramos0
d155bb142c Make proxy order spec a bit more resilient by allowing two secs diff in timestamps 2019-01-19 15:53:05 +00:00
luisramos0
6f7a351ffa Update knapsack report to get build jobs more balanced 2019-01-18 23:46:09 +00:00
dependabot[bot]
990b90009e Bump stripe from 3.3.2 to 4.5.0
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 3.3.2 to 4.5.0.
- [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.2...v4.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-18 19:17:05 +00:00
Matt-Yorkley
3929689d48 Ensure login via modal is completed 2019-01-18 19:06:42 +00:00
dependabot[bot]
49e3aa5070 Bump daemons from 1.2.2 to 1.3.1
Bumps [daemons](https://github.com/thuehlinger/daemons) from 1.2.2 to 1.3.1.
- [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.3.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-18 16:52:13 +00:00
dependabot[bot]
1e01cf81ec Bump diffy from 3.1.0 to 3.3.0
Bumps [diffy](https://github.com/samg/diffy) from 3.1.0 to 3.3.0.
- [Release notes](https://github.com/samg/diffy/releases)
- [Changelog](https://github.com/samg/diffy/blob/master/CHANGELOG)
- [Commits](https://github.com/samg/diffy/compare/3.1.0...3.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-18 16:51:42 +00:00
Pau Pérez Fabregat
a95dd98ed6 Merge pull request #2869 from Matt-Yorkley/bi/bulk_invoices
[Bulk Invoice Printing] Bulk invoices
2019-01-18 17:49:34 +01:00
Pau Pérez Fabregat
ee28cc5a29 Merge pull request #3323 from openfoodfoundation/dependabot/bundler/paper_trail-5.2.3
Bump paper_trail from 3.0.9 to 5.2.3
2019-01-18 17:48:56 +01:00
Pau Perez
a99a4725c9 Add #shipment to conform to OFN's decision
This ensures we can still use Order#shipment although Spree deprecates
it, while fixing a bug at the same time. The problem that was making the
test fail was on `Order#shipment` that Spree defines.

If the shipments association changes, `#shipment` returns stale data.
That is because the order object we might be using is still alive, and
so its @shipment ivar still holds an old shipment object (it's not nil)
and thus `@shipment ||= shipments.last` doesn't evaluate the right-hand
side of the expression.

Note that we need to `prepend` the evaluation of the concern (which it's
been rename) for our methods to take precedence over Spree ones. With
`include`, Spree's `#shipment` would still be picked up making the test
fail.
2019-01-18 16:02:51 +01:00
luisramos0
01f0671f6d Add missing accept alert in products_spec when deleting product properties 2019-01-18 12:45:29 +00:00
luisramos0
6da94fc960 Adapt cart_controller_spec to new variant_stock where variant count_on_hand can only be set after saving the variant 2019-01-18 12:45:29 +00:00
luisramos0
eac365182f Adapt variants_stock_levels_spec to new variant_stock where variant count_on_hand can only be set after saving the variant 2019-01-18 12:45:25 +00:00
luisramos0
13d65a4a39 Fix Gemfile.lock by running bundle install 2019-01-18 11:43:58 +00:00
luisramos0
0460e7fc6c Merge branch 'master' into 2-0-stable-jan-17th 2019-01-17 22:51:25 +00:00
luisramos0
f896e78e6f Set StockLocation.backorderable_default to false in DefaultStockLocation and in StockLocation factory.
This makes the default value of variant.on_demand false in all environments and in tests.

Additionally, adapt VariantStock.on_demand test and product factory to this change (setting on_hand value in product factory so it's not out of stock by default).
2019-01-17 20:28:05 +00:00
luisramos0
1d60732581 Improve readability of payment_method_spec 2019-01-17 20:18:43 +00:00
luisramos0
b52c99ac26 Delete on_hand test in product spec, this is already covered in product_stock_spec 2019-01-17 20:18:43 +00:00
dependabot[bot]
2e993542a7 Bump foundation-rails from 5.5.0.0 to 5.5.2.1
Bumps [foundation-rails](http://foundation.zurb.com) from 5.5.0.0 to 5.5.2.1.

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-17 19:20:09 +00:00
dependabot[bot]
560e52a0ce Bump delayed_job_active_record from 4.1.2 to 4.1.3
Bumps [delayed_job_active_record](https://github.com/collectiveidea/delayed_job_active_record) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/collectiveidea/delayed_job_active_record/releases)
- [Commits](https://github.com/collectiveidea/delayed_job_active_record/compare/v4.1.2...v4.1.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-17 19:17:20 +00:00
dependabot[bot]
adfa6b306c Bump paper_trail from 3.0.9 to 5.2.3
Bumps [paper_trail](https://github.com/airblade/paper_trail) from 3.0.9 to 5.2.3.
- [Release notes](https://github.com/airblade/paper_trail/releases)
- [Changelog](https://github.com/paper-trail-gem/paper_trail/blob/master/CHANGELOG.md)
- [Commits](https://github.com/airblade/paper_trail/compare/v3.0.9...v5.2.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-17 19:08:33 +00:00
Pau Pérez Fabregat
c178478a4f Merge pull request #3346 from luisramos0/headless-chrome
Merge Headless Chrome to master
2019-01-17 20:04:27 +01:00
Pau Pérez Fabregat
29990f25c1 Merge pull request #3325 from mkllnk/2469-fix-async-js-requests
2469 Fix async js requests
2019-01-17 20:03:54 +01:00
Pau Pérez Fabregat
e8dd6e9ce7 Merge pull request #3322 from luisramos0/delete_archive_spec
Delete dead code and unused folders
2019-01-17 20:01:49 +01:00
Luis Ramos
a8998fad79 Merge branch 'master' into headless-chrome 2019-01-17 18:22:25 +00:00
Pau Pérez Fabregat
fd00ad4e94 Merge pull request #3342 from openfoodfoundation/dependabot/bundler/letter_opener-1.7.0
Bump letter_opener from 1.6.0 to 1.7.0
2019-01-17 16:55:46 +01:00
Pau Pérez Fabregat
c51aa0f3b8 Merge pull request #3340 from openfoodfoundation/dependabot/bundler/whenever-0.10.0
Bump whenever from 0.9.2 to 0.10.0
2019-01-17 16:52:21 +01:00
Matt-Yorkley
e7e208061f Assign polling numbers to variables and add comments 2019-01-17 09:37:32 +00:00
Matt-Yorkley
a3b9936f37 Improve matching inventory using 'items' unit type 2019-01-17 09:33:39 +00:00
Maikel Linke
4d3aed8467 Avoid deprecation warnings of momentjs 2019-01-17 14:49:43 +11:00
Maikel
9322c3f0c8 Merge pull request #3343 from Matt-Yorkley/headless5
[Headless Chrome] Fix datepicker interactions in bulk_order_management_spec
2019-01-17 14:19:00 +11:00
Maikel Linke
520ec5d047 Fix whenever upgrade by declaring dependency
Whenever doesn't depend on ActiveSupport any more. So we can't rely on
YAML being automatically loaded for us. We have to require it.
2019-01-17 10:41:11 +11:00
Maikel
7272ec8738 Merge pull request #3333 from Matt-Yorkley/headless3
[Headless Chrome] Fix shipping method tests
2019-01-17 09:18:12 +11:00
Matt-Yorkley
b3849778fa Fix datepicker interactions in bulk_order_management_spec 2019-01-16 21:51:15 +00:00
dependabot[bot]
d884be54f9 Bump letter_opener from 1.6.0 to 1.7.0
Bumps [letter_opener](https://github.com/ryanb/letter_opener) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/ryanb/letter_opener/releases)
- [Changelog](https://github.com/ryanb/letter_opener/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ryanb/letter_opener/compare/v1.6.0...v1.7.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-16 19:22:19 +00:00
dependabot[bot]
483d8893f2 Bump whenever from 0.9.2 to 0.10.0
Bumps [whenever](https://github.com/javan/whenever) from 0.9.2 to 0.10.0.
- [Release notes](https://github.com/javan/whenever/releases)
- [Changelog](https://github.com/javan/whenever/blob/master/CHANGELOG.md)
- [Commits](https://github.com/javan/whenever/compare/v0.9.2...v0.10.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-16 19:18:32 +00:00
Matt-Yorkley
07dff0af7f Check tag js has finished executing before submitting form 2019-01-16 17:46:56 +00:00
Matt-Yorkley
7487a6da3c Fix shipping method tests 2019-01-16 17:17:10 +00:00
Matt-Yorkley
5caa958db0 Merge pull request #3336 from luisramos0/chrome-helper-fix
Fix Gemfile.lock by running bundle install. Adds missing chromedriver-helper.
2019-01-16 17:16:22 +00:00
Pau Pérez Fabregat
e557e06a7b Merge pull request #3324 from openfoodfoundation/dependabot/bundler/spring-1.7.2
Bump spring from 1.1.3 to 1.7.2
2019-01-16 17:50:08 +01:00
luisramos0
41cd8c7ed3 Fix Gemfile.lock by running bundle install. Adds missing chromedriver-helper. 2019-01-16 16:29:55 +00:00
Matt-Yorkley
21bdaf9960 Fix enterprise images spec 2019-01-16 16:24:01 +00:00
Matt-Yorkley
0589516368 Add chromedriver-helper to Gemfile for test and development 2019-01-16 16:24:01 +00:00
Matt-Yorkley
40ccabc2b4 Fix broken product import spec 2019-01-16 16:24:01 +00:00
Maikel Linke
f391eab5b0 Revert "Temporarily move 2 broken specs to pending (shops and producers search by url) due to google maps api changes"
This reverts commit 7dc208fb8c.
2019-01-16 16:24:01 +00:00
Maikel Linke
6a53e5fd3d Avoid alert by waiting until shop loaded 2019-01-16 16:24:01 +00:00
Maikel Linke
dd5bd5b616 Remove js_errors = false from specs because it is not available in Selenium ChromeDriver
If the js errors this line was hidding become a problem we will need to address them
2019-01-16 16:24:01 +00:00
luisramos0
fce56776f6 Make embedded_shopfronts_spec work with selenium 2019-01-16 16:24:01 +00:00
luisramos0
5fb4faac91 Make features/admin/subscriptions_spec and shopworkflow work with selenium
Also, remove a test support method, dead code
2019-01-16 16:24:01 +00:00
Maikel Linke
e49eb42af6 Make Chrome accepting alerts 2019-01-16 16:21:30 +00:00
Maikel Linke
843ec2c08f Wait for table rows before testing them
Unfortunately, the exact table row matcher doesn't wait correctly for
changes on the page. Waiting correctly would mean to assemble a very
complicated xpath similar to this gem:

https://github.com/jnicklas/capybara_table
2019-01-16 16:21:30 +00:00
Maikel Linke
1407ae7778 Make TableMatcher match exactly, not part of row
Reverts dbf3a7aaaf9d458f99e14983ca9db2d4cbe4b564.

The reverted commit tried to avoid a 30 second delay by using
have_selector. While that was successful in reducing test time, it made
the matcher find rows that where not exactly the wanted row, but contained
text of the wanted row. This wasn't a problem until we experimented with
Chrome as test browser returns text on select boxes.

This commit makes the matcher precise again. We still have to deal with
the 30 second delay.
2019-01-16 16:21:30 +00:00
Rob Harrington
ef68bd1b43 Replace unnecessary perform_and_ensure* type helpers with standard actions and expectations 2019-01-16 16:21:30 +00:00
Rob Harrington
98f4ae9b60 Change screen size back to large after authentication_spec 2019-01-16 16:21:30 +00:00
Rob Harrington
a988fad2db Update orders_spec to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
98a5b40aec Ensure multiligual switcher specs run in large screen 2019-01-16 16:21:30 +00:00
Rob Harrington
3a781049ed Update orders_spec to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
3b40ede0b8 Fix table row matchers
The matcher was silently failing on the check step (adding ~30 seconds to out specs each time it was used!), so I changed it to fail if the basic step does not succeed
2019-01-16 16:21:30 +00:00
Rob Harrington
56c07aac5c Don't run ticket printing spec 2019-01-16 16:21:30 +00:00
Rob Harrington
4951863e9b Update enterprises_spec to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
eccf874f03 Update shopping_spec to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
2b48b4ee18 Update cart_spec to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
bba8b2020c Replace use of 'trigger' in ui_component helper 2019-01-16 16:21:30 +00:00
Rob Harrington
23fa57ff6d Update multilingual_spec to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
bbaf6359f3 Update shopping_spec to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
1923c0dbc6 Update enterprise_fees_spec to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
c2432fab0b Use all_options_absent method instead of poorly written no_options_present
SAVES 30 SECONDS FOR EVERY SPEC THAT IS IT USED IN!
2019-01-16 16:21:30 +00:00
Rob Harrington
3e90f9aa1d Update customers_spec to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
189856a92a Reimplement resize helper methods to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
1bad08c1c0 Update checkout_workflow and spec_helper to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
3ab7a3d62b Update order_cycles_spec to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
50a8554b55 Update enterprises_spec to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
69e44bdeb3 Update enterprise_roles_spec to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
5ae33747ea Update enterprise_relationships_spec to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
7dc792b6fe Update enterprise_groups_spec to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
e97f5e36a6 Update bulk_order_management_spec to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
2ece6bfb49 Update subscriptions_spec to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
8416af4995 Update variants_spec to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
8413c5f60a Update variant_overrides_spec to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
5c268e9359 Update schedules_spec to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
708e308b7c Update products_spec to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
c6a383aafd Update bulk_product_update_spec to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
cc55f59b00 Update tag_rules_spec to work with Selenium 2019-01-16 16:21:30 +00:00
Rob Harrington
118d26b2ff Add aynchronous select2 search helper
select2_search from spree times out after 1 second, so this new method just waits for a result to be returned before attempting to select it
2019-01-16 16:21:30 +00:00
Rob Harrington
70502a7a32 Switch to using selenium as js driver for capybara specs
PhantomJS is no longer being maintained
2019-01-16 16:21:30 +00:00
Rob Harrington
6608655e9a Use headless chrome for karma specs instead of PhantomJS
PhantomJS is no longer being maintained
2019-01-16 16:21:30 +00:00
Pau Perez
1e03835391 Update order while adjustments are open
Spree supports updating line items as the model contains these two
callbacks:

f55722b38d/core/app/models/spree/line_item.rb (L27-L28)

However, as
f55722b38d/core/app/models/spree/adjustment.rb (L1-L7)
clearly states, due to Adjustment's state machine, once the order is
finalized it can't be updated. Then, if we want to have an up-to-date
adjustment_total attribute for a complete order we must update it while
the adjustments are open. Otherwise, the following `immutable?` check
does not pass.

f55722b38d/core/app/models/spree/adjustment.rb (L84-L92)
2019-01-16 15:28:54 +01:00
Pau Pérez Fabregat
b05b2c3a5a Merge pull request #3254 from coopdevs/add-default-stock-location
[Spree Upgrade] Create the default StockLocation in DB
2019-01-16 12:57:45 +01:00
Pau Pérez Fabregat
d2325fc7dd Merge pull request #3230 from luisramos0/stock_levels
3222 Improve stock levels calculation code on cart populate and add specs to test handling of variant overrides
2019-01-16 12:54:25 +01:00
Pau Pérez Fabregat
5bb327efbd Merge pull request #3234 from openfoodfoundation/dependabot/bundler/oauth2-1.4.1
Bump oauth2 from 1.2.0 to 1.4.1
2019-01-16 12:33:39 +01:00
Pau Pérez Fabregat
d37d964ab9 Merge pull request #3311 from luisramos0/2-0-stable-jan-11th
[Spree Upgrade] Merging master into 2-0-stable (second run in Jan2019)
2019-01-16 12:32:52 +01:00
Matt-Yorkley
79dce01aef Add spec for new on_demand logic 2019-01-16 01:19:01 +00:00
Matt-Yorkley
7dc7ffe1b7 Update inventory template 2019-01-16 01:18:46 +00:00
Maikel
54311c2d1b Merge pull request #3304 from HugsDaniel/3288-3291-translation-issues
Add I18n keys for order state and order firstname and lastname filters
2019-01-16 09:43:28 +11:00
Maikel
2c197d40bb Merge pull request #3326 from mkllnk/cleanup-specs
Cleanup specs
2019-01-16 09:23:06 +11:00
luisramos0
ea61e415e1 Add bugsnag notifications to detect potential dead code scenarios in variants_stock_levels and cart_service 2019-01-15 13:42:51 +00:00
luisramos0
d926f7c776 Reorganize and improve cart controller spec 2019-01-15 13:42:51 +00:00
luisramos0
aa603c9a84 Make rubocop happy on cart controller, cart service and stock levels service 2019-01-15 13:42:51 +00:00
luisramos0
b0449be302 Add spec to test cart controller handling of variant overrides on cart populate 2019-01-15 13:38:58 +00:00
luisramos0
c0473a4505 Extract variants_stock_levels from cart_controller and refactor some names 2019-01-15 13:38:58 +00:00
Maikel
e56915e65a Merge pull request #3303 from openfoodfoundation/transifex
Transifex
2019-01-15 17:19:21 +11:00
Maikel Linke
5a5db3c458 Fix state of RequestMonitor
`@loading` was set to false when the request with the last id finished.
But another request started earlier (having a lower id) could take
longer. `@loading` was set to false even though these long requests were
still active.
2019-01-15 15:45:49 +11:00
Maikel Linke
ca9673f562 Fix Dereferencer service
It failed when `object[attr]` was `undefined` instead of `null`.
2019-01-15 15:43:00 +11:00
Maikel
8ba0e3b474 Merge pull request #3302 from mkllnk/74-bundler-version
Add script to install required bundler version
2019-01-15 09:36:18 +11:00
dependabot[bot]
22c225968a Bump spring from 1.1.3 to 1.7.2
Bumps [spring](https://github.com/rails/spring) from 1.1.3 to 1.7.2.
- [Release notes](https://github.com/rails/spring/releases)
- [Changelog](https://github.com/rails/spring/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/spring/compare/v1.1.3...v1.7.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-14 19:18:25 +00:00
luisramos0
90240f1802 Delete unused folders under /vendor 2019-01-14 14:38:51 +00:00
luisramos0
497974db74 Delete outdated archived version of checkout spec 2019-01-14 14:32:51 +00:00
luisramos0
e2c966244a Delete /doc.
The list of specs is outdated and the images were transfered to the wiki itself

The project docs should be in the wiki
2019-01-14 14:31:31 +00:00
luisramos0
0009b663e7 Specify :mailer type in specs
According to RSpec docs we need to specify type: :mailer for mails to
work. Check it out:
https://relishapp.com/rspec/rspec-rails/v/3-8/docs/mailer-specs.

This fixes all specs in SubscriptionMailer
2019-01-13 15:50:35 +00:00
Pau Pérez Fabregat
ccc0a2cf96 Merge pull request #3280 from openfoodfoundation/dependabot/bundler/uglifier-4.1.20
Bump uglifier from 4.1.19 to 4.1.20
2019-01-11 19:46:04 +01:00
Pau Perez
5b8c0dffe2 Remove test for a state that is no longer possible 2019-01-11 16:39:06 +01:00
Pau Perez
817bf4caa1 Explain why a index forbids more than a location 2019-01-11 16:39:06 +01:00
Pau Perez
10a678bdfe Rely on Spree's default StockLocation 2019-01-11 16:39:06 +01:00
Pau Perez
730d5ff7d6 Include the default location in seed data
This ensures that new OFN instances will have the proper stock location
set up.
2019-01-11 15:52:25 +01:00
Pau Perez
9ebe112bcc Abstract OFN's default stock location into a class 2019-01-11 15:52:09 +01:00
luisramos0
9ab99f13c4 Merge branch 'master' into 2-0-stable-jan-11th 2019-01-11 11:58:24 +00:00
Matt-Yorkley
3f62d82afc Add more inventory testing for visibility in the inventory UI 2019-01-11 11:26:38 +00:00
Maikel Linke
4abacb3691 Remove unused spec helpers
They all seem to have been used in the past. People forgot to remove
them after removing the using spec code.
2019-01-11 18:04:24 +11:00
Maikel Linke
e89a836e72 Remove forgotten code from spec
Commit e4ebeb8a29 forgot to remove this
code.
2019-01-11 18:04:24 +11:00
Maikel Linke
223982f571 Prepare spec for Chrome testing 2019-01-11 18:04:24 +11:00
Maikel Linke
cbdda54989 DRY specs with new helper 2019-01-11 18:04:24 +11:00
Maikel
4920782742 Merge pull request #3072 from luisramos0/2-0-calc-line-items-for-take-2
Fix bug on calculator_decorator line_items_for where input is line_item with a nil order
2019-01-11 14:49:25 +11:00
dependabot[bot]
1548c7c25a Bump oauth2 from 1.2.0 to 1.4.1
Bumps [oauth2](https://github.com/oauth-xx/oauth2) from 1.2.0 to 1.4.1.
- [Release notes](https://github.com/oauth-xx/oauth2/releases)
- [Changelog](https://github.com/oauth-xx/oauth2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/oauth-xx/oauth2/compare/v1.2.0...v1.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-10 23:46:45 +00:00
dependabot[bot]
7f09112d7b Bump uglifier from 4.1.19 to 4.1.20
Bumps [uglifier](https://github.com/lautis/uglifier) from 4.1.19 to 4.1.20.
- [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/v4.1.19...v4.1.20)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-10 23:45:22 +00:00
Maikel
ab14b73e17 Merge pull request #3211 from openfoodfoundation/dependabot/bundler/blockenspiel-0.5.0
Bump blockenspiel from 0.4.5 to 0.5.0
2019-01-11 10:42:40 +11:00
Maikel
fff054efc1 Merge pull request #3169 from luisramos0/hubPermissions
Add guard clause on variant overrides filter in case hub id is not present in the hubPermissions
2019-01-11 10:41:57 +11:00
Maikel
6c3d769121 Merge pull request #3229 from mkllnk/3127-tax-rates-report
3127 More robust tax rates report
2019-01-11 10:41:12 +11:00
Maikel
935e233605 Merge pull request #3244 from luisramos0/ruby-racer
Revert to the ruby racer
2019-01-11 10:40:02 +11:00
Hugo Daniel
026fe55f1d Add I18n keys for order state and order firstname and lastname filters 2019-01-10 15:32:23 +01:00
Transifex-Openfoodnetwork
e70b8c03ce Updating translations for config/locales/nb.yml 2019-01-10 22:18:58 +11:00
Matt-Yorkley
e624faaacb Add 'please wait' message to bulk invoice modal 2019-01-10 09:57:06 +00:00
Matt-Yorkley
0e478ff501 Increase polling to 150 seconds maximum before showing error message. 2019-01-10 09:57:06 +00:00
Matt-Yorkley
66ac61f591 Rename background processing method 2019-01-10 09:57:06 +00:00
Matt-Yorkley
4f9f8adcd6 Add Service and remove Job 2019-01-10 09:57:06 +00:00
Matt-Yorkley
003014daf8 Extract invoice methods from ordersCtrl 2019-01-10 09:57:06 +00:00
Matt-Yorkley
bb814f91ef Extract timeout to named function 2019-01-10 09:57:06 +00:00
Matt-Yorkley
6b6a41cfbc Update CSS 2019-01-10 09:57:06 +00:00
Matt-Yorkley
638dc6eada Add polling and show action 2019-01-10 09:57:06 +00:00
Matt-Yorkley
b0f75162ac Add delayed job for create bulk invoice 2019-01-10 09:57:06 +00:00
Matt-Yorkley
7d82020657 Move bulk invoice to new RESTful route 2019-01-10 09:57:06 +00:00
Matt-Yorkley
4a88fb0626 Use simpler array for selected ids 2019-01-10 09:57:06 +00:00
Matt-Yorkley
5279210254 Improve invoice order querying 2019-01-10 09:57:06 +00:00
Matt-Yorkley
f3585befff Fix customer missing from some order records - guest checkout? 2019-01-10 09:57:06 +00:00
Matt-Yorkley
24207053e4 Reset selected orders on filter change 2019-01-10 09:57:06 +00:00
Matt-Yorkley
5cc8bad42b Improve UI layout for select all option 2019-01-10 09:57:06 +00:00
Matt-Yorkley
42cf96e635 Disable button unless orders selected 2019-01-10 09:57:06 +00:00
Matt-Yorkley
4ec0f0ff73 Add bulk invoices printing 2019-01-10 09:57:06 +00:00
Matt-Yorkley
96d530b473 Tidy up invoice template selection 2019-01-10 09:57:06 +00:00
Matt-Yorkley
9a71236abd Add combine_pdf gem 2019-01-10 09:57:06 +00:00
Matt-Yorkley
f263ef7dc0 Add selectable checkboxes 2019-01-10 09:57:06 +00:00
Maikel
4f5bb96484 Merge pull request #3300 from openfoodfoundation/transifex
Transifex
2019-01-10 17:52:28 +11:00
Maikel Linke
199dee3f64 Use install-bundler in setup script 2019-01-10 17:44:13 +11:00
Maikel Linke
dafa433788 Add script to install required bundler version
The newest version of bundler is not compatible with our current version
of Ruby. This script helps to install the bundler version defined in
Gemfile.lock.
2019-01-10 17:44:09 +11:00
luisramos0
292f22af4e Adapt factory completed_order_with_fees to new parent order_with_totals_and_distribution by cleaning up duplicate shipping fees 2019-01-09 23:31:40 +00:00
Transifex-Openfoodnetwork
15e197b3b0 Updating translations for config/locales/en_GB.yml 2019-01-10 07:31:46 +11:00
luisramos0
e787a317dc Adapt user_balance_calculator_spec to new order_with_totals_and_distribution with shipping fee correctly included in its total 2019-01-09 16:02:09 +00:00
luisramos0
e45f7571fb Fix order_with_totals_and_distribution by updating shipping fees 2019-01-09 15:20:28 +00:00
Pau Pérez Fabregat
0eefd2455c Merge pull request #3293 from luisramos0/2-0-stable-jan-8th
[Spree Upgrade] Merging master into 2-0-stable (first run in Jan2019)
2019-01-09 16:11:18 +01:00
Pau Pérez Fabregat
399cc5f796 Merge pull request #3224 from alvaro-chalar/footer-message
Add custom footer message in reports section
2019-01-09 16:01:02 +01:00
Pau Pérez Fabregat
1815a2116d Merge pull request #3257 from coopdevs/refactor-enterprise-controller-shop-injection
Refactor to reveal how we load enterprises in shop
2019-01-09 13:21:56 +01:00
Maikel
abe4f78e5c Merge pull request #2988 from Matt-Yorkley/pi/utf8
Pi/utf8
2019-01-09 15:39:05 +11:00
Pau Pérez Fabregat
57267ab4a4 Merge pull request #3297 from openfoodfoundation/transifex
Transifex
2019-01-08 22:45:55 +01:00
Transifex-Openfoodnetwork
f05f4ce0b1 Updating translations for config/locales/en_GB.yml 2019-01-09 07:06:27 +11:00
Pau Pérez Fabregat
bd10400457 Merge pull request #3295 from coopdevs/pull-translations
Update all locales with the latest Transifex translations
2019-01-08 17:58:51 +01:00
Pau Perez
f1f1ab9daf Update all locales with the latest Transifex translations 2019-01-08 17:17:35 +01:00
luisramos0
2cc8a0e9e3 Fix models/variant_override_spec by setting mandatory on_demand true when count_on_hand is nil 2019-01-08 15:32:10 +00:00
luisramos0
134a51ab1d Fix merge typo in the cancel email method of the order mailer decorator 2019-01-08 15:31:28 +00:00
luisramos0
e28f9a7c84 Merge branch 'master' into 2-0-stable-jan-8th 2019-01-08 14:29:50 +00:00
Maikel
14ccb39478 Merge pull request #3287 from luisramos0/2-0-edit-variants
[Spree Upgrade] Fix variant edit page optiontype deface code
2019-01-08 16:37:38 +11:00
Maikel
abbbfd6191 Merge pull request #3286 from luisramos0/2-0-order-spec
[Spree Upgrade] Fix specs in admin orders spec
2019-01-08 16:35:59 +11:00
Maikel
a46180ef78 Merge pull request #3282 from luisramos0/2-0-credit-card
[Spree Upgrade] Fix credit card spec that was depending on current year
2019-01-08 16:34:03 +11:00
Maikel
68df27df02 Merge pull request #3281 from luisramos0/2-0-tab-ransl
[Spree Upgrade] 3119, 3112 and 3073 - fix menu translations
2019-01-08 16:31:41 +11:00
luisramos0
676f0e71b8 Fix variant edit page optiontype deface code 2019-01-07 12:16:47 +00:00
luisramos0
bdefc0ebd1 Fix admin orders spec by adapting the spec to the recently de-defaced page 2019-01-07 12:16:28 +00:00
luisramos0
42eb92c40a Add missing translation related to capture payments in the backoffice 2019-01-07 12:16:28 +00:00
luisramos0
503d515930 Fix credit card spec that was depending on current year
After this commit 5d93d1dedb, this static fix was meant to fail 3f33e28839
2019-01-07 12:16:09 +00:00
luisramos0
d3325ed7bb Add translation entries for admin menu tabs.
This was moved to new namespace tab in spree 2, see 4c82bfdf48
2019-01-07 12:15:36 +00:00
Luis Ramos
db6d39cedd Merge pull request #3277 from openfoodfoundation/revert-3246-2-0-create-variants
Revert "[Spree Upgrade] Set on_demand default value to false in test factories"
2019-01-07 11:46:37 +00:00
luisramos0
364f9f9abd Improve variable names in cart spec 2019-01-07 11:40:42 +00:00
Pau Pérez Fabregat
34876cc255 Merge pull request #3275 from openfoodfoundation/transifex
Transifex
2019-01-07 11:43:06 +01:00
Pau Pérez Fabregat
ed8f719769 Merge pull request #3245 from luisramos0/spring
Add spring, a rails preloader alternative to zeus, to our gemfile
2019-01-07 11:07:34 +01:00
luisramos0
2893f1c141 Add test to cover weight calculation bug #3072 2019-01-07 01:18:40 +00:00
Maikel Linke
d2ba305ce6 Fix context data for tax rate finder spec
The spec was accidentally finding an exact tax rate match. The new test
data provides only close matches to choose from.

The naming of variables has been simplified as well.
2019-01-04 18:31:46 +11:00
Maikel Linke
a8ccb9b818 Explain why we look for the closest tax rate of a fee 2019-01-04 17:24:45 +11:00
Luis Ramos
116b842852 Revert "[Spree Upgrade] Set on_demand default value to false in test factories" 2019-01-03 23:54:17 +00:00
Maikel
1024fc1f34 Merge pull request #3273 from coopdevs/fix-fr-BE-link
Fix menu_1_url translation for fr_BE
2019-01-04 09:52:44 +11:00
Transifex-Openfoodnetwork
9da7ff5698 Updating translations for config/locales/fr.yml 2019-01-04 02:15:57 +11:00
Pau Pérez Fabregat
9f0c6a6bac Merge pull request #3251 from openfoodfoundation/dependabot/bundler/webmock-3.5.1
Bump webmock from 3.4.2 to 3.5.1
2019-01-03 11:18:59 +01:00
Pau Perez
edffbd72fe Update rubocop_manual_todo 2019-01-03 11:17:10 +01:00
Pau Perez
ddf916814f Reduce complexity of EnterprisesController#shop
As asked by Rubocop.
2019-01-03 11:17:10 +01:00
Pau Perez
e3edb51d3e Update rubocop_todo 2019-01-03 11:17:10 +01:00
Pau Perez
51da607ab1 Fix too long line 2019-01-03 11:17:10 +01:00
Pau Perez
46760ce28c Do not double-render when there is no stock 2019-01-03 11:17:10 +01:00
Pau Perez
cca15e75a6 Refactor to reveal how we load enterprises in shop
By sticking to Rails conventions we make it more obvious how (badly) we
are loading enterprises in EnterprisesController#shop and shed some
light on the obscure InjectionHelper.

This will also make it easier to improve its performance in the future as
it's among the top offenders. See https://www.skylight.io/app/applications/ibo3NOqCYMnq/1545851520/1d/endpoints/EnterprisesController%23shop?responseType=html
2019-01-03 11:17:10 +01:00
Maikel
ac76580932 Merge pull request #3274 from openfoodfoundation/transifex
Transifex
2019-01-03 11:35:47 +11:00
Transifex-Openfoodnetwork
89bf819b37 Updating translations for config/locales/en_US.yml 2019-01-03 00:33:56 +11:00
Pau Perez
112080d8c6 Fix menu_1_url translation for fr_BE
The first menu item in OFN BE is currently broken.
2019-01-02 13:10:33 +01:00
Maikel
832dca9742 Merge pull request #3247 from coopdevs/fix-anonymous-checkout-spec
[Spree Upgrade] Provide anonymous user instead of nil
2019-01-02 18:13:06 +11:00
Maikel
63ec4b59fe Merge pull request #3246 from luisramos0/2-0-create-variants
[Spree Upgrade] Set on_demand default value to false in test factories
2019-01-02 18:02:34 +11:00
Maikel
f68fd6eea9 Merge pull request #3242 from luisramos0/2-0-line-item-destroy
[Spree Upgrade] Fix line item destroy by forcing quantity to zero and update_inventory
2019-01-02 17:44:25 +11:00
Maikel
a3b7364c75 Merge pull request #3241 from luisramos0/2-0-checkout-out-of-stock
[Spree Upgrade] Fix checkout_controller_spec
2019-01-02 17:37:34 +11:00
Maikel
3ec7ccb12c Merge pull request #3240 from luisramos0/2-0-orders-ctrl-api
[Spree Upgrade] Fix api orders controller spec broken tests
2019-01-02 17:36:40 +11:00
Maikel
d5c48d7c41 Merge pull request #3239 from luisramos0/2-0-ship-method-restart-checkout
[Spree Upgrade] Fix restart checkout spec
2019-01-02 17:33:48 +11:00
dependabot[bot]
8170937708 Bump webmock from 3.4.2 to 3.5.1
Bumps [webmock](https://github.com/bblimke/webmock) from 3.4.2 to 3.5.1.
- [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/v3.4.2...v3.5.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-27 19:16:35 +00:00
Pau Pérez Fabregat
d88be202a6 Merge pull request #3223 from kristinalim/fix-rubocop_block_length_ignore_rake_routes_dsl
Ignore Rake and routes DSL methods in Rubocop BlockLength
2018-12-27 17:14:57 +01:00
Pau Pérez Fabregat
755eca5abe Merge pull request #3236 from openfoodfoundation/dependabot/bundler/guard-2.15.0
Bump guard from 2.14.1 to 2.15.0
2018-12-27 17:14:32 +01:00
Alvaro Chalar
6dccbeca70 Add custom footer message in reports section 2018-12-27 12:22:48 +01:00
Pau Perez
3e793652e8 Provide anonymous user instead of nil
As explained in
0181835fb6/app/models/spree/user.rb (L26-L32),
all orders have a user so checking out as a guest is just using an
automatically generated user by means of `.anonymous!`.
2018-12-27 12:18:27 +01:00
luisramos0
467623f000 Sets StockLocation.backorderable_default to false in test factories
This makes the default value of variant.on_demand be false
2018-12-26 22:16:05 +00:00
luisramos0
fd21914a15 Add spring, a rails preloader alternative to zeus, to our gemfile
Add /bin to gitignore, bin is used by spring, rails preloader
2018-12-26 13:36:48 +00:00
luisramos0
4eaaeb37c9 Reverting to therubyracer because mini racer is causing trouble to some developers using osx.
We will probably be able to move back to the faster mini racer when we upgrade to newer rails versions
2018-12-26 13:07:52 +00:00
luisramos0
d44c4778e1 Improve line item code by merging multiple destroy hooks into a single hook: update_inventory_on_destroy. This makes the code easier to read 2018-12-24 16:39:06 +00:00
Pau Pérez Fabregat
1ab50798fe Merge pull request #3189 from luisramos0/3043-i18n-emails
Make all mailers use appropriate locale when sending emails
2018-12-24 14:59:04 +01:00
luisramos0
429e513a77 Improve line_item code by moving order.shipment reload to a line_item after_destroy hook 2018-12-23 09:15:18 +00:00
luisramos0
b83ec8d357 Add order.shipments reload to line_item.update_inventory. This is necessary when destroying line items as update_inventory may delete the shipment from the order 2018-12-23 00:23:49 +00:00
luisramos0
26b5250f2c Fix line item destroy by forcing quantity to zero and update_inventory before_destroy so that the variant is restocked 2018-12-22 23:27:27 +00:00
luisramos0
4dd41bae9c Change out of stock message in spec. Now the checkout controller is returning the error message, not the line items validator 2018-12-21 21:50:13 +00:00
luisramos0
c2e05e7d87 In api orders controller spec, remove inventory_units_shipment_id_null as the filter was removed in spree 2
Also set the distributor used in the tests on completed_order_with_fees so results for that distributor are correct
2018-12-21 16:10:31 +00:00
luisramos0
8970131685 In restart checkout spec, create failed payment before the valid payment otherwise the failed payment will invalidate the previous payment, even if it is a good one
In spree 2, every new payment will invalidate all previous payments in the order
See here: c9eebba4f7
2018-12-21 15:13:52 +00:00
luisramos0
7155f28acf Remove shipping_method_id from RestartCheckout, destroying shipments is now enough as order.shipping_method_id is no longer used and will be dropped. See #2683 for more details 2018-12-21 15:13:43 +00:00
Luis Ramos
1007addddb Merge pull request #3232 from luisramos0/2-0-out-of-stock
[Spree Upgrade] Scope variants in line items availability validator
2018-12-21 12:05:43 +00:00
Luis Ramos
6935bfdf8b Merge pull request #3210 from luisramos0/2-0-bom-on-hand
[Spree Upgrade] Fix availability validator to include inventory_units in it's validation
2018-12-21 12:04:18 +00:00
luisramos0
6c70998b64 Move StockLocation.fill_status to VariantStock so we can easily override it 2018-12-21 11:33:07 +00:00
luisramos0
17ced61b3d Override Spree::Variant.in_stock? in VariantStock so that we don’t depend on Spree::Stock::Quantifier 2018-12-21 11:33:07 +00:00
luisramos0
1835d97013 Adapt line_item.sufficient_stock? to spree 2 2018-12-21 11:33:07 +00:00
luisramos0
d641705053 Add variant scoping to availability_validator_decorator by using line_item.scoper and moving Spree::Stock::Quantifier.can_supply? to VariantStock so that it becomes overridable 2018-12-21 11:33:07 +00:00
luisramos0
c0a095ffaf Improve variant_overrides_spec variable names 2018-12-21 11:33:07 +00:00
luisramos0
4f79fd5be0 Improve availability validator spec readability and remove unnecessary expect statements 2018-12-21 11:19:12 +00:00
albarnaz
5d515712ed Fix for instagram links (#2849)
* Add new attribute instagram_placeholder to local yml

* Add placeholder to instagram link input

* Add migration to fix wrong instagram links

* Add new attribute facebook_placeholder to local yml

* Add placeholder to facebook link input

* Add new attribute linkedin_placeholder to local yml

* Add placeholder to linkedin link input

* Change each for find_each in migration

* Add new attribute instagram_placeholder to local yml

* Add migration to fix wrong instagram links

* Add new attribute linkedin_placeholder to local yml

* Add placeholder to linkedin link input
2018-12-21 14:42:28 +11:00
Maikel
9557457ec2 Merge pull request #3088 from kristinalim/cleanup-test_scripts
Run RSpec tests in custom engines (and some fixes, cleanup)
2018-12-21 14:32:56 +11:00
dependabot[bot]
e680559169 Bump guard from 2.14.1 to 2.15.0
Bumps [guard](https://github.com/guard/guard) from 2.14.1 to 2.15.0.
- [Release notes](https://github.com/guard/guard/releases)
- [Changelog](https://github.com/guard/guard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/guard/guard/compare/v2.14.1...v2.15.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-20 19:18:59 +00:00
Pau Pérez Fabregat
e61b7139cc Merge pull request #3212 from openfoodfoundation/dependabot/bundler/wkhtmltopdf-binary-0.12.4
Bump wkhtmltopdf-binary from 0.12.3.1 to 0.12.4
2018-12-20 16:43:24 +01:00
Pau Pérez Fabregat
0876986215 Merge pull request #3227 from openfoodfoundation/dependabot/bundler/momentjs-rails-2.20.1
Bump momentjs-rails from 2.5.1 to 2.20.1
2018-12-20 16:36:40 +01:00
luisramos0
c1aeb2e9a3 Improve naming in availability_validator_decorator and cover it with tests 2018-12-20 14:26:34 +00:00
luisramos0
bc22b0a58e Fix capping quantity to stock levels by always validating line items with quantity zero
Stock::Quantifier.can_supply? returns false for an input of zero when stock level is negative
2018-12-20 14:26:34 +00:00
luisramos0
3085e15961 Fix order factory by making line_item.skip_stock_check work in spree 2 2018-12-20 14:26:34 +00:00
luisramos0
88b1bb61d6 Fix availability validator to include inventory_units in it's validation 2018-12-20 14:26:34 +00:00
dependabot[bot]
aac8706f9a Bump blockenspiel from 0.4.5 to 0.5.0
Bumps [blockenspiel](https://github.com/dazuma/blockenspiel) from 0.4.5 to 0.5.0.
- [Release notes](https://github.com/dazuma/blockenspiel/releases)
- [Changelog](https://github.com/dazuma/blockenspiel/blob/master/History.rdoc)
- [Commits](https://github.com/dazuma/blockenspiel/commits/v0.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-20 08:35:01 +00:00
Pau Pérez Fabregat
2a759a9c0d Merge pull request #3196 from openfoodfoundation/dependabot/bundler/angularjs-file-upload-rails-2.4.1
Bump angularjs-file-upload-rails from 1.1.6 to 2.4.1
2018-12-20 09:31:49 +01:00
Maikel
073f88b1c2 Merge pull request #3198 from kristinalim/fix-variant_override_stock_settings_validation
Validation and others for keeping variant override "On Demand" and "Count on Hand" compatible
2018-12-20 14:05:20 +11:00
Kristina Lim
4adae0a1e8 Disable Knapsack when running engine RSpec tests 2018-12-19 17:50:52 +08:00
Kristina Lim
a460e9d35f Allow disabling Knapsack when running RSpec tests 2018-12-19 17:50:29 +08:00
Luis Ramos
0aaa41ced0 Merge pull request #3228 from luisramos0/2-0-stable-dec-18th
[Spree Upgrade] Merging master into 2-0-stable (third run in Dec2018)
2018-12-19 09:30:57 +00:00
Kristina Lim
abcb71f8b3 Document running app engine RSpec tests 2018-12-19 17:11:03 +08:00
Kristina Lim
12780b722e Make Travis CI run RSpec tests in app engines 2018-12-19 17:08:27 +08:00
Kristina Lim
74ea1eee6b Add description for Rake tasks 2018-12-19 17:08:24 +08:00
Kristina Lim
571ad37c3e Add Rake task openfoodnetwork:specs:engines:rspec 2018-12-19 17:06:33 +08:00
Kristina Lim
f7e03ca60e Add Rake tasks openfoodnetwork:specs:engines:NAME:rspec
The task name follows the directory name under engines/. For example,
for the Web engine in engines/web, run:

    bundle exec rake openfoodnetwork:specs:engines:web:rspec
2018-12-19 17:02:19 +08:00
Maikel
4201549992 Merge pull request #3219 from luisramos0/2-0-payment-ctrl
[Spree Upgrade] Adapt payment controller spec to spree 2
2018-12-19 15:23:11 +11:00
Maikel Linke
a978e992bf Remove tax_rates shortcut from adjustment
Becoming less dependent on Spree, using our own namespace, keeping
decorators small.
2018-12-19 14:42:38 +11:00
Maikel Linke
fc1b182275 Simplify method complexity and comply with rubocop 2018-12-19 14:31:29 +11:00
Maikel Linke
3169a384ba Find approximate tax rate if no other is found
There are several cases in which a tax rate is not associated with an
adjustment. We find the closest one for reporting here. It is not a good
solution, but a workaround introduced for reporting:
https://github.com/openfoodfoundation/openfoodnetwork/pull/1496
2018-12-19 14:31:29 +11:00
Maikel Linke
a341561446 Move tax rate finding into service and spec it
The `#tax_rates` method is actually not present in Spree. We encapsulate
the logic in this commit and enable better unit testing. The new tests
cover a current bug: https://github.com/openfoodfoundation/openfoodnetwork/issues/3127
2018-12-19 14:31:29 +11:00
luisramos0
6fc3562a73 Merge branch 'master' into 2-0-stable-dec-18th 2018-12-18 23:32:45 +00:00
Maikel
84f2f9af3c Merge pull request #3156 from HugsDaniel/3121-deface-payment-methods-new
[Defacepocalypse] De-deface payment methods new and form
2018-12-19 09:44:57 +11:00
dependabot[bot]
6de1844b7c Bump momentjs-rails from 2.5.1 to 2.20.1
Bumps [momentjs-rails](https://github.com/derekprior/momentjs-rails) from 2.5.1 to 2.20.1.
- [Release notes](https://github.com/derekprior/momentjs-rails/releases)
- [Changelog](https://github.com/derekprior/momentjs-rails/blob/master/news.md)
- [Commits](https://github.com/derekprior/momentjs-rails/compare/v2.5.1...v2.20.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-18 19:14:54 +00:00
luisramos0
5e960512ac Set user locale on user registrations #create
This is done so that user.locale is used in the first confirmation email. This also stores user.locale in the DB from registration.
2018-12-18 15:30:01 +00:00
luisramos0
a9222665b8 Refactor user registrations controller, early return to reduce indentation 2018-12-18 15:26:49 +00:00
Pau Pérez Fabregat
0c8cb8abe2 Merge pull request #3218 from coopdevs/handle-soft-deleted-products-in-serializer-spec
Handle soft deleted products in serializer spec
2018-12-18 08:59:36 +01:00
Maikel
f36c045425 Merge pull request #3213 from kristinalim/fix-rubocop_block_length_ignore_it
Ignore `it` in Rubocop BlockLength
2018-12-18 11:42:14 +11:00
Matt-Yorkley
d34b8c52b8 Update all locales with the latest Transifex translations 2018-12-17 11:17:54 +00:00
Pau Pérez Fabregat
54775f6b6a Merge pull request #3221 from zvkemp/skylight-1.7.2
update Skylight to 1.7.2
2018-12-17 10:44:16 +01:00
Pau Pérez Fabregat
1876ec42dc Merge pull request #3201 from kevinchristianson/add-missing-stars
Add missing 'required field' stars in new product form
2018-12-17 10:36:51 +01:00
Pau Pérez Fabregat
554d650b8c Merge pull request #3176 from kevinchristianson/button-translation-fix
Fix untranslated buttons at image step of registration modal
2018-12-17 10:36:07 +01:00
Pau Pérez Fabregat
2deffb9c9f Merge pull request #3076 from Matt-Yorkley/orders_checkboxes
Fix checkbox values on orders page
2018-12-17 10:35:46 +01:00
Luis Ramos
dc6509aa83 use association on updates rather than #find
Co-Authored-By: sauloperez <saulopefa@gmail.com>
2018-12-17 10:31:52 +01:00
Kristina Lim
216c598e74 Ignore more methods in Metrics/BlockLength cop
Ignore these additional methods:

* collection
* member
* namespace
* resource
* resources
2018-12-17 05:21:20 +08:00
Kristina Lim
fb5a9356dc Fix spec_helper.rb of web engine
This fixes the tests of the web engine when running the following from
its root: bundle exec rspec

An engine is meant to have some independence from the main application,
and its tests should be run independently.

This should be using the engine's own dummy application, actually, or
the dummy application of a dependency.
2018-12-15 16:11:15 +08:00
Kristina Lim
93940ced3a Remove outdated comment recommending knapsack
We are already using this.
2018-12-15 16:11:12 +08:00
zvkemp
d3d43c8808 update Skylight to 1.7.2 2018-12-14 12:25:41 -08:00
luisramos0
a5bf7a1f35 Adapt payment controller spec to spree 2
In spree 2, since 5ed6015916, to fire a payment event the order needs to be in either payment or complete state
2018-12-14 16:04:19 +00:00
Pau Pérez Fabregat
fe0c56c800 Merge pull request #3174 from kevinchristianson/footer-url-fix
Fix broken registration link in footer
2018-12-14 15:42:08 +01:00
dependabot[bot]
2f19b37b54 Bump angularjs-file-upload-rails from 1.1.6 to 2.4.1
Bumps [angularjs-file-upload-rails](https://github.com/marthyn/angularjs-file-upload-rails) from 1.1.6 to 2.4.1.
- [Release notes](https://github.com/marthyn/angularjs-file-upload-rails/releases)
- [Commits](https://github.com/marthyn/angularjs-file-upload-rails/commits/v2.4.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-14 14:29:42 +00:00
Pau Pérez Fabregat
34a42cc592 Merge pull request #3181 from luisramos0/roadie-rails-upgrade
Bump roadie-rails from 1.0.3 to 1.1.1
2018-12-14 15:26:25 +01:00
Pau Perez
be6c8be07a Handle soft deleted products when refreshing cache
Since cd3add960e Spree soft-deletes products and as such the models not
destroyed but updated setting a value for the `deleted_at` field.

This turns what used to be deletes into updates thus triggering AR's
update callbacks instead of the destroy ones. As a result, this bypasses
the logic to refresh the products cache on destroy and hits the
`after_save` callback.

Furthermore, since act_as_paranoid (the soft-delete gem Spree uses) uses
a default scope to avoid retrieving soft-deleted records we need to
purposefully fetch them in order to refresh the cache.
2018-12-14 15:13:06 +01:00
Pau Perez
51e277a183 Make test setup more readable 2018-12-14 15:12:41 +01:00
Kristina Lim
d0d10eba4b Ignore it method in Rubocop BlockLength 2018-12-14 17:44:19 +08:00
Kristina Lim
77a6562762 Make DB migration generate summary by distributor 2018-12-14 13:02:43 +08:00
Kristina Lim
a6664d0ac6 Move report generated by migration to subdirectory
This is in preparation of an upcoming change to split the main CSV file
by distributor.
2018-12-14 13:00:42 +08:00
Kristina Lim
91e5a523f0 Add /reports/ to .gitignore but ignore README
Using the first slash to make sure that other reports/ directories are
not ignored.
2018-12-14 10:25:23 +08:00
Kristina Lim
d859939c79 Add README.md to reports/ directory 2018-12-14 10:24:26 +08:00
Kristina Lim
6458127892 Add undo logic for DB migration script 2018-12-14 10:09:09 +08:00
Kristina Lim
5a98acd101 Log changes from DB migration to CSV file 2018-12-14 10:09:09 +08:00
Kristina Lim
842a11b564 Refactor DB migration script 2018-12-14 10:09:08 +08:00
Maikel
24ca66bd71 Merge pull request #3207 from luisramos0/2-0-insuf-stock-transl
[Spree Upgrade] Add missing spree translations related to insufficient stock
2018-12-14 12:05:06 +11:00
Maikel
1ed880e353 Merge pull request #3206 from coopdevs/fix-redirection-on-admin-products-specs
[Spree Upgrade] Fix redirection on admin products specs
2018-12-14 11:59:21 +11:00
Maikel
f0d3992511 Merge pull request #3203 from luisramos0/2-0-fix-prod-images-delete
[Spree Upgrade] Fix product properties and images deletion
2018-12-14 11:54:05 +11:00
dependabot[bot]
2ecec93514 Bump wkhtmltopdf-binary from 0.12.3.1 to 0.12.4
Bumps [wkhtmltopdf-binary](https://github.com/zakird/wkhtmltopdf_binary_gem) from 0.12.3.1 to 0.12.4.
- [Release notes](https://github.com/zakird/wkhtmltopdf_binary_gem/releases)
- [Changelog](https://github.com/zakird/wkhtmltopdf_binary_gem/blob/master/CHANGELOG)
- [Commits](https://github.com/zakird/wkhtmltopdf_binary_gem/compare/0.12.3.1...0.12.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-13 19:19:36 +00:00
Pau Pérez Fabregat
2eb6d0a047 Merge pull request #3185 from openfoodfoundation/dependabot/bundler/oj-3.7.4
Bump oj from 3.6.10 to 3.7.4
2018-12-13 18:10:55 +01:00
Kristina Lim
aa92dd8771 Declare VariantOverride in migration for safe use 2018-12-13 23:29:05 +08:00
Kristina Lim
9e3332ba2a Rename DB migration file 2018-12-13 23:25:48 +08:00
Maikel
eb016c0471 Merge pull request #3145 from openfoodfoundation/dependabot/bundler/i18n-js-3.1.0
Bump i18n-js from 3.0.11 to 3.1.0
2018-12-13 10:58:22 +11:00
Maikel
eedba7a35b Merge pull request #3197 from luisramos0/2-0-product-stock
[Spree Upgrade] Adapt Product level stock management to Spree 2
2018-12-13 10:53:46 +11:00
Pau Pérez Fabregat
d317603872 Merge pull request #3187 from openfoodfoundation/dependabot/bundler/rspec-rails-3.8.1
Bump rspec-rails from 3.7.2 to 3.8.1
2018-12-12 17:14:05 +01:00
Pau Pérez Fabregat
64e41712c6 Merge pull request #3130 from coopdevs/extract-restart-checkout
Extract restart checkout
2018-12-12 17:12:53 +01:00
luisramos0
5183c90c89 Add missing spree translations related to insufficient stock 2018-12-12 15:34:48 +00:00
Pau Perez
43cacfc2fc Fix redirection on admin/products controller specs
In Spree v2.0 the product attributes being sent were no longer valid.
Providing a shipping category and setting a stock location on the DB so
that a stock item can be created fixes them.

Remember `Variant#create_stock_item`, which is defined as an
`after_create` callback, relies on `StockLocation` to create the item.
2018-12-12 13:10:39 +01:00
luisramos0
47be452ca0 Make ProductsController#create and #update work by not mass-assigning the provided on_hand and on_demand values and set them in product variant after the product is created 2018-12-12 12:10:29 +00:00
luisramos0
66e69edca4 Rename ProductOnDemand to ProductStock; move product.on_hand into it; add product.on_demand; and remove unnecessary on_demand= 2018-12-12 12:10:25 +00:00
Pau Perez
28cb1bf687 Clarify nasty boolean logic on method 2018-12-12 12:57:23 +01:00
luisramos0
181915c63a Fix deletion of product properties 2018-12-11 15:53:40 +00:00
luisramos0
4b74e50353 Make ProductsController#bulk_update work by making ProductSet#create_variant not mass-assigning the provided on_hand and on_demand values and set them after each variant is created 2018-12-11 15:18:00 +00:00
luisramos0
b5379a204b Fix deletion of product images 2018-12-11 15:10:26 +00:00
luisramos0
e274442d77 Cover i18nhelper.valid_locale and user mailer with tests related to localized emails 2018-12-11 11:16:50 +00:00
Maikel
1819fc8493 Merge pull request #3199 from luisramos0/2-0-stable-dec-10th
[Spree Upgrade] Merging master into 2-0-stable (second run in Dec2018)
2018-12-11 18:50:24 +11:00
Pau Pérez Fabregat
7834fa4d00 Merge pull request #3190 from luisramos0/2-0-new-product
[Spree Upgrade] Fix "new product" page specs and an html issue
2018-12-11 08:35:26 +01:00
haseleyi
835617159e Add missing 'required field' stars in new product form 2018-12-10 18:02:39 -08:00
Maikel
d63ae792b3 Merge pull request #2775 from luisramos0/2-0-checkout-ship-method
[Spree Upgrade] Handle shipping_method_id in checkout
2018-12-11 11:59:03 +11:00
Matt-Yorkley
0c5ac99e0f Fix multiple results with 'inventory_items_shipment_id_null' ransack query
The q['inventory_items_shipment_id_null'] search element was generating duplicates where there were multiple line items on an order that were ready to be shipped, with id = null
2018-12-10 20:48:53 +00:00
Matt-Yorkley
e711c5ed03 Add spec for search filters 2018-12-10 20:48:53 +00:00
Matt-Yorkley
d48774e3a2 Add comment 2018-12-10 20:48:53 +00:00
Matt-Yorkley
997169b974 Fix checkbox values on orders page 2018-12-10 20:48:53 +00:00
luisramos0
cdee7c0422 Merge branch 'master' into 2-0-stable-dec-10th 2018-12-10 16:41:29 +00:00
Luis Ramos
1bc51dea40 Merge pull request #3195 from mkllnk/2938-fix-create-order
[Spree Upgrade] 2938 Fix Create Order in Admin - missing translation
2018-12-10 13:20:02 +00:00
Pau Pérez Fabregat
b8a61257da Merge pull request #3188 from luisramos0/2-0-ctrl-specs
[Spree Upgrade] Fix line_item_controller spec by adpating to new spree 2 factories
2018-12-10 12:31:26 +01:00
luisramos0
4f4fc00549 Improve code, specs and comments in the shipping_method selection process in the checkout controller 2018-12-09 20:05:10 +00:00
luisramos0
38ff99717a Fix bug on calculator_decorator line_items_for where input is line_item with an nil order. Adapted line_items_for so that weight_calculator.line_items_for could be removed. 2018-12-09 19:37:11 +00:00
Kristina Lim
df51d137dc Update some code style for product import 2018-12-10 03:30:52 +08:00
Kristina Lim
cec50e81f5 Make product import set correct VO stock settings 2018-12-10 03:30:46 +08:00
Kristina Lim
0de829017a Refactor finding or initializing VO for product import 2018-12-10 03:30:39 +08:00
Kristina Lim
c873a7b8e3 Move stock settings override validation to concern 2018-12-09 23:29:36 +08:00
Kristina Lim
1bfdb708c1 Add app/models/concerns to autoload path 2018-12-09 23:29:36 +08:00
Kristina Lim
d67b3faf01 Address affected specs from new VO validations 2018-12-09 21:48:08 +08:00
Kristina Lim
34313c94ca Make reset stock settings for VO force limited stock 2018-12-09 21:47:05 +08:00
Kristina Lim
ad35ea1102 Add factory stock traits for variant overrides 2018-12-09 21:47:05 +08:00
Kristina Lim
210a11783c Test that saving invalid variant override provides error 2018-12-09 21:43:57 +08:00
luisramos0
8fb103ce8d Fix new_product div in new product page 2018-12-08 14:53:50 +00:00
luisramos0
7ecce51b8b Create default stock location and set required product.shipping_category in specs that create products 2018-12-08 14:52:50 +00:00
Maikel Linke
cac4fa4816 Use I18n.t instead of Spree's JS t function 2018-12-07 23:38:05 +11:00
Kristina Lim
4c0c0bbfd0 Simplify stock configuration in existing variant overrides 2018-12-07 14:40:15 +08:00
Kristina Lim
83b6973bc2 Require compatible VO on_demand and count_on_hand 2018-12-07 14:39:36 +08:00
Maikel
046ba14da4 Merge pull request #3191 from openfoodfoundation/dependabot/bundler/knapsack-1.17.1
Bump knapsack from 1.16.0 to 1.17.1
2018-12-07 15:18:25 +11:00
haseleyi
3f6e96dd5d Fix comment 2018-12-06 14:07:45 -08:00
haseleyi
4a0744dd94 Add comment to explain hard-coded link 2018-12-06 11:49:39 -08:00
dependabot[bot]
6ae2df7b92 Bump knapsack from 1.16.0 to 1.17.1
Bumps [knapsack](https://github.com/ArturT/knapsack) from 1.16.0 to 1.17.1.
- [Release notes](https://github.com/ArturT/knapsack/releases)
- [Changelog](https://github.com/ArturT/knapsack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ArturT/knapsack/compare/v1.16.0...v1.17.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-06 19:16:09 +00:00
luisramos0
b9b91231ae Fix rubocop issues in mailers 2018-12-06 14:18:24 +00:00
luisramos0
0f442a911e Improve I18nHelper.valid_locale to handle empty objects 2018-12-06 12:48:48 +00:00
luisramos0
feea499298 Make all mailers use appropriate locale when sending emails 2018-12-06 11:45:44 +00:00
Kristina Lim
71db9f5289 Import CSS variables in admin/components/input 2018-12-06 14:08:06 +08:00
Maikel
da6dc20fcf Merge pull request #3165 from coopdevs/fix-send-confirmation-instructions-specs
[Spree Upgrade] Fix send confirmation instructions specs
2018-12-06 16:24:40 +11:00
Maikel
883e9bbdd8 Merge pull request #3166 from luisramos0/2-0-orders-tab-without-shipments
[Spree Upgrade] Remove shipments option from orders tab (gone in spree 2)
2018-12-06 15:39:14 +11:00
luisramos0
c33ca508f7 Add guard clause on variant overrides filter in case hub id is not present in the hubPermissions 2018-12-06 15:35:44 +11:00
Maikel
1b94b10bb0 Merge pull request #3171 from luisramos0/2-0-var-over-hide
[Spree Upgrade] Remove hide class from the hide button in the inventory list
2018-12-06 15:21:34 +11:00
Maikel
3a3c9f3847 Merge pull request #3177 from coopdevs/dont-clean-db-twice-in-feature-specs
Do not clean DB twice on feature specs
2018-12-06 12:36:34 +11:00
luisramos0
7df869bd35 Fix line_item_controller spec by adpating to new spree 2 factories 2018-12-05 22:22:15 +00:00
haseleyi
75277e92e4 Lazy-load the translations for images step of registration 2018-12-05 11:36:27 -08:00
dependabot[bot]
727cc9d578 Bump rspec-rails from 3.7.2 to 3.8.1
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.7.2 to 3.8.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.7.2...v3.8.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-05 19:19:50 +00:00
dependabot[bot]
ebff8be996 Bump oj from 3.6.10 to 3.7.4
Bumps [oj](https://github.com/ohler55/oj) from 3.6.10 to 3.7.4.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.6.10...v3.7.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-05 19:16:55 +00:00
luisramos0
afd243c548 Replace stub with allow in checkout_controller_spec 2018-12-05 15:40:14 +00:00
luisramos0
bbc61b4eda Bump roadie-rails to 1.1.1 2018-12-05 15:11:45 +00:00
Pau Pérez Fabregat
1052d98255 Merge pull request #3175 from haseleyi/patch-1
Fix link to Mac setup guide in Getting Started
2018-12-05 12:52:08 +01:00
luisramos0
460e010408 Removed shipments from orders tab. This option is removed in spree 2 2018-12-05 11:38:16 +00:00
Pau Pérez Fabregat
72a4b4f8e2 Merge pull request #3158 from luisramos0/2-0-vos-scoping
[Spree Upgrade] Scopes variants on order completion and on changes to completed orders
2018-12-05 12:12:49 +01:00
Kristina Lim
842a8e3654 Move null option for VO use_producer_settings to JS 2018-12-05 17:40:32 +08:00
Kristina Lim
802e3bb447 Refactor choosing VO on_demand in feature specs
We are still using the Rails view I18n scope for :use_producer_settings.
Angular requires this replacement of the default blank option, which we
use for nil on_demand, to be in the template itself.

If we eventually move this template to a JS template, we can move it to
the same I18n scope as the :yes and :no options.
2018-12-05 17:40:31 +08:00
Kristina Lim
d8908bdf4b Remove unused translation keys js.yes and js.no 2018-12-05 17:40:31 +08:00
Kristina Lim
47d51ca525 Prefer guard clause in updateCountOnHand for VOs 2018-12-05 17:40:31 +08:00
Kristina Lim
34c34b94d1 Describe method countOnHandPlaceholder for VOs 2018-12-05 17:40:30 +08:00
Kristina Lim
cff4eb0005 Improve and simplify VO count on hand suggestions
Set variant override count_on_hand in UI to variant count_on_hand value
if on_demand is changed and both specify limited stock.
2018-12-05 17:40:30 +08:00
Kristina Lim
4f2d96d763 Use correct placeholders for VO count_on_hand 2018-12-05 17:40:29 +08:00
Kristina Lim
f5dc03e118 Style disabled text fields in admin pages 2018-12-05 17:40:29 +08:00
Kristina Lim
09b9f968b7 Make VO count on hand readonly unless limited stock 2018-12-05 17:40:29 +08:00
Kristina Lim
cc003c99d5 Ensure in UI compatible VO count and on demand 2018-12-05 17:40:28 +08:00
Kristina Lim
a32bb0445f Change translation for variant override use_producer_settings 2018-12-05 17:40:28 +08:00
Kristina Lim
7ae555cd9c Translate variant override on_demand yes and no 2018-12-05 17:40:27 +08:00
Kristina Lim
4b3198a2b4 Allow reset of "on demand" for variant overrides
Change the UI control for "on demand" in the Inventory page from a
checkbox to a SELECT field with three options: nil, true, and false.

This resolves the following issues:
* There is no way to tell between nil and false - both are represented
by an unticked checkbox.
* There is no way to go back to nil.
2018-12-05 17:40:24 +08:00
Pau Perez
6af8544c52 Restore perform_deliveries value in tests 2018-12-05 10:20:13 +01:00
Pau Perez
25eb297215 Perform delivery when checking deliveries in specs 2018-12-05 10:05:39 +01:00
Pau Perez
064d9cf183 Do not hide flaky tests under endless retries
If it fails, needs fixing, not hiding the problem and making the test
suite longer.
2018-12-05 10:05:39 +01:00
Pau Perez
5845f80af0 Remove commented out code
Because git keeps it for you.
2018-12-05 10:05:39 +01:00
Pau Perez
6594529cda Fix manager invitation controller spec 2018-12-05 10:05:39 +01:00
Pau Perez
25567d6bd6 Do not clean DB twice on feature specs
It turns out that we were executing `DatabaseCleaner.clean` on two
`after(:each)` blocks. One for all specs and another one for `js: true`
specs. As a result feature specs were hitting both which slows them down
considerably.

On my machine this changes consistently saves 2sec on
`spec/features/consumer/shops_spec.rb` but chances are it has an
accumulative effect when run on the whole test suite.
2018-12-05 09:58:14 +01:00
Pau Pérez Fabregat
3b56212290 Merge pull request #3151 from coopdevs/remove-frontoffice-enterprises-n+1
Remove frontoffice enterprises n+1
2018-12-05 08:12:19 +01:00
Pau Pérez Fabregat
e5a267f4c2 Merge pull request #2735 from luisramos0/cookies_colors
Moved definition of colors in the cookies modal and banner colors to common darkswarm/base/colors
2018-12-05 08:06:58 +01:00
haseleyi
94d12217de Fix untranslated buttons at image step of registration modal 2018-12-04 21:30:42 -08:00
Isaac Haseley
76e5d281bf Fix link for Mac setup guide 2018-12-04 20:37:23 -08:00
Maikel
609a4fde4d Merge pull request #3173 from openfoodfoundation/transifex
Transifex
2018-12-05 11:55:29 +11:00
Maikel
a2c8bea147 Merge pull request #3147 from luisramos0/2-0-vos
[Spree Upgrade] Adapt variant overrides to spree 2
2018-12-05 10:50:20 +11:00
Transifex-Openfoodnetwork
18a5f53330 Updating translations for config/locales/fr.yml 2018-12-05 09:17:00 +11:00
haseleyi
e863c3dec8 Fix broken link in register call partial 2018-12-04 10:23:46 -08:00
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
Transifex-Openfoodnetwork
9bedc69df8 Updating translations for config/locales/en_GB.yml 2018-12-05 04:52:44 +11:00
luisramos0
02d0b7e88c Improve comment on VariantStock#move 2018-12-04 15:25:38 +00:00
Pau Pérez Fabregat
30e7d32cea Merge pull request #3157 from coopdevs/fix-producer-mailer-specs
[Spree Upgrade] Specify :mailer type in specs
2018-12-04 15:21:17 +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
luisramos0
7f7e7ea65e Remove hide class from the hide button in the inventory list
The hide button should not be hidden. The hide css class was no active in v1 but it is in v2, so we need to remove it
2018-12-04 10:55:55 +00:00
Maikel Linke
66585e93a8 Update all locales with the latest Transifex translations 2018-12-04 14:48:03 +11:00
Maikel
60c8147391 Merge pull request #3164 from luisramos0/2-0-stable-dec-3rd
[Spree Upgrade] Merging master into 2-0-stable (first run in Dec2018)
2018-12-04 13:38:02 +11:00
Maikel
214235d8dd Merge pull request #3152 from coopdevs/fix-product-spec
[Spree Upgrade] Fix product spec
2018-12-04 12:07:33 +11:00
luisramos0
3776b891ce Merge branch 'master' into 2-0-stable-dec-3rd 2018-12-03 15:30:16 +00:00
Pau Perez
46bf4c9eea Specify :mailer type in specs
According to RSpec docs we need to specify type: :mailer for mails to
work. Check it out:
https://relishapp.com/rspec/rspec-rails/v/3-8/docs/mailer-specs.

This fixes all specs in producer_mailer_spec.rb.
2018-12-03 15:41:58 +01:00
luisramos0
258287b88d Add tests to cover CheckoutController#update with shipping_method_id 2018-11-30 17:04:46 +00:00
luisramos0
e23c4dda68 Add order_shipping_method specs to cover select_shipping_method 2018-11-30 12:58:27 +00:00
luisramos0
7a8c65b3ea In the checkout controller update process, grab shipping_method_id from form data and inject it in the order when the order workflow gets to delivery (which is when the order gets shipments created) 2018-11-30 10:46:31 +00:00
luisramos0
c032401eb0 Refactor checkout controller update method 2018-11-30 10:45:42 +00:00
Hugo Daniel
24dab58de7 Lazy load translations and add keys 2018-11-30 10:49:36 +01:00
Maikel
f859b7d3de Merge pull request #3153 from coopdevs/fix-missing-translations-in-password-edit
[Spree Upgrade] Add missing translations causing a test failure
2018-11-30 15:48:42 +11:00
luisramos0
d962358f15 Fix rubocop and transpec models/variant_override and its spec 2018-11-30 00:43:55 +00:00
luisramos0
0577011f5b Refactor variant override model and its spec: simplify move_stock and remove unused methods 2018-11-30 00:22:04 +00:00
luisramos0
782530d93b Scope variants in shipment manifest as they are fetched from DB 2018-11-29 20:43:15 +00:00
luisramos0
a18d289292 Scope variants on line_item before save hook update_inventory 2018-11-29 20:43:10 +00:00
luisramos0
6156aca467 Delegate stock_location.move to variant, and override it in the variant overrides scope 2018-11-29 19:32:52 +00:00
luisramos0
1c5d94472f Make colors.css relative reference to branding.css an absolute reference so that colors can be imported in engines 2018-11-29 18:39:58 +00: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
Hugo Daniel
aa948552e1 Import payment_methods edit view and apply overrides 2018-11-29 14:58:14 +01:00
Hugo Daniel
34bc79c7f6 Import payment_methods form partial and apply overrides 2018-11-29 14:58:06 +01:00
Hugo Daniel
29bc4c52a5 Import payment_methods#new view and apply overrides 2018-11-29 14:56:28 +01:00
luisramos0
93e1310deb Fixed bug in cookies css, import colors, not branding 2018-11-29 11:47:51 +00:00
luisramos0
cdc5899791 Moved cookies policy modal and cookies banner colors to darkswarm/base/colors.scss 2018-11-29 11:47:51 +00:00
Luis Ramos
2284bfb604 Merge pull request #3150 from luisramos0/new-knapsack-report
[Spree Upgrade] New up to date knapsack report for 2-0-stable branch
2018-11-29 11:13:51 +00: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 Perez
957c38e4f2 Add missing translations causing a test failure 2018-11-28 18:38:09 +01:00
Pau Perez
7834b1d3f3 Fix test case for invalid product master 2018-11-28 17:39:59 +01:00
Pau Perez
ab542cfdb2 Remove commented out code 2018-11-28 17:39:51 +01: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 Perez
96202ab00d Fix Rubocop violations 2018-11-28 16:23:56 +01:00
Pau Perez
e0f43191e2 Make helper methods private
Otherwise next dev might think these are attributes of the resulting
JSON serialized object.

They just made the refactoring a bit easier.
2018-11-28 16:21:40 +01:00
Pau Perez
c330d931ce Eager load product properties to avoid N+1
This totally removes the following N+1 query from the GET /shops request

```sql
SELECT "spree_properties".* FROM "spree_properties"
  INNER JOIN "spree_product_properties"
    ON "spree_product_properties"."property_id" = "spree_properties"."id"
  INNER JOIN "spree_products"
    ON "spree_products"."id" = "spree_product_properties"."product_id"
  INNER JOIN "enterprises"
    ON "enterprises"."id" = "spree_products"."supplier_id"
  WHERE "spree_products"."supplier_id" = 24;
```

The product properties of the corresponding enterprises are now loaded
in a single query fired from the controller.
2018-11-28 16:21:40 +01:00
Pau Perez
4608c434b4 Eager load producer properties to avoid N+1
This totally removes the following N+1 query from the GET /shops request

```sql
SELECT "spree_properties".* FROM "spree_properties"
  INNER JOIN "producer_properties"
    ON "spree_properties"."id" = "producer_properties"."property_id"
  WHERE "producer_properties"."producer_id" = 17
  ORDER BY producer_properties.position;
```

The producer properties of the corresponding enterprises are now loaded
in a single query fired from the controller.
2018-11-28 16:21:40 +01:00
Pau Perez
e40c1c08ca Refactor spec to not stub the class under test
This also relies on ActiveRecord which will come in handy as we move on
the refactor.
2018-11-28 16:21:40 +01:00
Pau Perez
149fc1ac6f Inline PropertyMerge's #merge into serializer
Now that it has become a plain Ruby #uniq, there's no point on having
the abstraction and indirection.
2018-11-28 16:21:40 +01:00
Pau Perez
faac5f4b2d Refactor PropertyMerge to use Ruby's #uniq instead 2018-11-28 16:21:40 +01:00
Pau Perez
1363a2a17d Improve readability of spec 2018-11-28 16:21:40 +01:00
Pau Perez
8e1f9a1ba3 Refactor #product_properties not to fetch ids 2018-11-28 16:21:40 +01:00
Pau Perez
bc7258d43b Test #supplied_properties helper methods 2018-11-28 16:21:40 +01:00
Pau Perez
23f629cfd6 Autofix all Rubocop violations in serializer 2018-11-28 13:54:42 +01:00
Pau Perez
c6ab5feb81 Move cached & uncached serializers to their files 2018-11-28 13:54:42 +01:00
Pau Perez
41d988176c Pass enterprises to inject method from controller 2018-11-28 13:54:42 +01:00
Pau Perez
5a85d7a77b RSpec3-ize controller spec 2018-11-28 13:54:42 +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
luisramos0
3009ab2f1a New up to date kanpsack report for 2-0-stable branch 2018-11-28 12:36:22 +00: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
dependabot[bot]
7b95e3a8d7 Bump i18n-js from 3.0.11 to 3.1.0
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.0.11 to 3.1.0.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.0.11...v3.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-27 19:17:57 +00:00
Luis Ramos
1bc06e7384 Merge pull request #3139 from luisramos0/2-0-bulk-prod-update-spec-fix
[Spree Upgrade] Fix tests in bulk_product_update spec
2018-11-27 18:36:36 +00:00
Pau Pérez Fabregat
c5ae9bdce2 Merge pull request #3132 from luisramos0/2-0-variant-ondemand
[Spree Upgrade] Add VariantStock.on_demand as attribute_accessible
2018-11-27 18:05:34 +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
luisramos0
64d16258cf Fix tests in bulk_product_update spec by:
- setting on_hand in the variant and not in the product directly
- setting variant on_demand to false (default from the factory is on_demand true)
- saving the variant after doing this to trigger appropriate callbacks like creating missing variant stock items
2018-11-27 16:03:52 +00: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
1b58c2519a Merge pull request #3138 from luisramos0/2-0-stable-nov-24th
[Spree Upgrade] Merging master into 2-0-stable (third run in Nov2018)
2018-11-27 16:16:32 +11:00
Maikel
296029ef28 Merge pull request #3131 from coopdevs/fix-restart-checkout-spec
[Spree Upgrade] Fix checkout spec due to shipments
2018-11-27 15:16:01 +11: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
luisramos0
e153510a71 Merge branch 'master' into 2-0-stable-nov-24th 2018-11-24 15:19:38 +00: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
Luis Ramos
94a2972d57 Merge pull request #3133 from HugsDaniel/3029-products-renderer-spec
[Spree Upgrade] Fix ProductsRenderer specs
2018-11-23 18:23:33 +00:00
luisramos0
73ed5eeaac Fix product import spec related to this change, the value provided to on_hand must be an integer 2018-11-23 18:07:51 +00:00
luisramos0
f509fa6c86 Make variantStock.on_demand= save the variant so that it doesn't impact on_hand that is already saving the variant with a lock 2018-11-23 18:07:08 +00:00
luisramos0
ba8aa110c2 Fix VariantStock.overwrite_stock_levels by using stock_item.adjust_count_on_hand. This makes product_controller_decorator.bulk_update work 2018-11-23 18:06:48 +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
Hugo Daniel
f1dc52fe4e Set variant.on_demand to false 2018-11-23 14:30:14 +01:00
luisramos0
6cdaaa9e7d Add VariantStock.on_demand as attribute_accessible so it can be mass assigned from product_controller_decorator.bulk_update 2018-11-23 12:04:00 +00:00
Pau Pérez Fabregat
0237432ba4 Merge pull request #3125 from luisramos0/2-0-variant-stock-item
[Spree Upgrade] Fix Product model spec and small refactoring in VariantStock
2018-11-23 12:53:52 +01:00
Pau Perez
23421758fa Fix checkout spec due to shipments 2018-11-23 12:28:31 +01:00
Pau Perez
453b2a99de Rename redundant #restart_checkout to #call 2018-11-23 12:05:39 +01:00
Pau Perez
88afa70f37 Simplify and speed up service tests 2018-11-23 12:04:42 +01:00
Pau Perez
2c8a1f5e78 Check for value and not object identity in spec 2018-11-23 12:04:42 +01:00
Pau Perez
99463427ce Refactor RestartCheckout service just extracted 2018-11-23 12:04:42 +01:00
Pau Perez
3b681a59ba Move controller tests to service class tests 2018-11-23 12:04:42 +01:00
Pau Perez
a62a2cb52f Extract #restart_checkout to a service 2018-11-23 12:04:42 +01:00
luisramos0
7257ab30f1 Fix typo in inventory_error_flash_for_insufficient_quantity translation 2018-11-23 08:39:46 +00: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
luisramos0
d28f47046a Fix product model spec by removing unnecessary on_hand setter and adding required fields for a new product 2018-11-22 20:38:58 +00:00
luisramos0
134b73d730 Improve VariantStock code by extracting stockitems.first to a separate method 2018-11-22 20:38:46 +00:00
Luis Ramos
0052d571b9 Merge pull request #3100 from HugsDaniel/2999-checkout-feature-specs
[Spree Upgrade] Fix checkout feature specs
2018-11-22 16:49:41 +00:00
Hugo Daniel
d7a148bb75 Fix checkout feature specs 2018-11-22 17:01:39 +01:00
Luis Ramos
d060d31051 Merge pull request #3117 from HugsDaniel/3034-api-products-controller-spec
Use :user factory instead of build_stubbed to create the current_api_…
2018-11-22 14:10:05 +00:00
Hugo Daniel
a08ddd8171 Use :user factory instead of build_stubbed to create the current_api_user 2018-11-22 14:29:37 +01:00
Pau Pérez Fabregat
064ec7d270 Merge pull request #3108 from luisramos0/2-0-new-order
[Spree Upgrade] Add missing translation to admin new order creation page
2018-11-22 10:39:06 +01: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
luisramos0
2abf4e39cb Add missing translation to admin new order creation page 2018-11-21 23:22:43 +00:00
Luis Ramos
391deb94b0 Merge pull request #3102 from luisramos0/2-0-fix-admin-adjusts-spec
[Spree Upgrade] Fix spec/features/admin/adjustments_spec
2018-11-21 22:27:28 +00: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
24a7494103 Fix admin/adjustments spec by renaming test adjustment from Shipping to Extra Adjustment.
This was causing an error because the order factory now includes a Shipping adjustment
2018-11-21 13:41:16 +00: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
Maikel
733a018f37 Merge pull request #3081 from luisramos0/2-0-enterprise-groups
[Spree Upgrade] Fix features/admin/enterprise_groups_spec by replacing select2_search with select2_select
2018-11-20 16:41:05 +11:00
Maikel
b05bfc5cc7 Merge pull request #3075 from luisramos0/2-0-setting-transl
[Spree Upgrade] Fix translation issue in settings spec
2018-11-20 16:39:54 +11:00
Maikel
5e82d38bec Merge pull request #3071 from luisramos0/2-0-xdescribe-proxy-order
[Spree Upgrade] Move ProxyOrder controller to xdescribe
2018-11-20 16:38:42 +11:00
Maikel
6835d24fbf Merge pull request #3004 from luisramos0/2-0-mail-method-fix
[Spree Upgrade] Fix line Item specs with problems related to VariantStock.on_hand=
2018-11-20 16:37:19 +11:00
Luis Ramos
a7bd793ad2 Merge pull request #3074 from luisramos0/2-0-acct-transl
[Spree Upgrade] Fix missing translation in User transaction history
2018-11-20 00:43:24 +00:00
Luis Ramos
e297b19a91 Merge pull request #3069 from luisramos0/2-0-check-missing-translation
[Spree Upgrade] Add missing translation in the checkout confirmation page
2018-11-20 00:39:05 +00:00
Luis Ramos
d984d76e6b Merge pull request #3070 from luisramos0/2-0-order-spec-restart
[Spree Upgrade] Fix order spec restart checkout test and orders controller enterprise with fees test
2018-11-20 00:38:11 +00: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
luisramos0
5f48f2b8a1 Fix enterprise groups spec by replacing select2_search with select2_select for country and state in enterprise group address 2018-11-19 12:44:25 +00:00
Pau Pérez Fabregat
27267926dc Merge pull request #3079 from luisramos0/2-0-order-feature-spec
[Spree Upgrade] Fix 3 tests in shopping/orders_spec
2018-11-19 12:51:07 +01:00
luisramos0
bf32a21155 Allow adapted on_hand attr to be mass assigned in VariantStock.
Without specifying it in `attr_accessible`, `#assign_attributes` won't
work. See details in
https://apidock.com/rails/v3.2.13/ActiveRecord/Persistence/update_attributes
and https://apidock.com/rails/ActiveRecord/Base/assign_attributes.
2018-11-19 10:05:17 +00: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
luisramos0
9deb249dec Fix order by changing expected results: order is paid.
These tests use order factory order_with_credit_payment with ‘amount: order.total + 10000’ and since spree 2 when order payment state is credit_owned (customer has credit after the order), the order is considered paid 71c6c4f297
2018-11-18 20:58:55 +00:00
luisramos0
a20aba26cd Fix order feature spec by adapting to new spree 2 order factory with 5 line_items by default. Removed currency sign to avoid having problems with it, it's not really part of the spec objective 2018-11-18 16:51:43 +00:00
luisramos0
d29778e2d1 Fix translation issue in spec by refering the correct translation namespace: spree 2018-11-18 16:36:03 +00:00
luisramos0
d282823d3a Fix missing translation in user transaction history 2018-11-18 16:15:35 +00: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
luisramos0
d1071acfdb Move ProxyOrder controller to xdescribe. It's part of non-core feature subscriptions and will be left for spree upgrade phase 2 2018-11-17 12:23:52 +00:00
luisramos0
b40c0e5b80 Fix order controller spec with enterprise fees by adapting to new order factory with 5 line items by default 2018-11-17 12:11:23 +00:00
luisramos0
ee8d77bc09 Fix order spec restart checkout test by adding a required line_item to the order being tested 2018-11-17 11:57:16 +00:00
luisramos0
1fc11c5658 Add missing translation in the checkout confirmation page 2018-11-16 22:56:41 +00: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
Maikel
5ecea06098 Merge pull request #3024 from luisramos0/2-0-credit-card-ctrl
[Spree Upgrade] Fix credit card controller
2018-11-16 10:43:16 +11:00
Maikel
5d200b7753 Merge pull request #3026 from luisramos0/2-0-calculator-line-items-for
[Spree Upgrade] Improve failed_checkout_spec by making calculator decorator line_items_for work with new Stock::Package
2018-11-16 10:41:29 +11:00
Luis Ramos
f985e723e8 Merge pull request #3048 from mkllnk/2882-spree2-email-config
[Spree Upgrade] Update test mail setup for Spree 2
2018-11-15 22:25:50 +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
Luis Ramos
1dc5cc6d42 Merge pull request #3040 from luisramos0/2-0-refactor-factories
[Spree Upgrade] Simplify completed_order_with_fees factory and make shipment_with an ofn factory
2018-11-15 11:24:49 +00:00
luisramos0
9ba0fc268e Run transpec and clean up rubocop issues in credit_card_controller and spec 2018-11-15 11:07:43 +00:00
Pau Pérez Fabregat
fb56293748 Merge pull request #3046 from luisramos0/2-0-knapsack-report
[Spree Upgrade] New knapsack report
2018-11-15 09:32:10 +01:00
Maikel
d109f882fc Merge pull request #3038 from luisramos0/2-0-order-factory
[Spree Upgrade] Remove shipping_method_id from order factory
2018-11-15 15:22:31 +11:00
Maikel
a2c9ba60d8 Merge pull request #3035 from luisramos0/2-0-order-ctrl-line-item-delete
[Spree Upgrade] Fix orders controller spec when removing line items from order
2018-11-15 15:20:31 +11:00
Maikel
ebbe02523e Merge pull request #3019 from luisramos0/more-x-spec-reports
[Spree Upgrade] Make broken report specs xdescribe and leave them for spree upgrade pha…
2018-11-15 15:17:04 +11:00
Maikel
2d3f706c05 Merge pull request #3042 from luisramos0/2-0-stable-nov-14th
[Spree Upgrade] Merging master into 2-0-stable (second run in Nov2018)
2018-11-15 15:02:21 +11:00
Maikel Linke
1e312dfa41 Update test mail setup for Spree 2
https://github.com/openfoodfoundation/openfoodnetwork/issues/2882

The email setup differs between Spree 1 and Spree 2. We already
encapsulated that setup in a single method which now needed changing.
2018-11-15 14:30:46 +11:00
Maikel
a25cdd90de Merge pull request #3014 from luisramos0/2-0-payments_spec
[Spree Upgrade] Fix admin payments spec
2018-11-15 13:02:28 +11:00
luisramos0
ece21a674a Simplify completed_order_with_fees factory and make shipment_with factory an ofn factory to avoid creating extra dummy shipping_method in every test 2018-11-14 23:13:05 +00:00
luisramos0
688ec5fb21 Fix rubocop issues in calculator_decorator and calculator/flat_percent_item_total_spec 2018-11-14 23:04:38 +00:00
luisramos0
7c0627a823 Improve failed_checkout_spec by making calculator decorator line_items_for work with new Stock::Package 2018-11-14 23:04:38 +00:00
luisramos0
a5fb3e337d New knapsack report
New knapsack report for 2-0-stable. Makes the 4 jobs with 20 mins each.
2018-11-14 22:58:09 +00:00
Luis Ramos
c19e954113 Merge pull request #3009 from HugsDaniel/authenticate-api-use-through-logged-in-user
[Spree Upgrade] Authenticate API user through logged in user
2018-11-14 14:27:30 +00:00
luisramos0
0a77eeb4b6 Merge branch 'master' into 2-0-stable-nov-14th 2018-11-14 11:35:58 +00:00
luisramos0
19321b6d4f Fix admin payments spec. Add missing payment method to order.distributor 2018-11-14 11:26:26 +00:00
Hugo Daniel
3dd981ca05 Use logged in user (spree_current_user) for API authentication (current_api_user) 2018-11-14 11:58:28 +01:00
Pau Pérez Fabregat
a65e2487c4 Merge pull request #3013 from luisramos0/2-0-api-orders-ctrl-spec
[Spree Upgrade] Fix api/orders_controller_spec
2018-11-14 11:48:34 +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
luisramos0
2947d7a98c Remove shipping_method_id from order factory. This attribute is gone in spree 2 and doesnt need to be the responsibility of the order factory to handle order shipping method. The shipping method is selected only when the order workflow is progressed on checkout 2018-11-13 21:25:59 +00:00
luisramos0
9b894c6a55 Fix orders controller spec when removing line items from order. Improved spec and adapted to the fact that in spree 2 the default number of line items in this factory is 5 2018-11-13 19:51:26 +00:00
luisramos0
a234308a06 Fix credit card controller by adding a rescue for wrong arguments passed in params 2018-11-13 15:28:10 +00:00
luisramos0
2037413df7 Make some report specs xdescribe and leave them for spree upgrade phase 2 2018-11-13 14:53:42 +00:00
luisramos0
ef5d679f90 Fix api/orders_controller_spec by fixing expectations on order attributes: remove old attributes shipments_path and show_path 2018-11-12 16:31:57 +00:00
luisramos0
bbdbfc1374 Fix opi/orders_controller_spec by providing line items with shipment and thus make the order workflow work 2018-11-12 16:29:38 +00: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
Maikel
57efc36448 Merge pull request #2993 from Matt-Yorkley/user_class
Deal with failing Spree::LegacyUser test
2018-11-09 10:21:31 +11:00
Luis Ramos
0ea0016fc9 Merge pull request #2998 from coopdevs/adapt-product-on-demand
[Spree Upgrade] Adapt product on demand
2018-11-08 19:21:46 +00:00
Luis Ramos
ed7c12bd26 Merge pull request #2997 from luisramos0/2-0-stable-nov-8th
[Spree Upgrade] Merging master into 2-0-stable (first run in Nov2018)
2018-11-08 19:20:42 +00:00
Luis Ramos
4149c95c65 Merge pull request #2991 from Matt-Yorkley/missing_resource_translation
[Spree Upgrade] Import missing translations from Spree 2 to fix some tests
2018-11-08 12:34:53 +00:00
Luis Ramos
30bca40ed0 Merge pull request #2996 from coopdevs/update-products-new-js-template
[Spree Upgrade] Bring Spree changes on admin/products/new.js.erb
2018-11-08 12:13:47 +00:00
Luis Ramos
a3da941d8f Merge pull request #2992 from Matt-Yorkley/credit-cards
[Spree Upgrade] Failing credit card spec
2018-11-08 12:12:34 +00:00
Pau Perez
de31823151 Add #on_demand= to make product creation page work
We're bringing in the setter that got removed in Spree 2.0 so that we
can still pass an on_demand value from the product creation form.

However, we won't keep the getter to keep things simple. The frontend
seems to be checking the existence of variants anyway, so then it can
also check for product.master.on_demand and we avoid some logic on the
backend.
2018-11-08 11:41:58 +00:00
luisramos0
fcdb5cd7af Merge branch 'master' into 2-0-stable-nov-8th 2018-11-08 11:18:54 +00:00
Pau Perez
18c51dc596 Bring Spree changes on admin/products/new.js.erb
We copied it from Spree to then append a little change on it. Since the
original version changed in Spree 2.0 we need to update our copy.
2018-11-08 10:45:04 +00:00
Matt-Yorkley
8aa6b2c0ac Stub spree_api_key on Spree::LegacyUser when signing in as regular user 2018-11-08 00:07:24 +00:00
Matt-Yorkley
edbfd64a44 Set the Spree.user_class explicitly in spree initializer 2018-11-08 00:04:04 +00:00
Matt-Yorkley
fae0617639 Merge pull request #2986 from HugsDaniel/2985-api-product-images-specs
[Spree Upgrade] Add an API key for admin user
2018-11-08 00:01:46 +00:00
Matt-Yorkley
3f33e28839 Fix outdated credit card spec 2018-11-07 20:48:54 +00:00
Matt-Yorkley
cfc31f1fbd Import missing translations from Spree 2 to fix some tests 2018-11-07 19:23:28 +00: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
Matt-Yorkley
9011f5d9a2 Rescue ArgumentError and give user feedback 2018-11-07 18:48:08 +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
b5c6ecb45a Explicitly use UTF-8 encoding when opening spreadsheet files 2018-11-07 16:50:24 +00:00
Hugo Daniel
bc9af7c45f Add an API key for admin user 2018-11-07 16:47:35 +01: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
Pau Pérez Fabregat
8547d5302c Merge pull request #2978 from Matt-Yorkley/spree-upgrade/orders#show
[Spree Upgrade] orders#show
2018-11-06 16:20:47 +00:00
Luis Ramos
0c02e8c15f Merge pull request #2981 from coopdevs/remove-commented-out-code
Remove old commented out code
2018-11-06 16:06:59 +00:00
Luis Ramos
1ceb632b83 Merge pull request #2980 from coopdevs/fix-long-line
Fix long line
2018-11-06 16:05:22 +00:00
Pau Pérez Fabregat
a4139a14a8 Merge pull request #2977 from luisramos0/2-0-payment-translation
[Spree Upgrade] Add missing failed authorization translation
2018-11-06 16:01:00 +00:00
Luis Ramos
86721d6d42 Merge pull request #2974 from luisramos0/2-0-user-balance
[Spree Upgrade] Fix User Balance Calculator spec
2018-11-06 16:00:44 +00:00
Pau Perez
71702af3c3 Have a single attributes list in serializer 2018-11-06 15:52:02 +00:00
Pau Perez
51155bb368 Remove old commented out code
You know, git already keeps old code for us.
2018-11-06 14:23:15 +00:00
Pau Perez
26d95b7250 Fix long lines 2018-11-06 13:59:51 +00:00
Matt-Yorkley
d0b7b57017 Remove OrderSerializer#show_path and adjust to use #edit over #show 2018-11-06 11:07:14 +00:00
Matt-Yorkley
aaaec4777d Remove admin order #show link from helper 2018-11-06 11:03:06 +00:00
luisramos0
c191a1feb8 Add missing translation related to authorization failure 2018-11-06 10:20:52 +00:00
luisramos0
79fcc7bce0 Fix user balance calculator spec by setting a target_shipment on line item of the order being tested 2018-11-05 19:23:09 +00:00
Pau Pérez Fabregat
4155f086e0 Merge pull request #2968 from openfoodfoundation/transifex
Transifex
2018-11-05 19:40:33 +01:00
Pau Pérez Fabregat
6bc14f4bab Merge pull request #2970 from Matt-Yorkley/2939-edit-order-button
Remove workaround in failing feature spec
2018-11-05 19:25:00 +01:00
Pau Pérez Fabregat
057412111d Merge pull request #2972 from coopdevs/mark-last-failing-enterprise-spec-pending
[Spree Upgrade] Mark last failing enterprises spec as pending
2018-11-05 18:59:47 +01:00
Pau Pérez Fabregat
e76bf81e2a Merge pull request #2973 from coopdevs/deliver-email-in-spec
[Spree Upgrade] Perform mail delivery in spec to make it pass
2018-11-05 18:58:37 +01:00
Pau Perez
f7b6867c28 Perform mail delivery in spec to make it pass
We need to purposefully enable deliveries for the deliveries array to
list this email. Otherwise the delivery logic is not executed and thus
the deliveries array never filled.
2018-11-05 17:49:08 +00:00
Pau Perez
21d756a1af Mark last failing enterprises spec as pending
This will get solved once we complete
https://github.com/openfoodfoundation/openfoodnetwork/issues/2971. Until
then, let's not focus on this spec to reach our 100% green test suite.
2018-11-05 16:45:53 +00:00
Matt-Yorkley
fd47756e2f Remove workaround in failing feature spec
Removed an old workaround that clicked a button multiple times.
This was no longer working and causing the spec to fail.
2018-11-05 11:19:57 +00:00
Pau Pérez Fabregat
50a06d1bd9 Merge pull request #2969 from luisramos0/2897-2-0-price-fix
[Spree Upgrade] Fix specs creating deleted variants
2018-11-05 11:59:06 +01:00
luisramos0
4f992a18f7 Fix specs creating deleted variants
Spree checks that each price belongs to a variant
Since we were creating deleted variants, the price models couldnt see those
2018-11-05 10:43:10 +00:00
Transifex-Openfoodnetwork
98d79ec939 Updating translations for config/locales/fr_BE.yml 2018-11-05 18:46:40 +11:00
Maikel
4930c9bc06 Merge pull request #2934 from mkllnk/manual-rubocop-todo-config
Add offending files to rubocop config
2018-11-05 10:37:03 +11:00
Maikel Linke
7ad40074a5 Make Code Climate show our real score ans split rubocop config
Our rubocop config hides all current violations. It allows us to have a
passing rubocop run on the current code and improve it gradually. It
detects new violations, but doesn't annoy us with all the existing ones.

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

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

Since we don't want these lax metrics, we override them in our config
file .rubocop.yml. This leads to a lot of offences again. This patch
lists all offending files for each cop to make rubocop pass. We can
improve the code over time and remove items from the list.
2018-11-05 10:11:35 +11:00
Pau Pérez Fabregat
fe8303cb19 Merge pull request #2957 from luisramos0/2-0-paypal-spec
[Spree Upgrade] Fix occurrences of order.shipping_method= by replacing with order.shipments
2018-11-02 15:50:59 +01:00
Pau Pérez Fabregat
834520491c Merge pull request #2900 from luisramos0/raise_error_if_no_stock_item_available
[Spree Upgrade] Avoiding variantStock raise by creating variant first and then setting `count_on_hand`
2018-11-02 15:49:21 +01:00
Pau Pérez Fabregat
e635cfc9c1 Merge pull request #2901 from luisramos0/variants_including_master
[Spree Upgrade] Adapt product_decorator code to spree 2 with new variants_including_master
2018-11-02 15:48:19 +01:00
Pau Pérez Fabregat
b1f3fa14e5 Merge pull request #2880 from luisramos0/backorders
[Spree Upgrade] Replace allow_backorders with variant.on_demand in the cart
2018-11-02 15:47:02 +01:00
Pau Pérez Fabregat
ad743a03ac Merge pull request #2888 from luisramos0/backorders-line-items
[Spree Upgrade] Replace allow_backorders with variant.on_demand in the line_item_decorator
2018-11-02 15:45:25 +01:00
Pau Pérez Fabregat
3b85bbe911 Merge pull request #2923 from mkllnk/2882-extract-email-setup-in-specs
Extract email setup in specs for easy upgrade
2018-11-02 15:40:19 +01:00
Pau Pérez Fabregat
a910fc50f5 Merge pull request #2926 from luisramos0/2-0-stable-oct-25
[Spree Upgrade] Merging master into 2-0-stable (second run in October2018)
2018-11-02 15:37:34 +01:00
Maikel
3259b3ecf1 Merge pull request #2912 from Matt-Yorkley/admin_orders_refactor
Admin orders refactor
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
luisramos0
8a034a1538 Fix occurrences of order.shipping_method= by replacing with order.shipments= 2018-10-30 13:37:45 +00: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
Luis Ramos
4422cdc691 Merge pull request #2936 from luisramos0/2933-2-0-orders-admin
[Spree Upgrade] Fix some tests in orders admin spec
2018-10-29 23:17:48 +00: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
luisramos0
b16ed86b2d Fix shipping_method basic test. Adapt to spree 2 that needs shipping_categories to be set and sets them on the base factory in a after_create block, the build command was not picking it up 2018-10-27 20:34:25 +01: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
4450380cb0 Add missing translation to filter on orders admin page 2018-10-26 21:32:16 +01:00
luisramos0
a5d4c50dea Fix some specs in admin orders. Fixed path to order edit page and some html class identifiers that were changed in spree 2. Subtotal line is gone in spree 2, removed test. 2018-10-26 21:32:16 +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
luisramos0
90d7b7f4a0 Merge branch 'master' into 2-0-stable-oct-25 2018-10-25 14:28:58 +01: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
Pau Pérez Fabregat
f32e4dddb1 Merge pull request #2902 from luisramos0/more-pending-tests
[Spree Upgrade] Mark specs from secondary features as xfeature
2018-10-23 19:00:49 +02:00
Pau Pérez Fabregat
9a06c1ef98 Merge pull request #2899 from luisramos0/2898-2-0-fix-orders-admin
[Spree Upgrade] Fix orders admin page by removing a filter that is gone in spree 2
2018-10-23 18:59:01 +02:00
Pau Pérez Fabregat
235d42024a Merge pull request #2903 from luisramos0/2884-2-0-order-ships-path
[Spree Upgrade] In order list page, the shipment state is now a label, not a link. The shipments page is gone in spree 2.
2018-10-23 18:57:05 +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
Luis Ramos
a9b390d0aa Merge pull request #2761 from HugsDaniel/2744_fix_feature_specs
[Spree Upgrade] Fix feature specs for shipping_methods
2018-10-22 23:12:20 +01: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
d0d9038308 Removed order.shipments_path from order serializer. In order list page the shipment state is now a label, not a link. The shipmeents page is gone in spree 2 2018-10-22 11:24:01 +01:00
luisramos0
34d1e6ffdb Remove pending from bulk_product_update_spec because it's a core spec and should not be left for later in the upgrade process. This reverts PR#2794 2018-10-21 22:13:15 +01:00
luisramos0
7ae5a615b2 Move all specs in update_account_invoices_spec and finalize_account_invoices_spec.rb temporarily to pending 2018-10-21 22:09:21 +01:00
luisramos0
6f78f3c595 Move all specs in proxy_order_spec temporarily to pending 2018-10-21 22:08:10 +01:00
luisramos0
b0ffb0f91a Move all specs in subscription_confirm_job_spec temporarily to pending 2018-10-21 22:07:23 +01:00
luisramos0
2e64226d29 Move all specs in spec/features/admin/subscriptions_spec temporarily to pending 2018-10-21 22:06:31 +01:00
luisramos0
ca786249a6 Move all specs in subscription_form_spec temporarily to pending 2018-10-21 22:05:45 +01:00
luisramos0
3afc59c864 Move all specs in products_reset_strategy_spec (part of product import feature) temporarily to pending 2018-10-21 22:04:16 +01:00
luisramos0
5b6b0f408f Move all specs in product_importer_spec temporarily to pending. There were 11 temporarily pending tests but more were failing 2018-10-21 22:02:34 +01:00
luisramos0
5d36450de2 Move all specs in reports_spec temporarily to pending. There were 6 temporarily pending tests but 3 more were failing 2018-10-21 21:56:55 +01:00
luisramos0
92c7db2249 Adapt product_decorator code to spree 2 where variants_including_master now makes use of Paranoi gem 2018-10-20 23:43:33 +01:00
luisramos0
f3ef3d0c3e Avoiding variantStock raise by creating variant first and then setting count_on_hand 2018-10-20 23:28:22 +01:00
luisramos0
653c67971f Remove order admin page filter 'show only unfulfilled orders' as done on spree 2 2018-10-20 15:11:47 +01: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
luisramos0
c373d5ab33 Replace usage of global allow_backorders with variant.on_demand in line item sufficient stock method 2018-10-18 19:44:38 +01:00
luisramos0
df36e0b344 In cart population, replace usage of global allow_backorders with variant.on_demand adapter 2018-10-18 18:37:09 +01:00
Pau Pérez Fabregat
32632addfb Merge pull request #2823 from luisramos0/2-0-order-spec-fees
[Spree Upgrade] Fix fees tests in models/spree/order_spec
2018-10-18 13:30:15 +02:00
luisramos0
a92e8c9923 Improve readability of shipment decorator 2018-10-18 10:54:21 +01:00
luisramos0
a83af367b4 Fix order_spec related to retrieving previously ordered items
In spree 2, each completed_order_with_totals comes with 5 line items (see order_factory in spree), so instead of 1+1+1=3 the calculation becomes 5+5+1=11
2018-10-18 10:54:21 +01:00
luisramos0
74eff8730b Fix tests of fees in a completed order in models/spree/order_spec by:
- set distributor with taxes on the order
- simplify the factory completed_order_with_fees by replacing shipment with shipping_method and ship_address and letting the order workflow handle shipments and inventory units
2018-10-18 10:54:21 +01:00
luisramos0
91f52d80c8 Fix problem in order and adjustment model specs by fixing the order.adjustment association
This fix was taken from spree 2.1  here 3fa44165c7
2018-10-18 10:53:00 +01:00
luisramos0
2ccbb87adc Fix payment decorator bug
Payment line items must come from the order, payment does not have inventory_units
2018-10-18 10:53:00 +01:00
Maikel
3a2e52cc98 Merge pull request #2780 from luisramos0/2-0-stripe-factory
[Spree Upgrade] Fix Stripe connect factory
2018-10-18 14:54:28 +11:00
Maikel
01c21c302c Merge pull request #2811 from luisramos0/2-0-adjust-basic-spec-fix
[Spree Upgrade] Fixes shipping tests in adjustment spec
2018-10-18 14:49:28 +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
luisramos0
98161daa90 Refactor duplicated distributors association in payment_method and gateway to a concern 2018-10-16 20:27:22 +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
601e0b927a Merge pull request #2816 from luisramos0/2-0-adjust-enterprise-fees-spec-fix-aplicator
[Spree Upgrade] Fix enterprise fees specs in adjustment_spec - enterprise_fee_aplicator
2018-10-16 19:47:10 +02:00
Pau Pérez Fabregat
54f0ccab93 Merge pull request #2861 from luisramos0/2-0-stable-spree-revision
[Spree Upgrade] Update spree 2-0-4-stable revision used to pick up latest commits
2018-10-16 19:41:08 +02:00
Luis Ramos
3e4f92fe92 Merge branch '2-0-stable' into 2-0-adjust-basic-spec-fix 2018-10-16 17:33:33 +01:00
Pau Pérez Fabregat
c99fec44da Merge pull request #2824 from luisramos0/2-0-order-spec
[Spree Upgrade] Fix taxes tests in models/spree/order_spec
2018-10-16 18:09:33 +02:00
Pau Pérez Fabregat
f2fe3c8cff Merge pull request #2812 from luisramos0/2-0-adjust-enterprise-fees-spec-fix
[Spree Upgrade] Fix enterprise fees specs in adjustment_spec - tax_rate
2018-10-16 18:02:21 +02:00
luisramos0
b3c56e6823 Duplicated payment method distributors association to gateway. This fixes the inheritance problem found in stripe gateway
See PR 2780 for more details
2018-10-16 16:55:18 +01:00
Pau Pérez Fabregat
db9669b4ce Merge pull request #2817 from coopdevs/remove-reference-to-on-demand
[Spree Upgrade] Remove on_demand from Product serializers
2018-10-16 17:52:42 +02:00
Luis Ramos
faf8322c59 Merge pull request #2785 from luisramos0/2-0-order-updater-fix
[Spree Upgrade] Fix order_updater_spec by using create (instead of build) in shipment
2018-10-16 16:43:42 +01:00
luisramos0
570016463b Fix order_updater_spec by using create (instead of build) in shipment. Also simplified spec by using prebuild shipment_with and shipping_method factories 2018-10-16 16:37:36 +01:00
Pau Pérez Fabregat
afe1d7caef Merge pull request #2863 from luisramos0/2-0-stable-oct
[Spree Upgrade] Merging master into 2-0-stable (one month of commits in master)
2018-10-16 17:09:56 +02: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
luisramos0
87cd73ddba Merge branch 'master' into 2-0-stable-oct 2018-10-15 17:09:26 +01: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 Perez
a5a2cb8ea7 Revert "Merge pull request #2856 from luisramos0/2-0-adjust-clean-up"
This reverts commit fa689b6607, reversing
changes made to 2aeed9763c.
2018-10-15 15:48:48 +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
fa689b6607 Merge pull request #2856 from luisramos0/2-0-adjust-clean-up
[Spree Upgrade] Running Transpec and Rubocop in "new" models/spree/adjustment_spec
2018-10-15 11:13:46 +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
luisramos0
f133524a9c Remove useless comment from spec factories 2018-10-12 23:09:36 +01:00
luisramos0
4380ff7bd7 Drop calculated_adjustments_decorator. This file was introduced in ofn's a0b740f52d. The change is already in spree 2.0.4, see here 2c82aab566 (diff-00aa4190da81ca29804a406252f1d0f4) 2018-10-12 23:09:36 +01:00
luisramos0
a5522b90f6 Fix Shipment adjustments specs on adjustment_spec by setting Config values before test objects are created 2018-10-12 23:09:35 +01:00
luisramos0
bd31348b94 Improve docs and readability on tax_rate_decorator 2018-10-12 23:09:35 +01:00
luisramos0
5693f44f5e Fix shipping adjustment basic test in adjustment_spec by removing extra shipping_method from test shipment 2018-10-12 23:09:35 +01: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
luisramos0
1b6f7485b8 Update spree 2-0-4-stable revision used to pick up latest commits 2018-10-12 12:05:18 +01:00
luisramos0
3b6d29968d Fix spree/models/adjustment_spec rubocop issues 2018-10-11 23:02:17 +01:00
luisramos0
6aa8978fe9 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/adjustment_spec.rb

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

* 25 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-10-11 23:02:17 +01:00
luisramos0
23ed4f705c Fix Enterprise Fee tax category inheritance spec by ensuring the line item is assigned to the order when the order is created. That way the tax category from product is correctly copied to the line item 2018-10-11 23:02:17 +01:00
luisramos0
b7416e42f4 Adapt tax_rate_decorator to new spree version. Spree's default tax calculator now is checking line_items tax category, not the product tax category. See Spree's change here: a0a4b91f13 (diff-46e557ca8717d6ab5039470a40d00ea8) 2018-10-11 23:02:17 +01:00
luisramos0
8b0726b815 Fix enterprise fee calculation. The adjustment.source value of the fee is now allowing the inheritance of the tax category from line items 2018-10-11 23:02:17 +01:00
luisramos0
8aee0f9438 Reorganize code in EnterpriseFeeApplicator 2018-10-11 23:02:17 +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
luisramos0
ed429dd20d Fix models/spree/order_spec tests related to tax on shipments:
- make Spree::Config be picked up correctly by reordering test object creation
- make sure line item is loaded in the order when the order is created
2018-10-11 18:06:33 +01:00
luisramos0
56ff4fe90d Remove useless comment from spec factories 2018-10-11 17:16:58 +01:00
luisramos0
dcf0eefe04 Drop calculated_adjustments_decorator. This file was introduced in ofn's a0b740f52d. The change is already in spree 2.0.4, see here 2c82aab566 (diff-00aa4190da81ca29804a406252f1d0f4) 2018-10-11 17:16:58 +01: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
luisramos0
39d232daaf Fix Enterprise Fee tax category inheritance spec by ensuring the line item is assigned to the order when the order is created. That way the tax category from product is correctly copied to the line item 2018-10-09 19:50:35 +01: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
2aeed9763c Merge pull request #2789 from luisramos0/pending_order_syncer
[Spree Upgrade] Making broken OrderSyncerSpec tests pending, 9 tests to be fixed in issue #2788
2018-10-08 17:51:36 +02:00
Pau Pérez Fabregat
c30458b90a Merge pull request #2787 from luisramos0/pending_subs_mailer
[Spree Upgrade] Making SubsMailerSpec pending, 21 tests to be fixed in issue #2786
2018-10-08 17:51:24 +02:00
Pau Pérez Fabregat
875f0c01bc Merge pull request #2794 from luisramos0/pending_bulk_prod_update
[Spree Upgrade] Making BulkOrderUpdateSpec pending, 33 out of 34 tests to be fixed in #2790
2018-10-08 17:51:08 +02:00
Pau Pérez Fabregat
d2720652bb Merge pull request #2795 from luisramos0/pending_subs_pacement_job
[Spree Upgrade] Making SubsPlacementJobSpec pending, 6 tests to be fixed in issue #2793
2018-10-08 17:50:58 +02:00
Pau Pérez Fabregat
b51bd4aa4b Merge pull request #2796 from luisramos0/pending_prod_import
[Spree Upgrade] Making product import and product importer specs pending, 17 tests to be fixed in #2791
2018-10-08 17:50:48 +02:00
Pau Pérez Fabregat
86d9f4d56a Merge pull request #2797 from luisramos0/pending_reports
[Spree Upgrade] Making reports and reports_controller specs pending, 18 tests to be fixed in #2792
2018-10-08 17:50:25 +02: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
Maikel
d15f524cb1 Merge pull request #2779 from luisramos0/2-0-shipment-specs
[Spree Upgrade] Fixed several specs by defining line_items.target_shipmnt
2018-10-08 17:43:54 +11: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
Pau Perez
f8ec198f9f Remove on_demand from Api::CachedProductSerializer
This fixes lots of specs like the whole
spec/controllers/shop_controller_spec.rb, almost all specs of
spec/lib/open_food_network/products_renderer_spec.rb and most of
spec/features/consumer/shopping/shopping_spec.rb.
2018-10-03 14:27:59 +02:00
Pau Perez
75ad4254a6 Remove on_demand from Api::Admin::ProductSerializer
This change also moves the spec file to its appropriate place for the
sake of consistency and RSpec3-izes the test example.
2018-10-03 13:06:13 +02:00
luisramos0
8a22567291 Fix enterprise fee calculation. The adjustment.source value of the fee is now allowing the inheritance of the tax category from line items 2018-10-02 23:44:38 +01:00
luisramos0
1ce431b671 Reorganize code in EnterpriseFeeApplicator 2018-10-02 23:39:31 +01:00
luisramos0
3fbb98519d Adapt tax_rate_decorator to new spree version. Spree's default tax calculator now is checking line_items tax category, not the product tax category. See Spree's change here: a0a4b91f13 (diff-46e557ca8717d6ab5039470a40d00ea8) 2018-10-02 23:28:47 +01: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
c559cf0394 Fix Shipment adjustments specs on adjustment_spec by setting Config values before test objects are created 2018-10-02 16:17:26 +01:00
luisramos0
bed4ec4102 Improve docs and readability on tax_rate_decorator 2018-10-02 16:15:10 +01:00
luisramos0
795441484d Fix shipping adjustment basic test in adjustment_spec by removing extra shipping_method from test shipment 2018-10-02 16:15:00 +01: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
luisramos0
d2fe203c89 Fixes error undefined 'stock_location' by adding shipment to line_items in the following specs: features/admin/reports_spec, lib/open_food_network/bulk_coop_report_spec, lib/open_food_network/customers_report_spec, lib/open_food_network/order_cycle_management_report_spec, lib/open_food_network/orders_and_fulfillments_report_spec and lib/open_food_network/packing_report_spec 2018-10-01 11:57:36 +01: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
luisramos0
1ff1e32398 Making reports and reports_controller specs pending, 18 tests to be fixed in issue #2792 2018-09-30 00:30:49 +01:00
luisramos0
7dfce6c368 Making product import and product importer specs pending, 17 tests to be fixed in issue #2791 2018-09-30 00:21:43 +01:00
luisramos0
1d49edb194 Making SubsPlacementJobSpec pending, 6 tests to be fixed in issue #2793 2018-09-30 00:10:31 +01:00
luisramos0
50ac519dd5 Making BulkOrderUpdateSpec pending, 33 out of 34 tests to be fixed in issue #2790 2018-09-30 00:04:33 +01:00
luisramos0
e79d184db0 Making broken OrderSyncerSpec tests pending, 9 tests to be fixed in issue #2788 2018-09-29 23:42:35 +01:00
luisramos0
801c4d1cab Making SubsMailerSpec pending, 21 tests to be fixed in issue #2786 2018-09-29 23:31:11 +01: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
6c05be9772 Fixed 22 out of 30 broken tests in bulk_order_management_spec.rb by providing target_shipment in test line_items. 2018-09-27 21:13:11 +01: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
Luis Ramos
f0183cd17e Merge pull request #2762 from luisramos0/2-0-order-model-spec
[Spree Upgrade] Fixed updates of order.shipping_method_id and improved order, stock_location and shipment factories
2018-09-27 13:43:58 +01:00
Pau Pérez Fabregat
060b3c55f1 Merge pull request #2751 from luisramos0/2-0-order-details
[Spree Upgrade] Refactored spree/order_details, extracted delivery and pickup details into separate partials
2018-09-27 14:30:42 +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
Pau Pérez Fabregat
037432d1a7 Merge pull request #2767 from luisramos0/order_empty
[Spree Upgrade] Destroy all shipments when clearing order
2018-09-26 08:54:11 +02: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
267edbdb45 Merge pull request #2752 from HugsDaniel/apply_overrides_to_shipping_methods_new
[Spree Upgrade] Replace Spree::ShippingMethods new view by our own and apply overrides
2018-09-25 11:37:46 +10:00
Maikel
5ede6a40e7 Merge pull request #2766 from HugsDaniel/2744_add_require_ship_address_to_shipping_methods_form
[Spree Upgrade] Add require_shipping_address to shipping_methods_form
2018-09-25 11:37:15 +10: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
luisramos0
4f32a8efc2 Fixed shipment factory by making shipments unique per order and stock_location factory by making stock_location unique 2018-09-25 00:49:03 +01: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
eb64569c9a Destroy all shipments when clearing order
Now we only clear the order's shipping_method, and in Spree 2.0 it can
have many shipments.
2018-09-24 15:25:33 +01:00
luisramos0
89114655fd Fixed shipping_method update in features/consumer/shopping/orders_spec, order.shipment is now updated instead of order.shipping_method_id 2018-09-24 15:13:36 +01:00
luisramos0
4476b88044 Fixed shipping_method update in models/spree/order_spec, order.shipment is now updated instead of order.shipping_method_id 2018-09-24 15:13:36 +01:00
luisramos0
99fff3d279 Fixed factory completed_order_with_fees by skipping a failing and unnecessary part of the checkout workflow
Fixed factory's shipment_with shipping_fees trait by ensuring only one shipping_rate in the shipment
2018-09-24 15:13:35 +01:00
Luis Ramos
08104c62be Merge pull request #2667 from luisramos0/2-0-ship-method-last-used-address
[Spree Upgrade] Adapt Address_Finder.last_used_ship_address to spree 2
2018-09-24 15:07:27 +01:00
Luis Ramos
0eb2854f8a Merge pull request #2680 from luisramos0/2-0-stable-x
[Spree Upgrade] Fixed inexistent order#shipping_method= in several specs
2018-09-24 15:07:04 +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
Hugo Daniel
0dd1b1a976 Fix feature specs for shipping_methods 2018-09-24 12:40:59 +02:00
Hugo Daniel
06ee75981a Add require_shipping_address to shipping_methods_form 2018-09-24 12:35:40 +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
Pau Pérez Fabregat
128ec1623a Merge pull request #2760 from luisramos0/2-0-admin-enterprise-spec
[Spree Upgrade] In admin enterprises spec, replacing select2_search with select2_select
2018-09-24 11:15:18 +02:00
Pau Pérez Fabregat
52a412a218 Merge pull request #2638 from coopdevs/unit-test-variant-stock
Unit test variant stock
2018-09-24 11:14:03 +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
Maikel
26eb79f5f2 Merge pull request #2729 from luisramos0/2-0-ship-method-curr-order-ser
[Spree Upgrade] Replace order.shipping_method_id in current_order_serializer
2018-09-24 08:56:21 +10:00
Maikel
9b10fbde2d Merge pull request #2728 from luisramos0/2-0-ship-method-ctrl
[Spree Upgrade] Remove use of Order#shipping_method_id from ShippingMethodsControllerDecorator
2018-09-24 08:54:03 +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
Pau Pérez Fabregat
3c4ec62352 Merge pull request #2753 from HugsDaniel/apply_overrides_to_shipping_methods_edit
[Spree Upgrade] Replace Spree::ShippingMethods edit view by our own and apply overrides
2018-09-21 16:16:25 +02:00
Pau Pérez Fabregat
33fa687c28 Merge pull request #2755 from HugsDaniel/apply_overrides_to_shipping_methods_form
[Spree Upgrade] Replace Spree::ShippingMethods form partial by our own and apply overrides
2018-09-21 15:35:41 +02:00
Pau Pérez Fabregat
36bdde6cc4 Merge pull request #2754 from HugsDaniel/apply_overrides_to_shipping_methods_index
[Spree Upgrade] Replace Spree::ShippingMethods index view by our own and apply overrides
2018-09-21 15:28:44 +02: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
a04e90d188 In admin enterprises spec, replacing select2_search with select2_select makes all tests pass. Also made screen size longer to avoid errors with overlaying components 2018-09-20 23:58:14 +01: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
Hugo Daniel
f9c5e732d8 Replace Spree::ShippingMethods form partial by our own and apply overrides 2018-09-20 19:21:02 +02: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
Hugo Daniel
0d7e24e554 Change to new ruby hash syntax 2018-09-20 14:34:10 +02:00
Hugo Daniel
b0fa76f519 Change to new ruby hash syntax 2018-09-20 14:32:27 +02:00
Hugo Daniel
07cbb08b42 Change to new ruby hash syntax 2018-09-20 14:28:20 +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
Hugo Daniel
56c1b073ee Replace Spree::ShippingMethods new view by our own and apply overrides 2018-09-20 12:37:26 +02:00
Hugo Daniel
493da83378 Replace Spree::ShippingMethods index view by our own and apply overrides 2018-09-20 12:35:49 +02:00
Hugo Daniel
a14337df5c Replace Spree::ShippingMethods edit view by our own and apply overrides 2018-09-20 12:34:16 +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
luisramos0
57bb1fec9a Adapt ShippingMethodsController to keep disallowing delete of shipping_methods associated with orders. Added controller tests to verify behaviour 2018-09-19 16:21:12 +01:00
Pau Perez
a2b3d8372e Reduce complexity of OrderUpdater decorator 2018-09-19 16:03:33 +02:00
Pau Pérez Fabregat
99ba9d7d1b Merge branch '2-0-stable' into unit-test-variant-stock 2018-09-19 15:41:21 +02:00
Pau Perez
b77dd41eb0 Refactored spree/order_details, extracted delivery and pickup details into separate partials.
This was copied/adapted from 6f7c8bb8b1
2018-09-19 14:20:44 +01:00
Pau Perez
0491a96d44 Ask to use backorderable? instead of on_demand 2018-09-19 15:12:38 +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
luisramos0
edcdf59621 In current_order_serializer, serialize shipping_method_id from order.shipping_method.id. Adapted respective spec. 2018-09-18 16:11:01 +01:00
Pau Perez
314ad5400f Move variant_stock.rb to concerns/ 2018-09-18 12:18:50 +02: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
Pau Pérez Fabregat
e79f7c13f1 Merge pull request #2727 from luisramos0/2-0-shipment-adjustment
[Spree Upgrade] Adapt order_decorator.shipments.adjustments to spree 2
2018-09-18 09:37:10 +02:00
Maikel
1130bb341d Merge pull request #2677 from luisramos0/2-0-sample-data
[Spree Upgrade] Fixed db:load_sample_data
2018-09-18 16:37:22 +10: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
luisramos0
843cd44b23 In paypal_spec, fixed setting shipping_method in order, this is now done through order shipments 2018-09-17 00:51:01 +01:00
luisramos0
c66b611b99 Fixed setting shipping_method in the order through order.shipments in proxy_order_spec, lib/open_food_network/customers_report_spec and features/admin/shipping_methods_spec 2018-09-17 00:51:01 +01:00
luisramos0
75656668cd Fixed query in order_cycle_management_report and fixed the respective spec by setting shipping_method in order through shipments 2018-09-17 00:51:01 +01:00
luisramos0
38c2f52278 In features/admin/reports_spec, fixed setting shipping_method in order, this is now done through order shipments 2018-09-17 00:51:01 +01:00
luisramos0
fbd2d96b05 Moved shipment and shipping_method factories with flat rate and shipping fees to traits 2018-09-17 00:51:01 +01:00
luisramos0
7b6e4825e7 Fixed controllers/spree/admin/orders/customer_details_controller_spec:
- fixed order creation to use order.shipments instead of order.shipping_method
- adapted test to new spree 2 controller logic (shipments page is gone since 67f568914988bcc0a1fc520d15ed6444a6d12824 and redirect logic changed on e9cde1b4d570dd4f7f979ac71a58d6f3f342ebb4)
2018-09-17 00:44:14 +01:00
luisramos0
93ac99b5cc Added new factory for shipping_method_with trait delivery to fix order.shipping_method issue in features/admin/orders_spec 2018-09-17 00:44:14 +01:00
Maikel Linke
ac85b90315 Clarify private class method declaration 2018-09-15 10:18:54 +10:00
luisramos0
8e5f43ed25 Fixed current order serializer spec name 2018-09-14 23:12:00 +01:00
luisramos0
238d2f4feb Removed unnecessary code copied and replaced with call to identical super class 2018-09-14 22:20:21 +01:00
luisramos0
5b3a529487 Adapted address_finder_spec to spree 2 shipments 2018-09-14 18:41:59 +01:00
luisramos0
d685b706ad In order_decorator.update_shipping_fees! and order_decorator.update_payment_fees!, only update adjustment if it exists 2018-09-14 17:13:20 +01:00
luisramos0
2da7cc00f8 Fixed Address Finder last_used_ship_address. It now uses order.shipments.shipping_methods instead of order.shipping_method 2018-09-14 16:43:20 +01:00
luisramos0
6b3fd22db8 Adapted order_decorator to spree 2 by fixing adjustment.update! call on update_adjustment 2018-09-14 16:40:59 +01: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
Pau Pérez Fabregat
692101db36 Merge pull request #2691 from coopdevs/fix-variant-override-spec
Fix failing spec due to wrong attribute
2018-09-13 12:21:35 +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 Perez
ce148e0197 Fix failing spec due to wrong attribute 2018-09-12 18:19:08 +02: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
luisramos0
145b4385a4 Fixed db:load_sample_data shipping_method build 2018-09-11 22:21:43 +01: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
Pau Pérez Fabregat
e58f7269c3 Merge pull request #2652 from luisramos0/2-0-within-zone
[Spree 2 Upgrade] Removed unused shipping_method.within_zone, customization not needed
2018-09-11 08:43:06 +02:00
Pau Pérez Fabregat
288f685fd4 Merge pull request #2654 from luisramos0/2-0-ship-method
[Spree 2 Upgrade] - Added adapted order.shipping_method
2018-09-11 08:27:36 +02:00
luisramos0
c00e6a5dc7 Added DB uniqueness constraint on order_id to shipments
By forbidding more than a row per order in the spree_shipments table we ensure all orders have no more than one shipment associated
2018-09-11 00:24:50 +01:00
luisramos0
3577f3790d Moved order.shipping_method to the OrderShippingMethod concern 2018-09-11 00:24:35 +01:00
luisramos0
62951f7d48 Removing duplicated factories inserted by previous PRs: 2668 and 2670 2018-09-10 16:51:20 +01:00
luisramos0
f24b20d28c Added adapted implementation of order.shipping_method to order_decorator 2018-09-10 14:32:50 +01:00
Pau Perez
8d8670bdf4 Fix typos in comments 2018-09-10 14:26:19 +02:00
Pau Pérez Fabregat
cde2f98514 Merge pull request #2590 from luisramos0/spree2_mail_method_create
Spree 2 - MailMethod - CreateMailMethod is now MailConfiguration
2018-09-10 12:08:23 +02:00
Pau Pérez Fabregat
a906ad15bd Merge pull request #2670 from luisramos0/2-0-ship-method-adjustment-spec
[Spree 2 Upgrade] Fix issues related to shipments in adjustment_spec
2018-09-10 11:32:54 +02:00
luisramos0
44d81622ac CreateMailMethod is now MailConfiguration and it uses Spree Config instead of MailMethod. The call from db/seeds was updated accordingly 2018-09-10 10:21:23 +01:00
Pau Pérez Fabregat
5a11af9118 Merge pull request #2668 from luisramos0/2-0-ship-method-order-spec
[Spree 2 Upgrade] Fixed models/order_spec issues related to order.shipping_method
2018-09-10 11:18:10 +02:00
Maikel
bce2c1cfd5 Merge pull request #2588 from luisramos0/spree2_mail_method_specs
Spree 2 Upgrade - MailMethod - Fix "undefined mail method" error in specs
2018-09-10 11:28:34 +10:00
luisramos0
2f1616a286 Changed reference from order.shipping_method to order.shipments in adjustment_spec 2018-09-09 23:32:59 +01:00
luisramos0
5bcc49a61c Removed calls to the now inexistent order.create_shipment! from specs 2018-09-09 23:16:19 +01:00
luisramos0
73512d3591 Replaced order.shipping_method with order.shipments in models.order_spec.
Fixed factory completed_order_with_fees used in order_spec and also in line_items_controller_spec and orders_controller_spec.
2018-09-09 23:13:32 +01:00
luisramos0
afedbe45ab Fixed scenario "guest order with registered email" in order_spec
Spree order factory requires user (we are setting it to nil below so, no impact on the test)
Defining shipping method is not necessary for this test
2018-09-09 23:13:32 +01:00
luisramos0
d6cff9bc68 Removed calls to the now inexistent order.create_shipment! from specs 2018-09-09 23:13:27 +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
Maikel
ce7c7b3867 Merge pull request #2640 from luisramos0/2-0-stable-spree-revision
Updated spree 2-0-4 revision used
2018-09-08 15:00:50 +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
luisramos0
d2f4f8ccb2 Removed unused shipping_method.within_zone, customization not needed 2018-09-06 20:29:04 +01: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
Pau Perez
cd53ec1a4f Replace exception with DB uniqueness constraint
By forbidding more than a row per variant in the spree_stock_items we
can ensure all variants have a single stock_item associated.
2018-09-06 13:21:22 +02:00
Pau Perez
8848af15ee Raise when a variant has more than a stock item
This means we violated the business rules of having a single stock
location for the OFN instance and hence a single stock item per variant.

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

We enforce a stock_item exists when modifying the variant and the
stock_item gets created on variant's after_create. This means it's not
possible to use any of the VariantStock's setters before the variant is
persisted so executing the callback on creation is pointless.
2018-09-06 13:20:52 +02:00
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
Maikel
417c33a870 Merge pull request #2639 from luisramos0/2-0-stable-sept
Merging master into 2-0-stable (one month of commits in master)
2018-09-06 08:50:47 +10:00
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
luisramos0
89d51d75ae Merge branch 'master' into 2-0-stable-sept 2018-09-04 17:43:20 +01:00
Maikel
0d2fa3dc40 Merge pull request #2611 from luisramos0/cookies_banner_font_size
[Cookies] Increased cookies banner font size for med/large screens to improve readability
2018-09-04 11:35:32 +10:00
Maikel
1b6bb72966 Merge pull request #2587 from luisramos0/spree2_order_mailer_decorator_bug
Spree 2 Upgrade - MailMethod - Fixed bug on order_mailer_decorator (only visible in spree 2)
2018-09-04 11:29:51 +10:00
luisramos0
d29a1ebf9a Updated spree 2-0-4 revision used 2018-09-04 00:41:29 +01: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
Pau Pérez Fabregat
0f118baa4e Merge pull request #2615 from mkllnk/2575-variant-on-hand-api
2575 variant on hand api
2018-09-03 11:16:02 +02:00
luisramos0
8004abbb9f Improved Order mailer and Subscriptions mailer specs by removing dependency to old mail method 2018-09-03 10:03:06 +01:00
luisramos0
921c8dfdf4 Removed unnecessary cancel_email from order_email_decorator (spree one is equivalent after ofn PR#2589). Also refactored remaining order_mailer_decorator methods by extracting duplicated code. 2018-09-03 10:03:02 +01:00
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
Maikel
c510bbd8d0 Merge pull request #2589 from luisramos0/spree2_base_mailer_dec_update
Spree 2 Upgrade - MailMethod - Delete outdated base_mailer_decorator.from_address
2018-09-03 11:05:48 +10:00
VadLusk
f74a6e47d5 Remove css_splitter references, delete all_split2.css. #1361 #2633 2018-09-03 09:20:26 +10:00
luisramos0
512577768c Removed old files that were used with, now unsuported, heroku 2018-09-02 22:13:42 +01:00
apoc64
e62a755ddb Adds comments for setting up timezone in application.yml 2018-09-02 11:08:27 -06:00
luisramos0
59f8dd4458 Improved cookies spec by keeping global config values as they were before the test 2018-09-01 20:35:07 +01:00
Kristina Lim
f844236b9c Remove order link in non-user order cancellation email 2018-09-01 23:46:12 +08:00
Kristina Lim
5f2c3a1955 Remove order link in non-user failed payment email 2018-09-01 23:46:12 +08:00
Kristina Lim
f8244a400a Custom subscription placement email if non-user
The order link should not be provided if the order does not have an
associated user account.
2018-09-01 23:46:11 +08:00
Kristina Lim
ad8b120e48 Extract format for order cycle closing in emails
Using a helper for this, but this can be changed to look up a
translation key.
2018-09-01 23:46:08 +08:00
Matt-Yorkley
9d05e5c97a Remove duplicate line in spec 2018-09-01 14:09:07 +01:00
Kristina Lim
dc4037474d Test order links in subscription placement emails 2018-09-01 15:40:36 +08:00
Matt-Yorkley
d8bbcdc54b Decrease batch size to reduce chance of timeouts 2018-08-31 22:52:44 +01:00
Matt-Yorkley
4dfbbd60d4 Fix occasional StaleObjectError on variant updates 2018-08-31 19:47:08 +01:00
dependabot[bot]
4557bfbc17 [Security] Bump rubyzip from 1.2.1 to 1.2.2
Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.1 to 1.2.2. **This update includes security fixes.**
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.1...v1.2.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-08-31 17:49:12 +00:00
Matt-Yorkley
75a9ea5bfa Prefer .flat_map(&foo) over .map(&foo).flatten 2018-08-31 15:38:38 +01:00
Matt-Yorkley
04d50d4555 Fix filter results bug in validation section 2018-08-31 15:00:29 +01:00
Kristina Lim
f5c44ef0e6 Rename "entreprise" in i18n keys to "enterprise" 2018-08-31 15:26:30 +08:00
Maikel
a9c8c033c7 Merge pull request #2566 from openfoodfoundation/dependabot/bundler/daemons-1.2.6
Bump daemons from 1.2.2 to 1.2.6
2018-08-31 14:54:53 +10:00
Maikel
c30e29051a Merge pull request #2594 from openfoodfoundation/dependabot/bundler/compass-rails-3.1.0
Bump compass-rails from 2.0.4 to 3.1.0
2018-08-31 13:47:22 +10:00
Maikel
42936be40a Merge pull request #2578 from luisramos0/spree2_fix_test_line_items
Spree2 fix test line items
2018-08-31 13:26:25 +10:00
Maikel Linke
13b9ecab21 Fix font issue in mobile menu 2018-08-31 11:23:11 +10:00
luisramos0
1b4e0cd73a Made the menu config default values more user friendly 2018-08-31 11:23:11 +10:00
luisramos0
e573a3fc2b The main menu is now translatable and configurable using Content configuration and translations. Added 7 menu entries to the translations file (each with text and url) and 7 content configuration points to enable/disable these. The mobile menu icons can also be configured. 2018-08-31 11:23:11 +10:00
dependabot[bot]
508643b64e Bump eventmachine from 1.2.3 to 1.2.7
Bumps [eventmachine](https://github.com/eventmachine/eventmachine) from 1.2.3 to 1.2.7.
- [Release notes](https://github.com/eventmachine/eventmachine/releases)
- [Changelog](https://github.com/eventmachine/eventmachine/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eventmachine/eventmachine/compare/v1.2.3...v1.2.7)

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

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-08-30 19:16:41 +00:00
Pau Perez
1de13a5049 Favor #public_send over #send using Rubocop's cop
Devs keep using `#send` although that method does not preserve
private/protected visibility. Watching after this turned out to be quite
time-consuming while doing code review.

Currently, the Style/Send cop doesn't enforce `#public_send` however
(that's what we want). It simply discourages the use of #send. See
https://github.com/rubocop-hq/rubocop/pull/2081#issuecomment-292251650
for details. So a new entry on the Code Conventions doc has been added
to overcome this limitation:
https://github.com/openfoodfoundation/openfoodnetwork/wiki/Code-Conventions#prefer-public_send-over-send
2018-08-30 18:48:45 +02:00
Pau Pérez Fabregat
b4bfa3ff2d Merge pull request #2591 from mkllnk/remove-rack-livereload
Remove gem rack-livereload
2018-08-30 13:50:57 +02:00
Maikel
1b88edea1f Merge pull request #2420 from stveep/stripe-admin-2
Stripe admin 2
2018-08-30 15:48:49 +10:00
Maikel Linke
d1f7828432 Fix pending spec
The link from the enterprise page was missing the enterprise id. So the
bulk edit page for fees was showing fees for all enterprises.
2018-08-30 14:50:41 +10:00
Maikel Linke
429bf132da Test creating a fee, not updating
The spec for creating an enterprise fee didn't actually create a new
fee. Because all enterprise fees are displayed, it changed an existing
fee.
2018-08-30 14:50:41 +10:00
Maikel Linke
297ea830dc Further style spec 2018-08-30 14:50:41 +10:00
Maikel Linke
bc1e8bfde6 Convert specs to RSpec 3.7.0 syntax with Transpec
This conversion is done by Transpec 3.3.0 with the following command:
    transpec spec/features/admin/enterprise_fees_spec.rb

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

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

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

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

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-08-30 03:19:13 +00:00
Maikel
8a97088bb6 Merge pull request #2606 from openfoodfoundation/dependabot/bundler/poltergeist-1.18.1
Bump poltergeist from 1.16.0 to 1.18.1
2018-08-30 13:16:47 +10:00
Maikel
1c61539119 Merge pull request #2585 from greysteil/bump-ams
Bump active_model_serializer to 0.8.4, and pin it
2018-08-30 10:00:22 +10:00
Maikel
fac29ebb96 Merge pull request #2595 from openfoodfoundation/dependabot/bundler/immigrant-0.3.6
Bump immigrant from 0.1.6 to 0.3.6
2018-08-30 09:56:37 +10:00
luisramos0
efcf680094 Fixed bulk_line_items_controller_spec by setting shipment on test line_items and by allowing shipment decorator to allow no adjustments in the shipment
Fixed 5 out of 7 tests in orders_and_fulfillments_report_spec by providing target_shipment in test line_items
Fixed 12 out of 44 broken tests in bulk_order_management_spec.rb by providing target_shipment in test line_items.” “The remaining 32 failing tests are now failing with the very common: undefined method on_hand= on Spree::Variant
Improved 1 test in reports_spec.rb by providing target_shipment in test line_items. Test now fails with undefined method Spree::Order.shipping_method
Fixed 9 tests in orders_controller_spec by providing target_shipment in test line_items
Fixed 4 tests in packing_report_spec.rb by providing target_shipment in test line_items. Failing tests are now failing with undefined product.on_hand? method
Fixed 8 tests in line_items_controller_spec by providing target_shipment in test line_items
Fixed 1 test in update_billable_periods_spec by providing target_shipment in test line_items
Fixed 4 tests in bulk_coop_report_spec by providing target_shipment in test line_items. The 2 failing tests are now failing with undefined product.on_hand? method
Improved 1 test in line_items_controller_spec by providing target_shipment in test line_items. Test is still failing with an unexpected method call
Fixed 1 test in order_and_distributor_report_spec by providing target_shipment in test line_items
2018-08-30 00:33:15 +01:00
luisramos0
02b968b312 Cookies policy page table has a single column now. Also made small updates to the page text, migrated translations to ruby translations and extracted repeated partial from cookies policy page view 2018-08-30 00:27:35 +01:00
luisramos0
53e7fcb019 Imcreased cookies banner font size for med/large screens to improve readability 2018-08-30 00:21:00 +01:00
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
189bd0911b Merge pull request #2574 from luisramos0/bulk_line_items_controller_spec_fix
Spree2 - Bulk line items controller spec fix
2018-08-28 16:47:04 +10: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
luisramos0
082f9e404b Fixed test on order_cycle_spec by replacing eq with match_array 2018-08-27 21:04:18 +01:00
luisramos0
b5038fa5dc Changed calls to MailMethod in specs to calls to Spree::Config[:mails_from] 2018-08-27 21:02: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
luisramos0
0de691b821 Delete outdated base_mailer_decorator.from_address (it used old MailMethod). This way we rely on the correct spree base_mailer.from_address (that gets it from Spree::Config 2018-08-25 13:47:05 +01:00
luisramos0
27f5e6db8a Fixed bug on order_mailer_decorator. When cancel_email is called with order id in paramater order, order.number will fail. This is only seen in spree 2 because only spree 2 calls this method with order id. Bug introduced here: 32d2adc8a2 (diff-aa82d768109073ea8ad7858146630be4R9). Spree change introduced here: 8d90ae15f8 (diff-1e2ba31309f1f1abd2a4b626036d316fR94) 2018-08-25 12:50:36 +01: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
luisramos0
a97138dd58 Fixed bulk_line_items_controller_spec by setting shipment on test line_items and by allowing shipment decorator to allow no adjustments in the shipment 2018-08-22 23:20:30 +01: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
luisramos0
898e41acfb Removed monkeypatchs to scope variants on inventory_unit and line_item decorators. We need to make the scoping somewhere else in spree2, see #2559 2018-08-19 20:23:31 +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
Maikel
f04903bca0 Merge pull request #2493 from HugsDaniel/2433-change-from-simple-product-to-base-product
Reimplement Spree's simple_product in OFN factory
2018-07-31 07:40:42 +10:00
Hugo Daniel
ce46f3de39 Removed empty line 2018-07-30 12:11:02 +02: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
Pau Perez
43bf7293bf Merge branch 'master' into 2-0-stable
* master: (125 commits)
  Fix syntax error in GETTING_STARTED.md
  Fix syntax error in README.md
  Fix link syntax errors in REAME.md and GETTING_STARTED.md
  Style recently merged code
  Update gem i18n-js to pick up locale changes
  Fix embedded shopfront menu responsiveness
  Add communications links to README
  Fix script/setup by making it less clever
  Change import and reset logic to work with first page
  Move options to first page
  Fix wrong sort predicates in customer index
  Reset reverse when clicking another column to sort
  Move logic for toggling by column into SortOptions
  Generalize sorting through SortOptions service
  Remove unused sorting preferences in ColumnsCtrl
  Fix frontend sorting in "Bulk Order Management"
  Fix frontend sorting in "Customers" index
  Change sorting to be done in ascending order first
  Wrap rows in customer index with TBODY tag
  Update .rubocop_todo.yml
  ...
2018-07-27 10:21:47 +02:00
Pau Pérez Fabregat
67bac8aae4 Merge pull request #2503 from coopdevs/upgrade-spree-2-0-4-version
[Spree upgrade] Update Gemfile.lock to fetch the latest revision
2018-07-27 08:51:06 +02:00
Maikel
238a07dbd6 Merge pull request #2488 from HugsDaniel/2434-remove-dash-dependency
[Spree Upgrade] Remove dependency to Dash and Jirafe
2018-07-27 13:00:15 +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
Pau Perez
6fb95d30c3 Update Gemfile.lock to fetch the latest revision
Since https://github.com/openfoodfoundation/spree/pull/6 got merged, we
need the app to use the latest Spree fork revision to pick up those
changes.
2018-07-26 18:06:57 +02:00
Pau Pérez Fabregat
5a4bc0c584 Merge pull request #2366 from coopdevs/refactor-ship-address-from-distributor
Refactor ship address from distributor
2018-07-26 12:04:02 +02: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
Pau Perez
eaf108718c Add doc to method 2018-07-25 13:52:05 +02:00
Pau Perez
a0d2ec5666 Enable OFN's custom OrderUpdater 2018-07-25 13:51:01 +02:00
Pau Perez
d1e65691cf Copy distributor addr. when using a pick up method
This copies the distributor's address when at least one of the order shipments
uses a shipping method that requires shipping address.
2018-07-25 11:07:16 +02:00
Pau Perez
f1896313b3 Move shipping_address_from_distributor to OrderUpdater
This is still Spree-1.3 compatible not considering multiple shipments
and shipping methods.
2018-07-25 11:07:16 +02:00
Pau Perez
21d905a092 Refactor OrderUpdater to decorate Spree's one
This replaces the nasty class eval and provides some encapsulation
2018-07-25 11:07:16 +02:00
Pau Perez
72f02ee1ee RSpec3-ize OrderUpdater spec 2018-07-25 11:07:16 +02:00
Matt-Yorkley
ae5fd864d1 Fix embedded shopfront menu responsiveness 2018-07-25 17:41:26 +10:00
Pau Pérez Fabregat
a3cace46e0 Merge pull request #2431 from mkllnk/2007-no-shipment-for-payment
2007 Skip shipment creation for payment step
2018-07-25 08:46:47 +02:00
Hugo Daniel
eab04e0d86 Reimplement Spree<2.0 :simple_product factory in OFN 2018-07-24 16:27:30 +02:00
Hugo Daniel
ec751c0a78 Remove admin analytics ability 2018-07-24 15:27:22 +02: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
Hugo Daniel
514fc0a781 Remove dependency to Dash and Jirafe 2018-07-20 13:04:58 +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
Maikel Linke
2334f0854c Less invasive modifying the checkout state machine 2018-07-11 10:55:12 +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
Maikel Linke
c7f7e420ea Skip shipment creation for payment step
https://github.com/openfoodfoundation/openfoodnetwork/issues/2007

Spree 2.0.4 creates in-memory shipments for the payment step. That means
we don't need to create a shipment in that transition. This change
copies the checkout_flow from the Spree code, but leaves one last
customisation: removal of the confirm step.
75ec77dc31
2018-07-05 16:34: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
Pau Perez
7707df354b Merge branch 'master' into 2-0-stable
* master: (206 commits)
  embedded groups layout changes
  embedded groups initial test
  Allow html requests for OrderCycleController#update
  Move applicator calls to OrderCycleForm
  Refactor OrderCycleForm to make logic clearer
  Extract schedule syncing logic into OrderCycleForm
  Add basic specs for OrderCyclesController#create
  Add basic OrderCycleForm to handle create/update logic
  Remove unnecessary respond_to blocks from OrderCyclesController
  Include admin users as managers on new enterprises
  Remove obsolete goWithoutHashFragments
  Simplify Navigation.go, not preserving hash fragments
  Only show change warning for open order cycles
  Use a SubscriptionsCount query object to provide counts to IndexOrderCycleSerializer
  Preload subscription counts for serialization in order cycle collection actions
  Request the subscription count for change warning each time, don't cache
  Ask user to confirm oc date change for open order cycles with subsciptions
  Fix ordering of Gemfile.lock
  Add rack-rewrite to handle redirects
  Renames product bulk edit action to index
  ...
2018-06-22 13:23:18 +02: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
Pau Pérez Fabregat
d5310eed6c Merge pull request #2371 from HugsDaniel/2359_js_libs_not_found_or_not_defined
Changed require syntax to fit jquery-ui-rails v<5.0
2018-06-13 09:12:57 +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
Hugo Daniel
6e2966d7e8 Changed require syntax to fit jquery < 5.0 2018-06-12 15:59:41 +02: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
Maikel
0befc714ce Merge pull request #2358 from coopdevs/revert-current-order-argument
Spree 2.0: Fix GET "/"
2018-06-07 10:45:06 +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
Pau Perez
daf12d1300 Revert "Refactor Order#current_order argument"
This reverts commit ae935202be.
2018-06-05 18:42:41 +02:00
Pau Perez
89c2733f50 Revert "Removing redundant curly braces"
This reverts commit 03173d4f7b.
2018-06-05 18:42:31 +02:00
Pau Perez
32069cffe1 Revert "Removing useless spaces"
This reverts commit d81b6be259.
2018-06-05 18:42:19 +02: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
Pau Pérez Fabregat
5b89f6a159 Merge pull request #2285 from coopdevs/get-last-spree-fork-changes
Upgrade spree to point to 1c3dfc7fb
2018-05-16 08:42:41 +02:00
Maikel Linke
585bba0e23 Update activemerchant to v1.78 with new root cert
Fixes https://github.com/openfoodfoundation/openfoodnetwork/issues/2265.

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

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

This reimplements what `#available_to_order_with_distributor_check?`
used to do and it doesn't work with Spree 2.0.4.
2018-05-02 13:58:25 +02:00
Pau Perez
5da9b55cdd Improve order_and_distributor report's readability 2018-05-02 12:26:42 +02:00
Pau Pérez Fabregat
21ebb5849c Merge pull request #2258 from mkllnk/2254-invite-manager-flow
Fix initial password setting
2018-05-02 08:48:36 +02:00
Pau Pérez Fabregat
b2301190af Merge pull request #2259 from mkllnk/remove-heroku
Remove Heroku references since nobody is using it
2018-05-02 08:43:51 +02:00
Maikel Linke
c597b3c377 Speed-up spec 2018-05-01 14:40:05 +10:00
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 Perez
6784621c1b Remove invalid spree config
According to
5ef8dc67df
"Backorders can be configured now as per stock location or stock item".
2018-04-30 13:53:23 +02:00
Pau Perez
c3132e87d6 Rename and fix simple_product to base_product
This factory has been merged into the base_product factory. Besides,
products no longer have on_hand attribute.
2018-04-30 13:49:52 +02:00
Pau Pérez Fabregat
e7b1d933f4 Merge pull request #2253 from coopdevs/apply-spree-2.0-migrations
Apply spree 2.0 migrations
2018-04-30 12:51:29 +02:00
Pau Perez
19870eccdc Install and run Spree v2.0.4 migrations 2018-04-27 17:02:28 +02:00
Pau Pérez Fabregat
9840f3bb6b Merge pull request #2252 from coopdevs/use-patched-spree-2.0.4
Use OFN's Spree fork of 2.0.4 to get fixes
2018-04-27 16:58:33 +02: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
Pau Perez
97e8adf7a7 Use OFN's Spree fork of 2.0.4 to get fixes
We encountered the bug that
3fd1535e75
fixes, which is needed to boot the app using Spree 2.0.4.

This stems from
https://github.com/openfoodfoundation/openfoodnetwork/issues/2236#issuecomment-384633612
2018-04-26 16:35:28 +02: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
Pau Pérez Fabregat
a1645477e0 Merge pull request #2235 from coopdevs/upgrade-to-spree-2.0.4
Upgrade Spree to 2.0.4 instead of 2.0.13
2018-04-23 12:14:49 +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
58f3b5a97e Upgrade Spree to 2.0.4 instead of 2.0.13
Although we don't know how big the fixes introduced between 2.0.4 and
2.0.13 are, jumping from roughly 1.3.99 to 2.0.13 seems too big of
a change to do in one go.

Unless more issues like this one come up that force us to upgrade to
a newer version I believe it's best to be conservative. You'll find an
in-depth explanation in
https://github.com/openfoodfoundation/openfoodnetwork/wiki/Spree-2.0-upgrade#getting-to-version-204-

A previous effort was done to upgrade to v2.0.13 in
https://github.com/openfoodfoundation/openfoodnetwork/pull/2209
2018-04-18 08:56:03 +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 Perez
06ef2a4c63 Remove commented out gem from Gemfile 2018-04-17 16:10:41 +02:00
Hugo Daniel
595a622d5b Removing useless spaces 2018-04-17 16:10:41 +02:00
Hugo Daniel
d9f451b6fe Removing redundant curly braces 2018-04-17 16:10:41 +02:00
Hugo Daniel
abe5d3596c Refactor Order#current_order argument 2018-04-17 16:10:41 +02:00
Hugo Daniel
e6b58c6db4 Remove ssl deprecated configuration 2018-04-17 16:10:40 +02:00
Hugo Daniel
6f3663f1b9 update gemfile to spree 2.0.13 2018-04-17 16:10:40 +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 &nbsp; 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
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
Rohan Mitchell
d908701b59 Merge branch 'master' into folklabs-producer-emails
Conflicts:
	Gemfile
2015-06-11 17:02:34 +10:00
Rohan Mitchell
5ae88dbd6c Fix content overlapping alert 2015-06-11 14:29:49 +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
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
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
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
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
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
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
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
Rohan Mitchell
7da403808c Style mobile menu [skip ci] 2015-05-13 16:56:49 +10:00
Rohan Mitchell
ec1290d687 Style home page for mobile 2015-05-13 15:59:36 +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
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
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
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
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
Paul Mackay
fd37324359 #536: Add permissions checking for Notify producers action. 2015-05-09 11:02:25 +01: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
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
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
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
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
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
summerscope
d9fd0b284d WIP on home panes and layout 2015-05-01 14:52:17 +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
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
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
Paul Mackay
0f1ec17698 #275: Use better path variable in test. 2015-04-28 16:08:26 +01:00
Paul Mackay
9103e83ce2 #275: spec test for controller method. Other small fixes. 2015-04-11 18:28:31 +01: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
Paul Mackay
717b3b6494 #275: Fixes for testing aggregated orders. 2015-03-10 19:19:57 +00:00
Paul Mackay
ca665dc6bc Merge master into producer-emails. 2015-03-04 19:09:43 +00: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
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
Paul Mackay
375bdc0586 #275: Change report format. Improved mailer. 2014-11-16 07:14:29 +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
3330 changed files with 240295 additions and 62688 deletions

53
.codeclimate.yml Normal file
View File

@@ -0,0 +1,53 @@
version: "2"
plugins:
rubocop:
enabled: true
channel: "rubocop-0-76"
config:
file: ".rubocop_styleguide.yml"
scss-lint:
enabled: true
checks:
ImportantRule:
enabled: false
VendorPrefix:
enabled: false
LeadingZero:
enabled: false
PropertySortOrder:
enabled: false
StringQuotes:
enabled: false
DeclarationOrder:
enabled: false
duplication:
enabled: true
exclude_patterns:
- "db/**"
- "config/initializers/active_record_postgresql_referential_integrity_patch.rb"
checks:
argument-count:
enabled: false
complex-logic:
enabled: false
file-lines:
enabled: false
method-complexity:
enabled: false
method-count:
enabled: false
method-lines:
enabled: false
nested-control-flow:
enabled: false
return-statements:
enabled: false
similar-code:
enabled: false
identical-code:
enabled: false
exclude_patterns:
- "spec/**/*"
- "vendor/**/*"
- "app/assets/javascripts/shared/*"
- "app/assets/javascripts/jquery-migrate-1.0.0.js"

4
.dockerignore Normal file
View File

@@ -0,0 +1,4 @@
.git
.gitignore
log/*
tmp/*

61
.github/ISSUE_TEMPLATE/bug_report.md vendored Normal file
View File

@@ -0,0 +1,61 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''
---
## Description
<!-- Provide a more detailed introduction to the issue itself, and why you consider it to be a bug -->
<!-- How has this bug affected you? What were you trying to accomplish? -->
## Expected Behavior
<!-- Tell us what should happen -->
## Actual Behaviour
<!-- Tell us what happens instead -->
## Steps to Reproduce
<!-- Provide an unambiguous set of steps to reproduce this bug -->
<!-- Include code to reproduce if relevant -->
<!-- Include links -->
<!-- Include user ID -->
1.
2.
3.
4.
## Animated Gif/Screenshot
<!-- Provide a screenshot or brief video reproducing the bug. -->
<!-- Please try to have the dev tools opened on the network tab (press F12 to open the devtools of your browser -->
## Workaround
<!-- Include a workaround for this bug (if relevant) -->
## Severity
<!-- Assign a label and explain the impact.
bug-s1: a critical feature is broken: checkout, payments, signup, login
bug-s2: a non-critical feature is broken, no workaround
bug-s3: a feature is broken but there is a workaround
bug-s4: it's annoying, but you can use it
bug-s5: we can live with it, only a few users impacted
https://github.com/openfoodfoundation/openfoodnetwork/wiki/Bug-severity
-->
## Your Environment
<!-- Include relevant details about the environment you experienced the bug in -->
* Version used:
* Browser name and version:
* Operating System and version (desktop or mobile):
## Possible Fix
<!-- Not obligatory, but suggest a fix or reason for the bug -->

View File

@@ -0,0 +1,35 @@
---
name: Feature template
about: Create feature epics that detail the larger feature or functionality to be
delivered.
title: ''
labels: ''
assignees: ''
---
## What is the problem we are solving
<!-- Describe the problem this feature is supposed to solve. Should be described in the icebox item (in Discourse). -->
## Success factors = expected outcome
<!-- Describe what is the expected outcome: when the feature is released, what would it look like? What will make you say "the problem is solved"? Can be metrics like "Platform has less than 1% service interruption", or yes/no statements like "People can checkout on mobiles. -->
## Useful information for inception
<!-- List here any information that can be useful for the inception stage. -->
## Link to the "Product Development - Backlog" item in Discourse
<!-- Put the link here, and put this epic link in the Discourse item as well for cross-referencing. -->
Add a custom footer
Pages 70
Home
Development environment setup
macOS (Sierra, HighSierra and Mojave)
OS X (El Capitan)
OS X (Mavericks)
Ubuntu
On Heroku
Rubocop
General guidelines
Spree Commerce customisation

22
.github/ISSUE_TEMPLATE/release.md vendored Normal file
View File

@@ -0,0 +1,22 @@
---
name: Release task
about: Track the process of a new release
title: 'Release v'
labels: ''
assignees: ''
---
Steps:
- [ ] Include translations
- [ ] [Draft new release]
- [ ] Notify #instance-managers of user-facing changes.
- [ ] Test: https://semaphoreci.com/openfoodfoundation/openfoodnetwork-2/branches/master <!-- replace the URL -->
- [ ] Publish and notify #global-community
- [ ] Deploy and notify #instance-managers
- [ ] Nudge next release manager
The full process is described at https://github.com/openfoodfoundation/openfoodnetwork/wiki/Releasing.
[Draft new release]: https://github.com/openfoodfoundation/openfoodnetwork/releases/new?tag=v&title=v+Code+Name&body=Congrats%0A%0ADescription%0A%0A%23%23+User+facing+changes+:eyes:%0A%0A%0A%0A%23%23+Technical+changes+:wrench:%0A%0A

View File

@@ -0,0 +1,25 @@
---
name: Story template
about: Create stories that are small chunks of work that devs will pick up and deliver
title: ''
labels: ''
assignees: ''
---
## Description
<!-- Describe the story in detail:
**- As a:** (enterprise user, super admin, user...)
**- On page:** (provide url of the page you want to modify. If not provide where will be created the new url and the name we want to give it)
**- I want to be able to do:** (specify the desired behavior)
(Link to others issues or resources to provide context > only if really necessary). -->
## Acceptance Criteria & Tests
<!-- Document the outcomes that need to be achieved before this component can be considered complete.
-->
<!-- Provide an unambiguous set of steps a tester should do to validate the PR that will solve this issue -->
1.
2.
3.
4.

View File

@@ -0,0 +1,21 @@
---
name: Tech debt template
about: File a refactoring task that aids future development
title: ''
labels: tech debt
assignees: ''
---
### What we should change and why (this is tech debt)
<!-- The use of X changed and part y is now redundant. We can remove it and... -->
### Context
<!-- This came up in PR #3451#issuecomment-461616636. -->
### Impact and timeline
<!-- Example: This simplifies the upgrade to Spree 3 and should be done after upgrading to Spree 2. -->

47
.github/PULL_REQUEST_TEMPLATE.md vendored Normal file
View File

@@ -0,0 +1,47 @@
#### What? Why?
Closes #[the issue number this PR is related to]
<!-- Explain why this change is needed and the solution you propose.
Provide context for others to understand it. -->
#### What should we test?
<!-- List which features should be tested and how. -->
#### Release notes
<!-- Write a line or two to be included in the release notes.
Everything is worth mentioning, because you did it for a reason. -->
<!-- Please assign one category to your PR and delete the others.
The categories are based on https://keepachangelog.com/en/1.0.0/. -->
Changelog Category: Added | Changed | Deprecated | Removed | Fixed | Security
#### How is this related to the Spree upgrade?
<!-- Any known conflicts with the Spree Upgrade?
Explain them or remove this section. -->
#### Discourse thread
<!-- Is there a discussion about this in Discourse?
Add the link or remove this section. -->
#### Dependencies
<!-- Does this PR depend on another one?
Add the link or remove this section. -->
#### Documentation updates
<!-- Are their any wiki pages that need updating after merging this PR?
List them here or remove this section. -->

11
.gitignore vendored
View File

@@ -1,5 +1,6 @@
.bundle
.rbenv-version
.byebug_history
.swp
*.swo
*.swp
@@ -30,11 +31,17 @@ public/system
public/stylesheets
public/images
public/spree
public/assets
config/abr.yml
config/heroku_env.rb
config/newrelic.yml
config/initializers/feature_toggle.rb
NERD_tree*
coverage
libpeerconnection.log
/config/application.yml
/config/newrelic.yml
node_modules
vendor/bundle/
coverage
/reports/
!/reports/README.md
bin/

1
.node-version Normal file
View File

@@ -0,0 +1 @@
5.12.0

View File

@@ -1,4 +0,0 @@
--format progress
--format ParallelTests::RSpec::SummaryLogger --out tmp/spec_summary.log
--format ParallelTests::RSpec::RuntimeLogger --out tmp/parallel_runtime_rspec.log
--tag ~performance

21
.rubocop.yml Normal file
View File

@@ -0,0 +1,21 @@
# This is our main Rubocop configuration for developers. It is used when you run:
#
# bundle exec rubocop
#
# The configuration is split into three files. Look into those files for more details.
#
require: rubocop-rails
inherit_from:
# The automatically generated todo list to ignore all current violations.
- .rubocop_todo.yml
# Our Open Food Network style guide. It's used by Code Climate. If you want to see all violations,
# then use only that configuration (like Code Climate):
#
# bundle exec rubocop -c .rubocop_styleguide.yml
#
- .rubocop_styleguide.yml
# A manually compiled todo list to ignore metrics violations on a file-by-file basis.
- .rubocop_manual_todo.yml

738
.rubocop_manual_todo.yml Normal file
View File

@@ -0,0 +1,738 @@
# A manually compiled todo list to ignore metrics violations on a file-by-file basis.
#
# 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 metrics cops it sets a different metric.
#
# Since we don't want these lax metrics, we override them in our config
# file .rubocop.yml which results in a lot of offences again. This file
# lists all offending files for each cop to make rubocop pass. We can
# improve the code over time and remove items from the list.
#
# This file was manually created by using the following tools:
#
# rubocop > rubo.log
# # inspect log file to see which cops are failing
# # copy cop configurations and add Exclude parameter
# grep ExampleCop rubo.log | cut -d ":" -f 1 | sort -u | while read f; do echo " - $f"; done >> .rubocop.yml
#
# This process probably doesn't need repeating. Otherwise there is plenty
# of room for improvements and automation.
Layout/LineLength:
Max: 100
Exclude:
- app/controllers/admin/bulk_line_items_controller.rb
- app/controllers/admin/contents_controller.rb
- app/controllers/admin/customers_controller.rb
- app/controllers/admin/enterprise_fees_controller.rb
- app/controllers/admin/enterprise_relationships_controller.rb
- app/controllers/admin/enterprise_roles_controller.rb
- app/controllers/admin/enterprises_controller.rb
- app/controllers/admin/inventory_items_controller.rb
- app/controllers/admin/manager_invitations_controller.rb
- app/controllers/admin/product_import_controller.rb
- app/controllers/admin/schedules_controller.rb
- app/controllers/admin/subscriptions_controller.rb
- app/controllers/admin/variant_overrides_controller.rb
- app/controllers/api/enterprise_attachment_controller.rb
- app/controllers/api/product_images_controller.rb
- app/controllers/spree/paypal_controller_decorator.rb
- app/controllers/stripe/callbacks_controller.rb
- app/helpers/angular_form_builder.rb
- app/helpers/angular_form_helper.rb
- app/helpers/checkout_helper.rb
- app/helpers/enterprises_helper.rb
- app/helpers/injection_helper.rb
- app/helpers/markdown_helper.rb
- app/helpers/order_cycles_helper.rb
- app/helpers/spree/orders_helper.rb
- app/jobs/subscription_confirm_job.rb
- app/mailers/subscription_mailer.rb
- app/models/column_preference.rb
- app/models/concerns/order_shipment.rb
- app/models/concerns/product_stock.rb
- app/models/concerns/variant_stock.rb
- app/models/content_configuration.rb
- app/models/customer.rb
- app/models/enterprise_group.rb
- app/models/enterprise_role.rb
- app/models/inventory_item.rb
- app/models/product_import/entry_processor.rb
- app/models/product_import/spreadsheet_entry.rb
- app/models/product_import/unit_converter.rb
- app/models/proxy_order.rb
- app/models/schedule.rb
- app/models/spree/ability_decorator.rb
- app/models/spree/app_configuration_decorator.rb
- app/models/spree/calculator/default_tax_decorator.rb
- app/models/spree/classification_decorator.rb
- app/models/spree/concerns/payment_method_distributors.rb
- app/models/spree/gateway/stripe_connect.rb
- app/models/spree/line_item_decorator.rb
- app/models/spree/order_decorator.rb
- app/models/spree/payment_decorator.rb
- app/models/spree/payment_method_decorator.rb
- app/models/spree/product_decorator.rb
- app/models/spree/shipping_method_decorator.rb
- app/models/spree/taxon_decorator.rb
- app/models/spree/tax_rate_decorator.rb
- app/models/spree/user.rb
- app/models/subscription.rb
- app/models/variant_override.rb
- app/models/variant_override_set.rb
- app/serializers/api/admin/subscription_line_item_serializer.rb
- app/services/cart_service.rb
- app/services/default_stock_location.rb
- app/services/embedded_page_service.rb
- app/services/order_cycle_form.rb
- app/services/order_factory.rb
- engines/order_management/app/services/order_management/subscriptions/validator.rb
- engines/web/app/helpers/web/cookies_policy_helper.rb
- engines/web/config/routes.rb
- engines/web/spec/features/consumer/cookies_spec.rb
- Gemfile
- lib/discourse/single_sign_on.rb
- lib/open_food_network/available_payment_method_filter.rb
- lib/open_food_network/bulk_coop_report.rb
- lib/open_food_network/customers_report.rb
- lib/open_food_network/enterprise_fee_applicator.rb
- lib/open_food_network/enterprise_fee_calculator.rb
- lib/open_food_network/enterprise_issue_validator.rb
- lib/open_food_network/group_buy_report.rb
- lib/open_food_network/lettuce_share_report.rb
- lib/open_food_network/order_cycle_form_applicator.rb
- lib/open_food_network/order_cycle_management_report.rb
- lib/open_food_network/payments_report.rb
- lib/open_food_network/reports/bulk_coop_allocation_report.rb
- lib/open_food_network/sales_tax_report.rb
- lib/open_food_network/scope_variants_for_search.rb
- lib/open_food_network/variant_and_line_item_naming.rb
- lib/open_food_network/xero_invoices_report.rb
- lib/spree/localized_number.rb
- lib/spree/product_filters.rb
- lib/tasks/data.rake
- lib/tasks/enterprises.rake
- spec/controllers/admin/bulk_line_items_controller_spec.rb
- spec/controllers/admin/column_preferences_controller_spec.rb
- spec/controllers/admin/customers_controller_spec.rb
- spec/controllers/admin/enterprises_controller_spec.rb
- spec/controllers/admin/inventory_items_controller_spec.rb
- spec/controllers/admin/manager_invitations_controller_spec.rb
- spec/controllers/admin/order_cycles_controller_spec.rb
- spec/controllers/admin/proxy_orders_controller_spec.rb
- spec/controllers/admin/schedules_controller_spec.rb
- spec/controllers/admin/stripe_accounts_controller_spec.rb
- spec/controllers/admin/stripe_connect_settings_controller_spec.rb
- spec/controllers/admin/subscription_line_items_controller_spec.rb
- spec/controllers/admin/subscriptions_controller_spec.rb
- spec/controllers/admin/variant_overrides_controller_spec.rb
- spec/controllers/api/base_controller_spec.rb
- spec/controllers/api/exchange_products_controller_spec.rb
- spec/controllers/api/logos_controller_spec.rb
- spec/controllers/api/order_cycles_controller_spec.rb
- spec/controllers/api/orders_controller_spec.rb
- spec/controllers/api/product_images_controller_spec.rb
- spec/controllers/api/products_controller_spec.rb
- spec/controllers/api/promo_images_controller_spec.rb
- spec/controllers/api/variants_controller_spec.rb
- spec/controllers/cart_controller_spec.rb
- spec/controllers/checkout_controller_spec.rb
- spec/controllers/enterprises_controller_spec.rb
- spec/controllers/line_items_controller_spec.rb
- spec/controllers/shop_controller_spec.rb
- spec/controllers/shops_controller_spec.rb
- spec/controllers/spree/admin/adjustments_controller_spec.rb
- spec/controllers/spree/admin/base_controller_spec.rb
- spec/controllers/spree/admin/orders_controller_spec.rb
- spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
- spec/controllers/spree/admin/payment_methods_controller_spec.rb
- spec/controllers/spree/admin/products_controller_spec.rb
- spec/controllers/spree/admin/reports_controller_spec.rb
- spec/controllers/spree/admin/variants_controller_spec.rb
- spec/controllers/spree/credit_cards_controller_spec.rb
- spec/controllers/spree/orders_controller_spec.rb
- spec/controllers/spree/users_controller_spec.rb
- spec/controllers/spree/user_sessions_controller_spec.rb
- spec/controllers/stripe/callbacks_controller_spec.rb
- spec/controllers/stripe/webhooks_controller_spec.rb
- spec/controllers/user_confirmations_controller_spec.rb
- spec/factories/order_factory.rb
- spec/factories.rb
- spec/features/admin/adjustments_spec.rb
- spec/features/admin/bulk_order_management_spec.rb
- spec/features/admin/bulk_product_update_spec.rb
- spec/features/admin/customers_spec.rb
- spec/features/admin/enterprise_fees_spec.rb
- spec/features/admin/enterprise_relationships_spec.rb
- spec/features/admin/enterprise_roles_spec.rb
- spec/features/admin/enterprises/images_spec.rb
- spec/features/admin/enterprises/index_spec.rb
- spec/features/admin/enterprises_spec.rb
- spec/features/admin/enterprise_user_spec.rb
- spec/features/admin/image_settings_spec.rb
- spec/features/admin/multilingual_spec.rb
- spec/features/admin/order_cycles/complex_creating_specific_time_spec.rb
- spec/features/admin/order_cycles/complex_editing_multiple_product_pages_spec.rb
- spec/features/admin/order_cycles/complex_editing_spec.rb
- spec/features/admin/order_cycles/complex_updating_specific_time_spec.rb
- spec/features/admin/order_cycles/list_spec.rb
- spec/features/admin/order_cycles/simple_spec.rb
- spec/features/admin/order_spec.rb
- spec/features/admin/overview_spec.rb
- spec/features/admin/payment_method_spec.rb
- spec/features/admin/product_import_spec.rb
- spec/features/admin/products_spec.rb
- spec/features/admin/reports_spec.rb
- spec/features/admin/schedules_spec.rb
- spec/features/admin/shipping_methods_spec.rb
- spec/features/admin/subscriptions_spec.rb
- spec/features/admin/tag_rules_spec.rb
- spec/features/admin/users_spec.rb
- spec/features/admin/variant_overrides_spec.rb
- spec/features/consumer/account/cards_spec.rb
- spec/features/consumer/account/settings_spec.rb
- spec/features/consumer/account_spec.rb
- spec/features/consumer/authentication_spec.rb
- spec/features/consumer/caching/darkwarm_caching_spec.rb
- spec/features/consumer/caching/shops_caching_spec.rb
- spec/features/consumer/groups_spec.rb
- spec/features/consumer/multilingual_spec.rb
- spec/features/consumer/producers_spec.rb
- spec/features/consumer/registration_spec.rb
- spec/features/consumer/shopping/cart_spec.rb
- spec/features/consumer/shopping/checkout_auth_spec.rb
- spec/features/consumer/shopping/checkout_spec.rb
- spec/features/consumer/shopping/embedded_groups_spec.rb
- spec/features/consumer/shopping/embedded_shopfronts_spec.rb
- spec/features/consumer/shopping/orders_spec.rb
- spec/features/consumer/shopping/products_spec.rb
- spec/features/consumer/shopping/shopping_spec.rb
- spec/features/consumer/shopping/variant_overrides_spec.rb
- spec/features/consumer/shops_spec.rb
- spec/helpers/admin/subscriptions_helper_spec.rb
- spec/helpers/checkout_helper_spec.rb
- spec/helpers/enterprises_helper_spec.rb
- spec/helpers/groups_helper_spec.rb
- spec/helpers/injection_helper_spec.rb
- spec/helpers/order_cycles_helper_spec.rb
- spec/helpers/spree/admin/base_helper_spec.rb
- spec/jobs/confirm_order_job_spec.rb
- spec/jobs/subscription_confirm_job_spec.rb
- spec/jobs/subscription_placement_job_spec.rb
- spec/lib/open_food_network/address_finder_spec.rb
- spec/lib/open_food_network/bulk_coop_report_spec.rb
- spec/lib/open_food_network/customers_report_spec.rb
- spec/lib/open_food_network/enterprise_fee_applicator_spec.rb
- spec/lib/open_food_network/enterprise_fee_calculator_spec.rb
- spec/lib/open_food_network/group_buy_report_spec.rb
- spec/lib/open_food_network/lettuce_share_report_spec.rb
- spec/lib/open_food_network/option_value_namer_spec.rb
- spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
- spec/lib/open_food_network/order_cycle_permissions_spec.rb
- spec/lib/open_food_network/order_grouper_spec.rb
- spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb
- spec/lib/open_food_network/packing_report_spec.rb
- spec/lib/open_food_network/permissions_spec.rb
- spec/lib/open_food_network/products_and_inventory_report_spec.rb
- spec/lib/open_food_network/scope_variant_to_hub_spec.rb
- spec/lib/open_food_network/tag_rule_applicator_spec.rb
- spec/lib/open_food_network/user_balance_calculator_spec.rb
- spec/lib/open_food_network/users_and_enterprises_report_spec.rb
- spec/lib/open_food_network/xero_invoices_report_spec.rb
- spec/lib/stripe/account_connector_spec.rb
- spec/lib/stripe/webhook_handler_spec.rb
- spec/mailers/order_mailer_spec.rb
- spec/mailers/producer_mailer_spec.rb
- spec/mailers/subscription_mailer_spec.rb
- spec/models/calculator/weight_spec.rb
- spec/models/column_preference_spec.rb
- spec/models/concerns/order_shipment_spec.rb
- spec/models/concerns/product_stock_spec.rb
- spec/models/customer_spec.rb
- spec/models/enterprise_caching_spec.rb
- spec/models/enterprise_fee_spec.rb
- spec/models/enterprise_group_spec.rb
- spec/models/enterprise_relationship_spec.rb
- spec/models/enterprise_spec.rb
- spec/models/exchange_spec.rb
- spec/models/model_set_spec.rb
- spec/models/order_cycle_spec.rb
- spec/models/product_importer_spec.rb
- spec/models/product_import/reset_absent_spec.rb
- spec/models/proxy_order_spec.rb
- spec/models/spree/ability_spec.rb
- spec/models/spree/adjustment_spec.rb
- spec/models/spree/calculator/flexi_rate_spec.rb
- spec/models/spree/calculator/price_sack_spec.rb
- spec/models/spree/classification_spec.rb
- spec/models/spree/gateway/stripe_connect_spec.rb
- spec/models/spree/line_item_spec.rb
- spec/models/spree/order_spec.rb
- spec/models/spree/payment_method_spec.rb
- spec/models/spree/payment_spec.rb
- spec/models/spree/product_set_spec.rb
- spec/models/spree/product_spec.rb
- spec/models/spree/shipping_method_spec.rb
- spec/models/spree/taxon_spec.rb
- spec/models/spree/tax_rate_spec.rb
- spec/models/spree/user_spec.rb
- spec/models/spree/variant_spec.rb
- spec/models/stripe_account_spec.rb
- spec/models/tag_rule/discount_order_spec.rb
- spec/models/tag_rule/filter_order_cycles_spec.rb
- spec/models/tag_rule/filter_payment_methods_spec.rb
- spec/models/tag_rule/filter_products_spec.rb
- spec/models/tag_rule/filter_shipping_methods_spec.rb
- spec/models/variant_override_spec.rb
- spec/performance/orders_controller_spec.rb
- spec/performance/shop_controller_spec.rb
- spec/requests/checkout/failed_checkout_spec.rb
- spec/requests/checkout/stripe_sca_spec.rb
- spec/requests/embedded_shopfronts_headers_spec.rb
- spec/serializers/api/admin/customer_serializer_spec.rb
- spec/serializers/api/admin/exchange_serializer_spec.rb
- spec/serializers/api/admin/for_order_cycle/supplied_product_serializer_spec.rb
- spec/serializers/api/admin/order_cycle_serializer_spec.rb
- spec/serializers/api/admin/subscription_customer_serializer_spec.rb
- spec/serializers/api/admin/variant_override_serializer_spec.rb
- spec/serializers/api/current_order_serializer_spec.rb
- spec/serializers/api/enterprise_shopfront_serializer_spec.rb
- spec/serializers/api/order_serializer_spec.rb
- spec/services/cart_service_spec.rb
- spec/services/checkout/form_data_adapter_spec.rb
- spec/services/embedded_page_service_spec.rb
- spec/services/exchange_products_renderer_spec.rb
- spec/services/order_cycle_distributed_products_spec.rb
- spec/services/order_cycle_distributed_variants_spec.rb
- spec/services/order_cycle_form_spec.rb
- spec/services/order_factory_spec.rb
- spec/services/order_syncer_spec.rb
- spec/services/order_tax_adjustments_fetcher_spec.rb
- spec/services/permissions/order_spec.rb
- spec/services/permitted_attributes/order_cycle_spec.rb
- spec/services/products_renderer_spec.rb
- spec/services/product_tag_rules_filterer_spec.rb
- spec/spec_helper.rb
- spec/support/cancan_helper.rb
- spec/support/delayed_job_helper.rb
- spec/support/matchers/delegate_matchers.rb
- spec/support/matchers/select2_matchers.rb
- spec/support/matchers/table_matchers.rb
- spec/support/request/shop_workflow.rb
- spec/support/request/web_helper.rb
- spec/support/seeds.rb
Metrics/AbcSize:
Max: 15
Exclude:
- app/controllers/admin/bulk_line_items_controller.rb
- app/controllers/admin/customers_controller.rb
- app/controllers/admin/enterprise_fees_controller.rb
- app/controllers/admin/enterprises_controller.rb
- app/controllers/admin/order_cycles_controller.rb
- app/controllers/admin/product_import_controller.rb
- app/controllers/admin/stripe_accounts_controller.rb
- app/controllers/admin/subscription_line_items_controller.rb
- app/controllers/admin/subscriptions_controller.rb
- app/controllers/api/enterprises_controller.rb
- app/controllers/api/product_images_controller.rb
- app/controllers/api/products_controller.rb
- app/controllers/api/shipments_controller.rb
- app/controllers/api/taxons_controller.rb
- app/controllers/api/variants_controller.rb
- app/controllers/cart_controller.rb
- app/controllers/discourse_sso_controller.rb
- app/controllers/enterprises_controller.rb
- app/controllers/spree/admin/image_settings_controller.rb
- app/controllers/spree/admin/orders_controller.rb
- app/controllers/spree/admin/orders/customer_details_controller.rb
- app/controllers/spree/admin/overview_controller.rb
- app/controllers/spree/admin/payment_methods_controller.rb
- app/controllers/spree/admin/payments_controller.rb
- app/controllers/spree/admin/products_controller.rb
- app/controllers/spree/admin/reports_controller.rb
- app/controllers/spree/admin/resource_controller.rb
- app/controllers/spree/admin/search_controller.rb
- app/controllers/spree/admin/taxons_controller.rb
- app/controllers/spree/admin/users_controller.rb
- app/controllers/spree/credit_cards_controller.rb
- app/controllers/spree/orders_controller.rb
- app/controllers/spree/user_passwords_controller.rb
- app/controllers/spree/user_registrations_controller.rb
- app/controllers/spree/users_controller.rb
- app/controllers/spree/user_sessions_controller.rb
- app/controllers/stripe/callbacks_controller.rb
- app/controllers/user_confirmations_controller.rb
- app/controllers/user_passwords_controller.rb
- app/controllers/user_registrations_controller.rb
- app/helpers/checkout_helper.rb
- app/helpers/i18n_helper.rb
- app/helpers/order_cycles_helper.rb
- app/helpers/spree/admin/base_helper.rb
- app/helpers/spree/admin/navigation_helper.rb
- app/helpers/spree/admin/zones_helper.rb
- app/helpers/spree/orders_helper.rb
- app/models/calculator/flat_percent_per_item.rb
- app/models/column_preference.rb
- app/models/enterprise_group.rb
- app/models/enterprise.rb
- app/models/enterprise_relationship.rb
- app/models/model_set.rb
- app/models/product_import/entry_processor.rb
- app/models/product_import/entry_validator.rb
- app/models/product_import/product_importer.rb
- app/models/proxy_order.rb
- app/models/spree/ability_decorator.rb
- app/models/spree/calculator/default_tax_decorator.rb
- app/models/spree/calculator/flexi_rate_decorator.rb
- app/models/spree/line_item_decorator.rb
- app/models/spree/order_decorator.rb
- app/models/spree/payment_decorator.rb
- app/models/spree/product_decorator.rb
- app/models/spree/shipment.rb
- app/models/spree/taxon_decorator.rb
- app/models/spree/tax_rate_decorator.rb
- app/serializers/api/admin/enterprise_serializer.rb
- app/serializers/api/product_serializer.rb
- app/serializers/api/variant_serializer.rb
- app/services/cart_service.rb
- app/services/create_order_cycle.rb
- app/services/order_cycle_form.rb
- app/services/order_syncer.rb
- engines/order_management/app/services/order_management/stock/estimator.rb
- engines/order_management/app/services/order_management/stock/package.rb
- engines/order_management/app/services/order_management/stock/packer.rb
- engines/order_management/app/services/order_management/subscriptions/validator.rb
- lib/active_merchant/billing/gateways/stripe_decorator.rb
- lib/active_merchant/billing/gateways/stripe_payment_intents.rb
- lib/discourse/single_sign_on.rb
- lib/open_food_network/bulk_coop_report.rb
- lib/open_food_network/customers_report.rb
- lib/open_food_network/enterprise_issue_validator.rb
- lib/open_food_network/group_buy_report.rb
- lib/open_food_network/lettuce_share_report.rb
- lib/open_food_network/option_value_namer.rb
- lib/open_food_network/order_and_distributor_report.rb
- lib/open_food_network/order_cycle_form_applicator.rb
- lib/open_food_network/order_cycle_management_report.rb
- lib/open_food_network/order_cycle_permissions.rb
- lib/open_food_network/packing_report.rb
- lib/open_food_network/payments_report.rb
- lib/open_food_network/permissions.rb
- lib/open_food_network/products_and_inventory_report.rb
- lib/open_food_network/reports/line_items.rb
- lib/open_food_network/sales_tax_report.rb
- lib/open_food_network/users_and_enterprises_report.rb
- lib/open_food_network/variant_and_line_item_naming.rb
- lib/open_food_network/xero_invoices_report.rb
- lib/spree/api/controller_setup.rb
- lib/spree/core/controller_helpers/order.rb
- lib/spree/core/controller_helpers/respond_with.rb
- lib/spree/core/controller_helpers/ssl.rb
- lib/spree/localized_number.rb
- lib/stripe/account_connector.rb
- lib/tasks/enterprises.rake
- lib/tasks/sample_data/order_factory.rb
- lib/tasks/sample_data/product_factory.rb
- spec/features/admin/product_import_spec.rb
- spec/features/admin/reports_spec.rb
- spec/features/admin/subscriptions_spec.rb
- spec/features/consumer/shopping/checkout_paypal_spec.rb
- spec/features/consumer/shopping/shopping_spec.rb
- spec/features/consumer/shopping/variant_overrides_spec.rb
- spec/models/enterprise_spec.rb
- spec/models/product_importer_spec.rb
- spec/services/order_checkout_restart_spec.rb
- spec/support/performance_helper.rb
Metrics/BlockLength:
Max: 25
ExcludedMethods: [
"class_eval",
"collection",
"context",
"describe",
"feature",
"it",
"member",
"namespace",
"resource",
"resources",
"scenario"
]
Exclude:
- app/models/spree/shipment.rb
- lib/spree/core/controller_helpers/common.rb
- lib/spree/core/controller_helpers/ssl.rb
- lib/tasks/data.rake
- spec/controllers/spree/admin/invoices_controller_spec.rb
- spec/factories/enterprise_factory.rb
- spec/factories/order_cycle_factory.rb
- spec/factories/order_factory.rb
- spec/factories/product_factory.rb
- spec/factories.rb
- spec/factories/shipping_method_factory.rb
- spec/factories/subscription_factory.rb
- spec/factories/user_factory.rb
- spec/factories/variant_factory.rb
- spec/features/consumer/shopping/embedded_shopfronts_spec.rb
- spec/lib/open_food_network/group_buy_report_spec.rb
- spec/models/tag_rule/discount_order_spec.rb
- spec/spec_helper.rb
- spec/support/delayed_job_helper.rb
- spec/support/matchers/select2_matchers.rb
- spec/support/matchers/table_matchers.rb
Metrics/CyclomaticComplexity:
Max: 6
Exclude:
- app/controllers/admin/enterprise_fees_controller.rb
- app/controllers/admin/enterprises_controller.rb
- app/controllers/spree/admin/taxons_controller.rb
- app/controllers/spree/orders_controller.rb
- app/helpers/checkout_helper.rb
- app/helpers/i18n_helper.rb
- app/helpers/order_cycles_helper.rb
- app/helpers/spree/admin/base_helper.rb
- app/helpers/spree/admin/navigation_helper.rb
- app/models/enterprise.rb
- app/models/enterprise_relationship.rb
- app/models/spree/ability_decorator.rb
- app/models/spree/payment_decorator.rb
- app/models/spree/payment_method_decorator.rb
- app/models/spree/product_decorator.rb
- app/models/variant_override_set.rb
- app/services/cart_service.rb
- engines/order_management/app/services/order_management/stock/estimator.rb
- lib/active_merchant/billing/gateways/stripe_payment_intents.rb
- lib/discourse/single_sign_on.rb
- lib/open_food_network/bulk_coop_report.rb
- lib/open_food_network/enterprise_issue_validator.rb
- lib/spree/core/controller_helpers/order.rb
- lib/spree/core/controller_helpers/respond_with.rb
- lib/spree/core/controller_helpers/ssl.rb
- lib/spree/localized_number.rb
- spec/models/product_importer_spec.rb
Metrics/PerceivedComplexity:
Max: 7
Exclude:
- app/controllers/admin/enterprises_controller.rb
- app/controllers/api/variants_controller.rb
- app/controllers/spree/admin/taxons_controller.rb
- app/controllers/spree/orders_controller.rb
- app/helpers/checkout_helper.rb
- app/helpers/i18n_helper.rb
- app/helpers/order_cycles_helper.rb
- app/helpers/spree/admin/navigation_helper.rb
- app/models/enterprise_relationship.rb
- app/models/spree/ability_decorator.rb
- app/models/spree/order_decorator.rb
- app/models/spree/product_decorator.rb
- engines/order_management/app/services/order_management/stock/estimator.rb
- lib/active_merchant/billing/gateways/stripe_payment_intents.rb
- lib/discourse/single_sign_on.rb
- lib/open_food_network/bulk_coop_report.rb
- lib/open_food_network/enterprise_issue_validator.rb
- lib/spree/core/controller_helpers/order.rb
- lib/spree/core/controller_helpers/respond_with.rb
- lib/spree/core/controller_helpers/ssl.rb
- lib/spree/localized_number.rb
- spec/models/product_importer_spec.rb
Metrics/MethodLength:
Max: 10
Exclude:
- app/controllers/admin/contents_controller.rb
- app/controllers/admin/customers_controller.rb
- app/controllers/admin/enterprise_fees_controller.rb
- app/controllers/admin/enterprises_controller.rb
- app/controllers/admin/manager_invitations_controller.rb
- app/controllers/admin/order_cycles_controller.rb
- app/controllers/admin/stripe_accounts_controller.rb
- app/controllers/admin/subscriptions_controller.rb
- app/controllers/api/products_controller.rb
- app/controllers/api/shipments_controller.rb
- app/controllers/api/taxons_controller.rb
- app/controllers/api/variants_controller.rb
- app/controllers/cart_controller.rb
- app/controllers/shop_controller.rb
- app/controllers/spree/admin/image_settings_controller.rb
- app/controllers/spree/admin/orders_controller.rb
- app/controllers/spree/admin/orders/customer_details_controller.rb
- app/controllers/spree/admin/payment_methods_controller.rb
- app/controllers/spree/admin/payments_controller.rb
- app/controllers/spree/admin/products_controller.rb
- app/controllers/spree/admin/reports_controller.rb
- app/controllers/spree/admin/resource_controller.rb
- app/controllers/spree/admin/tax_categories_controller.rb
- app/controllers/spree/admin/taxons_controller.rb
- app/controllers/spree/admin/users_controller.rb
- app/controllers/spree/credit_cards_controller.rb
- app/controllers/spree/orders_controller.rb
- app/controllers/spree/user_registrations_controller.rb
- app/controllers/spree/user_sessions_controller.rb
- app/controllers/stripe/callbacks_controller.rb
- app/controllers/user_confirmations_controller.rb
- app/controllers/user_passwords_controller.rb
- app/controllers/user_registrations_controller.rb
- app/helpers/checkout_helper.rb
- app/helpers/order_cycles_helper.rb
- app/helpers/spree/admin/base_helper.rb
- app/helpers/spree/admin/navigation_helper.rb
- app/mailers/producer_mailer.rb
- app/models/column_preference.rb
- app/models/enterprise.rb
- app/models/enterprise_relationship.rb
- app/models/preference_sections/footer_and_external_links_section.rb
- app/models/preference_sections/main_links_section.rb
- app/models/product_import/entry_processor.rb
- app/models/product_import/entry_validator.rb
- app/models/product_import/product_importer.rb
- app/models/spree/ability_decorator.rb
- app/models/spree/calculator/default_tax_decorator.rb
- app/models/spree/calculator/flexi_rate_decorator.rb
- app/models/spree/order_decorator.rb
- app/models/spree/payment_decorator.rb
- app/models/spree/payment_method_decorator.rb
- app/models/spree/product_decorator.rb
- app/models/spree/shipment.rb
- app/serializers/api/admin/order_cycle_serializer.rb
- app/serializers/api/cached_enterprise_serializer.rb
- app/services/order_cycle_form.rb
- app/services/permitted_attributes/checkout.rb
- engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb
- engines/order_management/app/services/order_management/stock/estimator.rb
- engines/order_management/app/services/order_management/stock/package.rb
- lib/active_merchant/billing/gateways/stripe_payment_intents.rb
- lib/discourse/single_sign_on.rb
- lib/open_food_network/bulk_coop_report.rb
- lib/open_food_network/column_preference_defaults.rb
- lib/open_food_network/customers_report.rb
- lib/open_food_network/enterprise_fee_calculator.rb
- lib/open_food_network/enterprise_issue_validator.rb
- lib/open_food_network/group_buy_report.rb
- lib/open_food_network/lettuce_share_report.rb
- lib/open_food_network/option_value_namer.rb
- lib/open_food_network/order_and_distributor_report.rb
- lib/open_food_network/order_cycle_form_applicator.rb
- lib/open_food_network/order_cycle_management_report.rb
- lib/open_food_network/order_cycle_permissions.rb
- lib/open_food_network/order_grouper.rb
- lib/open_food_network/packing_report.rb
- lib/open_food_network/payments_report.rb
- lib/open_food_network/permissions.rb
- lib/open_food_network/products_and_inventory_report.rb
- lib/open_food_network/rack_request_blocker.rb
- lib/open_food_network/reports/bulk_coop_allocation_report.rb
- lib/open_food_network/reports/bulk_coop_supplier_report.rb
- lib/open_food_network/reports/line_items.rb
- lib/open_food_network/sales_tax_report.rb
- lib/open_food_network/users_and_enterprises_report.rb
- lib/open_food_network/xero_invoices_report.rb
- lib/spree/api/controller_setup.rb
- lib/spree/core/controller_helpers/auth.rb
- lib/spree/core/controller_helpers/order.rb
- lib/spree/core/controller_helpers/respond_with.rb
- lib/spree/core/controller_helpers/ssl.rb
- lib/spree/localized_number.rb
- lib/stripe/profile_storer.rb
- lib/tasks/data/truncate_data.rb
- lib/tasks/sample_data/group_factory.rb
- lib/tasks/sample_data/order_factory.rb
- lib/tasks/sample_data/product_factory.rb
- spec/features/consumer/shopping/checkout_paypal_spec.rb
- spec/features/consumer/shopping/variant_overrides_spec.rb
- spec/models/product_importer_spec.rb
- spec/support/request/authentication_workflow.rb
Metrics/ClassLength:
Max: 100
Exclude:
- app/controllers/admin/enterprises_controller.rb
- app/controllers/admin/order_cycles_controller.rb
- app/controllers/admin/schedules_controller.rb
- app/controllers/admin/subscriptions_controller.rb
- app/controllers/api/products_controller.rb
- app/controllers/application_controller.rb
- app/controllers/checkout_controller.rb
- app/controllers/spree/admin/orders_controller.rb
- app/controllers/spree/admin/payment_methods_controller.rb
- app/controllers/spree/admin/products_controller.rb
- app/controllers/spree/admin/reports_controller.rb
- app/controllers/spree/admin/resource_controller.rb
- app/controllers/spree/admin/users_controller.rb
- app/controllers/spree/orders_controller.rb
- app/models/enterprise.rb
- app/models/order_cycle.rb
- app/models/product_import/entry_processor.rb
- app/models/product_import/entry_validator.rb
- app/models/product_import/product_importer.rb
- app/models/spree/ability_decorator.rb
- app/models/spree/shipment.rb
- app/models/spree/user.rb
- app/serializers/api/cached_enterprise_serializer.rb
- app/serializers/api/enterprise_shopfront_serializer.rb
- app/services/cart_service.rb
- engines/order_management/app/services/order_management/reports/enterprise_fee_summary/scope.rb
- lib/active_merchant/billing/gateways/stripe_payment_intents.rb
- lib/open_food_network/bulk_coop_report.rb
- lib/open_food_network/enterprise_fee_calculator.rb
- lib/open_food_network/order_cycle_form_applicator.rb
- lib/open_food_network/order_cycle_management_report.rb
- lib/open_food_network/order_cycle_permissions.rb
- lib/open_food_network/packing_report.rb
- lib/open_food_network/payments_report.rb
- lib/open_food_network/permissions.rb
- lib/open_food_network/users_and_enterprises_report.rb
- lib/open_food_network/xero_invoices_report.rb
Metrics/ModuleLength:
Max: 100
Exclude:
- app/helpers/admin/injection_helper.rb
- app/helpers/injection_helper.rb
- app/helpers/spree/admin/base_helper.rb
- app/helpers/spree/admin/navigation_helper.rb
- engines/order_management/spec/services/order_management/stock/package_spec.rb
- engines/order_management/spec/services/order_management/subscriptions/estimator_spec.rb
- engines/order_management/spec/services/order_management/subscriptions/form_spec.rb
- engines/order_management/spec/services/order_management/subscriptions/proxy_order_syncer_spec.rb
- engines/order_management/spec/services/order_management/subscriptions/summarizer_spec.rb
- engines/order_management/spec/services/order_management/subscriptions/validator_spec.rb
- engines/order_management/spec/services/order_management/subscriptions/variants_list_spec.rb
- lib/open_food_network/column_preference_defaults.rb
- spec/controllers/admin/enterprises_controller_spec.rb
- spec/controllers/admin/order_cycles_controller_spec.rb
- spec/controllers/api/order_cycles_controller_spec.rb
- spec/controllers/api/orders_controller_spec.rb
- spec/controllers/spree/admin/payment_methods_controller_spec.rb
- spec/lib/open_food_network/address_finder_spec.rb
- spec/lib/open_food_network/customers_report_spec.rb
- spec/lib/open_food_network/enterprise_fee_calculator_spec.rb
- spec/lib/open_food_network/option_value_namer_spec.rb
- spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
- spec/lib/open_food_network/order_cycle_permissions_spec.rb
- spec/lib/open_food_network/order_grouper_spec.rb
- spec/lib/open_food_network/permissions_spec.rb
- spec/lib/open_food_network/products_and_inventory_report_spec.rb
- spec/lib/open_food_network/scope_variant_to_hub_spec.rb
- spec/lib/open_food_network/tag_rule_applicator_spec.rb
- spec/lib/open_food_network/user_balance_calculator_spec.rb
- spec/lib/open_food_network/users_and_enterprises_report_spec.rb
- spec/models/spree/ability_spec.rb
- spec/models/spree/adjustment_spec.rb
- spec/models/spree/line_item_spec.rb
- spec/models/spree/payment_spec.rb
- spec/models/spree/product_spec.rb
- spec/models/spree/variant_spec.rb
- spec/services/permissions/order_spec.rb
- spec/support/request/web_helper.rb
Metrics/ParameterLists:
Max: 5
Exclude:
- app/helpers/angular_form_builder.rb
- app/models/product_import/entry_processor.rb
- lib/open_food_network/xero_invoices_report.rb
- spec/features/admin/reports_spec.rb

216
.rubocop_styleguide.yml Normal file
View File

@@ -0,0 +1,216 @@
# Our Open Food Network style guide.
#
# These are the rules we agreed upon and we work towards. Code Climate uses
# these rules to rate our code and detect new violations. But when you run
# rubocop locally, the default configuration file `.rubocop.yml` loads
# our "todo lists" to ignore all current violations.
AllCops:
TargetRailsVersion: 4.0
Exclude:
- 'bin/**/*'
- 'db/**/*'
- 'config/**/*'
- 'script/**/*'
- 'vendor/**/*'
- 'node_modules/**/*'
# Excluding: inadequate Naming/FileName rule rejects GemFile name with camelcase
- 'engines/web/Gemfile'
## OFN SETTINGS
#
# Cop settings that have been agreed upon by the OFN community
Style/Documentation:
Enabled: false
Style/StringLiterals:
Enabled: false
Style/HashSyntax:
Enabled: true
EnforcedStyle: ruby19_no_mixed_keys
Style/Send:
Enabled: true
Layout/MultilineMethodCallIndentation:
Enabled: true
EnforcedStyle: indented
Layout/LineLength:
Max: 100
Lint/RaiseException:
Enabled: true
Lint/StructNewOverride:
Enabled: true
## TEMPORARY/CONTESTED SETTINGS
#
# These are still to be decided upon, but recommended for inclusion by
# oeoeaio after scrutinising offenses the codebase
# Don't think this is a big issue, mostly picking up RPSEC scope definitions
# with lamdas and RSpec '.to change{}' blocks
Lint/AmbiguousBlockAssociation:
Enabled: false
# Heaps of offences (> 100) in specs, mostly in situations where two or more
# instances of a model are required, but only one is referenced. Difficult to
# fix without making the spec look messy or rewriting it.
# Should definitely fix at some point.
Lint/UselessAssignment:
Exclude:
- spec/**/*
## Relaxed.Ruby.Style SETTINGS
#
# These styles are a starting point for the conversation around conventions
# They should be removed or tweaked and moved above as decisions are made
# NOTE: Cops which did not fail at the time of writing were removed
Layout/DotPosition:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#styledotposition
Layout/SpaceBeforeBlockBraces:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#stylespacebeforeblockbraces
Layout/SpaceInsideParens:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#stylespaceinsideparens
Style/Alias:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#stylealias
Style/BlockDelimiters:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#styleblockdelimiters
Style/CommentAnnotation:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#stylecommentannotation
Style/DoubleNegation:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#styledoublenegation
Style/FormatString:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#styleformatstring
Style/HashEachMethods:
Enabled: false
Style/HashTransformKeys:
Enabled: false
Style/HashTransformValues:
Enabled: false
Style/IfUnlessModifier:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#styleifunlessmodifier
Style/Lambda:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#stylelambda
Style/MultilineBlockChain:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#stylemultilineblockchain
Style/NegatedIf:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#stylenegatedif
Style/NegatedWhile:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#stylenegatedwhile
Style/ParallelAssignment:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#styleparallelassignment
Style/PercentLiteralDelimiters:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#stylepercentliteraldelimiters
Style/Semicolon:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#stylesemicolon
Style/SingleLineMethods:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#stylesinglelinemethods
Style/TrailingCommaInArguments:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#styletrailingcommainarguments
Style/TrailingCommaInArrayLiteral:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#styletrailingcommainliteral
Style/TrailingCommaInHashLiteral:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#styletrailingcommainliteral
Style/WordArray:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#stylewordarray
Style/SymbolArray:
Enabled: false
StyleGuide: https://rubocop.readthedocs.io/en/latest/cops_style/#stylesymbolarray
Lint/AmbiguousRegexpLiteral:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#lintambiguousregexpliteral
Lint/AssignmentInCondition:
Enabled: false
StyleGuide: http://relaxed.ruby.style/#lintassignmentincondition
Metrics/AbcSize:
Max: 15
Metrics/BlockLength:
Max: 25
ExcludedMethods: [
"class_eval",
"collection",
"context",
"describe",
"feature",
"it",
"member",
"namespace",
"resource",
"resources",
"scenario"
]
Metrics/BlockNesting:
Max: 3
Metrics/ClassLength:
Max: 100
Metrics/ModuleLength:
Max: 100
Metrics/CyclomaticComplexity:
Max: 6
Metrics/MethodLength:
Max: 10
Metrics/ParameterLists:
Max: 5
Metrics/PerceivedComplexity:
Max: 7

1480
.rubocop_todo.yml Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -1 +1 @@
1.9.3-p392
2.3.7

3
.scss-lint.yml Normal file
View File

@@ -0,0 +1,3 @@
scss_files: 'app/assets/stylesheets/**/*.css.scss'
exclude: 'app/assets/stylesheets/shared/**'

View File

@@ -1,15 +0,0 @@
language: ruby
bundler_args: --without development
rvm:
- "1.9.3"
services: postgresql
before_install:
before_script:
- cp config/database.travis.yml config/database.yml
- psql -c 'create database open_food_network_test;' -U postgres
- cp config/application.yml.example config/application.yml
script:
- RAILS_ENV=test bundle exec rake db:migrate --trace
- bundle exec rake spec
notifications:
email: false

8
.tx/config Normal file
View File

@@ -0,0 +1,8 @@
[main]
host = https://www.transifex.com
[open-food-network.enyml]
file_filter = config/locales/<lang>.yml
source_lang = en
type = YML

65
CONTRIBUTING.md Normal file
View File

@@ -0,0 +1,65 @@
# Contributing
We love pull requests from everyone. Any contribution is valuable!
If you have some time and are interested in working on some issues please make yourself known on the [#dev][slack-dev] channel on Slack.
We have curated all issues we consider to be a good starting point for new members of the community within the [Welcome New Developers project board][welcome-dev]. Have a look and pick the one you would prefer working on!
## Set up
Please follow the [GETTING_STARTED](GETTING_STARTED.md) guide to set up your local dev environment.
This guide assumes that the git remote name of the main repo is `upstream` and that your fork is named `origin`.
Create a new branch on your local machine to make your changes against (based on `upstream/master`):
git checkout -b branch-name-here --no-track upstream/master
If you want to run the whole test suite, we recommend using a free CI service to run your tests in parallel. Running the whole suite locally in series is likely to take > 40 minutes. [TravisCI][travis] and [SemaphoreCI][semaphore] both work great in our experience. Either way, make sure the tests pass on your new branch:
bundle exec rspec spec
## Internationalisation (i18n)
The locale `en` is maintained in the source code, but other locales are managed at [Transifex][ofn-transifex]. Read more about [internationalisation][i18n] in the developer wiki.
## Making a change
Make your changes to the codebase. We recommend using TDD. Add a test, make changes and get the test suite back to green.
bundle exec rspec spec
Once the tests are passing you can commit your changes. See [Making a great commit][great-commit] for more tips.
git add .
git commit -m "Add a concise commit message describing your change here"
Push your changes to a branch on your fork:
git push origin branch-name-here
## Submitting a Pull Request
Use the GitHub UI to submit a [new pull request][pr] against upstream/master. To increase the chances that your pull request is swiftly accepted please have a look at our guide to [making a great pull request][great-pr].
TL;DR:
* Write tests
* Make sure the whole test suite is passing
* Keep your PR small, with a single focus
* Maintain a clean commit history
* Use a style consistent with the rest of the codebase
* Before submitting, [rebase your work][rebase] on the current master branch
From here, your pull request will progress through the [Review, Test, Merge & Deploy process][process].
[pr]: https://github.com/openfoodfoundation/openfoodnetwork/compare/
[great-pr]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Making-a-great-pull-request
[great-commit]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Making-a-great-commit
[process]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/The-process-of-review%2C-test%2C-merge-and-deploy
[rebase]: https://www.atlassian.com/git/tutorials/merging-vs-rebasing/workflow-walkthrough
[travis]: https://travis-ci.org/
[semaphore]: https://semaphoreci.com/
[slack-dev]: https://openfoodnetwork.slack.com/messages/C2GQ45KNU
[ofn-transifex]: https://www.transifex.com/open-food-foundation/open-food-network/
[i18n]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/i18n
[welcome-dev]: https://github.com/openfoodfoundation/openfoodnetwork/projects/27

62
DOCKER.md Normal file
View File

@@ -0,0 +1,62 @@
### Docker
It is possible to setup the Open Food Network app easily with Docker and Docker Compose.
The objective is to spare configuration time, in order to help people testing the app and contribute to it.
It can also be used as documentation. It is not perfect but it is used in many other projects and many devs are used to it nowadays.
### Install Docker
Please check the documentation here, https://docs.docker.com/install/ to install Docker.
For Docker Compose, information are here: https://docs.docker.com/compose/install/.
Better to have at least 2GB free on your computer in order to download images and create containers for Open Food Network app.
### Use Docker with Open Food Network
Open a terminal with a shell.
Clone the repository. If you're planning on contributing code to the project (which we [LOVE](CONTRIBUTING.md)), it is a good idea to begin by forking this repo using the Fork button in the top-right corner of this screen. You should then be able to use git clone to copy your fork onto your local machine.
```sh
$ git clone https://github.com/YOUR_GITHUB_USERNAME_HERE/openfoodnetwork
```
Otherwise, if you just want to get things running, clone from the OFN main repo:
```sh
$ git clone git@github.com:openfoodfoundation/openfoodnetwork.git
```
Go at the root of the app:
```sh
$ cd openfoodnetwork
```
Download the Docker images and build the containers:
```sh
$ docker-compose build
```
Setup the database and seed it with sample data:
```sh
$ docker-compose run web bundle exec rake db:reset
$ docker-compose run web bundle exec rake db:test:prepare
$ docker-compose run web bundle exec rake ofn:sample_data
```
Finally, run the app with all the required containers:
```sh
$ docker-compose up
```
The default admin user is 'ofn@example.com' with 'ofn123' password.
Check the app in the browser at `http://localhost:3000`.
You will then get the trace of the containers in the terminal. You can stop the containers using Ctrl-C in the terminal.
You can find some useful tips and commands [here](https://github.com/openfoodfoundation/openfoodnetwork/wiki/Docker:-useful-tips-and-commands).

47
Dockerfile Normal file
View File

@@ -0,0 +1,47 @@
FROM ubuntu:18.04
# Install all the requirements
RUN apt-get update && apt-get install -y curl git build-essential software-properties-common wget zlib1g-dev libssl1.0-dev libreadline-dev libyaml-dev libffi-dev libxml2-dev libxslt1-dev wait-for-it imagemagick unzip
# Setup ENV variables
ENV PATH /usr/local/src/rbenv/shims:/usr/local/src/rbenv/bin:$PATH
ENV RBENV_ROOT /usr/local/src/rbenv
ENV CONFIGURE_OPTS --disable-install-doc
ENV BUNDLE_PATH /bundles
WORKDIR /usr/src/app
COPY .ruby-version .
# Install Rbenv & Ruby
RUN git clone --depth 1 --branch v1.1.2 https://github.com/rbenv/rbenv.git ${RBENV_ROOT} && \
git clone --depth 1 --branch v20200520 https://github.com/rbenv/ruby-build.git ${RBENV_ROOT}/plugins/ruby-build && \
${RBENV_ROOT}/plugins/ruby-build/install.sh && \
echo 'eval "$(rbenv init -)"' >> /etc/profile.d/rbenv.sh && \
rbenv install $(cat .ruby-version) && \
rbenv global $(cat .ruby-version) && \
gem install bundler --version=1.17.2
# Install Postgres
RUN sh -c "echo 'deb https://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main' > /etc/apt/sources.list.d/pgdg.list" && \
wget --quiet -O - https://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | apt-key add - && \
apt-get update && \
apt-get install -yqq --no-install-recommends postgresql-client-9.5 libpq-dev
# Install node
RUN apt-get install -y nodejs
# Install Chrome
RUN wget --quiet -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
sh -c "echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' >> /etc/apt/sources.list.d/google-chrome.list" && \
apt-get update && \
apt-get install -fy google-chrome-stable
# Install Chromedriver
RUN wget https://chromedriver.storage.googleapis.com/2.41/chromedriver_linux64.zip && \
unzip chromedriver_linux64.zip -d /usr/bin && \
chmod u+x /usr/bin/chromedriver
# Copy code and install app dependencies
COPY . /usr/src/app/
# Run bundler install in parallel with the amount of available CPUs
RUN bundle install --jobs="$(nproc)"

123
GETTING_STARTED.md Normal file
View File

@@ -0,0 +1,123 @@
### Getting Started
This is a general guide to setting up an Open Food Network **development environment on your local machine**. If you want to setup OFN on a server, please have a look at the [ofn-install deployment guide](https://github.com/openfoodfoundation/ofn-install/wiki).
### Requirements
The fastest way to make it work locally is to use Docker, you only need to setup git, see the [Docker setup guide](DOCKER.md).
Otherwise, for a local setup you will need:
* Ruby 2.3.7 and bundler
* PostgreSQL database
* Chrome (for testing)
The following guides will provide OS-specific step-by-step instructions to get these requirements installed:
- [Ubuntu Setup Guide][ubuntu]
- [OSX Setup Guide][osx]
If you are likely to need to manage multiple version of ruby on your local machine, we recommend version managers such as [rbenv](https://github.com/rbenv/rbenv) or [RVM](https://rvm.io/).
For those new to Rails, the following tutorial will help get you up to speed with configuring a [Rails environment](http://guides.rubyonrails.org/getting_started.html).
### Get it
If you're planning on contributing code to the project (which we [LOVE](CONTRIBUTING.md)), it is a good idea to begin by forking this repo using the `Fork` button in the top-right corner of this screen. You should then be able to use `git clone` to copy your fork onto your local machine.
git clone https://github.com/YOUR_GITHUB_USERNAME_HERE/openfoodnetwork
Jump into your new local copy of the Open Food Network:
cd openfoodnetwork
And then add an `upstream` remote that points to the main repo:
git remote add upstream https://github.com/openfoodfoundation/openfoodnetwork
Fetch the latest version of `master` from `upstream` (ie. the main repo):
git fetch upstream master
### Get it running
First, you need to create the database user the app will use by manually typing the following in your terminal:
```sh
$ sudo -u postgres psql -c "CREATE USER ofn WITH SUPERUSER CREATEDB PASSWORD 'f00d'"
```
This will create the "ofn" user as superuser and allowing it to create databases. If this command fails, check the [troubleshooting section](#creating-the-database) for an alternative.
Once done, run `script/setup`. If the script succeeds you're ready to start developing. If not, take a look at the output as it should be informative enough to help you troubleshoot.
Now, your dreams of spinning up a development server can be realised:
bundle exec rails server
Go to [http://localhost:3000](http://localhost:3000) to play around!
To login as the default user, use:
email: ofn@example.com
password: ofn123
### Testing
Tests, both unit and integration, are based on RSpec. To run the test suite, first prepare the test database:
bundle exec rake db:test:prepare
Then the main application tests can be run with:
bundle exec rspec spec
The tests of all custom engines can be run with:
bundle exec rake ofn:specs:engines:rspec
Note: If your OS is not explicitly supported in the setup guides then not all tests may pass. However, you may still be able to develop.
Note: The time zone on your machine should match the one defined in `config/application.yml`.
The project is configured to use [Zeus][zeus] to reduce the pre-test startup time while Rails loads. See the [Zeus GitHub page][zeus] for usage instructions.
Once [npm dependencies are installed][karma], AngularJS tests can be run with:
./script/karma run
If you want karma to automatically rerun the tests on file modification, use:
./script/karma start
### Multilingual
Do not forget to run `rake tmp:cache:clear` after locales are updated to reload I18n js translations.
### Rubocop
The project is configured to use [rubocop][rubocop] to automatically check for style and syntax errors.
You can run rubocop against your changes using:
rubocop
### Troubleshooting
Below are fixes to potential issues that can happen during the installation process. If these don't solve the problem, or it's not listed, feel free to reach out to the [Developer Community][slack-dev] on slack. We usually respond pretty quickly.
#### Creating the database
If the ```$ sudo -u postgres psql -c "CREATE USER ofn WITH SUPERUSER CREATEDB PASSWORD 'f00d'"``` command doesn't work, you can run the following commands instead:
```
$ createuser --superuser --pwprompt ofn
Enter password for new role: f00d
Enter it again: f00d
$ createdb open_food_network_dev --owner=ofn
$ createdb open_food_network_test --owner=ofn
```
If these commands succeed, you should be able to [continue the setup process](#get-it-running).
[developer-wiki]: https://github.com/openfoodfoundation/openfoodnetwork/wiki
[osx]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Development-Environment-Setup:-OS-X
[ubuntu]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Development-Environment-Setup:-Ubuntu
[wiki]: https://github.com/openfoodfoundation/openfoodnetwork/wiki
[zeus]: https://github.com/burke/zeus
[rubocop]: https://rubocop.readthedocs.io/en/latest/
[karma]: https://github.com/openfoodfoundation/openfoodnetwork/wiki/Karma
[slack-dev]: https://openfoodnetwork.slack.com/messages/C2GQ45KNU

219
Gemfile
View File

@@ -1,117 +1,180 @@
source 'https://rubygems.org'
ruby "1.9.3"
ruby "2.3.7"
git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
gem 'rails', '3.2.21'
gem 'rails-i18n', '~> 3.0.0'
gem 'i18n', '~> 0.6.11'
gem 'i18n-js', '~> 3.7.1'
gem 'rails', '~> 4.0.13'
gem 'rails-i18n', '~> 4.0'
gem 'rails_safe_tasks', '~> 1.0'
gem 'pg'
gem 'spree', :github => 'openfoodfoundation/spree', :branch => '1-3-stable'
gem 'spree_i18n', :github => 'spree/spree_i18n', :branch => '1-3-stable'
gem 'spree_auth_devise', :github => 'spree/spree_auth_devise', :branch => '1-3-stable'
gem "activerecord-import"
# Waiting on merge of PR #117
# https://github.com/spree-contrib/better_spree_paypal_express/pull/117
gem 'spree_paypal_express', :github => "openfoodfoundation/better_spree_paypal_express", :branch => "1-3-stable"
#gem 'spree_paypal_express', :github => "spree-contrib/better_spree_paypal_express", :branch => "1-3-stable"
gem "catalog", path: "./engines/catalog"
gem 'dfc_provider', path: './engines/dfc_provider'
gem "order_management", path: "./engines/order_management"
gem 'web', path: './engines/web'
gem 'activerecord-postgresql-adapter'
gem 'pg', '~> 0.21.0'
# OFN-maintained and patched version of Spree v2.0.4. See
# https://github.com/openfoodfoundation/openfoodnetwork/wiki/Tech-Doc:-OFN's-Spree-fork%F0%9F%8D%B4
# for details.
gem 'spree_core', github: 'openfoodfoundation/spree', branch: '2-1-0-stable'
### Dependencies brought from spree core
gem 'acts_as_list', '= 0.2.0'
gem 'awesome_nested_set', '~> 3.0.0.rc.1'
gem 'cancan', '~> 1.6.10'
gem 'ffaker', '~> 1.16'
gem 'highline', '= 1.6.18' # Necessary for the install generator
gem 'httparty', '~> 0.18' # Used to check alerts in spree_core, this is not used in OFN.
gem 'json', '>= 1.7.7'
gem 'money', '5.1.1'
gem 'paranoia', '~> 2.0'
gem 'ransack', '~> 1.8.10'
gem 'state_machine', '1.2.0'
gem 'stringex', '~> 1.5.1'
gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
# Our branch contains two changes
# - Pass customer email and phone number to PayPal (merged to upstream master)
# - Change type of password from string to password to hide it in the form
gem 'spree_paypal_express', github: 'openfoodfoundation/better_spree_paypal_express', branch: '2-1-0-stable'
gem 'stripe'
# We need at least this version to have Digicert's root certificate
# which is needed for Pin Payments (and possibly others).
gem 'activemerchant', '~> 1.78.0'
gem 'devise', '~> 3.5.10' # v4.0.0 needs rails 4.1
gem 'devise-encryptable'
gem 'devise-token_authenticatable', '~> 0.4.10' # v0.5.0 needs devise v4
gem 'jwt', '~> 2.2'
gem 'oauth2', '~> 1.4.4' # Used for Stripe Connect
gem 'delayed_job_active_record'
gem 'daemons'
gem 'comfortable_mexican_sofa'
gem 'delayed_job_active_record'
gem 'delayed_job_web'
# Fix bug in simple_form preventing collection_check_boxes usage within form_for block
# When merged, revert to upstream gem
gem 'simple_form', :github => 'RohanM/simple_form'
# Spree's default pagination gem (locked to the current version used by Spree)
# We use it's methods in OFN code as well, so this is a direct dependency
gem 'kaminari', '~> 0.14.1'
gem 'unicorn'
gem 'angularjs-rails', '1.2.13'
gem 'bugsnag'
gem 'newrelic_rpm'
gem 'haml'
gem 'sass', "~> 3.3"
gem 'sass-rails', '~> 3.2.3', groups: [:default, :assets]
gem 'aws-sdk'
gem 'db2fog'
gem 'andand'
gem 'truncate_html'
gem 'representative_view'
gem 'rabl'
gem "active_model_serializers"
gem 'oj'
gem 'deface', :github => 'spree/deface', :ref => '1110a13'
gem 'paperclip'
gem 'angularjs-rails', '1.5.5'
gem 'aws-sdk', '1.11.1' # temporarily locked down due to https://github.com/aws/aws-sdk-ruby/issues/273
gem 'bugsnag'
gem 'db2fog'
gem 'haml'
gem 'redcarpet'
gem 'sass'
gem 'sass-rails'
gem 'truncate_html', '0.9.2'
gem 'unicorn'
gem 'actionpack-action_caching'
# AMS 0.9.x and 0.10.x are very different from 0.8.4 and the upgrade is not straight forward
# AMS is deprecated, we will introduce an alternative at some point
gem "active_model_serializers", "0.8.4"
gem 'activerecord-session_store'
gem 'acts-as-taggable-on', '~> 4.0'
gem 'angularjs-file-upload-rails', '~> 2.4.1'
gem 'custom_error_message', github: 'jeremydurham/custom-err-msg'
gem 'dalli'
gem 'diffy'
gem 'figaro'
gem 'geocoder'
gem 'gmaps4rails'
gem 'spinjs-rails'
gem 'rack-ssl', :require => 'rack/ssl'
gem 'custom_error_message', :github => 'jeremydurham/custom-err-msg'
gem 'angularjs-file-upload-rails', '~> 1.1.0'
gem 'roadie-rails', '~> 1.0.3'
gem 'figaro'
gem 'acts-as-taggable-on', '~> 3.4'
gem 'oj'
gem 'paper_trail', '~> 5.2.3'
gem 'paperclip', '~> 3.4.1'
gem 'rack-rewrite'
gem 'rack-ssl', require: 'rack/ssl'
gem 'roadie-rails', '~> 1.3.0'
gem 'combine_pdf'
gem 'wicked_pdf'
gem 'wkhtmltopdf-binary'
gem 'foreigner'
gem 'immigrant'
gem 'roo', '~> 2.8.3'
gem 'whenever', require: false
# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'compass-rails'
gem 'coffee-rails', '~> 3.2.1'
gem 'test-unit', '~> 3.3'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'therubyracer'
gem 'coffee-rails', '~> 4.2.2'
gem 'compass-rails'
gem 'uglifier', '>= 1.0.3'
gem 'mini_racer', '0.2.15'
gem 'turbo-sprockets-rails3'
gem 'foundation-icons-sass-rails'
gem 'momentjs-rails'
gem 'angular-rails-templates', '~> 0.2.0'
gem 'uglifier', '>= 1.0.3'
gem 'angular-rails-templates', '~> 0.3.0'
gem 'foundation-icons-sass-rails'
gem 'momentjs-rails'
gem 'foundation-rails', '= 5.5.2.1'
gem 'jquery-migrate-rails'
gem 'jquery-rails', '3.1.5'
gem 'jquery-ui-rails', '~> 4.2'
gem 'select2-rails', '~> 3.4.7'
gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz', branch: 'ofn-rails-4'
group :production, :staging do
gem 'ddtrace'
gem 'unicorn-worker-killer'
end
gem "foundation-rails"
gem 'foundation_rails_helper', github: 'willrjmarshall/foundation_rails_helper', branch: "rails3"
gem 'jquery-rails'
group :test, :development do
# Pretty printed test output
gem 'turn', '~> 0.8.3', :require => false
gem 'fuubar'
gem 'rspec-rails'
gem 'shoulda-matchers'
gem 'factory_girl_rails', :require => false
gem 'capybara'
gem 'database_cleaner', '0.7.1', :require => false
gem 'simplecov', :require => false
gem 'atomic'
gem 'awesome_print'
gem 'letter_opener'
gem 'capybara', '>= 2.18.0' # 3.0 requires rack 1.6 that only works with Rails 4.2
gem 'database_cleaner', require: false
gem "factory_bot_rails", '4.10.0', require: false
gem 'fuubar', '~> 2.5.0'
gem 'json_spec', '~> 1.1.4'
gem 'knapsack'
gem 'letter_opener', '>= 1.4.1'
gem 'rspec-rails', ">= 3.5.2"
gem 'rspec-retry'
gem 'rswag'
gem 'selenium-webdriver'
gem 'shoulda-matchers'
gem 'timecop'
gem 'poltergeist'
gem 'json_spec'
gem 'unicorn-rails'
gem 'webdrivers'
end
group :test do
gem 'simplecov', require: false
gem 'webmock'
# See spec/spec_helper.rb for instructions
#gem 'perftools.rb'
# gem 'perftools.rb'
end
group :development do
gem 'pry-debugger'
gem 'byebug', '~> 11.0.0' # 11.1 requires ruby 2.4
gem 'debugger-linecache'
gem 'guard'
gem 'guard-livereload'
gem 'rack-livereload'
gem 'guard-rails'
gem 'guard-zeus'
gem 'guard-rspec'
gem 'parallel_tests'
gem "newrelic_rpm", "~> 3.0"
gem "pry", "~> 0.12.0" # pry 0.13 is not compatible with pry-byebug 3.7
gem 'pry-byebug', '~> 3.7.0' # 3.8 requires ruby 2.4
gem 'rubocop'
gem 'rubocop-rails'
gem 'spring'
gem 'spring-commands-rspec'
# 1.0.9 fixed openssl issues on macOS https://github.com/eventmachine/eventmachine/issues/602
# While we don't require this gem directly, no dependents forced the upgrade to a version
# greater than 1.0.9, so we just required the latest available version here.
gem 'eventmachine', '>= 1.2.3'
gem 'rack-mini-profiler', '< 3.0.0'
end

File diff suppressed because it is too large Load Diff

View File

@@ -1,50 +0,0 @@
# A sample Guardfile
# More info at https://github.com/guard/guard#readme
guard 'livereload' do
watch(%r{app/views/.+\.(erb|haml|slim)$})
watch(%r{app/helpers/.+\.rb})
watch(%r{public/.+\.(css|js|html)})
#watch(%r{config/locales/.+\.yml})
# Rails Assets Pipeline
watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html|png|jpg))).*}) { |m| "/assets/#{m[3]}" }
end
#guard 'rails' do
#watch('Gemfile.lock')
#watch(%r{^(config|lib)/.*})
#end
#guard 'zeus' do
## uses the .rspec file
## --colour --fail-fast --format documentation --tag ~slow
#watch(%r{^spec/.+_spec\.rb$})
#watch(%r{^app/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
#watch(%r{^app/(.+)\.haml$}) { |m| "spec/#{m[1]}.haml_spec.rb" }
#watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
#watch(%r{^app/controllers/(.+)_(controller)\.rb$}) { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/requests/#{m[1]}_spec.rb"] }
#end
#guard :rspec do
#watch(%r{^spec/.+_spec\.rb$})
#watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
#watch('spec/spec_helper.rb') { "spec" }
## Rails example
#watch(%r{^app/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
#watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$}) { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
#watch(%r{^app/controllers/(.+)_(controller)\.rb$}) { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
#watch(%r{^spec/support/(.+)\.rb$}) { "spec" }
#watch('config/routes.rb') { "spec/routing" }
#watch('app/controllers/application_controller.rb') { "spec/controllers" }
## Capybara features specs
#watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$}) { |m| "spec/features/#{m[1]}_spec.rb" }
## Turnip features and steps
#watch(%r{^spec/acceptance/(.+)\.feature$})
#watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
#end

View File

@@ -1 +0,0 @@
web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb

View File

@@ -1,97 +0,0 @@
[![Code Climate](https://codeclimate.com/github/openfoodfoundation/openfoodnetwork.png)](https://codeclimate.com/github/openfoodfoundation/openfoodnetwork)
# Open Food Network
The Open Food Network is an online marketplace for local food. It enables a network of independent online food stores that connect farmers and food hubs (including coops, online farmers' markets, independent food businesses etc); with individuals and local businesses. It gives farmers and food hubs an easier and fairer way to distribute their food.
Supported by the Open Food Foundation, we are proudly open source and not-for-profit - we're trying to seriously disrupt the concentration of power in global agri-food systems, and we need as many smart people working together on this as possible.
We're part of global movement - get involved!
* Fill in this short survey to tell us who you are and what you want to do with OFN: https://docs.google.com/a/eaterprises.com.au/forms/d/1zxR5vSiU9CigJ9cEaC8-eJLgYid8CR8er7PPH9Mc-30/edit#
* Find out more and join in the conversation - http://openfoodnetwork.org
## Dependencies
* Rails 3.2.x
* Ruby >= 1.9.3
* PostgreSQL database
* PhantomJS (for testing)
* See Gemfile for a list of gems required
## Get it
The source code is managed with Git (a version control system) and
hosted at GitHub.
You can view the code at:
https://github.com/openfoodfoundation/openfoodnetwork
You can download the source with the command:
git clone git@github.com:openfoodfoundation/openfoodnetwork
## Get it running
For those new to Rails, the following tutorial will help get you up to speed with configuring a Rails environment: http://guides.rubyonrails.org/getting_started.html .
First, check your dependencies: Ensure that you have Ruby 1.9.x installed:
ruby --version
Install the project's gem dependencies:
bundle install
Configure the site:
cp config/application.yml.example config/application.yml
edit config/application.yml
Create the development and test databases, using the settings specified in `config/database.yml`, and populate them with a schema and seed data:
rake db:setup
Load some default data for your environment:
rake openfoodnetwork:dev:load_sample_data
At long last, your dreams of spinning up a development server can be realised:
rails server
## Testing
Tests, both unit and integration, are based on RSpec. To run the test suite, first prepare the test database:
bundle exec rake db:test:prepare
Then the tests can be run with:
bundle exec rspec spec
The site is configured to use
[Zeus](https://github.com/burke/zeus) to reduce the pre-test
startup time while Rails loads. See the Zeus github page for
usage instructions.
## Credits
* Andrew Spinks (http://github.com/andrewspinks)
* Rohan Mitchell (http://github.com/rohanm)
* Rob Harrington (http://github.com/oeoeaio)
* Alex Serdyuk (http://github.com/alexs333)
* David Cook (http://github.com/dacook)
* Will Marshall (http://soundcloud.com/willmarshall)
* Laura Summers (https://github.com/summerscope)
* Maikel Linke (https://github.com/mkllnk)
## Licence
Copyright (c) 2012 - 2015 Open Food Foundation, released under the AGPL licence.

41
README.md Normal file
View File

@@ -0,0 +1,41 @@
[![Build Status](https://semaphoreci.com/api/v1/openfoodfoundation/openfoodnetwork-2/branches/master/badge.svg)](https://semaphoreci.com/openfoodfoundation/openfoodnetwork-2)
[![Code Climate](https://codeclimate.com/github/openfoodfoundation/openfoodnetwork.png)](https://codeclimate.com/github/openfoodfoundation/openfoodnetwork)
# Open Food Network
The Open Food Network is an online marketplace for local food. It enables a network of independent online food stores that connects farmers and food hubs (including co-ops, online farmers markets, independent food businesses, etc) with individuals and local businesses. It gives farmers and food hubs an easier and fairer way to distribute their food.
Supported by the Open Food Foundation and a network of global affiliates, we are proudly open source and not-for-profit - we're trying to seriously disrupt the concentration of power in global agri-food systems, and we need as many smart people working together on this as possible.
We're part of global movement - get involved!
* Join the conversation [on Slack][slack-invite]. Make sure you introduce yourself in the #general channel.
* Head to [https://openfoodnetwork.org](https://openfoodnetwork.org) for more information about the global OFN project.
* Check out the [User Guide](https://guide.openfoodnetwork.org/) for a list of features and tutorials.
* Join our [discussion forum](https://community.openfoodnetwork.org).
## Contributing
If you are interested in contributing to the OFN in any capacity, please introduce yourself [on Slack][slack-invite], and have a look through our [Contributor Guide][contributor-guide].
Our [GETTING_STARTED](GETTING_STARTED.md) and [CONTRIBUTING](CONTRIBUTING.md) guides are the best place to start for developers looking to set up a development environment and make contributions to the codebase.
## Provisioning
If you're interested in provisioning a server, see [ofn-install][ofn-install] for the project's Ansible playbooks.
We also have a [Super Admin Guide][super-admin-guide] to help with configuration of new servers.
## Testing
We use [BrowserStack](https://www.browserstack.com/) as a manual testing tool. BrowserStack provides open source projects with unlimited and free of charge accounts. A big thanks to them!
## Licence
Copyright (c) 2012 - 2020 Open Food Foundation, released under the AGPL licence.
[survey]: https://docs.google.com/a/eaterprises.com.au/forms/d/1zxR5vSiU9CigJ9cEaC8-eJLgYid8CR8er7PPH9Mc-30/edit#
[slack-invite]: https://join.slack.com/t/openfoodnetwork/shared_invite/zt-9sjkjdlu-r02kUMP1zbrTgUhZhYPF~A
[contributor-guide]: https://ofn-user-guide.gitbook.io/ofn-contributor-guide/who-are-we
[ofn-install]: https://github.com/openfoodfoundation/ofn-install
[super-admin-guide]: https://ofn-user-guide.gitbook.io/ofn-super-admin-guide

4
Rakefile Normal file → Executable file
View File

@@ -2,6 +2,8 @@
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
require File.expand_path('../config/application', __FILE__)
require_relative 'config/application'
Openfoodnetwork::Application.load_tasks
Knapsack.load_tasks if defined?(Knapsack)

Binary file not shown.

BIN
app/assets/fonts/OFN-v2.eot Normal file

Binary file not shown.

View File

@@ -0,0 +1,81 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>Generated by IcoMoon</metadata>
<defs>
<font id="OFN" horiz-adv-x="1024">
<font-face units-per-em="1024" ascent="960" descent="-64" />
<missing-glyph horiz-adv-x="1024" />
<glyph unicode="&#x20;" horiz-adv-x="512" d="" />
<glyph unicode="&#xe600;" glyph-name="uniE600" d="M521.6 960h-9.6c-278.4 0-505.6-224-512-502.4-3.2-137.6 48-265.6 144-364.8s224-153.6 358.4-156.8h9.6c278.4 0 505.6 224 512 502.4 3.2 137.6-48 265.6-144 364.8s-220.8 153.6-358.4 156.8zM512-28.8h-9.6c-128 3.2-246.4 54.4-332.8 144-89.6 92.8-134.4 211.2-134.4 339.2 6.4 259.2 220.8 470.4 476.8 470.4h9.6c128-3.2 246.4-54.4 332.8-144 89.6-92.8 134.4-211.2 134.4-339.2-6.4-259.2-220.8-470.4-476.8-470.4zM755.2 460.8l-441.6 9.6 214.4 208c6.4 6.4 6.4 19.2 0 25.6s-19.2 6.4-25.6 0l-259.2-249.6 12.8-16 236.8-246.4c3.2-3.2 9.6-6.4 12.8-6.4s9.6 3.2 12.8 6.4c6.4 6.4 6.4 19.2 0 25.6l-208 214.4 441.6-6.4c9.6 0 19.2 6.4 19.2 19.2 3.2 9.6-6.4 16-16 16z" />
<glyph unicode="&#xe601;" glyph-name="uniE601" d="M521.6 960h-9.6c-278.4 0-505.6-224-512-502.4-3.2-137.6 48-265.6 144-364.8s224-153.6 358.4-156.8h9.6c278.4 0 505.6 224 512 502.4 6.4 281.6-220.8 515.2-502.4 521.6zM512-25.6h-9.6c-128 3.2-246.4 54.4-332.8 144-89.6 92.8-134.4 211.2-134.4 339.2 6.4 256 220.8 464 476.8 464h9.6c262.4-3.2 470.4-220.8 464-483.2-3.2-256-217.6-464-473.6-464zM768 457.6l-236.8 246.4c-6.4 6.4-19.2 6.4-25.6 0s-6.4-19.2 0-25.6l208-214.4-444.8 6.4c-9.6 0-19.2-9.6-19.2-19.2s6.4-19.2 19.2-19.2l441.6-6.4-214.4-208c-6.4-6.4-6.4-19.2 0-25.6 3.2-3.2 9.6-6.4 12.8-6.4s9.6 3.2 12.8 6.4l259.2 249.6-12.8 16z" />
<glyph unicode="&#xe602;" glyph-name="uniE602" d="M521.6 960h-9.6c-278.4 0-505.6-224-512-502.4-6.4-281.6 220.8-515.2 502.4-521.6h9.6c278.4 0 505.6 224 512 502.4 6.4 281.6-220.8 515.2-502.4 521.6zM512-28.8h-9.6c-262.4 6.4-470.4 224-464 486.4 3.2 256 217.6 467.2 473.6 467.2h9.6c262.4-6.4 470.4-224 464-486.4-3.2-256-217.6-467.2-473.6-467.2zM729.6 700.8c-3.2 3.2-9.6 3.2-12.8 3.2-6.4 0-12.8-3.2-19.2-9.6l-252.8-358.4-124.8 121.6c-3.2 3.2-9.6 6.4-16 6.4-3.2 0-9.6 0-12.8-3.2-9.6-6.4-12.8-19.2-6.4-28.8l115.2-211.2s0-3.2 3.2-3.2c12.8-16 28.8-25.6 48-25.6 22.4 0 41.6 12.8 51.2 28.8l233.6 451.2c6.4 9.6 3.2 22.4-6.4 28.8z" />
<glyph unicode="&#xe603;" glyph-name="uniE603" d="M521.6 960h-9.6c-278.4 0-505.6-224-512-502.4-6.4-281.6 220.8-515.2 502.4-521.6h9.6c278.4 0 505.6 224 512 502.4 3.2 137.6-48 265.6-144 364.8s-220.8 153.6-358.4 156.8zM512-28.8h-9.6c-262.4 6.4-470.4 224-467.2 486.4 6.4 256 220.8 467.2 476.8 467.2h9.6c128-3.2 246.4-54.4 332.8-144 89.6-92.8 134.4-211.2 134.4-339.2-6.4-259.2-220.8-470.4-476.8-470.4zM678.4 633.6l-163.2-160-160 163.2c-6.4 6.4-19.2 6.4-25.6 0s-6.4-19.2 0-25.6l160-163.2-163.2-160c-6.4-6.4-6.4-19.2 0-25.6 3.2-3.2 9.6-6.4 12.8-6.4s9.6 3.2 12.8 6.4l163.2 160 160-163.2c3.2-3.2 9.6-6.4 12.8-6.4s9.6 3.2 12.8 6.4c6.4 6.4 6.4 19.2 0 25.6l-160 163.2 163.2 160c6.4 6.4 6.4 19.2 0 25.6-9.6 6.4-19.2 6.4-25.6 0z" />
<glyph unicode="&#xe604;" glyph-name="uniE604" d="M883.2 646.4c-12.8 12.8-35.2 12.8-48 0l-326.4-320-316.8 320c-12.8 12.8-35.2 12.8-48 0s-12.8-35.2 0-48l336-345.6c3.2-3.2 9.6-9.6 22.4-9.6h6.4c6.4 0 16 3.2 22.4 9.6l352 345.6c6.4 6.4 9.6 16 9.6 25.6 0 6.4-3.2 12.8-9.6 22.4z" />
<glyph unicode="&#xe605;" glyph-name="uniE605" d="M947.2 272l-400 406.4c-3.2 3.2-12.8 12.8-25.6 12.8h-6.4c-9.6 0-19.2-3.2-25.6-12.8l-416-406.4c-6.4-6.4-9.6-16-9.6-25.6s3.2-22.4 12.8-28.8c6.4-6.4 19.2-12.8 28.8-12.8s19.2 3.2 28.8 12.8l387.2 377.6 371.2-377.6c6.4-6.4 19.2-12.8 28.8-12.8s19.2 3.2 28.8 12.8c12.8 12.8 12.8 38.4-3.2 54.4z" />
<glyph unicode="&#xe606;" glyph-name="uniE606" d="M755.2 441.6c0 9.6-3.2 19.2-12.8 25.6l-406.4 416c-16 16-41.6 16-57.6 0s-16-41.6 0-57.6l377.6-387.2-377.6-368c-6.4-6.4-12.8-19.2-12.8-28.8s3.2-22.4 12.8-28.8c9.6-9.6 19.2-12.8 28.8-12.8s19.2 3.2 28.8 12.8l406.4 400c12.8 9.6 16 22.4 12.8 28.8z" />
<glyph unicode="&#xe607;" glyph-name="uniE607" d="M745.6 70.4l-380.8 371.2 380.8 387.2c16 16 16 41.6 0 57.6s-41.6 12.8-57.6 0l-406.4-416c-6.4-6.4-9.6-16-12.8-25.6 0-9.6 0-19.2 12.8-32l406.4-400c6.4-6.4 16-12.8 28.8-12.8 9.6 0 22.4 3.2 28.8 12.8 6.4 6.4 12.8 19.2 12.8 28.8-3.2 9.6-6.4 19.2-12.8 28.8z" />
<glyph unicode="&#xe608;" glyph-name="uniE608" d="M876.8 128l-320 316.8 320 326.4c12.8 12.8 12.8 35.2 0 48s-35.2 12.8-48 0l-316.8-326.4-316.8 326.4c-12.8 12.8-35.2 12.8-48 0s-12.8-35.2 0-48l320-326.4-320-316.8c-6.4-6.4-9.6-16-9.6-25.6s3.2-19.2 9.6-25.6c12.8-12.8 35.2-12.8 48 0l316.8 313.6 316.8-313.6c6.4-6.4 16-9.6 22.4-9.6 9.6 0 19.2 3.2 25.6 9.6s9.6 16 9.6 25.6c3.2 9.6-3.2 19.2-9.6 25.6z" />
<glyph unicode="&#xe609;" glyph-name="uniE609" d="M521.6 624c-96 0-176-80-176-176s80-176 176-176 176 80 176 176-76.8 176-176 176zM521.6 560c60.8 0 112-51.2 112-112s-51.2-112-112-112-112 51.2-112 112 51.2 112 112 112z" />
<glyph unicode="&#xe60a;" glyph-name="uniE60A" d="M531.2 928c25.6 0 48-9.6 64-25.6 19.2-19.2 25.6-38.4 25.6-64s-9.6-48-25.6-64c-19.2-19.2-38.4-25.6-64-25.6s-48 9.6-64 25.6c-19.2 19.2-25.6 38.4-25.6 64s9.6 48 25.6 64c19.2 16 38.4 25.6 64 25.6zM246.4 793.6c22.4 0 41.6-6.4 57.6-22.4s22.4-35.2 22.4-57.6-6.4-41.6-22.4-57.6c-16-16-35.2-22.4-57.6-22.4s-41.6 6.4-57.6 22.4c-16 16-22.4 35.2-22.4 57.6s6.4 41.6 22.4 57.6c16 16 35.2 22.4 57.6 22.4zM819.2 732.8c6.4 0 9.6-3.2 12.8-6.4s6.4-6.4 6.4-12.8-3.2-9.6-6.4-12.8c-3.2-3.2-6.4-6.4-12.8-6.4s-9.6 3.2-12.8 6.4c-3.2 3.2-6.4 6.4-6.4 12.8s3.2 9.6 6.4 12.8c3.2 6.4 6.4 6.4 12.8 6.4zM121.6 499.2c19.2 0 35.2-6.4 51.2-19.2 12.8-16 19.2-32 19.2-51.2s-6.4-35.2-19.2-51.2c-12.8-12.8-28.8-19.2-51.2-19.2-19.2 0-35.2 6.4-51.2 19.2-12.8 12.8-19.2 28.8-19.2 51.2 0 19.2 6.4 35.2 19.2 51.2 16 12.8 32 19.2 51.2 19.2zM940.8 457.6c9.6 0 16-3.2 22.4-9.6s9.6-12.8 9.6-22.4c0-9.6-3.2-16-9.6-22.4s-12.8-9.6-22.4-9.6c-9.6 0-16 3.2-22.4 9.6s-9.6 12.8-9.6 22.4c0 9.6 3.2 16 9.6 22.4 9.6 6.4 16 9.6 22.4 9.6zM246.4 201.6c16 0 28.8-6.4 41.6-19.2s19.2-25.6 19.2-41.6-6.4-32-19.2-41.6c-12.8-12.8-25.6-19.2-41.6-19.2s-32 6.4-41.6 16c-12.8 12.8-16 25.6-16 41.6s6.4 32 16 41.6c9.6 16 22.4 22.4 41.6 22.4zM819.2 179.2c12.8 0 19.2-3.2 28.8-12.8s12.8-16 12.8-28.8c0-9.6-3.2-19.2-12.8-28.8s-16-12.8-28.8-12.8c-9.6 0-19.2 3.2-28.8 12.8s-12.8 16-12.8 28.8 3.2 19.2 12.8 28.8c9.6 9.6 19.2 12.8 28.8 12.8zM531.2 67.2c12.8 0 25.6-3.2 35.2-16 9.6-9.6 16-22.4 16-35.2s-3.2-25.6-16-35.2c-9.6-9.6-22.4-16-35.2-16s-25.6 3.2-35.2 16c-9.6 9.6-16 22.4-16 35.2s3.2 25.6 16 35.2c9.6 12.8 22.4 16 35.2 16zM531.2 960c-35.2 0-64-12.8-86.4-35.2s-35.2-54.4-35.2-86.4c0-35.2 12.8-64 35.2-86.4s54.4-35.2 86.4-35.2c35.2 0 64 12.8 86.4 35.2s35.2 54.4 35.2 86.4c0 35.2-12.8 64-35.2 86.4s-51.2 35.2-86.4 35.2zM246.4 825.6c-32 0-57.6-9.6-80-32s-32-48-32-80 9.6-57.6 32-80 48-32 80-32 57.6 9.6 80 32 32 48 32 80-9.6 57.6-32 80-48 32-80 32zM819.2 764.8c-12.8 0-25.6-6.4-35.2-16s-16-19.2-16-35.2c0-12.8 6.4-25.6 16-35.2s22.4-16 35.2-16 25.6 6.4 35.2 16c9.6 9.6 16 22.4 16 35.2s-6.4 25.6-16 35.2c-9.6 12.8-22.4 16-35.2 16zM121.6 531.2c-28.8 0-51.2-9.6-73.6-28.8-16-22.4-28.8-48-28.8-73.6s9.6-51.2 28.8-73.6c19.2-19.2 44.8-28.8 73.6-28.8s51.2 9.6 73.6 28.8c19.2 19.2 28.8 44.8 28.8 73.6s-9.6 51.2-28.8 70.4c-19.2 19.2-44.8 32-73.6 32zM940.8 489.6c-16 0-32-6.4-44.8-19.2s-19.2-25.6-19.2-44.8c0-16 6.4-32 19.2-44.8s25.6-19.2 44.8-19.2c16 0 32 6.4 44.8 19.2s19.2 25.6 19.2 44.8c0 16-6.4 32-19.2 44.8s-25.6 19.2-44.8 19.2zM246.4 233.6c-25.6 0-48-9.6-64-25.6-19.2-19.2-25.6-38.4-25.6-64s9.6-48 25.6-64c19.2-19.2 38.4-25.6 64-25.6s48 9.6 64 25.6c19.2 19.2 28.8 38.4 28.8 64s-9.6 48-28.8 64c-19.2 16-38.4 25.6-64 25.6zM819.2 211.2c-19.2 0-35.2-6.4-51.2-22.4-12.8-12.8-22.4-32-22.4-51.2s6.4-35.2 22.4-51.2c12.8-12.8 32-22.4 51.2-22.4s35.2 6.4 51.2 22.4c12.8 12.8 22.4 32 22.4 51.2s-6.4 35.2-22.4 51.2c-16 16-32 22.4-51.2 22.4zM531.2 99.2c-22.4 0-41.6-6.4-57.6-22.4s-25.6-35.2-25.6-57.6 6.4-41.6 25.6-57.6c16-16 35.2-22.4 57.6-22.4s41.6 6.4 57.6 22.4c16 16 25.6 35.2 25.6 57.6s-6.4 41.6-25.6 57.6c-12.8 16-35.2 22.4-57.6 22.4z" />
<glyph unicode="&#xe60b;" glyph-name="uniE60B" d="M867.2-22.4h-710.4c-60.8 0-112 25.6-137.6 70.4-25.6 48-22.4 105.6 9.6 163.2l358.4 620.8c32 57.6 76.8 86.4 124.8 86.4s92.8-32 124.8-86.4l358.4-620.8c32-57.6 35.2-118.4 9.6-163.2s-73.6-70.4-137.6-70.4zM512 886.4c-35.2 0-70.4-25.6-96-70.4l-361.6-620.8c-25.6-48-32-96-9.6-131.2 19.2-35.2 60.8-54.4 108.8-54.4h713.6c51.2 0 89.6 19.2 108.8 54.4 22.4 35.2 16 83.2-9.6 131.2l-358.4 620.8c-25.6 44.8-60.8 70.4-96 70.4zM512 329.6c-9.6 0-16 6.4-16 16v294.4c0 9.6 6.4 16 16 16s16-6.4 16-16v-294.4c0-9.6-6.4-16-16-16zM508.8 137.6c-32 0-60.8 25.6-60.8 60.8s25.6 60.8 60.8 60.8 60.8-25.6 60.8-60.8-25.6-60.8-60.8-60.8zM508.8 227.2c-16 0-28.8-12.8-28.8-28.8s12.8-28.8 28.8-28.8 28.8 12.8 28.8 28.8-12.8 28.8-28.8 28.8z" />
<glyph unicode="&#xe60c;" glyph-name="uniE60C" d="M521.6 960h-9.6c-278.4 0-505.6-224-512-502.4-6.4-281.6 220.8-515.2 502.4-521.6h9.6c278.4 0 505.6 224 512 502.4 6.4 281.6-220.8 515.2-502.4 521.6zM512-28.8h-9.6c-262.4 6.4-470.4 224-464 486.4 3.2 256 217.6 467.2 473.6 467.2h9.6c262.4-6.4 470.4-224 464-486.4-3.2-256-217.6-467.2-473.6-467.2zM483.2 345.6v32c0 12.8 3.2 25.6 6.4 35.2s12.8 19.2 19.2 28.8 16 19.2 25.6 25.6c9.6 9.6 19.2 16 25.6 25.6 9.6 9.6 16 19.2 19.2 28.8 6.4 9.6 6.4 22.4 6.4 35.2 0 9.6 0 22.4-3.2 32s-9.6 19.2-16 25.6c-6.4 6.4-16 12.8-25.6 16 0 9.6-12.8 9.6-25.6 9.6-25.6 0-44.8-9.6-60.8-28.8s-25.6-44.8-25.6-73.6h-44.8c0 22.4 3.2 38.4 9.6 57.6s16 32 28.8 44.8c12.8 12.8 25.6 22.4 41.6 28.8s32 9.6 51.2 9.6c22.4 0 41.6-3.2 57.6-9.6s28.8-16 38.4-25.6c9.6-9.6 16-22.4 22.4-38.4 3.2-12.8 6.4-28.8 6.4-44.8 0-12.8-3.2-25.6-6.4-38.4-6.4-9.6-9.6-22.4-19.2-32-6.4-9.6-16-19.2-25.6-28.8s-16-19.2-25.6-25.6l-19.2-28.8c-6.4-9.6-6.4-22.4-6.4-35.2v-28.8h-54.4zM512 185.6c-32 0-60.8 25.6-60.8 60.8s25.6 60.8 60.8 60.8 60.8-25.6 60.8-60.8-28.8-60.8-60.8-60.8zM512 272c-16 0-28.8-12.8-28.8-28.8s12.8-28.8 28.8-28.8 28.8 12.8 28.8 28.8-12.8 28.8-28.8 28.8z" />
<glyph unicode="&#xe60d;" glyph-name="uniE60D" d="M960 192c19.2 0 32-12.8 32-32s-12.8-32-32-32h-896c-19.2 0-32 12.8-32 32s12.8 32 32 32h896zM960 224h-896c-35.2 0-64-28.8-64-64s28.8-64 64-64h896c35.2 0 64 28.8 64 64s-28.8 64-64 64zM960 480c19.2 0 32-12.8 32-32s-12.8-32-32-32h-896c-19.2 0-32 12.8-32 32s12.8 32 32 32h896zM960 512h-896c-35.2 0-64-28.8-64-64s28.8-64 64-64h896c35.2 0 64 28.8 64 64s-28.8 64-64 64zM960 736c19.2 0 32-12.8 32-32s-12.8-32-32-32h-896c-19.2 0-32 12.8-32 32s12.8 32 32 32h896zM960 768h-896c-35.2 0-64-28.8-64-64s28.8-64 64-64h896c35.2 0 64 28.8 64 64s-28.8 64-64 64z" />
<glyph unicode="&#xe60e;" glyph-name="uniE60E" d="M512 896c57.6 0 105.6-19.2 147.2-60.8s60.8-89.6 60.8-147.2c0-57.6-19.2-105.6-60.8-147.2s-89.6-60.8-147.2-60.8-105.6 19.2-147.2 60.8c-41.6 41.6-60.8 89.6-60.8 147.2s19.2 105.6 60.8 147.2c41.6 41.6 89.6 60.8 147.2 60.8zM284.8 454.4c3.2 0 6.4-3.2 12.8-9.6 12.8-9.6 28.8-19.2 48-28.8 19.2-12.8 44.8-22.4 73.6-32 32-9.6 60.8-16 92.8-16s64 6.4 92.8 16c32 9.6 54.4 22.4 73.6 32 16 9.6 32 22.4 48 28.8 6.4 3.2 12.8 6.4 12.8 9.6 19.2 0 38.4-3.2 54.4-9.6s32-16 41.6-25.6c12.8-12.8 22.4-25.6 32-44.8s19.2-35.2 25.6-54.4c6.4-19.2 12.8-41.6 16-64s6.4-44.8 9.6-64c0-19.2 3.2-41.6 3.2-64 0-41.6-12.8-73.6-35.2-96-25.6-22.4-57.6-35.2-99.2-35.2h-547.2c-41.6 0-73.6 12.8-99.2 35.2s-35.2 54.4-35.2 96c0 22.4 0 41.6 3.2 64 0 19.2 3.2 41.6 9.6 64 3.2 22.4 9.6 44.8 16 64s12.8 38.4 25.6 54.4c9.6 16 22.4 32 32 44.8 12.8 9.6 25.6 19.2 41.6 25.6 12.8 6.4 32 9.6 51.2 9.6zM512 928c-67.2 0-121.6-22.4-169.6-70.4s-70.4-102.4-70.4-169.6c0-67.2 22.4-121.6 70.4-169.6s102.4-70.4 169.6-70.4c67.2 0 121.6 22.4 169.6 70.4s70.4 102.4 70.4 169.6c0 67.2-22.4 121.6-70.4 169.6s-102.4 70.4-169.6 70.4zM736 489.6c-3.2 0-12.8-3.2-25.6-12.8s-28.8-19.2-48-28.8c-16-9.6-38.4-22.4-67.2-28.8-28.8-9.6-54.4-12.8-83.2-12.8s-54.4 3.2-83.2 12.8c-28.8 9.6-51.2 19.2-67.2 28.8s-32 22.4-48 28.8c-12.8 9.6-22.4 12.8-25.6 12.8-25.6 0-48-3.2-70.4-12.8s-38.4-19.2-54.4-32-28.8-32-38.4-51.2-19.2-41.6-25.6-64c-6.4-22.4-12.8-44.8-16-67.2-3.2-25.6-6.4-48-9.6-67.2 0-22.4-3.2-41.6-3.2-64 0-51.2 16-89.6 44.8-118.4 32-28.8 70.4-44.8 121.6-44.8h547.2c51.2 0 89.6 16 121.6 44.8s44.8 67.2 44.8 118.4c0 22.4 0 44.8-3.2 64 0 22.4-3.2 44.8-9.6 67.2-3.2 25.6-9.6 48-16 67.2-6.4 22.4-16 41.6-25.6 60.8-12.8 19.2-25.6 35.2-38.4 51.2-16 12.8-32 25.6-54.4 32-19.2 9.6-41.6 16-67.2 16z" />
<glyph unicode="&#xe60f;" glyph-name="uniE60F" d="M800 864c25.6 0 48-9.6 67.2-28.8s28.8-41.6 28.8-67.2-9.6-48-28.8-67.2c-19.2-19.2-41.6-28.8-67.2-28.8s-48 9.6-67.2 28.8c-19.2 19.2-28.8 41.6-28.8 67.2s9.6 48 28.8 67.2c19.2 19.2 41.6 28.8 67.2 28.8zM224 864c25.6 0 48-9.6 67.2-28.8s28.8-41.6 28.8-67.2-9.6-48-28.8-67.2c-19.2-19.2-41.6-28.8-67.2-28.8s-48 9.6-67.2 28.8c-19.2 19.2-28.8 41.6-28.8 67.2s9.6 48 28.8 67.2c19.2 19.2 41.6 28.8 67.2 28.8zM512 736c44.8 0 80-16 112-48s48-67.2 48-112-16-80-48-112-67.2-48-112-48-80 16-112 48-48 67.2-48 112 16 80 48 112 67.2 48 112 48zM934.4 608c9.6-6.4 25.6-38.4 25.6-144 0-19.2-6.4-28.8-16-32-12.8-12.8-28.8-16-48-16h-51.2c-25.6 28.8-60.8 48-96 57.6 12.8 28.8 19.2 60.8 22.4 96 9.6 0 22.4-3.2 32-3.2 22.4 0 48 3.2 70.4 12.8 22.4 6.4 38.4 16 54.4 22.4 0 3.2 3.2 3.2 6.4 6.4zM89.6 608c3.2 0 6.4-3.2 9.6-6.4 12.8-6.4 32-16 54.4-22.4 22.4-9.6 48-12.8 70.4-12.8 9.6 0 22.4 0 32 3.2 0-32 9.6-64 22.4-96-35.2-9.6-70.4-28.8-96-57.6h-54.4c-19.2 0-38.4 3.2-51.2 12.8-6.4 6.4-16 12.8-16 32 3.2 105.6 19.2 140.8 28.8 147.2zM329.6 384c3.2 0 3.2-3.2 9.6-6.4 9.6-6.4 22.4-16 35.2-22.4 16-9.6 35.2-19.2 60.8-28.8s51.2-12.8 76.8-12.8c25.6 0 51.2 3.2 76.8 12.8s44.8 16 60.8 28.8c12.8 9.6 25.6 16 35.2 22.4 3.2 3.2 6.4 3.2 9.6 6.4 12.8 0 28.8-3.2 38.4-6.4 12.8-6.4 22.4-12.8 32-19.2 9.6-9.6 19.2-19.2 25.6-32s12.8-28.8 19.2-41.6c6.4-16 9.6-32 12.8-51.2s6.4-35.2 6.4-51.2 3.2-32 3.2-48c0-32-9.6-54.4-25.6-70.4-19.2-16-41.6-25.6-73.6-25.6h-438.4c-32 0-57.6 9.6-73.6 25.6-19.2 9.6-28.8 35.2-28.8 64 0 16 0 32 3.2 48 0 16 3.2 32 6.4 51.2s6.4 35.2 12.8 51.2c3.2 16 9.6 28.8 19.2 41.6 6.4 12.8 16 25.6 25.6 32 9.6 9.6 19.2 16 32 19.2 9.6 9.6 22.4 12.8 38.4 12.8zM800 896c-35.2 0-64-12.8-89.6-38.4s-38.4-54.4-38.4-89.6c0-35.2 12.8-64 38.4-89.6s54.4-38.4 89.6-38.4c35.2 0 64 12.8 89.6 38.4s38.4 54.4 38.4 89.6c0 35.2-12.8 64-38.4 89.6s-54.4 38.4-89.6 38.4zM224 896c-35.2 0-64-12.8-89.6-38.4s-38.4-54.4-38.4-89.6c0-35.2 12.8-64 38.4-89.6s54.4-38.4 89.6-38.4c35.2 0 64 12.8 89.6 38.4s38.4 54.4 38.4 89.6c0 35.2-12.8 64-38.4 89.6s-54.4 38.4-89.6 38.4zM512 768c-54.4 0-99.2-19.2-134.4-57.6-38.4-35.2-57.6-80-57.6-134.4s19.2-99.2 57.6-134.4c38.4-38.4 83.2-57.6 134.4-57.6 54.4 0 99.2 19.2 134.4 57.6 38.4 38.4 57.6 83.2 57.6 134.4 0 54.4-19.2 99.2-57.6 134.4-35.2 38.4-80 57.6-134.4 57.6zM931.2 640c-3.2 0-9.6-3.2-22.4-9.6s-28.8-12.8-48-22.4c-19.2-6.4-38.4-9.6-60.8-9.6s-44.8 3.2-67.2 12.8c3.2-12.8 3.2-22.4 3.2-32 0-44.8-12.8-89.6-41.6-128 54.4-3.2 99.2-22.4 131.2-64h70.4c28.8 0 51.2 6.4 70.4 19.2s28.8 32 28.8 60.8c-3.2 115.2-22.4 172.8-64 172.8zM92.8 640c-41.6 0-60.8-57.6-60.8-176 0-25.6 9.6-44.8 28.8-60.8 19.2-12.8 41.6-19.2 67.2-19.2h67.2c35.2 41.6 80 60.8 131.2 64-25.6 38.4-38.4 83.2-38.4 128 0 9.6 0 19.2 3.2 32-22.4-6.4-44.8-12.8-67.2-12.8-19.2 0-38.4 3.2-60.8 9.6-19.2 6.4-35.2 12.8-48 22.4s-19.2 12.8-22.4 12.8zM691.2 416c-3.2 0-9.6-3.2-22.4-9.6-9.6-6.4-22.4-16-35.2-25.6s-32-16-54.4-22.4c-22.4-6.4-44.8-9.6-67.2-9.6s-44.8 3.2-67.2 9.6c-22.4 6.4-41.6 16-54.4 22.4-12.8 9.6-25.6 16-35.2 25.6-9.6 6.4-19.2 9.6-22.4 9.6-19.2 0-38.4-3.2-54.4-9.6s-32-16-41.6-25.6c-12.8-12.8-22.4-25.6-32-41.6s-16-32-22.4-48c-6.4-16-9.6-35.2-12.8-54.4s-6.4-38.4-6.4-54.4c-3.2-19.2-3.2-35.2-3.2-54.4 0-38.4 12.8-70.4 35.2-96 25.6-22.4 57.6-35.2 96-35.2h438.4c41.6 0 73.6 12.8 96 35.2 25.6 22.4 35.2 54.4 35.2 96 0 19.2 0 35.2-3.2 51.2 0 16-3.2 35.2-6.4 54.4s-6.4 38.4-12.8 54.4-12.8 32-22.4 48c-9.6 16-19.2 28.8-32 41.6-12.8 9.6-25.6 19.2-41.6 25.6-12.8 9.6-32 12.8-51.2 12.8z" />
<glyph unicode="&#xe610;" glyph-name="uniE610" d="M512 928c124.8 0 224-99.2 224-224v-224h32c35.2 0 64-28.8 64-64v-384c0-35.2-28.8-64-64-64h-512c-35.2 0-64 28.8-64 64v384c0 35.2 28.8 64 64 64h32v224c0 124.8 99.2 224 224 224zM448 262.4c-19.2-19.2-32-44.8-32-70.4 0-54.4 41.6-96 96-96s96 41.6 96 96c0 28.8-12.8 54.4-32 70.4v57.6c0 35.2-28.8 64-64 64s-64-28.8-64-64v-57.6zM512 960c-140.8 0-256-115.2-256-256v-192c-54.4 0-96-41.6-96-96v-384c0-54.4 41.6-96 96-96h512c54.4 0 96 41.6 96 96v384c0 54.4-41.6 96-96 96v192c0 140.8-115.2 256-256 256zM512 128c-35.2 0-64 28.8-64 64 0 22.4 12.8 44.8 32 54.4v73.6c0 19.2 12.8 32 32 32s32-12.8 32-32v-73.6c19.2-9.6 32-32 32-54.4 0-35.2-28.8-64-64-64zM512 864c89.6 0 160-70.4 160-160v-192h-320v192c0 89.6 70.4 160 160 160zM512 896c-105.6 0-192-86.4-192-192v-224h384v224c0 105.6-86.4 192-192 192z" />
<glyph unicode="&#xe611;" glyph-name="uniE611" d="M416 320c0 35.2-28.8 64-64 64s-64-28.8-64-64v-57.6c-19.2-19.2-32-44.8-32-70.4 0-54.4 41.6-96 96-96s96 41.6 96 96c0 28.8-12.8 54.4-32 70.4v57.6zM352 128c-35.2 0-64 28.8-64 64 0 22.4 12.8 44.8 32 54.4v73.6c0 19.2 12.8 32 32 32s32-12.8 32-32v-73.6c19.2-9.6 32-32 32-54.4 0-35.2-28.8-64-64-64zM752 960c-150.4 0-272-121.6-272-272v-176h-384c-54.4 0-96-41.6-96-96v-384c0-54.4 41.6-96 96-96h512c54.4 0 96 41.6 96 96v384c0 54.4-41.6 96-96 96h-32v176c0 96 80 176 176 176s176-80 176-176v-192c0-25.6 22.4-48 48-48s48 22.4 48 48v192c0 150.4-121.6 272-272 272zM992 496c0-9.6-6.4-16-16-16s-16 6.4-16 16v192c0 115.2-92.8 208-208 208s-208-92.8-208-208v-208h64c35.2 0 64-28.8 64-64v-384c0-35.2-28.8-64-64-64h-512c-35.2 0-64 28.8-64 64v384c0 35.2 28.8 64 64 64h416v208c0 131.2 108.8 240 240 240s240-108.8 240-240v-192z" />
<glyph unicode="&#xe612;" glyph-name="uniE612" d="M512-64c-3.2 0-6.4 0-9.6 3.2-16 12.8-374.4 320-374.4 636.8 0 211.2 172.8 384 384 384s384-172.8 384-384c0-323.2-358.4-624-374.4-636.8-3.2-3.2-6.4-3.2-9.6-3.2zM512 928c-195.2 0-352-156.8-352-352 0-275.2 294.4-550.4 352-601.6 57.6 51.2 352 323.2 352 601.6 0 195.2-156.8 352-352 352zM512 384c-105.6 0-192 86.4-192 192s86.4 192 192 192 192-86.4 192-192-86.4-192-192-192zM512 736c-89.6 0-160-70.4-160-160s70.4-160 160-160 160 70.4 160 160-70.4 160-160 160z" />
<glyph unicode="&#xe613;" glyph-name="uniE613" d="M336 288c-185.6 0-336 150.4-336 336s150.4 336 336 336 336-150.4 336-336-150.4-336-336-336zM336 928c-166.4 0-304-137.6-304-304s137.6-304 304-304 304 137.6 304 304-137.6 304-304 304zM336 384c-131.2 0-240 108.8-240 240s108.8 240 240 240 240-108.8 240-240-108.8-240-240-240zM336 832c-115.2 0-208-92.8-208-208s92.8-208 208-208 208 92.8 208 208-92.8 208-208 208zM960-64c-16 0-32 6.4-44.8 19.2l-272 272c-12.8 12.8-19.2 28.8-19.2 44.8s6.4 32 19.2 44.8c25.6 25.6 67.2 25.6 89.6 0l272-272c12.8-12.8 19.2-28.8 19.2-44.8s-6.4-32-19.2-44.8c-12.8-12.8-28.8-19.2-44.8-19.2zM688 304c-9.6 0-16-3.2-22.4-9.6s-9.6-12.8-9.6-22.4 3.2-16 9.6-22.4l272-272c12.8-12.8 32-12.8 44.8 0 6.4 6.4 9.6 12.8 9.6 22.4s-3.2 16-9.6 22.4l-272 272c-6.4 6.4-12.8 9.6-22.4 9.6zM656 288c-3.2 0-9.6 0-12.8 3.2l-80 80c-6.4 6.4-6.4 16 0 22.4s16 6.4 22.4 0l80-80c6.4-6.4 6.4-16 0-22.4-3.2 0-6.4-3.2-9.6-3.2z" />
<glyph unicode="&#xe614;" glyph-name="uniE614" d="M204.8-64c-28.8 0-57.6 6.4-83.2 19.2-3.2 3.2-9.6 6.4-9.6 12.8s0 9.6 3.2 12.8l112 112c6.4 6.4 6.4 19.2 0 25.6l-48 51.2c-6.4 6.4-19.2 6.4-25.6-3.2l-112-112c-3.2-3.2-9.6-6.4-12.8-3.2-6.4 0-9.6 3.2-12.8 9.6-32 73.6-16 160 41.6 214.4 38.4 38.4 89.6 60.8 147.2 60.8 22.4 0 44.8-3.2 64-9.6l368 364.8c-25.6 70.4-6.4 156.8 48 211.2 57.6 57.6 144 73.6 217.6 38.4 3.2-3.2 9.6-6.4 9.6-12.8s0-9.6-3.2-12.8l-112-112c-6.4-6.4-6.4-19.2 0-25.6l48-48c6.4-6.4 19.2-6.4 25.6 0l112 112c3.2 3.2 9.6 6.4 12.8 3.2 6.4 0 9.6-3.2 12.8-9.6 32-73.6 16-160-41.6-214.4-38.4-38.4-89.6-60.8-147.2-60.8-22.4 0-44.8 3.2-64 9.6l-368-364.8c25.6-70.4 6.4-156.8-48-211.2-35.2-38.4-83.2-57.6-134.4-57.6zM156.8-25.6c54.4-16 118.4-3.2 160 41.6 48 48 64 128 38.4 188.8-3.2 6.4 0 12.8 3.2 16l384 384c3.2 3.2 12.8 6.4 16 3.2 19.2-9.6 38.4-12.8 60.8-12.8 48 0 92.8 19.2 121.6 51.2 41.6 41.6 57.6 102.4 41.6 156.8l-92.8-92.8c-19.2-19.2-51.2-19.2-70.4 0l-48 48c-19.2 19.2-19.2 51.2 0 70.4l96 96c-54.4 16-118.4 3.2-160-41.6-48-48-64-128-38.4-188.8 3.2-6.4 0-12.8-3.2-16l-384-384c-3.2-6.4-9.6-6.4-16-6.4-19.2 9.6-38.4 12.8-60.8 12.8-44.8 0-92.8-19.2-121.6-51.2-41.6-41.6-57.6-102.4-41.6-156.8l92.8 92.8c19.2 19.2 51.2 19.2 70.4 3.2l48-51.2c19.2-19.2 19.2-51.2 0-70.4l-96-92.8zM921.6-57.6c-12.8 0-25.6 6.4-35.2 16l-320 320c-6.4 6.4-6.4 16 0 22.4s16 6.4 22.4 0l320-320c6.4-6.4 19.2-6.4 25.6 0l44.8 48c6.4 6.4 6.4 19.2 0 25.6l-320 320c-6.4 6.4-6.4 16 0 22.4s16 6.4 22.4 0l320-320c19.2-19.2 19.2-51.2 0-70.4l-44.8-48c-9.6-9.6-22.4-16-35.2-16zM400 544c-3.2 0-9.6 0-12.8 3.2l-256 256c-3.2 6.4-3.2 19.2 3.2 25.6s16 6.4 22.4 0l256-256c6.4-6.4 6.4-16 0-22.4-3.2-3.2-9.6-6.4-12.8-6.4zM112 768c-3.2 0-9.6 0-12.8 3.2l-96 96c-3.2 6.4-3.2 19.2 3.2 25.6l64 64c6.4 6.4 16 6.4 22.4 0l96-96c6.4-6.4 6.4-16 0-22.4l-64-64c-3.2-3.2-9.6-6.4-12.8-6.4zM38.4 880l73.6-73.6 41.6 41.6-73.6 73.6-41.6-41.6z" />
<glyph unicode="&#xe615;" glyph-name="uniE615" d="M512-64h-35.2c-19.2 3.2-41.6 19.2-44.8 38.4l-25.6 102.4c-3.2 9.6-12.8 19.2-19.2 22.4l-32 12.8c-9.6 3.2-22.4 3.2-28.8 0l-89.6-54.4c-16-9.6-44.8-9.6-60.8 6.4l-48 48c-16 16-16 41.6-6.4 60.8l54.4 89.6c3.2 6.4 6.4 22.4 0 28.8l-12.8 32c-3.2 9.6-12.8 19.2-22.4 19.2l-102.4 25.6c-19.2 6.4-38.4 25.6-38.4 44.8v70.4c3.2 19.2 19.2 41.6 38.4 44.8l102.4 25.6c9.6 3.2 19.2 12.8 22.4 19.2l12.8 32c3.2 9.6 3.2 22.4 0 28.8l-54.4 92.8c-9.6 16-6.4 41.6 6.4 57.6l48 48c16 12.8 41.6 16 57.6 6.4l89.6-54.4c6.4-3.2 22.4-6.4 28.8 0l32 12.8c9.6 3.2 19.2 12.8 19.2 22.4l25.6 102.4c6.4 19.2 25.6 38.4 44.8 38.4h70.4c19.2-3.2 41.6-19.2 44.8-38.4l25.6-102.4c3.2-9.6 12.8-19.2 19.2-22.4l32-12.8c9.6-3.2 22.4-3.2 28.8 0l89.6 54.4c16 9.6 44.8 9.6 60.8-6.4l51.2-48c16-16 16-41.6 6.4-60.8l-54.4-89.6c-3.2-6.4-6.4-22.4 0-28.8l12.8-32c3.2-9.6 12.8-19.2 22.4-19.2l102.4-25.6c19.2-6.4 38.4-25.6 38.4-44.8v-70.4c-3.2-19.2-19.2-41.6-38.4-44.8l-102.4-25.6c-9.6-3.2-19.2-12.8-22.4-19.2l-12.8-32c-3.2-9.6-3.2-22.4 0-28.8l54.4-89.6c9.6-19.2 9.6-44.8-6.4-60.8l-48-48c-9.6-9.6-22.4-12.8-35.2-12.8-9.6 0-19.2 3.2-25.6 6.4l-89.6 54.4c-6.4 3.2-22.4 6.4-28.8 0l-32-12.8c-9.6-3.2-19.2-12.8-19.2-22.4l-25.6-102.4c-6.4-19.2-25.6-38.4-44.8-38.4h-35.2zM342.4 150.4c9.6 0 19.2-3.2 25.6-6.4l32-12.8c16-6.4 35.2-25.6 38.4-44.8l25.6-102.4c3.2-6.4 9.6-12.8 16-16h64c6.4 0 16 6.4 16 16l25.6 102.4c3.2 19.2 22.4 38.4 41.6 44.8l32 12.8c16 6.4 41.6 6.4 57.6-3.2l89.6-54.4c3.2 0 6.4-3.2 9.6-3.2 6.4 0 9.6 0 12.8 3.2l44.8 44.8c3.2 3.2 6.4 16 0 22.4l-54.4 89.6c-9.6 16-12.8 41.6-3.2 60.8l12.8 32c6.4 16 25.6 35.2 44.8 38.4l102.4 25.6c6.4 3.2 12.8 9.6 16 16v64c0 6.4-6.4 16-16 16l-102.4 25.6c-19.2 3.2-38.4 22.4-44.8 41.6l-12.8 32c-9.6 16-6.4 41.6 3.2 57.6l54.4 89.6c3.2 6.4 3.2 16-3.2 22.4l-44.8 44.8c-3.2 3.2-16 3.2-22.4 0l-89.6-54.4c-16-9.6-41.6-9.6-60.8-3.2l-32 12.8c-16 6.4-35.2 25.6-38.4 44.8l-25.6 102.4c3.2 6.4-6.4 12.8-12.8 16h-64c-6.4 0-16-6.4-16-16l-25.6-102.4c-3.2-19.2-22.4-38.4-41.6-44.8l-32-12.8c-12.8-6.4-41.6-6.4-57.6 3.2l-89.6 54.4c-6.4 3.2-16 3.2-22.4 0l-44.8-48c-3.2-3.2-6.4-16 0-22.4l54.4-89.6c9.6-16 12.8-41.6 3.2-60.8l-12.8-32c-6.4-16-25.6-35.2-44.8-38.4l-102.4-25.6c-6.4 3.2-12.8-6.4-16-12.8v-64c0-6.4 6.4-16 16-16l102.4-25.6c19.2-3.2 38.4-22.4 44.8-41.6l12.8-32c9.6-16 6.4-41.6-3.2-57.6l-54.4-89.6c-3.2-6.4-3.2-16 3.2-22.4l44.8-44.8c3.2-3.2 16-3.2 22.4 0l89.6 54.4c6.4 6.4 19.2 9.6 32 9.6zM512 233.6c-118.4 0-214.4 96-214.4 214.4s96 214.4 214.4 214.4 214.4-96 214.4-214.4-96-214.4-214.4-214.4zM512 630.4c-99.2 0-182.4-83.2-182.4-182.4s83.2-182.4 182.4-182.4 182.4 83.2 182.4 182.4-83.2 182.4-182.4 182.4z" />
<glyph unicode="&#xe616;" glyph-name="uniE616" d="M992 803.2c19.2 0 32 12.8 32 32s-12.8 32-32 32h-185.6c-19.2 0-32-12.8-32-32v-185.6c0-19.2 12.8-32 32-32s32 12.8 32 32v105.6c80-83.2 121.6-192 121.6-307.2 0-118.4-44.8-230.4-131.2-316.8-83.2-83.2-195.2-131.2-316.8-131.2-54.4 0-108.8 9.6-163.2 28.8-16 6.4-35.2-3.2-41.6-19.2-3.2-6.4-3.2-16 0-25.6 3.2-6.4 9.6-12.8 19.2-16 60.8-22.4 121.6-35.2 185.6-35.2 137.6 0 265.6 54.4 361.6 150.4 195.2 195.2 198.4 515.2 6.4 713.6h112zM220.8 278.4c-19.2 0-32-12.8-32-32v-108.8c-169.6 176-166.4 454.4 6.4 627.2 83.2 83.2 198.4 131.2 316.8 131.2 54.4 0 105.6-9.6 153.6-28.8 16-6.4 35.2 3.2 41.6 19.2 3.2 6.4 3.2 16 0 25.6s-9.6 12.8-19.2 16c-57.6 22.4-115.2 32-176 32-134.4 0-265.6-54.4-361.6-150.4-198.4-198.4-201.6-515.2-9.6-713.6h-105.6c-19.2 0-32-12.8-32-32s12.8-32 32-32h185.6c9.6 0 16 3.2 22.4 9.6l3.2 3.2c6.4 6.4 9.6 12.8 9.6 22.4v185.6c-3.2 12.8-19.2 25.6-35.2 25.6z" />
<glyph unicode="&#xe617;" glyph-name="uniE617" d="M937.6 758.4c32 0 54.4-25.6 54.4-54.4v-512c0-28.8-22.4-54.4-54.4-54.4h-851.2c-32 0-54.4 25.6-54.4 54.4v512c0 28.8 22.4 54.4 54.4 54.4h851.2zM937.6 790.4h-851.2c-48 0-86.4-38.4-86.4-86.4v-512c0-48 38.4-86.4 86.4-86.4h854.4c48 0 86.4 38.4 86.4 86.4v512c-3.2 48-41.6 86.4-89.6 86.4v0zM512 326.4l-473.6 387.2c-9.6 3.2-9.6 16-3.2 22.4s16 6.4 22.4 0l454.4-368 454.4 368c6.4 6.4 16 3.2 22.4-3.2 3.2-6.4 3.2-16-3.2-22.4l-473.6-384zM976 140.8c-3.2 0-6.4 0-9.6 3.2l-342.4 268.8c-6.4 6.4-9.6 16-3.2 22.4s16 9.6 22.4 3.2l342.4-268.8c6.4-6.4 9.6-16 3.2-22.4-3.2-3.2-9.6-6.4-12.8-6.4zM48 137.6c-3.2 0-9.6 3.2-12.8 6.4-6.4 6.4-3.2 16 3.2 22.4l342.4 268.8c6.4 6.4 16 3.2 22.4-3.2s3.2-16-3.2-22.4l-342.4-265.6c-3.2-3.2-6.4-6.4-9.6-6.4z" />
<glyph unicode="&#xe618;" glyph-name="uniE618" d="M784 902.4h-80v41.6c0 9.6-6.4 16-16 16s-16-6.4-16-16v-41.6h-80v41.6c0 9.6-6.4 16-16 16s-16-6.4-16-16v-41.6h-83.2v41.6c0 9.6-6.4 16-16 16s-16-6.4-16-16v-41.6h-83.2v41.6c0 9.6-6.4 16-16 16s-25.6-6.4-25.6-16v-41.6h-80c-41.6 0-73.6-35.2-73.6-76.8v-873.6c0-9.6 6.4-16 16-16h659.2c9.6 0 16 6.4 16 16v873.6c0 41.6-32 73.6-73.6 76.8zM201.6 825.6c0 22.4 19.2 41.6 41.6 41.6h76.8v-41.6c0-9.6 6.4-16 16-16s16 6.4 16 16v41.6h83.2v-41.6c0-9.6 6.4-16 16-16s16 6.4 16 16v41.6h83.2v-41.6c0-9.6 6.4-16 16-16s16 6.4 16 16v41.6h80v-41.6c0-9.6 6.4-16 16-16s16 6.4 16 16v41.6h80c22.4 0 41.6-19.2 41.6-41.6v-156.8h-614.4v156.8zM822.4 553.6h-620.8v83.2h624l-3.2-83.2zM201.6 169.6h624v-83.2h-624v83.2zM201.6 204.8v83.2h624v-83.2h-624zM201.6 320v83.2h624v-83.2h-624zM201.6 435.2v83.2h624v-83.2h-624zM201.6-28.8v83.2h624v-83.2h-624z" />
<glyph unicode="&#xe619;" glyph-name="uniE619" d="M828.8 9.6h-633.6v764.8h633.6v-764.8zM230.4 48h560v688h-560v-688zM716.8 736h-409.6v150.4h409.6v-150.4zM345.6 774.4h336v73.6h-336v-73.6zM361.6 140.8c-9.6 0-19.2 9.6-19.2 19.2v464c0 9.6 9.6 19.2 19.2 19.2s19.2-9.6 19.2-19.2v-464c0-12.8-6.4-19.2-19.2-19.2zM512 140.8c-9.6 0-19.2 9.6-19.2 19.2v464c0 9.6 9.6 19.2 19.2 19.2s19.2-9.6 19.2-19.2v-464c0-12.8-9.6-19.2-19.2-19.2zM662.4 140.8c-9.6 0-19.2 9.6-19.2 19.2v464c0 9.6 9.6 19.2 19.2 19.2s19.2-9.6 19.2-19.2v-464c-3.2-12.8-9.6-19.2-19.2-19.2zM64 774.4h896v-38.4h-896z" />
<glyph unicode="&#xe61a;" glyph-name="uniE61A" d="M1017.6 700.8c-6.4 9.6-19.2 22.4-41.6 22.4h-684.8l-32 70.4c-3.2 6.4-3.2 9.6-9.6 16 0 3.2-3.2 6.4-9.6 9.6 0 3.2-3.2 3.2-6.4 6.4h-3.2c-3.2 3.2-6.4 3.2-9.6 6.4-3.2 0-6.4 0-9.6 3.2h-147.2c-35.2 0-64-28.8-64-64s28.8-64 64-64h92.8l38.4-80c9.6-28.8 22.4-51.2 22.4-51.2l92.8-204.8c0-3.2 3.2-3.2 3.2-6.4l16-35.2c6.4-22.4 22.4-38.4 44.8-44.8v-3.2h464v3.2c19.2 6.4 38.4 22.4 44.8 44.8l112 246.4c6.4 12.8 44.8 86.4 22.4 124.8zM963.2 592l-105.6-233.6h-3.2l-3.2-16c-3.2-12.8-16-22.4-28.8-22.4h-432c-12.8 0-25.6 9.6-28.8 22.4l-3.2 16h-3.2l-105.6 236.8s-12.8 22.4-19.2 44.8l-51.2 102.4h-115.2c-16 0-28.8 12.8-28.8 28.8s12.8 28.8 28.8 28.8h144s3.2 0 6.4-3.2l6.4-6.4c3.2-6.4 3.2-9.6 3.2-9.6l44.8-92.8h704c9.6 0 9.6-3.2 9.6-3.2 9.6-16-3.2-60.8-19.2-92.8zM460.8 243.2c-51.2 0-89.6-41.6-89.6-89.6s41.6-89.6 89.6-89.6c51.2 0 89.6 41.6 89.6 89.6s-38.4 89.6-89.6 89.6zM460.8 92.8c-32 0-57.6 25.6-57.6 57.6s25.6 57.6 57.6 57.6 57.6-25.6 57.6-57.6-25.6-57.6-57.6-57.6zM777.6 243.2c-51.2 0-89.6-41.6-89.6-89.6s41.6-89.6 89.6-89.6c51.2 0 89.6 41.6 89.6 89.6s-38.4 89.6-89.6 89.6zM777.6 92.8c-32 0-57.6 25.6-57.6 57.6s25.6 57.6 57.6 57.6 57.6-25.6 57.6-57.6-25.6-57.6-57.6-57.6z" />
<glyph unicode="&#xe61b;" glyph-name="uniE61B" d="M732.8 784h-86.4v-489.6h86.4v489.6zM176 784h-41.6v-489.6h44.8l-3.2 489.6zM198.4 259.2c-22.4 0-44.8-16-44.8-41.6v-60.8c0-28.8 19.2-41.6 44.8-41.6 22.4 0 44.8 16 44.8 41.6v60.8c0 25.6-22.4 41.6-44.8 41.6zM214.4 156.8c0-12.8-6.4-19.2-16-19.2s-16 6.4-16 19.2v60.8c0 12.8 6.4 19.2 16 19.2s16-6.4 16-19.2v-60.8zM601.6 784h-64v-489.6h64v489.6zM0 115.2h89.6v668.8h-89.6v-668.8zM825.6 784h-44.8v-489.6h44.8v489.6zM265.6 784h-41.6v-489.6h44.8v489.6zM822.4 233.6v-28.8l28.8 25.6v-115.2h25.6v144h-25.6l-28.8-25.6zM870.4 294.4h41.6v489.6h-41.6v-489.6zM700.8 211.2h25.6v22.4h38.4l-48-121.6h28.8l48 121.6v22.4h-92.8v-44.8zM960 784v-668.8h64v668.8h-64zM681.6 217.6c0 25.6-19.2 41.6-44.8 41.6s-44.8-16-44.8-41.6h25.6c0 12.8 9.6 19.2 16 19.2 9.6 0 16-6.4 16-19.2 0-6.4-3.2-9.6-6.4-16l-54.4-60.8v-22.4h86.4v22.4h-54.4l41.6 48c12.8 6.4 19.2 16 19.2 28.8zM313.6 294.4h153.6v489.6h-153.6v-489.6zM313.6 201.6c-3.2 0-6.4 0-9.6-3.2l28.8 60.8h-28.8l-28.8-60.8c-6.4-12.8-12.8-25.6-12.8-38.4 0-28.8 19.2-44.8 44.8-44.8s44.8 16 44.8 44.8c0 25.6-19.2 41.6-38.4 41.6zM307.2 137.6c-9.6 0-19.2 6.4-19.2 22.4s6.4 22.4 19.2 22.4c9.6 0 19.2-9.6 19.2-22.4 0-16-9.6-22.4-19.2-22.4zM371.2 211.2h25.6v22.4h38.4l-48-121.6h28.8l48 121.6v22.4h-92.8v-44.8zM553.6 188.8c9.6 6.4 16 12.8 16 28.8 0 25.6-19.2 41.6-44.8 41.6s-44.8-16-44.8-41.6h25.6c0 9.6 6.4 16 19.2 16 9.6 0 16-6.4 16-19.2 0-9.6-6.4-19.2-19.2-19.2h-3.2v-22.4h3.2c12.8 0 19.2-6.4 19.2-19.2s-9.6-19.2-19.2-19.2-19.2 6.4-19.2 19.2h-22.4c0-28.8 22.4-41.6 44.8-41.6 25.6 0 44.8 12.8 44.8 41.6 3.2 19.2-6.4 28.8-16 35.2z" />
<glyph unicode="&#xe61c;" glyph-name="uniE61C" d="M720 134.4c16 0 28.8 12.8 28.8 32v217.6c0 16-12.8 32-28.8 32s-28.8-12.8-28.8-32v-217.6c-3.2-19.2 9.6-32 28.8-32zM582.4 134.4c16 0 28.8 12.8 28.8 32v217.6c0 16-12.8 32-28.8 32s-28.8-12.8-28.8-32v-217.6c-3.2-19.2 9.6-32 28.8-32zM444.8 134.4c16 0 28.8 12.8 28.8 32v217.6c0 16-12.8 32-28.8 32s-28.8-12.8-28.8-32v-217.6c-3.2-19.2 9.6-32 28.8-32zM940.8 688h-169.6l-86.4 140.8c-9.6 19.2-32 32-54.4 32-9.6 0-22.4-3.2-32-9.6-28.8-16-38.4-54.4-22.4-83.2l51.2-80h-256l51.2 80c16 28.8 6.4 67.2-22.4 83.2-9.6 6.4-19.2 9.6-32 9.6-22.4 0-41.6-12.8-54.4-28.8l-83.2-144h-147.2c-44.8 0-83.2-38.4-83.2-83.2v-48c0-41.6 28.8-80 70.4-86.4l60.8-352c0-44.8 38.4-80 83.2-80h595.2c44.8 0 80 35.2 83.2 80l60.8 352c41.6 6.4 70.4 44.8 70.4 86.4v48c0 44.8-38.4 83.2-83.2 83.2zM851.2 121.6v-3.2c0-22.4-19.2-41.6-41.6-41.6h-595.2c-22.4 0-41.6 19.2-41.6 41.6l-64 352h803.2l-60.8-348.8zM985.6 556.8c0-22.4-19.2-48-41.6-48h-860.8c-22.4 0-41.6 25.6-41.6 48v48c0 22.4 19.2 41.6 41.6 41.6h169.6l99.2 160c6.4 9.6 19.2 12.8 28.8 9.6 9.6-6.4 12.8-19.2 9.6-28.8l-89.6-137.6h400l-89.6 137.6c-6.4 9.6-3.2 25.6 9.6 28.8 9.6 6.4 25.6 3.2 32-9.6l99.2-160h192c22.4 0 41.6-19.2 41.6-41.6v-48zM304 134.4c16 0 28.8 12.8 28.8 32v217.6c0 16-12.8 32-28.8 32s-28.8-12.8-28.8-32v-217.6c0-19.2 12.8-32 28.8-32z" />
<glyph unicode="&#xe61d;" glyph-name="uniE61D" d="M553.6 931.2v-108.8l25.6-3.2c86.4-9.6 160-38.4 217.6-89.6l-16-19.2h3.2l-41.6-57.6c-41.6 35.2-92.8 60.8-150.4 73.6l-35.2 9.6v-220.8l22.4-6.4c147.2-35.2 236.8-86.4 236.8-211.2s-86.4-204.8-233.6-220.8l-25.6-3.2v-102.4h-54.4v102.4l-25.6 3.2c-99.2 9.6-179.2 41.6-243.2 99.2v3.2l-12.8 9.6h3.2v3.2l48 70.4h3.2l3.2 6.4c51.2-51.2 121.6-86.4 192-99.2l35.2-6.4v240l-22.4 6.4c-144 35.2-230.4 83.2-230.4 208 0 112 92.8 195.2 227.2 208l25.6 3.2v102.4h48zM499.2 518.4v217.6l-32-3.2c-64-9.6-105.6-48-105.6-105.6 0-64 67.2-83.2 102.4-96l35.2-12.8zM553.6 156.8l35.2 6.4c83.2 16 112 67.2 112 112 0 67.2-73.6 89.6-108.8 102.4l-38.4 12.8v-233.6zM563.2 960h-73.6c-9.6 0-19.2-9.6-19.2-19.2v-89.6c-160-16-252.8-118.4-252.8-236.8 0-160 131.2-208 252.8-236.8v-182.4c-76.8 12.8-140.8 54.4-185.6 99.2-3.2 3.2-6.4 3.2-12.8 3.2s-12.8-3.2-16-9.6l-67.2-96c-3.2-3.2-3.2-6.4-3.2-12.8s3.2-9.6 6.4-12.8c64-64 156.8-112 278.4-121.6v-86.4c0-9.6 9.6-19.2 19.2-19.2h73.6c9.6 0 19.2 9.6 19.2 19.2v86.4c172.8 19.2 259.2 118.4 259.2 249.6 0 160-137.6 208-259.2 240v160c54.4-12.8 105.6-38.4 147.2-76.8 3.2-3.2 6.4-3.2 12.8-3.2s9.6 3.2 12.8 6.4l67.2 96c3.2 3.2 3.2 6.4 3.2 12.8s-3.2 9.6-6.4 12.8c-64 57.6-144 92.8-240 105.6v92.8c3.2 9.6-6.4 19.2-16 19.2zM470.4 560c-48 16-80 32-80 67.2 0 41.6 28.8 67.2 80 76.8v-144zM582.4 192v156.8c51.2-16 89.6-35.2 89.6-73.6-3.2-38.4-32-70.4-89.6-83.2z" />
<glyph unicode="&#xe61e;" glyph-name="uniE61E" d="M966.4 640c73.6 73.6 73.6 192 0 265.6s-192 73.6-265.6 0c-6.4-6.4-6.4-12.8-3.2-19.2-57.6 22.4-121.6 35.2-185.6 35.2s-128-12.8-185.6-38.4c3.2 6.4 3.2 12.8-3.2 19.2-73.6 73.6-192 73.6-265.6 0s-73.6-192 0-265.6c3.2-3.2 9.6-6.4 12.8-6.4s3.2 3.2 6.4 3.2c-25.6-57.6-38.4-118.4-38.4-185.6 0-153.6 73.6-288 185.6-374.4-12.8-6.4-28.8-16-35.2-28.8-9.6-16-12.8-38.4-6.4-57.6s19.2-35.2 35.2-44.8c12.8-3.2 25.6-6.4 38.4-6.4 25.6 0 51.2 12.8 64 38.4 6.4 12.8 9.6 28.8 9.6 44.8 54.4-22.4 118.4-35.2 182.4-35.2s124.8 12.8 182.4 35.2c0-16 0-28.8 9.6-44.8 12.8-22.4 38.4-38.4 64-38.4 12.8 0 25.6 3.2 38.4 9.6 16 9.6 28.8 25.6 35.2 44.8s3.2 38.4-6.4 57.6c-6.4 12.8-22.4 22.4-35.2 28.8 112 86.4 185.6 220.8 185.6 374.4 0 64-12.8 128-38.4 185.6 3.2 0 3.2-3.2 6.4-3.2s6.4 3.2 12.8 6.4zM86.4 880c57.6 57.6 156.8 57.6 214.4 0 3.2-3.2 6.4-3.2 9.6-3.2-96-44.8-172.8-124.8-220.8-220.8 0 3.2 0 6.4-3.2 9.6-60.8 57.6-60.8 153.6 0 214.4zM291.2-9.6c-9.6-16-35.2-22.4-54.4-12.8-6.4 6.4-12.8 12.8-16 22.4s0 19.2 3.2 28.8c6.4 12.8 19.2 19.2 32 19.2 6.4 0 12.8-3.2 19.2-6.4 19.2-9.6 25.6-32 16-51.2zM800 28.8c6.4-9.6 6.4-19.2 3.2-28.8s-9.6-19.2-19.2-22.4c-19.2-9.6-41.6-3.2-51.2 12.8-9.6 19.2-3.2 41.6 12.8 51.2 6.4 3.2 12.8 6.4 19.2 6.4 16 0 28.8-6.4 35.2-19.2zM947.2 451.2c0-240-195.2-435.2-435.2-435.2s-435.2 195.2-435.2 435.2 195.2 435.2 435.2 435.2 435.2-195.2 435.2-435.2zM940.8 665.6c-3.2-3.2-3.2-6.4-3.2-9.6-44.8 96-124.8 172.8-220.8 217.6 3.2 0 6.4 0 9.6 3.2 57.6 57.6 156.8 57.6 214.4 0s57.6-153.6 0-211.2zM512 803.2c-195.2 0-355.2-160-355.2-355.2s160-355.2 355.2-355.2 355.2 160 355.2 355.2-160 355.2-355.2 355.2zM512 131.2c-176 0-316.8 144-316.8 316.8s140.8 320 316.8 320 316.8-144 316.8-316.8-140.8-320-316.8-320zM531.2 454.4v217.6c0 9.6-9.6 19.2-19.2 19.2s-19.2-9.6-19.2-19.2v-224c0-3.2 3.2-9.6 6.4-12.8l105.6-105.6c3.2-3.2 9.6-6.4 12.8-6.4s9.6 3.2 12.8 6.4c6.4 6.4 6.4 19.2 0 25.6l-99.2 99.2z" />
<glyph unicode="&#xe61f;" glyph-name="uniE61F" d="M960 640h-16l-432 284.8-432-284.8h-16c-35.2 0-64-41.6-64-76.8v-512c0-35.2 28.8-51.2 64-51.2h896c35.2 0 64 16 64 51.2v512c0 35.2-28.8 76.8-64 76.8zM512 886.4l374.4-246.4h-748.8l374.4 246.4zM992 51.2c0-19.2-12.8-19.2-32-19.2h-896c-19.2 0-32 3.2-32 19.2v512c0 19.2 12.8 44.8 32 44.8h896c19.2 0 32-25.6 32-44.8v-512zM147.2 352c3.2 6.4 6.4 12.8 12.8 16s12.8 6.4 19.2 6.4c12.8 0 22.4-6.4 32-16l19.2 25.6c-6.4 9.6-12.8 12.8-22.4 19.2-9.6 3.2-19.2 6.4-32 6.4s-22.4-3.2-32-6.4-16-16-22.4-25.6-12.8-22.4-16-35.2c-3.2-12.8-6.4-28.8-6.4-41.6 0-16 3.2-28.8 6.4-41.6s9.6-25.6 16-35.2c6.4-9.6 12.8-16 22.4-22.4s19.2-9.6 32-9.6 22.4 3.2 32 6.4c9.6 6.4 16 12.8 19.2 19.2l-19.2 22.4c-3.2-6.4-6.4-9.6-12.8-12.8-3.2 0-9.6-3.2-16-3.2s-12.8 3.2-19.2 6.4-9.6 9.6-12.8 16-6.4 16-6.4 22.4c-3.2 9.6-3.2 19.2-3.2 28.8s0 19.2 3.2 28.8c0 12.8 3.2 19.2 6.4 25.6zM288 416h-32v-224h96v32h-64zM476.8 377.6c-6.4 9.6-12.8 16-22.4 22.4s-19.2 6.4-32 6.4-22.4-3.2-32-6.4-16-12.8-22.4-22.4c-6.4-9.6-9.6-19.2-16-35.2-3.2-12.8-6.4-28.8-6.4-44.8s3.2-32 6.4-44.8 9.6-25.6 16-35.2c6.4-9.6 12.8-16 22.4-22.4s19.2-6.4 32-6.4 22.4 3.2 32 6.4 16 12.8 22.4 22.4c6.4 9.6 9.6 19.2 16 35.2s6.4 28.8 6.4 44.8-3.2 32-6.4 44.8c-6.4 12.8-9.6 25.6-16 35.2zM457.6 272c0-9.6-3.2-16-6.4-22.4s-6.4-12.8-12.8-16c-3.2-3.2-9.6-6.4-16-6.4s-12.8 3.2-16 6.4-9.6 9.6-12.8 16c-3.2 6.4-6.4 16-6.4 22.4 0 9.6-3.2 19.2-3.2 28.8s0 19.2 3.2 28.8c0 9.6 3.2 16 6.4 22.4s6.4 12.8 12.8 16 9.6 6.4 16 6.4 12.8-3.2 16-6.4 9.6-9.6 12.8-16 6.4-16 6.4-22.4 3.2-19.2 3.2-28.8c0-12.8 0-22.4-3.2-28.8zM563.2 368c3.2 3.2 6.4 3.2 9.6 6.4h9.6c12.8 0 19.2-3.2 28.8-12.8l19.2 25.6c-6.4 6.4-12.8 12.8-19.2 16-9.6 3.2-16 6.4-28.8 6.4-6.4 0-12.8 0-22.4-3.2l-19.2-9.6c-6.4-6.4-9.6-12.8-12.8-19.2s-6.4-16-6.4-28.8c0-9.6 0-16 3.2-22.4s6.4-12.8 9.6-16l12.8-12.8c6.4-3.2 9.6-6.4 16-9.6 9.6-3.2 16-9.6 22.4-16s9.6-12.8 9.6-22.4c0-9.6-3.2-16-6.4-22.4-9.6 0-12.8-3.2-22.4-3.2-6.4 0-12.8 0-19.2 3.2s-12.8 6.4-16 12.8l-19.2-25.6c6.4-6.4 12.8-12.8 22.4-16s19.2-6.4 32-6.4c6.4 0 16 0 22.4 3.2s12.8 6.4 19.2 12.8 9.6 12.8 12.8 19.2c3.2 6.4 3.2 16 3.2 25.6s0 16-3.2 22.4c-3.2 6.4-6.4 12.8-9.6 16l-12.8 12.8c-6.4 3.2-9.6 6.4-16 9.6-9.6 3.2-16 9.6-19.2 12.8-6.4 3.2-6.4 12.8-6.4 19.2s0 9.6 3.2 12.8c-3.2 6.4 0 9.6 3.2 9.6zM704 288h32v32h-32v64h32v32h-64v-224h64v32h-32zM803.2 416h-35.2v-224h35.2c25.6 0 44.8 12.8 60.8 28.8 12.8 19.2 19.2 44.8 19.2 76.8s-6.4 64-19.2 83.2c-16 19.2-35.2 35.2-60.8 35.2zM844.8 268.8c-3.2-9.6-6.4-16-9.6-22.4s-9.6-12.8-16-16c-6.4-3.2-12.8-6.4-19.2-6.4v160h3.2c6.4 0 12.8-6.4 19.2-9.6s9.6-9.6 16-16c3.2-6.4 6.4-16 9.6-25.6s3.2-19.2 3.2-32c-3.2-12.8-3.2-22.4-6.4-32z" />
<glyph unicode="&#xe620;" glyph-name="uniE620" d="M960 640h-16l-432 284.8-432-284.8h-16c-35.2 0-64-41.6-64-76.8v-512c0-35.2 28.8-51.2 64-51.2h896c35.2 0 64 16 64 51.2v512c0 35.2-28.8 76.8-64 76.8zM512 886.4l374.4-246.4h-748.8l374.4 246.4zM992 51.2c0-19.2-12.8-19.2-32-19.2h-896c-19.2 0-32 3.2-32 19.2v512c0 19.2 12.8 44.8 32 44.8h896c19.2 0 32-25.6 32-44.8v-512zM352 390.4c-6.4 9.6-12.8 16-22.4 22.4s-19.2 6.4-32 6.4-22.4-3.2-32-6.4-16-12.8-22.4-22.4c-6.4-9.6-9.6-19.2-16-35.2 0-12.8-3.2-28.8-3.2-44.8s3.2-32 6.4-44.8 9.6-25.6 16-35.2c6.4-9.6 12.8-16 22.4-22.4s19.2-6.4 32-6.4 22.4 3.2 32 6.4 16 12.8 22.4 22.4c6.4 9.6 9.6 19.2 16 35.2s6.4 28.8 6.4 44.8-3.2 32-6.4 44.8c-9.6 12.8-12.8 25.6-19.2 35.2zM332.8 281.6c0-9.6-3.2-16-6.4-22.4s-6.4-12.8-12.8-16c-3.2-3.2-9.6-6.4-16-6.4s-12.8 3.2-16 6.4-9.6 9.6-12.8 16c-3.2 6.4-6.4 16-6.4 22.4 0 9.6-3.2 19.2-3.2 28.8s0 19.2 3.2 28.8c0 9.6 3.2 16 6.4 22.4s6.4 12.8 12.8 16 9.6 6.4 16 6.4 12.8-3.2 16-6.4 9.6-9.6 12.8-16 6.4-16 6.4-22.4 3.2-19.2 3.2-28.8c0-9.6 0-19.2-3.2-28.8zM499.2 400c-6.4 3.2-12.8 9.6-19.2 12.8s-12.8 3.2-19.2 3.2h-44.8v-192h32v64h12.8c6.4 0 12.8 3.2 19.2 6.4s12.8 6.4 19.2 12.8c6.4 6.4 9.6 12.8 12.8 19.2s3.2 16 3.2 28.8-3.2 22.4-6.4 28.8c0 6.4-3.2 12.8-9.6 16zM476.8 329.6c-6.4-6.4-12.8-9.6-19.2-9.6h-9.6v64h9.6c9.6 0 16-3.2 19.2-6.4s6.4-12.8 6.4-22.4c3.2-12.8 0-22.4-6.4-25.6zM576 288h64v32h-64v64h64v32h-96v-192h96v32h-64zM771.2 256h-3.2l-57.6 160h-38.4v-192h32v128l57.6-128h38.4v192h-32z" />
<glyph unicode="&#xe621;" glyph-name="uniE621" d="M832 928h-640c-9.6 0-16 6.4-16 16s6.4 16 16 16h640c9.6 0 16-6.4 16-16s-6.4-16-16-16zM800 0h-576c-9.6 0-16 6.4-16 16v115.2c0 153.6 115.2 259.2 195.2 316.8-70.4 48-192 156.8-192 316.8v115.2c0 9.6 6.4 16 16 16h572.8c9.6 0 16-6.4 16-16v-115.2c0-153.6-115.2-259.2-195.2-316.8 70.4-51.2 195.2-160 195.2-316.8v-115.2c0-9.6-6.4-16-16-16zM240 32h544v99.2c0 160-140.8 265.6-201.6 304-3.2 3.2-6.4 6.4-6.4 12.8s3.2 9.6 6.4 12.8c73.6 48 201.6 150.4 201.6 304v99.2h-540.8v-99.2c0-160 137.6-265.6 198.4-304 3.2-3.2 6.4-9.6 6.4-12.8s-3.2-9.6-6.4-12.8c-73.6-48-201.6-150.4-201.6-304v-99.2zM512 496c-3.2 0-6.4 0-9.6 3.2l-6.4 3.2c-57.6 41.6-115.2 80-153.6 147.2-3.2 6.4-3.2 9.6 0 16 6.4 3.2 9.6 6.4 16 6.4h313.6c6.4 0 9.6-3.2 12.8-9.6s3.2-9.6 0-16c-35.2-57.6-89.6-96-140.8-131.2-9.6-6.4-16-12.8-25.6-19.2h-6.4zM390.4 640c32-44.8 73.6-73.6 121.6-108.8 6.4 3.2 9.6 6.4 16 12.8 44.8 28.8 86.4 57.6 115.2 99.2h-252.8zM832-64h-640c-9.6 0-16 6.4-16 16s6.4 16 16 16h640c9.6 0 16-6.4 16-16s-6.4-16-16-16zM512 288c-9.6 0-16 6.4-16 16v32c0 9.6 6.4 16 16 16s16-6.4 16-16v-32c0-9.6-6.4-16-16-16zM512 192c-9.6 0-16 6.4-16 16v32c0 9.6 6.4 16 16 16s16-6.4 16-16v-32c0-9.6-6.4-16-16-16zM512 384c-9.6 0-16 6.4-16 16v32c0 9.6 6.4 16 16 16s16-6.4 16-16v-32c0-9.6-6.4-16-16-16zM697.6 6.4c-3.2 0-9.6 0-12.8 3.2l-172.8 176-176-176c-6.4-6.4-16-6.4-22.4 0s-6.4 16 0 22.4l185.6 185.6c6.4 6.4 16 6.4 22.4 0l185.6-185.6c6.4-6.4 6.4-16 0-22.4 0-3.2-3.2-3.2-9.6-3.2z" />
<glyph unicode="&#xe622;" glyph-name="uniE622" d="M1024 448c0 137.6-83.2 256-201.6 310.4-54.4 118.4-172.8 201.6-310.4 201.6s-256-83.2-310.4-201.6c-118.4-54.4-201.6-172.8-201.6-310.4s83.2-256 201.6-310.4c54.4-118.4 172.8-201.6 310.4-201.6s256 83.2 310.4 201.6c118.4 54.4 201.6 172.8 201.6 310.4zM512 928c112 0 211.2-60.8 265.6-153.6-28.8 9.6-60.8 12.8-96 12.8-60.8 0-121.6-16-169.6-44.8-51.2 28.8-108.8 44.8-169.6 44.8-32 0-64-6.4-96-12.8 54.4 92.8 153.6 153.6 265.6 153.6zM822.4 617.6c0-32-3.2-60.8-12.8-89.6-3.2 108.8-92.8 198.4-201.6 198.4-19.2 0-38.4-3.2-57.6-9.6-3.2 0-3.2 3.2-6.4 3.2 41.6 22.4 89.6 35.2 140.8 35.2 41.6 0 80-9.6 115.2-22.4 12.8-35.2 22.4-73.6 22.4-115.2zM800 160c-35.2-16-73.6-22.4-115.2-22.4-32 0-60.8 3.2-89.6 12.8 108.8 3.2 198.4 92.8 198.4 201.6 0 19.2-3.2 38.4-9.6 57.6 0 3.2 3.2 3.2 3.2 6.4 22.4-41.6 35.2-89.6 35.2-140.8 0-38.4-9.6-76.8-22.4-115.2zM201.6 278.4c0 32 3.2 60.8 12.8 89.6 3.2-108.8 92.8-198.4 201.6-198.4 19.2 0 38.4 3.2 57.6 9.6 3.2 0 3.2-3.2 6.4-3.2-41.6-22.4-89.6-35.2-140.8-35.2-41.6 0-80 9.6-115.2 22.4-12.8 35.2-22.4 73.6-22.4 115.2zM224 736c35.2 16 73.6 22.4 115.2 22.4 32 0 60.8-3.2 89.6-12.8-108.8-3.2-195.2-92.8-195.2-204.8 0-19.2 3.2-38.4 9.6-57.6 0-3.2-3.2-3.2-3.2-6.4-22.4 41.6-35.2 89.6-35.2 140.8-3.2 41.6 6.4 80 19.2 118.4zM758.4 355.2c0-92.8-76.8-169.6-169.6-169.6-9.6 0-19.2 0-28.8 3.2 38.4 32 70.4 73.6 92.8 121.6 38.4 19.2 73.6 41.6 105.6 73.6v-28.8zM265.6 540.8c0 92.8 76.8 169.6 169.6 169.6 9.6 0 19.2 0 28.8-3.2-38.4-32-70.4-73.6-92.8-121.6-38.4-19.2-73.6-41.6-105.6-73.6v28.8zM761.6 460.8c0-3.2 0-3.2 0 0 0-3.2 0-3.2 0 0 0-3.2 0-3.2 0 0zM729.6 480c-25.6 19.2-44.8 41.6-57.6 70.4 25.6-6.4 51.2-9.6 80-9.6 16 0 35.2 3.2 51.2 3.2-19.2-28.8-44.8-51.2-73.6-64zM502.4 697.6c0 3.2 0 3.2 0 0 0 3.2 0 3.2 0 0 0 3.2 0 3.2 0 0zM534.4 678.4c25.6-19.2 44.8-41.6 57.6-70.4-25.6 6.4-51.2 9.6-80 9.6-16 0-35.2-3.2-51.2-3.2 19.2 28.8 44.8 51.2 73.6 64zM649.6 448c0-32-6.4-60.8-12.8-89.6-6.4 0-12.8 0-16-3.2v16c0 22.4-3.2 44.8-12.8 67.2 12.8 22.4 22.4 51.2 25.6 80 3.2 0 3.2 0 6.4-3.2 6.4-22.4 9.6-44.8 9.6-67.2zM374.4 448c0 32 6.4 60.8 12.8 89.6 6.4 0 12.8 0 16 3.2v-16c0-22.4 3.2-44.8 12.8-67.2-12.8-22.4-22.4-51.2-25.6-80-3.2 0-3.2 0-6.4 3.2-6.4 22.4-9.6 44.8-9.6 67.2zM572.8 441.6c-16-22.4-41.6-41.6-67.2-54.4-22.4 16-41.6 41.6-54.4 67.2 16 22.4 41.6 41.6 67.2 54.4 22.4-16 41.6-38.4 54.4-67.2zM553.6 521.6c12.8 3.2 22.4 3.2 35.2 3.2h16c-3.2-16-6.4-32-12.8-48-9.6 16-22.4 32-38.4 44.8zM588.8 371.2v-16c-16 3.2-32 6.4-48 12.8 16 9.6 32 22.4 48 38.4v-35.2zM470.4 374.4c-12.8-3.2-22.4-3.2-35.2-3.2h-16c3.2 16 6.4 32 12.8 48 9.6-16 22.4-32 38.4-44.8zM438.4 489.6c-3.2 12.8-3.2 22.4-3.2 35.2v16c16-3.2 32-6.4 48-12.8-16-9.6-32-22.4-44.8-38.4zM419.2 339.2h16c22.4 0 44.8 3.2 67.2 12.8 22.4-12.8 51.2-22.4 80-25.6 0-3.2 0-3.2-3.2-6.4-22.4-6.4-44.8-6.4-67.2-6.4-32 0-60.8 6.4-89.6 12.8-3.2 3.2-3.2 9.6-3.2 12.8zM604.8 556.8h-16c-22.4 0-44.8-3.2-67.2-12.8-22.4 12.8-51.2 22.4-80 25.6 0 3.2 0 3.2 3.2 6.4 22.4 6.4 44.8 6.4 67.2 6.4 32 0 60.8-6.4 89.6-12.8 3.2-3.2 3.2-9.6 3.2-12.8zM419.2 604.8h-3.2c6.4 9.6 9.6 16 16 25.6-3.2-9.6-9.6-16-12.8-25.6zM352 528c-6.4-25.6-9.6-51.2-9.6-80 0-16 3.2-35.2 3.2-51.2-28.8 19.2-51.2 44.8-64 73.6 16 25.6 41.6 44.8 70.4 57.6zM355.2 355.2v-3.2c-9.6 6.4-16 9.6-25.6 16 9.6-3.2 16-9.6 25.6-12.8zM604.8 291.2h3.2c-6.4-9.6-9.6-16-16-25.6 3.2 9.6 9.6 16 12.8 25.6zM672 368c6.4 25.6 9.6 51.2 9.6 80 0 16-3.2 35.2-3.2 51.2 28.8-19.2 51.2-44.8 64-73.6-16-25.6-41.6-44.8-70.4-57.6zM668.8 540.8v3.2c9.6-6.4 16-9.6 25.6-16-9.6 3.2-16 9.6-25.6 12.8zM249.6 400c32-38.4 73.6-70.4 121.6-92.8 19.2-38.4 41.6-73.6 73.6-105.6-9.6 0-19.2-3.2-25.6-3.2-92.8 0-169.6 76.8-169.6 169.6-3.2 12.8 0 22.4 0 32zM774.4 496c-32 38.4-73.6 70.4-121.6 92.8-19.2 38.4-41.6 73.6-73.6 105.6 9.6 0 19.2 3.2 25.6 3.2 92.8 0 169.6-76.8 169.6-169.6 3.2-12.8 0-22.4 0-32zM32 448c0 112 60.8 211.2 153.6 265.6-9.6-28.8-12.8-60.8-12.8-96 0-60.8 16-121.6 44.8-169.6-28.8-51.2-44.8-108.8-44.8-169.6 0-32 6.4-64 12.8-96-92.8 54.4-153.6 153.6-153.6 265.6zM512-32c-112 0-211.2 60.8-265.6 153.6 28.8-9.6 60.8-12.8 96-12.8 60.8 0 121.6 16 169.6 44.8 51.2-28.8 108.8-44.8 169.6-44.8 32 0 64 6.4 96 12.8-54.4-92.8-153.6-153.6-265.6-153.6zM838.4 182.4c9.6 28.8 12.8 60.8 12.8 96 0 60.8-16 121.6-44.8 169.6 28.8 51.2 44.8 108.8 44.8 169.6 0 32-6.4 64-12.8 96 92.8-54.4 153.6-153.6 153.6-265.6s-60.8-211.2-153.6-265.6z" />
<glyph unicode="&#xe623;" glyph-name="uniE623" d="M1008 368c6.4 35.2 9.6 70.4 16 115.2 3.2 19.2 0 41.6-12.8 57.6-16 16-38.4 19.2-57.6 22.4-41.6 0-83.2 3.2-121.6 3.2-3.2 44.8 0 105.6 0 105.6v16l-12.8 9.6c-3.2 3.2-19.2 12.8-41.6 12.8-12.8 0-25.6-3.2-35.2-9.6l-16-9.6v-121.6c-25.6 0-64 0-108.8 3.2-3.2 9.6-9.6 25.6-16 44.8-16 41.6-38.4 99.2-64 176-16 28.8-51.2 70.4-105.6 70.4h-281.6v-288h-6.4l-25.6-3.2-3.2-25.6c-3.2-25.6-6.4-48 9.6-64l3.2-3.2c-76.8-38.4-128-118.4-128-208 0-131.2 105.6-240 240-240 124.8 0 227.2 96 236.8 217.6h22.4c38.4 0 76.8 3.2 115.2 3.2 44.8 0 89.6 3.2 137.6 3.2-12.8-22.4-19.2-48-19.2-73.6 0-80 67.2-147.2 147.2-147.2s147.2 67.2 147.2 147.2c0 38.4-16 73.6-41.6 99.2 12.8 9.6 19.2 28.8 22.4 57.6-3.2 6.4-3.2 16 0 28.8zM240 64c-115.2 0-208 92.8-208 208s92.8 208 208 208 208-92.8 208-208c-3.2-115.2-96-208-208-208zM992 486.4c-3.2-38.4-6.4-76.8-16-112-12.8-76.8 3.2-73.6-83.2-80 54.4-9.6 96-54.4 96-112 0-64-51.2-115.2-115.2-115.2s-115.2 51.2-115.2 115.2c0 51.2 35.2 96 83.2 108.8-115.2-6.4-233.6-6.4-348.8-9.6-6.4 0-9.6 0-16 3.2 0 6.4-3.2 12.8-3.2 19.2-16 121.6-118.4 211.2-233.6 211.2-16-3.2-38.4-3.2-57.6-9.6-9.6-3.2-16-3.2-22.4-3.2-16 0-19.2 12.8-12.8 44.8 16 0 35.2 9.6 35.2 9.6v275.2h249.6c51.2 0 70.4-48 70.4-48 38.4-112 67.2-182.4 80-220.8 6.4-12.8 16-19.2 19.2-22.4 89.6-3.2 150.4-3.2 150.4-3.2v134.4c6.4 3.2 12.8 6.4 19.2 6.4 19.2 0 28.8-6.4 28.8-6.4s-3.2-92.8-3.2-131.2c0-3.2 3.2-3.2 3.2-3.2 51.2-3.2 99.2-3.2 150.4-6.4 35.2-3.2 44.8-9.6 41.6-44.8zM809.6 179.2c0-38.4 28.8-67.2 67.2-67.2s67.2 28.8 67.2 67.2c0 38.4-28.8 67.2-67.2 67.2s-67.2-28.8-67.2-67.2zM928 179.2c0-28.8-22.4-51.2-51.2-51.2s-51.2 22.4-51.2 51.2c0 28.8 22.4 51.2 51.2 51.2s51.2-22.4 51.2-51.2zM454.4 748.8h-211.2v-208c64 3.2 137.6 3.2 211.2 3.2h67.2l-67.2 204.8zM454.4 569.6c-60.8 0-128 0-185.6-3.2v160h169.6l51.2-156.8h-35.2zM240 387.2c-64 0-115.2-51.2-115.2-115.2s51.2-115.2 115.2-115.2 115.2 51.2 115.2 115.2-54.4 115.2-115.2 115.2zM240 182.4c-51.2 0-89.6 41.6-89.6 89.6 0 51.2 41.6 89.6 89.6 89.6 51.2 0 89.6-41.6 89.6-89.6 0-51.2-41.6-89.6-89.6-89.6z" />
<glyph unicode="&#xe624;" glyph-name="uniE624" d="M1017.6 902.4c-3.2 3.2-6.4 3.2-9.6 3.2h-6.4l-326.4-121.6-320 131.2h-12.8l-329.6-128c-6.4-3.2-12.8-16-12.8-22.4v-771.2c0-6.4 3.2-12.8 6.4-16s6.4-3.2 9.6-3.2h6.4l326.4 121.6 323.2-121.6h12.8l329.6 121.6c6.4 3.2 12.8 9.6 12.8 16v774.4c-3.2 6.4-6.4 12.8-9.6 16zM352 867.2l320-108.8v-742.4l-320 108.8v742.4zM32 755.2l288 112v-742.4l-288-112v742.4zM992 124.8l-288-112v742.4l288 112v-742.4z" />
<glyph unicode="&#xe625;" glyph-name="uniE625" d="M265.6 627.2c9.6 0 19.2-6.4 19.2-19.2s-6.4-19.2-19.2-19.2-19.2 6.4-19.2 19.2 9.6 19.2 19.2 19.2zM265.6 659.2c-28.8 0-51.2-22.4-51.2-51.2s22.4-51.2 51.2-51.2c28.8 0 51.2 22.4 51.2 51.2s-22.4 51.2-51.2 51.2zM694.4 912c38.4 0 67.2-32 67.2-67.2s-32-67.2-67.2-67.2c-38.4 0-67.2 32-67.2 67.2s28.8 67.2 67.2 67.2zM694.4 944c-54.4 0-99.2-44.8-99.2-99.2s44.8-99.2 99.2-99.2c54.4 0 99.2 44.8 99.2 99.2s-44.8 99.2-99.2 99.2zM486.4 841.6c16 0 32-12.8 32-32s-12.8-32-32-32c-16 0-32 12.8-32 32s16 32 32 32zM486.4 873.6c-35.2 0-64-28.8-64-64s28.8-64 64-64 64 28.8 64 64-28.8 64-64 64zM572.8 672c112 0 201.6-89.6 201.6-201.6 0-41.6-12.8-80-35.2-112l-12.8-19.2 3.2-3.2c-9.6-22.4-16-48-16-76.8 0-25.6 6.4-51.2 16-73.6l-6.4-3.2 25.6-32c16-19.2 22.4-41.6 22.4-64 0-57.6-44.8-102.4-102.4-102.4-44.8 0-83.2 28.8-96 70.4v6.4l-156.8 265.6h3.2l-16 28.8c-9.6 16-16 32-19.2 48-6.4 19.2-9.6 41.6-9.6 64-6.4 115.2 86.4 204.8 198.4 204.8zM572.8 704c-131.2 0-233.6-105.6-233.6-233.6 0-25.6 3.2-51.2 12.8-73.6 6.4-19.2 12.8-38.4 22.4-57.6l169.6-294.4c19.2-54.4 67.2-92.8 128-92.8 73.6 0 134.4 60.8 134.4 134.4 0 32-12.8 60.8-28.8 86.4s-25.6 54.4-25.6 89.6c0 28.8 6.4 54.4 19.2 76.8 25.6 38.4 38.4 83.2 38.4 131.2-3.2 128-105.6 233.6-236.8 233.6zM352 732.8c9.6 0 19.2-6.4 19.2-19.2s-9.6-16-19.2-16-16 6.4-16 19.2 6.4 16 16 16zM352 764.8c-28.8 0-51.2-22.4-51.2-51.2s22.4-51.2 51.2-51.2 51.2 22.4 51.2 51.2c0 28.8-22.4 51.2-51.2 51.2z" />
<glyph unicode="&#xe626;" glyph-name="uniE626" d="M985.6 128h-83.2v16c0 32-16 64-38.4 89.6-25.6 22.4-54.4 35.2-89.6 35.2s-67.2-12.8-89.6-35.2c-22.4-22.4-38.4-57.6-38.4-86.4v-19.2h-236.8v16c0 32-16 64-38.4 89.6-22.4 22.4-51.2 35.2-89.6 35.2-35.2 0-67.2-12.8-89.6-35.2s-38.4-57.6-38.4-86.4v-19.2h-121.6c-9.6 0-16 0-22.4 9.6l-3.2 3.2c-9.6 9.6-6.4 22.4-6.4 28.8v646.4c-3.2 6.4-3.2 22.4 6.4 32l3.2 3.2c0 3.2 6.4 12.8 22.4 12.8h636.8c12.8 0 35.2-6.4 44.8-16l3.2-3.2c6.4-9.6 19.2-22.4 19.2-35.2v-169.6h67.2c6.4 0 16 0 25.6-3.2 3.2 0 6.4-3.2 9.6-3.2 9.6-3.2 19.2-6.4 25.6-12.8l115.2-112c6.4-6.4 19.2-16 22.4-28.8 0-3.2 3.2-6.4 6.4-9.6 6.4-6.4 12.8-16 12.8-25.6v-220.8c3.2-3.2 6.4-3.2 9.6-6.4 9.6-9.6 9.6-22.4 9.6-28.8v-6.4c0-16-9.6-25.6-16-32l-3.2-3.2c-12.8-19.2-25.6-19.2-35.2-19.2zM28.8 160c3.2 0 3.2 0 0 0h89.6c3.2 35.2 22.4 70.4 44.8 92.8 28.8 28.8 67.2 44.8 112 44.8s83.2-16 112-44.8c25.6-25.6 41.6-60.8 44.8-96h176c3.2 35.2 22.4 70.4 44.8 92.8 32 32 67.2 44.8 112 44.8s83.2-16 112-44.8c25.6-25.6 41.6-60.8 44.8-96h54.4c9.6 0 12.8 0 12.8 3.2l3.2 3.2c3.2 3.2 6.4 6.4 6.4 9.6v12.8l-9.6 9.6 3.2 6.4v240l-6.4 6.4c-3.2 6.4-9.6 12.8-12.8 19.2s-9.6 12.8-16 19.2l-115.2 115.2c-3.2 3.2-6.4 3.2-12.8 6.4-3.2 0-6.4 3.2-9.6 3.2s-9.6 3.2-16 3.2l-99.2-3.2v201.6c0 3.2-9.6 9.6-12.8 12.8l-3.2 3.2c-3.2 3.2-16 6.4-22.4 6.4h-630.4l-6.4-6.4v-3.2c3.2-3.2 3.2-9.6 3.2-12.8v-636.8c0-6.4 0-9.6-3.2-12.8zM960 384h-256v192h86.4c9.6 0 16-3.2 22.4-9.6l124.8-108.8s3.2 0 3.2-3.2c6.4-3.2 19.2-6.4 19.2-19.2v-51.2zM736 416h192v12.8c-6.4 3.2-12.8 6.4-16 9.6l-121.6 105.6h-54.4v-128zM774.4 25.6c-32 0-57.6 9.6-80 32s-32 48-32 80 9.6 57.6 32 80 48 32 80 32 57.6-9.6 80-32 32-48 32-80-9.6-57.6-32-80c-25.6-22.4-51.2-32-80-32zM774.4 217.6c-22.4 0-41.6-6.4-57.6-22.4s-22.4-35.2-22.4-57.6 6.4-41.6 22.4-57.6 35.2-22.4 57.6-22.4 41.6 6.4 57.6 22.4c16 16 22.4 35.2 22.4 57.6s-6.4 41.6-22.4 57.6c-19.2 16-38.4 22.4-57.6 22.4zM278.4 25.6c-32 0-57.6 9.6-80 32s-32 48-32 80 9.6 57.6 32 80 48 32 80 32 57.6-9.6 80-32 32-48 32-80-9.6-57.6-32-80-48-32-80-32zM278.4 217.6c-22.4 0-41.6-6.4-57.6-22.4s-22.4-35.2-22.4-57.6 6.4-41.6 22.4-57.6c16-16 35.2-22.4 57.6-22.4s41.6 6.4 57.6 22.4c16 16 22.4 35.2 22.4 57.6s-6.4 41.6-22.4 57.6c-16 16-35.2 22.4-57.6 22.4z" />
<glyph unicode="&#xe627;" glyph-name="uniE627" d="M604.8 179.2c96 163.2 201.6 374.4 201.6 486.4 0 163.2-131.2 294.4-294.4 294.4s-294.4-131.2-294.4-294.4c0-112 105.6-323.2 201.6-486.4-108.8-16-179.2-64-179.2-118.4 0-70.4 115.2-124.8 272-124.8 153.6 0 272 54.4 272 124.8 0 54.4-70.4 102.4-179.2 118.4zM563.2 108.8c3.2 3.2 3.2 6.4 6.4 9.6 3.2 6.4 9.6 16 12.8 22.4 102.4-12.8 160-51.2 160-83.2 0-41.6-96-89.6-233.6-89.6s-233.6 44.8-233.6 89.6c0 32 60.8 70.4 160 83.2 6.4-9.6 9.6-16 12.8-22.4 3.2-3.2 6.4-9.6 6.4-12.8 6.4-9.6 9.6-16 16-25.6 0-3.2 3.2-6.4 3.2-6.4 6.4-6.4 9.6-12.8 12.8-19.2 3.2-3.2 3.2-6.4 3.2-6.4l16-25.6 16 25.6s0 3.2 3.2 6.4c0 0 0 3.2 3.2 3.2 3.2 3.2 6.4 9.6 9.6 16 0 0 3.2 3.2 3.2 6.4 12.8 12.8 16 19.2 22.4 28.8zM249.6 665.6c0 144 118.4 262.4 262.4 262.4s262.4-118.4 262.4-262.4c0-57.6-35.2-188.8-198.4-470.4l-22.4-38.4c-3.2-6.4-6.4-12.8-9.6-16v-3.2l-3.2-6.4-3.2-3.2-9.6-12.8-6.4-9.6s0-3.2-3.2-3.2c-3.2-3.2-3.2-6.4-6.4-9.6l-6.4 3.2-6.4 6.4-6.4 9.6-6.4 16-3.2 6.4-3.2 3.2-3.2 9.6c-3.2 3.2-6.4 9.6-6.4 12.8l-22.4 35.2c-128 220.8-198.4 387.2-198.4 470.4zM675.2 665.6c0 89.6-73.6 160-163.2 160s-163.2-73.6-163.2-160c0-89.6 73.6-163.2 163.2-163.2 89.6 3.2 163.2 73.6 163.2 163.2zM374.4 665.6c0 76.8 60.8 137.6 137.6 137.6s137.6-60.8 137.6-137.6-60.8-137.6-137.6-137.6-137.6 64-137.6 137.6z" />
<glyph unicode="&#xe628;" glyph-name="uniE628" d="M512 960c-281.6 0-512-230.4-512-512s230.4-512 512-512 512 230.4 512 512-230.4 512-512 512zM716.8 528v-12.8c0-137.6-105.6-300.8-300.8-300.8-60.8 0-115.2 16-160 48h25.6c48 0 96 16 131.2 44.8-44.8 0-86.4 32-99.2 73.6 6.4 0 12.8-3.2 19.2-3.2 9.6 0 19.2 0 28.8 3.2-48 9.6-83.2 51.2-83.2 102.4 12.8-6.4 32-12.8 48-12.8-28.8 19.2-48 51.2-48 86.4 0 19.2 6.4 38.4 12.8 54.4 51.2-64 128-105.6 217.6-108.8-3.2 6.4-3.2 16-3.2 22.4 0 57.6 48 105.6 105.6 105.6 28.8 0 57.6-12.8 76.8-32 25.6 3.2 48 12.8 67.2 25.6-6.4-25.6-25.6-44.8-44.8-57.6 22.4 3.2 41.6 9.6 60.8 16-16-22.4-35.2-38.4-54.4-54.4z" />
<glyph unicode="&#xe629;" glyph-name="uniE629" d="M512 960c-281.6 0-512-230.4-512-512s230.4-512 512-512 512 230.4 512 512-230.4 512-512 512zM368 233.6h-99.2v320h99.2v-320zM316.8 592c-38.4 0-60.8 25.6-60.8 57.6s25.6 54.4 60.8 54.4c35.2 0 60.8-22.4 60.8-54.4s-22.4-57.6-60.8-57.6zM768 233.6h-112v166.4c0 44.8-19.2 73.6-57.6 73.6-28.8 0-44.8-19.2-54.4-38.4-3.2-6.4-3.2-16-3.2-25.6v-172.8h-112v320h112v-51.2c6.4 22.4 41.6 54.4 99.2 54.4 70.4 0 128-44.8 128-144v-182.4z" />
<glyph unicode="&#xe62a;" glyph-name="uniE62A" d="M710.4 556.8v89.6h-12.8l-76.8-3.2v-86.4zM512 358.4c51.2 0 89.6 41.6 89.6 89.6 0 19.2-6.4 38.4-16 51.2-16 22.4-41.6 38.4-73.6 38.4s-57.6-16-73.6-38.4c-9.6-16-16-32-16-51.2 0-51.2 38.4-89.6 89.6-89.6zM512 960c-281.6 0-512-230.4-512-512s230.4-512 512-512 512 230.4 512 512-230.4 512-512 512zM768 499.2v-211.2c0-54.4-44.8-99.2-99.2-99.2h-313.6c-54.4 3.2-99.2 48-99.2 102.4v316.8c0 51.2 44.8 96 99.2 96h313.6c54.4 0 99.2-44.8 99.2-99.2v-105.6zM652.8 448c0-76.8-64-140.8-140.8-140.8s-140.8 64-140.8 140.8c0 19.2 3.2 35.2 9.6 51.2h-73.6v-211.2c0-25.6 22.4-48 48-48h313.6c25.6 0 48 22.4 48 48v211.2h-76.8c9.6-16 12.8-32 12.8-51.2z" />
<glyph unicode="&#xe62b;" glyph-name="uniE62B" d="M512 960c-281.6 0-512-230.4-512-512s230.4-512 512-512 512 230.4 512 512-230.4 512-512 512zM624 534.4l-6.4-76.8h-80v-265.6h-99.2v265.6h-54.4v76.8h54.4v51.2c0 22.4 0 57.6 16 80 22.4 22.4 44.8 38.4 86.4 38.4 67.2 0 96-9.6 96-9.6l-12.8-80s-22.4 6.4-41.6 6.4c-19.2 0-38.4-6.4-38.4-28.8v-60.8l80 3.2z" />
<glyph unicode="&#xe62c;" glyph-name="uniE62C" d="M512 960c-281.6 0-512-230.4-512-512s230.4-512 512-512 512 230.4 512 512-230.4 512-512 512zM512 192c-25.6 0-48 3.2-73.6 9.6 9.6 16 19.2 35.2 25.6 54.4 3.2 12.8 19.2 70.4 19.2 70.4 9.6-16 35.2-32 64-32 83.2 0 137.6 73.6 137.6 176 0 76.8-64 147.2-163.2 147.2-121.6 0-182.4-86.4-182.4-160 0-44.8 16-83.2 51.2-99.2 6.4-3.2 9.6 0 12.8 6.4 0 3.2 3.2 16 6.4 19.2 3.2 6.4 0 9.6-3.2 12.8-9.6 12.8-16 28.8-16 51.2 0 64 48 121.6 124.8 121.6 67.2 0 105.6-41.6 105.6-99.2 0-73.6-32-137.6-80-137.6-25.6 0-48 22.4-41.6 48 6.4 32 22.4 67.2 22.4 89.6s-12.8 38.4-35.2 38.4c-28.8 0-48-28.8-48-67.2 0-25.6 9.6-41.6 9.6-41.6s-28.8-118.4-32-140.8c-3.2-19.2-6.4-41.6-3.2-57.6-92.8 54.4-156.8 144-156.8 246.4 0 140.8 115.2 256 256 256s256-115.2 256-256-115.2-256-256-256z" />
<glyph unicode="&#xe62d;" glyph-name="uniE62D" d="M505.6 585.6c-6.4 54.4-44.8 96-86.4 99.2s-67.2-38.4-60.8-92.8c6.4-54.4 44.8-99.2 86.4-99.2 38.4-3.2 67.2 38.4 60.8 92.8zM512 960c-281.6 0-512-230.4-512-512s230.4-512 512-512 512 230.4 512 512-230.4 512-512 512zM428.8 192c-89.6 0-163.2 35.2-163.2 92.8s67.2 115.2 156.8 115.2h28.8c-12.8 12.8-22.4 25.6-22.4 44.8 0 9.6 3.2 19.2 9.6 28.8h-16c-73.6 0-121.6 51.2-121.6 115.2 0 60.8 67.2 115.2 137.6 115.2h160l-35.2-25.6h-51.2c32-12.8 51.2-51.2 51.2-92.8 0-32-19.2-60.8-44.8-83.2-25.6-19.2-32-28.8-32-44.8s28.8-38.4 41.6-48c41.6-28.8 54.4-57.6 54.4-102.4 0-57.6-54.4-115.2-153.6-115.2zM758.4 435.2h-60.8v-60.8h-51.2v60.8h-60.8v51.2h60.8v60.8h51.2v-60.8h60.8v-51.2zM476.8 380.8c-12.8 3.2-25.6 6.4-38.4 6.4-60.8 0-115.2-38.4-115.2-83.2s44.8-83.2 105.6-83.2c86.4 0 115.2 35.2 115.2 83.2 0 6.4 0 9.6-3.2 16-6.4 22.4-32 35.2-64 60.8z" />
<glyph unicode="&#xe62e;" glyph-name="uniE62E" d="M480 291.2c0-3.2-3.2-3.2-6.4-6.4s-3.2-3.2-6.4-3.2-3.2 0-3.2 3.2v96h-22.4v-99.2c0-6.4 0-12.8 3.2-16s6.4-6.4 12.8-6.4c3.2 0 9.6 0 12.8 3.2s9.6 6.4 12.8 9.6v-12.8h22.4v118.4h-25.6v-86.4zM566.4 380.8c-3.2 0-6.4 0-9.6-3.2s-6.4-3.2-9.6-6.4v51.2h-22.4v-156.8h19.2v9.6c3.2-3.2 6.4-6.4 9.6-6.4 3.2-3.2 6.4-3.2 12.8-3.2s12.8 3.2 16 6.4c3.2 3.2 6.4 9.6 6.4 19.2v64c0 9.6-3.2 16-6.4 22.4-3.2 3.2-9.6 3.2-16 3.2zM566.4 291.2c0-3.2 0-6.4-3.2-6.4 0-3.2-3.2-3.2-6.4-3.2h-6.4c-3.2 0-3.2 3.2-6.4 3.2v73.6s3.2 3.2 6.4 3.2h6.4c3.2 0 6.4 0 6.4-3.2 3.2-3.2 3.2-6.4 3.2-9.6v-57.6zM508.8 512c3.2 0 6.4 0 9.6 3.2s3.2 3.2 3.2 6.4v70.4c0 3.2 0 6.4-3.2 6.4-3.2 3.2-6.4 3.2-9.6 3.2s-6.4 0-6.4-3.2c-3.2 0-3.2-3.2-3.2-6.4v-70.4c0-3.2 0-6.4 3.2-6.4 0-3.2 3.2-3.2 6.4-3.2zM345.6 400h28.8v-137.6h25.6v137.6h28.8v22.4h-83.2zM512 960c-281.6 0-512-230.4-512-512s230.4-512 512-512 512 230.4 512 512-230.4 512-512 512zM566.4 620.8h25.6v-99.2c0-3.2 0-6.4 3.2-6.4 0 0 3.2-3.2 6.4-3.2s3.2 0 6.4 3.2 6.4 3.2 6.4 6.4v96h25.6v-128h-25.6v12.8c-6.4-6.4-9.6-9.6-16-12.8s-9.6-3.2-16-3.2-9.6 3.2-12.8 6.4c-3.2 3.2-3.2 9.6-3.2 16v112zM470.4 592c0 9.6 3.2 19.2 9.6 22.4 6.4 6.4 16 9.6 28.8 9.6 9.6 0 19.2-3.2 25.6-9.6s9.6-12.8 9.6-25.6v-67.2c0-9.6-3.2-19.2-9.6-25.6s-16-9.6-28.8-9.6-19.2 3.2-28.8 9.6c-6.4 6.4-9.6 16-9.6 25.6l3.2 70.4zM400 665.6l19.2-70.4h3.2l19.2 70.4h28.8l-35.2-102.4v-73.6h-28.8v70.4l-35.2 105.6h28.8zM768 304c0-41.6-32-73.6-73.6-73.6h-364.8c-38.4 0-73.6 32-73.6 73.6v73.6c0 41.6 32 73.6 73.6 73.6h364.8c38.4 0 73.6-32 73.6-73.6v-73.6zM636.8 384c-9.6 0-19.2-3.2-25.6-9.6s-9.6-16-9.6-25.6v-51.2c0-12.8 3.2-19.2 9.6-25.6s12.8-9.6 25.6-9.6 19.2 3.2 25.6 9.6c6.4 6.4 9.6 16 9.6 25.6v6.4h-25.6v-6.4c0-6.4 0-12.8-3.2-12.8 0-3.2-3.2-3.2-6.4-3.2s-6.4 0-6.4 3.2-3.2 6.4-3.2 12.8v22.4h44.8v28.8c0 9.6-3.2 19.2-9.6 25.6s-16 9.6-25.6 9.6zM646.4 336h-19.2v12.8c0 3.2 0 9.6 3.2 9.6 0 3.2 3.2 3.2 6.4 3.2s6.4 0 6.4-3.2 3.2-6.4 3.2-9.6v-12.8z" />
<glyph unicode="&#xe62f;" glyph-name="uniE62F" d="M444.8 348.8l166.4 99.2-166.4 99.2zM512 960c-281.6 0-512-230.4-512-512s230.4-512 512-512 512 230.4 512 512-230.4 512-512 512zM768 355.2c0-89.6-89.6-89.6-89.6-89.6h-332.8c-89.6 3.2-89.6 89.6-89.6 89.6v182.4c0 89.6 89.6 89.6 89.6 89.6h336c89.6 0 89.6-89.6 89.6-89.6v-182.4z" />
<glyph unicode="&#xe630;" glyph-name="uniE630" d="M480 230.4v89.6s-54.4-6.4-76.8-12.8c19.2-41.6 44.8-67.2 76.8-76.8zM352 278.4c16-12.8 38.4-22.4 57.6-28.8-9.6 12.8-19.2 28.8-28.8 44.8-9.6-6.4-22.4-9.6-28.8-16zM393.6 332.8c28.8 9.6 54.4 19.2 86.4 22.4v60.8h-96c3.2-32 0-54.4 9.6-83.2zM403.2 588.8c25.6-6.4 76.8-12.8 76.8-12.8v89.6c-32-9.6-57.6-35.2-76.8-76.8zM409.6 649.6c-22.4-6.4-41.6-19.2-57.6-28.8 9.6-6.4 19.2-9.6 28.8-16 6.4 16 16 32 28.8 44.8zM348.8 416h-92.8c3.2-32 28.8-86.4 64-121.6 12.8 9.6 28.8 16 44.8 22.4-9.6 32-16 67.2-16 99.2zM384 480h96v60.8c-32 0-57.6 12.8-86.4 22.4-9.6-28.8-6.4-51.2-9.6-83.2zM364.8 576c-16 6.4-32 19.2-44.8 28.8-35.2-35.2-57.6-92.8-64-124.8h89.6c3.2 32 9.6 64 19.2 96zM672 617.6c-16 12.8-38.4 22.4-57.6 28.8 9.6-12.8 19.2-28.8 28.8-44.8 9.6 6.4 22.4 9.6 28.8 16zM659.2 320c16-6.4 32-19.2 44.8-28.8 35.2 35.2 60.8 92.8 64 124.8h-89.6c-3.2-32-9.6-64-19.2-96zM659.2 576c9.6-32 16-64 19.2-96h89.6c-3.2 32-28.8 89.6-64 124.8-16-9.6-28.8-22.4-44.8-28.8zM640 416h-96v-60.8c32 0 57.6-12.8 86.4-22.4 9.6 28.8 6.4 51.2 9.6 83.2zM614.4 246.4c22.4 6.4 41.6 19.2 57.6 28.8-9.6 6.4-19.2 9.6-28.8 16-6.4-16-16-32-28.8-44.8zM512 960c-281.6 0-512-230.4-512-512s230.4-512 512-512 512 230.4 512 512-230.4 512-512 512zM512 192c-160 0-291.2 115.2-291.2 256s131.2 256 291.2 256 291.2-115.2 291.2-256-131.2-256-291.2-256zM544 665.6v-89.6s54.4 6.4 76.8 12.8c-19.2 41.6-44.8 67.2-76.8 76.8zM630.4 563.2c-28.8-9.6-54.4-19.2-86.4-22.4v-60.8h96c-3.2 32 0 54.4-9.6 83.2zM544 230.4c32 6.4 57.6 35.2 80 73.6-25.6 9.6-80 12.8-80 16v-89.6z" />
<glyph unicode="&#xe631;" glyph-name="uniE631" d="M272 563.2v-230.4l144 112zM713.6 592h-403.2l201.6-163.2zM512 368l-57.6 48-140.8-112h396.8l-140.8 112zM512 960c-281.6 0-512-230.4-512-512s230.4-512 512-512 512 230.4 512 512-230.4 512-512 512zM800 316.8c0-32-25.6-60.8-60.8-60.8h-454.4c-32 0-60.8 25.6-60.8 60.8v262.4c0 32 25.6 60.8 60.8 60.8h454.4c32 0 60.8-25.6 60.8-60.8v-262.4zM752 332.8v230.4l-144-118.4z" />
<glyph unicode="&#xe632;" glyph-name="uniE632" d="M819.2 803.2c-6.4 3.2-9.6 3.2-16 3.2-9.6 0-19.2-3.2-25.6-12.8l-358.4-505.6-172.8 172.8c-6.4 6.4-12.8 9.6-22.4 9.6-6.4 0-12.8-3.2-19.2-6.4-12.8-9.6-16-25.6-9.6-41.6l160-297.6 3.2-3.2c16-22.4 41.6-35.2 70.4-35.2h3.2c32 0 57.6 16 73.6 41.6v3.2l323.2 630.4c9.6 16 3.2 35.2-9.6 41.6z" />
<glyph unicode="&#xe633;" glyph-name="uniE633" d="M736 576c16 0 22.4-9.6 9.6-22.4l-211.2-211.2c-12.8-12.8-32-12.8-44.8 0l-211.2 211.2c-12.8 12.8-9.6 22.4 9.6 22.4h448z" />
<glyph unicode="&#xe634;" glyph-name="uniE634" d="M278.4 320c-25.6 0-32 16-12.8 32l214.4 214.4c19.2 19.2 48 19.2 67.2 0l214.4-214.4c19.2-19.2 12.8-32-12.8-32h-470.4z" />
<glyph unicode="&#xe635;" glyph-name="uniE635" d="M384 681.6c0 25.6 16 32 32 12.8l214.4-214.4c19.2-19.2 19.2-48 0-67.2l-214.4-211.2c-19.2-19.2-32-12.8-32 12.8v467.2z" />
<glyph unicode="&#xe636;" glyph-name="uniE636" d="M640 681.6c0 25.6-16 32-32 12.8l-211.2-214.4c-19.2-19.2-19.2-48 0-67.2l214.4-214.4c19.2-19.2 32-12.8 32 12.8v470.4z" />
<glyph unicode="&#xe637;" glyph-name="uniE637" d="M316.8 230.4c3.2 3.2 0 9.6 0 12.8-3.2 3.2-6.4 6.4-12.8 6.4-3.2 0-9.6-3.2-19.2-6.4l-16-9.6 16-28.8 19.2 9.6c6.4 6.4 9.6 12.8 12.8 16zM787.2 704l102.4 121.6s-67.2 89.6-176 102.4c-108.8 12.8-144-54.4-198.4-57.6-54.4 3.2-92.8 67.2-198.4 57.6-115.2-12.8-182.4-102.4-182.4-102.4l102.4-121.6h550.4zM336 201.6c-6.4 0-12.8-3.2-19.2-6.4l-19.2-9.6 19.2-32 19.2 9.6c3.2 0 6.4 3.2 6.4 6.4l6.4 6.4c0 3.2 3.2 6.4 3.2 9.6s0 6.4-3.2 9.6c-3.2 3.2-6.4 6.4-12.8 6.4zM790.4 672h-556.8s-268.8-208-179.2-595.2c0 0 28.8-108.8 163.2-108.8h588.8c134.4 0 163.2 108.8 163.2 108.8 89.6 387.2-179.2 595.2-179.2 595.2zM387.2 166.4c-3.2-6.4-6.4-12.8-12.8-16s-12.8-9.6-19.2-12.8l-54.4-32-80 137.6 54.4 32c6.4 3.2 9.6 6.4 16 6.4 6.4 3.2 12.8 3.2 19.2 3.2s12.8 0 16-3.2c6.4-3.2 9.6-6.4 12.8-16 3.2-6.4 6.4-16 3.2-22.4 0-6.4-3.2-12.8-9.6-19.2 3.2 0 9.6 3.2 12.8 3.2h12.8c3.2 0 6.4-3.2 12.8-6.4l9.6-9.6c3.2-6.4 6.4-16 6.4-22.4 3.2-9.6 3.2-16 0-22.4zM524.8 249.6c-3.2-6.4-6.4-16-12.8-22.4s-12.8-12.8-22.4-19.2c-9.6-6.4-19.2-9.6-25.6-9.6h-25.6c-6.4 3.2-16 6.4-22.4 9.6-6.4 6.4-12.8 12.8-16 19.2l-48 86.4 32 19.2 48-83.2c3.2-3.2 3.2-6.4 6.4-9.6s6.4-6.4 9.6-6.4c3.2 0 6.4-3.2 12.8-3.2 3.2 0 9.6 3.2 12.8 3.2s9.6 6.4 9.6 9.6 3.2 6.4 3.2 9.6v12.8s-3.2 6.4-3.2 12.8l-48 83.2 32 19.2 48-86.4c3.2-9.6 6.4-16 9.6-25.6 3.2-3.2 0-9.6 0-19.2zM572.8 262.4l-80 137.6 32 19.2 64-108.8 54.4 32 16-28.8-86.4-51.2zM758.4 371.2l-86.4 32 35.2-64-32-19.2-80 137.6 32 19.2 32-54.4 16 83.2 41.6 22.4-22.4-96 105.6-38.4-41.6-22.4z" />
<glyph unicode="&#xe638;" glyph-name="uniE638" d="M96 224v387.2c0 38.4 12.8 67.2 38.4 96s57.6 38.4 96 38.4h326.4c3.2 0 6.4 0 9.6-3.2s3.2-6.4 3.2-9.6v-28.8c0-3.2 0-6.4-3.2-9.6s-6.4-3.2-9.6-3.2h-326.4c-22.4-6.4-38.4-12.8-54.4-28.8s-22.4-32-22.4-51.2v-387.2c0-19.2 6.4-38.4 22.4-51.2 16-16 32-22.4 51.2-22.4h387.2c19.2 0 38.4 6.4 51.2 22.4 16 16 22.4 32 22.4 51.2v147.2c0 3.2 0 6.4 3.2 9.6s6.4 3.2 9.6 3.2h35.2c3.2 0 6.4 0 9.6-3.2s3.2-6.4 3.2-9.6v-147.2c0-38.4-12.8-67.2-38.4-96s-57.6-38.4-96-38.4h-384c-38.4 0-67.2 12.8-96 38.4s-38.4 60.8-38.4 96zM412.8 358.4c0 3.2 0 6.4 3.2 9.6l304 304-80 83.2c-6.4 6.4-9.6 12.8-9.6 22.4s3.2 16 9.6 22.4c6.4 6.4 12.8 9.6 22.4 9.6h236.8c9.6 0 16-3.2 22.4-9.6 3.2-9.6 6.4-16 6.4-25.6v-236.8c0-9.6-3.2-16-9.6-22.4s-12.8-9.6-22.4-9.6c-9.6 0-16 3.2-22.4 9.6l-83.2 83.2-304-304c-3.2-3.2-6.4-3.2-9.6-3.2s-6.4 0-9.6 3.2l-54.4 54.4c3.2 3.2 0 6.4 0 9.6z" />
<glyph unicode="&#xe639;" glyph-name="uniE639" d="M480 416c-3.2 3.2-6.4 9.6-9.6 16s-3.2 12.8-3.2 16v512c-262.4-25.6-467.2-243.2-467.2-512 0-281.6 230.4-512 512-512 124.8 0 236.8 44.8 326.4 118.4l-358.4 361.6zM1024 496c-22.4 246.4-217.6 441.6-464 464v-460.8h464zM908.8 121.6c64 76.8 105.6 172.8 115.2 278.4h-393.6l278.4-278.4z" />
<glyph unicode="&#xe63a;" glyph-name="uniE63A" d="M348.8 633.6v-105.6c38.4 0 83.2 3.2 124.8 3.2h22.4l-35.2 102.4h-112zM323.2 457.6c-6.4 0-12.8 0-19.2-3.2h-3.2c-3.2 0-9.6-3.2-12.8-3.2-54.4-16-96-67.2-96-128 0-73.6 60.8-131.2 131.2-131.2 73.6 0 131.2 60.8 131.2 131.2 3.2 73.6-57.6 134.4-131.2 134.4zM323.2 252.8c-41.6 0-73.6 32-73.6 73.6s32 73.6 73.6 73.6c41.6 0 73.6-32 73.6-73.6s-32-73.6-73.6-73.6zM790.4 268.8c0-19.44-15.76-35.2-35.2-35.2s-35.2 15.76-35.2 35.2c0 19.44 15.76 35.2 35.2 35.2s35.2-15.76 35.2-35.2zM380.8 326.4c0-31.812-25.788-57.6-57.6-57.6s-57.6 25.788-57.6 57.6c0 31.812 25.788 57.6 57.6 57.6s57.6-25.788 57.6-57.6zM803.2 502.4c-35.2 0-67.2 3.2-99.2 3.2 0 0-3.2 0-3.2 3.2v89.6s-6.4 6.4-16 6.4c-3.2 0-9.6 0-12.8-3.2v-89.6s-41.6 0-102.4 3.2c-3.2 0-9.6 3.2-12.8 12.8-9.6 25.6-28.8 73.6-54.4 147.2 0 0-12.8 32-48 32h-166.4v-185.6s-12.8-6.4-22.4-6.4c-3.2-19.2-3.2-28.8 9.6-28.8h6.4c6.4 0 9.6 3.2 16 3.2 12.8 3.2 22.4 3.2 35.2 3.2 76.8 0 147.2-60.8 156.8-140.8 0-3.2 0-6.4 3.2-12.8h9.6c76.8 3.2 153.6 3.2 233.6 6.4-32-9.6-54.4-38.4-54.4-73.6 0-41.6 35.2-76.8 76.8-76.8s76.8 35.2 76.8 76.8c0 38.4-28.8 70.4-64 76.8 57.6 3.2 44.8 3.2 54.4 54.4 3.2 25.6 6.4 51.2 9.6 73.6 0 19.2-6.4 25.6-32 25.6zM473.6 512c-48 0-96 0-140.8-3.2v137.6h140.8l44.8-134.4h-44.8zM800 268.8c0-25.6-19.2-44.8-44.8-44.8s-44.8 19.2-44.8 44.8c0 25.6 19.2 44.8 44.8 44.8s44.8-19.2 44.8-44.8zM512 960c-281.6 0-512-230.4-512-512s230.4-512 512-512 512 230.4 512 512-230.4 512-512 512zM864 470.4c-3.2-28.8-6.4-54.4-9.6-76.8 0-6.4-3.2-12.8-3.2-19.2-3.2-16-6.4-28.8-9.6-35.2 16-19.2 22.4-41.6 22.4-67.2 0-60.8-48-108.8-108.8-108.8s-108.8 48-108.8 108.8c0 12.8 3.2 25.6 6.4 38.4h-166.4c-9.6-86.4-76.8-150.4-163.2-150.4-89.6 0-163.2 73.6-163.2 166.4 0 60.8 35.2 115.2 83.2 144-12.8 16-9.6 35.2-6.4 51.2l3.2 25.6 19.2-3.2v192h198.4c44.8 0 67.2-32 76.8-51.2 19.2-51.2 32-89.6 41.6-115.2 3.2-9.6 6.4-16 9.6-22.4h54.4v76.8l16 9.6c9.6 6.4 19.2 6.4 28.8 6.4 19.2 0 32-9.6 35.2-9.6l12.8-9.6v-73.6c22.4 0 48-3.2 70.4-3.2 16 0 32-3.2 44.8-16 16-25.6 16-41.6 16-57.6z" />
<glyph unicode="&#xe63b;" glyph-name="uniE63B" d="M854.4 393.6c3.2 22.4 6.4 48 9.6 76.8 0 12.8 0 32-12.8 48-12.8 12.8-28.8 16-44.8 16-25.6 0-48 3.2-70.4 3.2v73.6l-12.8 9.6c-3.2 3.2-16 9.6-35.2 9.6-9.6 0-19.2-3.2-28.8-6.4l-16-9.6v-76.8h-54.4c-3.2 6.4-6.4 12.8-9.6 22.4-9.6 28.8-25.6 67.2-41.6 118.4-9.6 25.6-35.2 57.6-80 57.6h-198.4v-192l-19.2-3.2-3.2-25.6c-3.2-12.8-6.4-35.2 6.4-51.2-48-25.6-83.2-76.8-83.2-137.6 0-89.6 73.6-163.2 163.2-163.2 83.2 0 153.6 64 163.2 147.2h166.4c-3.2-12.8-6.4-25.6-6.4-38.4 0-60.8 48-108.8 108.8-108.8s108.8 48 108.8 108.8c0 25.6-9.6 48-22.4 67.2 6.4 9.6 9.6 19.2 9.6 35.2 0 3.2 0 9.6 3.2 19.2zM323.2 192c-70.4 0-131.2 60.8-131.2 134.4 0 60.8 41.6 112 96 128 3.2 0 6.4 0 12.8 3.2h3.2c6.4 0 12.8 3.2 19.2 3.2 73.6 0 131.2-60.8 131.2-131.2 3.2-76.8-57.6-137.6-131.2-137.6zM822.4 396.8c-9.6-51.2 0-51.2-54.4-54.4 35.2-6.4 64-38.4 64-76.8 0-41.6-35.2-76.8-76.8-76.8s-76.8 35.2-76.8 76.8c0 35.2 22.4 64 54.4 73.6-76.8-3.2-153.6-3.2-233.6-6.4h-9.6c0 3.2 0 9.6-3.2 12.8-9.6 80-80 140.8-156.8 140.8-12.8 0-22.4-3.2-35.2-3.2-6.4 0-9.6-3.2-16-3.2h-6.4c-12.8 0-12.8 9.6-9.6 28.8 9.6 0 22.4 6.4 22.4 6.4v188.8h166.4c32 0 48-32 48-32 25.6-73.6 44.8-121.6 54.4-147.2 3.2-9.6 9.6-12.8 12.8-12.8 60.8 0 102.4-3.2 102.4-3.2v89.6c6.4 3.2 9.6 3.2 12.8 3.2 9.6 0 16-6.4 16-6.4v-89.6l3.2-3.2c35.2 0 67.2-3.2 99.2-3.2 22.4 0 28.8-6.4 25.6-28.8 3.2-22.4 0-48-3.2-73.6zM710.4 268.8c0-25.6 19.2-44.8 44.8-44.8s44.8 19.2 44.8 44.8c0 25.6-19.2 44.8-44.8 44.8s-44.8-19.2-44.8-44.8zM790.4 268.8c0-19.2-16-35.2-35.2-35.2s-35.2 16-35.2 35.2c0 19.2 16 35.2 35.2 35.2 19.2 3.2 35.2-12.8 35.2-35.2zM473.6 649.6h-140.8v-137.6c41.6 0 92.8 3.2 140.8 3.2h44.8l-44.8 134.4zM473.6 528c-41.6 0-83.2 0-124.8-3.2v105.6h112l35.2-102.4h-22.4zM323.2 400c-41.6 0-73.6-32-73.6-73.6s32-73.6 73.6-73.6c41.6 0 73.6 32 73.6 73.6 0 38.4-32 73.6-73.6 73.6zM323.2 268.8c-32 0-57.6 25.6-57.6 57.6s25.6 57.6 57.6 57.6 57.6-25.6 57.6-57.6-25.6-57.6-57.6-57.6zM512 960c-281.6 0-512-230.4-512-512s230.4-512 512-512 512 230.4 512 512-230.4 512-512 512zM512-32c-265.6 0-480 214.4-480 480s214.4 480 480 480 480-214.4 480-480-214.4-480-480-480z" />
<glyph unicode="&#xe63c;" glyph-name="uniE63C" d="M368 678.4v-92.8c35.2 0 73.6 3.2 108.8 3.2h19.2l-28.8 89.6h-99.2zM393.6 400c0-28.277-22.923-51.2-51.2-51.2s-51.2 22.923-51.2 51.2c0 28.277 22.923 51.2 51.2 51.2s51.2-22.923 51.2-51.2zM460.8 412.8v9.6c0 12.8-6.4 22.4-9.6 35.2 0 3.2-3.2 6.4-6.4 9.6 0 3.2-3.2 3.2-3.2 6.4-16 22.4-41.6 41.6-70.4 48-6.4 0-12.8 3.2-19.2 3.2-9.6 0-19.2 0-28.8-3.2-9.6-9.6-16-9.6-22.4-9.6h-3.2c-41.6-19.2-73.6-60.8-73.6-112 0-67.2 54.4-118.4 118.4-118.4s118.4 51.2 118.4 118.4v12.8zM342.4 336c-35.2 0-67.2 28.8-67.2 67.2s28.8 67.2 67.2 67.2c35.2 0 67.2-28.8 67.2-67.2s-28.8-67.2-67.2-67.2zM761.6 352c0-17.673-14.327-32-32-32s-32 14.327-32 32c0 17.673 14.327 32 32 32s32-14.327 32-32zM790.4 467.2l9.6 67.2c3.2 22.4-3.2 25.6-25.6 25.6-32 0-57.6 3.2-89.6 3.2 0 0-3.2 0-3.2 3.2v80s-6.4 3.2-16 3.2c-3.2 0-6.4 0-12.8-3.2v-80s-38.4 0-89.6 3.2c-3.2 0-9.6 3.2-12.8 12.8-9.6 22.4-25.6 64-48 131.2 0 0-12.8 28.8-41.6 28.8h-150.4v-166.4s-12.8-3.2-19.2-6.4c-3.2-16-3.2-22.4 3.2-25.6 16 3.2 28.8 9.6 48 9.6 12.8 0 25.6-3.2 35.2-3.2 35.2-6.4 67.2-28.8 86.4-60.8l3.2-3.2c3.2-6.4 6.4-9.6 9.6-16s6.4-9.6 6.4-16c3.2-12.8 6.4-25.6 6.4-38.4h9.6c70.4 3.2 140.8 3.2 208 6.4-28.8-9.6-51.2-35.2-51.2-67.2 0-38.4 32-67.2 67.2-67.2 38.4 0 67.2 32 67.2 67.2s-25.6 64-57.6 67.2c60.8 0 51.2 0 57.6 44.8zM476.8 569.6c-41.6 0-86.4 0-124.8-3.2v124.8h128l41.6-121.6h-44.8zM771.2 352c0-22.4-19.2-41.6-41.6-41.6s-41.6 19.2-41.6 41.6c0 22.4 19.2 41.6 41.6 41.6 22.4-3.2 41.6-19.2 41.6-41.6zM512 960c-246.4 0-448-214.4-448-425.6 0-316.8 419.2-582.4 438.4-595.2 3.2-3.2 6.4-3.2 9.6-3.2s6.4 0 9.6 3.2c19.2 12.8 438.4 268.8 438.4 595.2 0 211.2-201.6 425.6-448 425.6zM832 352c0-54.4-44.8-99.2-99.2-99.2s-99.2 44.8-99.2 99.2c0 9.6 3.2 22.4 6.4 32h-137.6c-9.6-73.6-73.6-131.2-150.4-131.2-83.2 0-150.4 67.2-150.4 150.4 0 54.4 28.8 102.4 73.6 128-9.6 16-6.4 32-3.2 44.8l3.2 25.6 16 3.2v169.6h182.4c41.6 0 64-28.8 70.4-48 16-44.8 28.8-80 38.4-105.6 3.2-6.4 6.4-12.8 6.4-19.2h44.8v64l16 9.6c9.6 6.4 19.2 6.4 28.8 6.4 16 0 28.8-9.6 32-9.6l12.8-9.6v-67.2c19.2 0 41.6 0 60.8-3.2 9.6 0 28.8 0 44.8-16 12.8-12.8 12.8-32 12.8-44.8-3.2-25.6-6.4-48-9.6-70.4 0-6.4-3.2-12.8-3.2-16-3.2-12.8-6.4-22.4-9.6-32 3.2-16 12.8-38.4 12.8-60.8z" />
<glyph unicode="&#xe63d;" glyph-name="uniE63D" d="M512 960c-246.4 0-448-214.4-448-425.6 0-316.8 419.2-582.4 438.4-595.2 3.2-3.2 6.4-3.2 9.6-3.2s6.4 0 9.6 3.2c19.2 12.8 438.4 268.8 438.4 595.2 0 211.2-201.6 425.6-448 425.6zM512-28.8c-99.2 67.2-416 300.8-416 563.2 0 185.6 179.2 393.6 416 393.6s416-208 416-393.6c0-268.8-316.8-496-416-563.2zM822.4 460.8c3.2 22.4 6.4 44.8 9.6 70.4 0 12.8 0 32-12.8 44.8-12.8 16-35.2 16-44.8 16-22.4 0-41.6 0-60.8 3.2v67.2l-9.6 9.6c-3.2 3.2-16 9.6-32 9.6-9.6 0-19.2-3.2-28.8-6.4l-16-9.6v-67.2h-44.8c-3.2 6.4-3.2 12.8-6.4 19.2-9.6 25.6-22.4 57.6-38.4 105.6-6.4 19.2-32 48-70.4 48h-185.6v-172.8l-16-3.2-3.2-19.2c-3.2-12.8-3.2-28.8 3.2-44.8-44.8-25.6-73.6-73.6-73.6-128 0-83.2 67.2-150.4 150.4-150.4 76.8 0 137.6 57.6 150.4 131.2h137.6c-3.2-9.6-6.4-19.2-6.4-32 0-54.4 44.8-99.2 99.2-99.2s99.2 44.8 99.2 99.2c0 22.4-6.4 44.8-22.4 60.8 3.2 6.4 6.4 19.2 9.6 32 9.6 3.2 12.8 9.6 12.8 16zM342.4 281.6c-67.2 0-118.4 54.4-118.4 118.4 0 51.2 32 92.8 73.6 112h3.2c6.4 0 12.8 0 22.4 3.2s19.2 3.2 28.8 3.2c6.4 0 12.8 0 19.2-3.2 28.8-6.4 54.4-22.4 70.4-48 0-3.2 3.2-3.2 3.2-6.4 3.2-3.2 3.2-6.4 6.4-9.6 6.4-9.6 9.6-22.4 9.6-35.2v-22.4c0-57.6-51.2-112-118.4-112zM800 352c0-38.4-32-67.2-67.2-67.2-38.4 0-67.2 32-67.2 67.2 0 32 22.4 57.6 51.2 67.2-70.4-3.2-140.8-3.2-208-6.4h-9.6c0 12.8-3.2 25.6-6.4 38.4-3.2 6.4-3.2 9.6-6.4 16s-6.4 9.6-9.6 16l-3.2 3.2c-19.2 32-51.2 51.2-86.4 60.8-12.8 3.2-22.4 3.2-35.2 3.2-16 0-32-3.2-48-9.6-6.4 3.2-6.4 9.6-3.2 25.6 9.6 0 19.2 6.4 19.2 6.4v169.6h150.4c28.8 0 41.6-28.8 41.6-28.8 22.4-67.2 41.6-108.8 48-131.2 3.2-9.6 9.6-12.8 12.8-12.8 54.4 0 89.6-3.2 89.6-3.2v80c3.2 3.2 9.6 3.2 12.8 3.2 9.6 0 16-3.2 16-3.2v-80s0-3.2 3.2-3.2c32 0 57.6-3.2 89.6-3.2 19.2 0 25.6-6.4 25.6-25.6-3.2-22.4-3.2-44.8-9.6-67.2-9.6-44.8 0-44.8-51.2-48 25.6-6.4 51.2-32 51.2-67.2zM691.2 352c0-22.4 19.2-41.6 41.6-41.6s41.6 19.2 41.6 41.6c0 22.4-19.2 41.6-41.6 41.6-25.6-3.2-41.6-19.2-41.6-41.6zM761.6 352c0-19.2-16-32-32-32-19.2 0-32 16-32 32 0 19.2 16 32 32 32 19.2 0 32-16 32-32zM476.8 694.4h-128v-124.8c38.4 0 83.2 3.2 124.8 3.2h41.6l-38.4 121.6zM476.8 585.6c-35.2 0-73.6 0-108.8-3.2v92.8h99.2l28.8-89.6h-19.2zM342.4 467.2c-35.2 0-67.2-28.8-67.2-67.2s28.8-67.2 67.2-67.2c35.2 0 67.2 28.8 67.2 67.2s-28.8 67.2-67.2 67.2zM342.4 352c-28.8 0-51.2 22.4-51.2 51.2s22.4 51.2 51.2 51.2c28.8 0 51.2-22.4 51.2-51.2s-22.4-51.2-51.2-51.2z" />
<glyph unicode="&#xe63e;" glyph-name="uniE63E" d="M512 678.4c-44.8 0-83.2-38.4-83.2-83.2s38.4-83.2 83.2-83.2c44.8 0 83.2 38.4 83.2 83.2s-38.4 83.2-83.2 83.2zM515.2 966.4c-281.6 0-512-230.4-512-512s230.4-512 512-512 512 230.4 512 512-230.4 512-512 512zM697.6 198.4c0-57.6-92.8-89.6-185.6-89.6s-185.6 32-185.6 89.6c0 38.4 48 70.4 121.6 83.2-60.8 105.6-128 240-128 313.6 0 105.6 86.4 192 192 192s192-86.4 192-192c0-73.6-67.2-204.8-128-313.6 73.6-12.8 121.6-44.8 121.6-83.2zM556.8 246.4c-3.2-3.2-3.2-6.4-6.4-9.6 0-3.2-3.2-6.4-3.2-6.4-3.2-6.4-6.4-12.8-9.6-16 0 0 0-3.2-3.2-3.2-3.2-3.2-6.4-9.6-6.4-9.6v-3.2c-3.2-6.4-6.4-6.4-6.4-6.4l-9.6-16-9.6 16s0 3.2-3.2 3.2c-3.2 3.2-3.2 6.4-6.4 12.8l-3.2 3.2c-3.2 6.4-6.4 9.6-9.6 16 0 3.2-3.2 6.4-3.2 6.4 0 3.2-3.2 6.4-3.2 6.4l-12.8-3.2c-60.8-9.6-89.6-32-89.6-44.8 0-9.6 12.8-19.2 32-28.8 28.8-12.8 70.4-19.2 112-19.2 96 0 147.2 32 147.2 51.2 0 12.8-28.8 35.2-89.6 44.8l-16 6.4zM512 755.2c-89.6 0-160-73.6-160-160 0-54.4 44.8-160 128-304l12.8-22.4 6.4-9.6 3.2-6.4v-3.2l3.2-6.4 6.4-9.6 3.2-3.2v3.2l6.4 9.6v3.2l3.2 6.4v3.2c3.2 3.2 3.2 6.4 6.4 12.8l12.8 25.6c112 192 128 272 128 304 0 86.4-70.4 156.8-160 156.8zM512 489.6c-57.6 0-105.6 48-105.6 105.6s48 105.6 105.6 105.6c57.6 0 105.6-48 105.6-105.6s-48-105.6-105.6-105.6z" />
<glyph unicode="&#xe63f;" glyph-name="uniE63F" d="M512 700.8c-57.6 0-105.6-48-105.6-105.6s48-105.6 105.6-105.6c57.6 0 105.6 48 105.6 105.6s-48 105.6-105.6 105.6zM512 512c-44.8 0-83.2 38.4-83.2 83.2s38.4 83.2 83.2 83.2c44.8 0 83.2-38.4 83.2-83.2s-38.4-83.2-83.2-83.2zM512 787.2c-105.6 0-192-86.4-192-192 0-73.6 67.2-204.8 128-313.6-73.6-12.8-121.6-44.8-121.6-83.2 0-57.6 92.8-89.6 185.6-89.6s185.6 32 185.6 89.6c0 38.4-48 70.4-121.6 83.2 60.8 105.6 128 240 128 313.6 0 105.6-86.4 192-192 192zM659.2 198.4c0-16-51.2-51.2-147.2-51.2-44.8 0-86.4 6.4-112 19.2-19.2 9.6-32 19.2-32 28.8 0 12.8 28.8 35.2 89.6 44.8l12.8 3.2c0-3.2 3.2-6.4 3.2-6.4 0-3.2 3.2-6.4 3.2-6.4 3.2-6.4 6.4-9.6 9.6-16l3.2-3.2c3.2-6.4 6.4-9.6 6.4-12.8l3.2-3.2 9.6-16 9.6 16 3.2 3.2v3.2c3.2 3.2 3.2 6.4 6.4 9.6 0 0 0 3.2 3.2 3.2 3.2 6.4 6.4 9.6 9.6 16 0 3.2 3.2 6.4 3.2 6.4 3.2 3.2 3.2 6.4 6.4 9.6l12.8-3.2c67.2-9.6 96-32 96-44.8zM544 291.2l-12.8-25.6c-3.2-3.2-3.2-6.4-6.4-12.8v-3.2l-3.2-6.4v-3.2l-9.6-3.2v-3.2l-3.2 3.2-6.4 9.6-3.2 6.4v3.2l-3.2 6.4-6.4 9.6-9.6 19.2c-83.2 144-128 249.6-128 304 0 89.6 73.6 160 160 160 89.6 0 160-73.6 160-160 0-32-16-112-128-304zM515.2 956.8c-281.6 0-512-230.4-512-512s230.4-512 512-512 512 230.4 512 512c0 284.8-227.2 512-512 512zM515.2-35.2c-265.6 0-480 214.4-480 480s214.4 480 480 480 480-214.4 480-480c0-262.4-214.4-480-480-480z" />
<glyph unicode="&#xe640;" glyph-name="uniE640" d="M512 688c-38.4 0-70.4-32-70.4-70.4s32-73.6 70.4-73.6c38.4 0 73.6 32 73.6 73.6 0 35.2-35.2 70.4-73.6 70.4zM512 758.4c-80 0-140.8-64-140.8-140.8 0-28.8 16-99.2 115.2-272l12.8-22.4 6.4-12.8v-3.2l3.2-3.2 3.2-6.4 3.2 6.4v3.2l3.2 3.2v3.2l6.4 9.6 12.8 22.4c99.2 172.8 115.2 246.4 115.2 272 0 76.8-60.8 140.8-140.8 140.8zM512 518.4c-54.4 0-96 41.6-96 96s41.6 96 96 96 96-41.6 96-96-41.6-96-96-96zM512 960c-246.4 0-448-214.4-448-425.6 0-316.8 419.2-582.4 438.4-595.2 3.2-3.2 6.4-3.2 9.6-3.2s6.4 0 9.6 3.2c19.2 12.8 438.4 268.8 438.4 595.2 0 211.2-201.6 425.6-448 425.6zM681.6 256c0-54.4-86.4-83.2-169.6-83.2-86.4 0-169.6 28.8-169.6 83.2 0 38.4 44.8 67.2 112 80-54.4 96-115.2 214.4-115.2 281.6 0 96 76.8 172.8 172.8 172.8s172.8-76.8 172.8-172.8c0-64-60.8-182.4-115.2-281.6 70.4-12.8 112-44.8 112-80zM550.4 294.4l-3.2-3.2c0-3.2-3.2-3.2-3.2-6.4-3.2-6.4-6.4-9.6-9.6-16 0 0 0-3.2-3.2-3.2-3.2-3.2-3.2-6.4-6.4-9.6v-3.2l-3.2-3.2-9.6-16-9.6 16-3.2 3.2c-3.2 3.2-3.2 6.4-6.4 9.6l-3.2 3.2c-3.2 3.2-6.4 9.6-9.6 12.8 0 3.2-3.2 6.4-3.2 6.4l-3.2 3.2-12.8-3.2c-54.4 0-76.8-19.2-76.8-28.8 0-6.4 9.6-16 28.8-25.6 25.6-12.8 60.8-19.2 102.4-19.2 83.2 0 128 28.8 128 41.6 0 9.6-22.4 28.8-80 38.4l-12.8 3.2z" />
<glyph unicode="&#xe641;" glyph-name="uniE641" d="M512 960c-246.4 0-448-214.4-448-425.6 0-316.8 419.2-582.4 438.4-595.2 3.2-3.2 6.4-3.2 9.6-3.2s6.4 0 9.6 3.2c19.2 12.8 438.4 268.8 438.4 595.2 0 211.2-201.6 425.6-448 425.6zM512-28.8c-99.2 67.2-416 300.8-416 563.2 0 185.6 179.2 393.6 416 393.6s416-208 416-393.6c0-268.8-316.8-496-416-563.2zM512 710.4c-54.4 0-96-41.6-96-96s41.6-96 96-96 96 41.6 96 96-41.6 96-96 96zM512 544c-38.4 0-70.4 32-70.4 73.6 0 38.4 32 70.4 70.4 70.4s73.6-32 73.6-70.4c-3.2-41.6-35.2-73.6-73.6-73.6zM512 790.4c-96 0-172.8-76.8-172.8-172.8 0-64 60.8-185.6 115.2-281.6-67.2-12.8-112-41.6-112-80 0-54.4 86.4-83.2 169.6-83.2 86.4 0 169.6 28.8 169.6 83.2 0 38.4-44.8 67.2-112 80 54.4 96 115.2 214.4 115.2 281.6 0 92.8-76.8 172.8-172.8 172.8zM640 256c0-16-44.8-41.6-128-41.6-38.4 0-76.8 6.4-102.4 19.2-19.2 6.4-25.6 16-25.6 22.4 0 9.6 22.4 28.8 80 38.4l12.8 3.2 3.2-3.2c0-3.2 3.2-6.4 3.2-6.4 3.2-6.4 6.4-9.6 9.6-12.8l3.2-3.2c3.2-3.2 6.4-9.6 6.4-9.6l3.2-3.2 9.6-16 9.6 16 3.2 3.2v3.2c3.2 3.2 3.2 6.4 6.4 9.6 0 0 0 3.2 3.2 3.2 3.2 3.2 6.4 9.6 9.6 16 0 3.2 3.2 3.2 3.2 6.4l3.2 3.2 12.8-3.2c51.2-16 73.6-35.2 73.6-44.8zM537.6 342.4l-9.6-22.4-6.4-9.6v-3.2l-3.2-6.4v-3.2l-6.4-3.2-3.2 6.4-3.2 3.2v3.2l-3.2 6.4-6.4 6.4-12.8 22.4c-99.2 172.8-115.2 246.4-115.2 272 0 80 64 140.8 140.8 140.8 80 0 140.8-64 140.8-140.8 3.2-28.8-9.6-99.2-112-272z" />
<glyph unicode="&#xe642;" glyph-name="uniE642" d="M780.8 582.4h-115.2l-60.8 96c-6.4 9.6-19.2 16-32 9.6-6.4-3.2-9.6-6.4-9.6-12.8s0-12.8 3.2-16l48-73.6h-217.6l48 73.6c3.2 3.2 3.2 9.6 3.2 16s-6.4 9.6-9.6 12.8-25.6 3.2-32-6.4l-60.8-96h-102.4c-19.2 0-35.2-16-35.2-35.2v-28.8c0-19.2 12.8-35.2 28.8-38.4h544c16 3.2 32 19.2 32 38.4v28.8c3.2 16-12.8 32-32 32zM297.6 233.6c0-9.6 6.4-12.8 9.6-12.8h403.2c6.4 0 9.6 6.4 9.6 9.6v3.2l35.2 211.2h-492.8l35.2-211.2zM624 374.4c0 9.6 6.4 19.2 19.2 19.2 9.6 0 19.2-9.6 19.2-19.2v-70.4c0-9.6-6.4-19.2-19.2-19.2-9.6 0-19.2 9.6-19.2 19.2v70.4zM537.6 374.4c0 9.6 6.4 19.2 19.2 19.2s19.2-9.6 19.2-19.2v-70.4c0-9.6-6.4-19.2-19.2-19.2s-19.2 9.6-19.2 19.2v70.4zM451.2 374.4c0 9.6 6.4 19.2 19.2 19.2 9.6 0 19.2-9.6 19.2-19.2v-70.4c0-9.6-6.4-19.2-19.2-19.2-9.6 0-19.2 9.6-19.2 19.2v70.4zM364.8 374.4c0 9.6 6.4 19.2 19.2 19.2 9.6 0 19.2-9.6 19.2-19.2v-70.4c0-9.6-6.4-19.2-19.2-19.2-9.6 0-19.2 9.6-19.2 19.2v70.4zM512 963.2c-281.6 0-512-227.2-512-512s230.4-512 512-512 512 230.4 512 512-230.4 512-512 512zM848 518.4c0-28.8-19.2-57.6-48-67.2l-35.2-211.2c0-35.2-32-64-67.2-64h-371.2c-35.2 0-67.2 28.8-67.2 67.2l-35.2 208c-25.6 9.6-44.8 38.4-44.8 67.2v28.8c0 38.4 28.8 67.2 67.2 67.2h83.2l51.2 80c12.8 25.6 48 35.2 73.6 19.2 12.8-6.4 22.4-19.2 25.6-32s3.2-28.8-6.4-41.6l-16-25.6h102.4l-19.2 25.6c-6.4 12.8-9.6 28.8-6.4 41.6s12.8 25.6 25.6 32c25.6 12.8 60.8 6.4 73.6-19.2l51.2-80h99.2c38.4 0 67.2-28.8 67.2-67.2v-28.8z" />
<glyph unicode="&#xe643;" glyph-name="uniE643" d="M512 960c-281.6 0-512-230.4-512-512s230.4-512 512-512 512 230.4 512 512-230.4 512-512 512zM512-32c-265.6 0-480 214.4-480 480s214.4 480 480 480 480-214.4 480-480-214.4-480-480-480zM780.8 617.6h-99.2l-51.2 80c-16 25.6-48 35.2-73.6 19.2-12.8-6.4-22.4-19.2-25.6-32s-3.2-28.8 6.4-41.6l16-25.6h-102.4l16 25.6c6.4 12.8 9.6 28.8 6.4 41.6s-12.8 25.6-25.6 32c-25.6 16-60.8 6.4-73.6-19.2l-51.2-80h-80c-38.4 0-67.2-28.8-67.2-67.2v-28.8c0-28.8 19.2-57.6 44.8-67.2l35.2-208c0-35.2 32-67.2 67.2-67.2h371.2c35.2 0 67.2 28.8 67.2 64l35.2 211.2c25.6 9.6 48 38.4 48 67.2v28.8c3.2 35.2-25.6 67.2-64 67.2zM726.4 236.8v-3.2c0-6.4-6.4-9.6-9.6-9.6h-406.4c-6.4 0-9.6 6.4-9.6 12.8l-38.4 211.2h496l-32-211.2zM816 518.4c0-19.2-12.8-35.2-32-38.4h-547.2c-16 3.2-28.8 19.2-28.8 38.4v28.8c0 19.2 16 35.2 35.2 35.2h99.2l60.8 96c6.4 9.6 19.2 12.8 32 6.4 6.4-3.2 9.6-6.4 9.6-12.8s0-12.8-3.2-16l-48-73.6h217.6l-48 73.6c-3.2 6.4-3.2 12.8-3.2 16 0 6.4 6.4 9.6 9.6 12.8 9.6 6.4 25.6 3.2 32-9.6l60.8-96h115.2c19.2 0 35.2-16 35.2-35.2v-25.6zM640 284.8c9.6 0 19.2 9.6 19.2 19.2v70.4c0 9.6-6.4 19.2-19.2 19.2-9.6 0-19.2-9.6-19.2-19.2v-70.4c3.2-9.6 9.6-19.2 19.2-19.2zM553.6 284.8c9.6 0 19.2 9.6 19.2 19.2v70.4c0 9.6-6.4 19.2-19.2 19.2s-19.2-9.6-19.2-19.2v-70.4c3.2-9.6 9.6-19.2 19.2-19.2zM470.4 284.8c9.6 0 19.2 9.6 19.2 19.2v70.4c0 9.6-6.4 19.2-19.2 19.2-9.6 0-19.2-9.6-19.2-19.2v-70.4c0-9.6 6.4-19.2 19.2-19.2zM384 284.8c9.6 0 19.2 9.6 19.2 19.2v70.4c0 9.6-6.4 19.2-19.2 19.2-9.6 0-19.2-9.6-19.2-19.2v-70.4c0-9.6 6.4-19.2 19.2-19.2z" />
<glyph unicode="&#xe644;" glyph-name="uniE644" d="M755.2 630.4h-105.6l-54.4 86.4c-6.4 9.6-16 12.8-25.6 6.4l-9.6-9.6c0-6.4 0-9.6 3.2-16l44.8-67.2h-201.6l41.6 70.4c3.2 3.2 3.2 9.6 0 12.8 0 6.4-3.2 9.6-9.6 12.8-9.6 6.4-19.2 3.2-25.6-6.4l-54.4-86.4h-89.6c-16 0-28.8-12.8-28.8-28.8v-25.6c0-16 12.8-32 25.6-32h492.8c12.8 3.2 25.6 16 25.6 32v25.6c0 12.8-12.8 25.6-28.8 25.6zM323.2 320c0-6.4 3.2-9.6 9.6-9.6h364.8c3.2 0 9.6 3.2 9.6 9.6v3.2l32 188.8h-448l32-192zM611.2 444.8c0 9.6 6.4 16 16 16s16-6.4 16-16v-64c0-9.6-6.4-16-16-16s-16 6.4-16 16v64zM534.4 444.8c0 9.6 6.4 16 16 16s16-6.4 16-16v-64c0-9.6-6.4-16-16-16s-16 6.4-16 16v64zM457.6 444.8c0 9.6 6.4 16 16 16s16-6.4 16-16v-64c0-9.6-6.4-16-16-16s-16 6.4-16 16v64zM380.8 444.8c0 9.6 6.4 16 16 16s16-6.4 16-16v-64c0-9.6-6.4-16-16-16s-16 6.4-16 16v64zM512 960c-246.4 0-448-214.4-448-425.6 0-316.8 419.2-582.4 438.4-595.2 3.2-3.2 6.4-3.2 9.6-3.2s6.4 0 9.6 3.2c19.2 12.8 438.4 268.8 438.4 595.2 0 211.2-201.6 425.6-448 425.6zM816 572.8c0-28.8-19.2-54.4-41.6-60.8l-32-188.8c0-32-28.8-57.6-60.8-57.6h-339.2c-35.2 0-60.8 28.8-60.8 60.8l-32 185.6c-22.4 9.6-41.6 35.2-41.6 60.8v25.6c0 35.2 28.8 60.8 60.8 60.8h73.6l44.8 76.8c12.8 22.4 44.8 32 67.2 19.2 25.6-12.8 32-44.8 19.2-70.4l-12.8-19.2h86.4l-12.8 19.2c-6.4 12.8-9.6 25.6-6.4 38.4s12.8 22.4 22.4 32c25.6 9.6 57.6 3.2 73.6-22.4l44.8-70.4h86.4c35.2 0 60.8-28.8 60.8-60.8v-28.8z" />
<glyph unicode="&#xe645;" glyph-name="uniE645" d="M512 928c236.8 0 416-208 416-393.6 0-265.6-316.8-496-416-563.2-99.2 67.2-416 300.8-416 563.2 0 185.6 179.2 393.6 416 393.6zM512 960c-246.4 0-448-214.4-448-425.6 0-316.8 419.2-582.4 438.4-595.2 3.2-3.2 6.4-3.2 9.6-3.2s6.4 0 9.6 3.2c19.2 12.8 438.4 268.8 438.4 595.2 0 211.2-201.6 425.6-448 425.6zM755.2 662.4h-86.4l-44.8 70.4c-12.8 22.4-48 32-70.4 19.2-12.8-6.4-19.2-16-22.4-32-3.2-12.8-3.2-25.6 6.4-38.4l12.8-19.2h-86.4l12.8 19.2c6.4 12.8 9.6 25.6 6.4 38.4s-12.8 25.6-22.4 32c-22.4 12.8-54.4 3.2-67.2-19.2l-44.8-70.4h-80c-35.2 0-60.8-28.8-60.8-60.8v-25.6c0-28.8 16-51.2 41.6-60.8l32-185.6c0-35.2 28.8-60.8 60.8-60.8h336c35.2 0 60.8 28.8 60.8 57.6l32 188.8c25.6 9.6 41.6 35.2 41.6 60.8v25.6c3.2 32-25.6 60.8-57.6 60.8zM700.8 320v-3.2c0-3.2-3.2-9.6-9.6-9.6h-361.6c-3.2 0-9.6 3.2-9.6 9.6l-32 188.8h441.6l-28.8-185.6zM784 572.8c0-16-12.8-32-25.6-32h-492.8c-12.8 3.2-25.6 16-25.6 32v25.6c0 16 12.8 28.8 28.8 28.8h92.8l54.4 92.8c3.2 9.6 16 12.8 25.6 6.4 3.2-3.2 6.4-6.4 9.6-12.8v-12.8l-44.8-70.4h201.6l-44.8 67.2c-3.2 3.2-3.2 9.6-3.2 16 0 3.2 3.2 9.6 9.6 12.8 9.6 6.4 19.2 3.2 25.6-6.4l54.4-86.4h105.6c16 0 28.8-12.8 28.8-28.8v-32zM627.2 364.8c9.6 0 16 6.4 16 16v64c0 9.6-6.4 16-16 16s-16-6.4-16-16v-64c0-9.6 6.4-16 16-16zM550.4 364.8c9.6 0 16 6.4 16 16v64c0 9.6-6.4 16-16 16s-16-6.4-16-16v-64c0-9.6 6.4-16 16-16zM473.6 364.8c9.6 0 16 6.4 16 16v64c0 9.6-6.4 16-16 16s-16-6.4-16-16v-64c0-9.6 6.4-16 16-16zM396.8 364.8c9.6 0 16 6.4 16 16v64c0 9.6-6.4 16-16 16s-16-6.4-16-16v-64c-3.2-9.6 6.4-16 16-16z" />
<glyph unicode="&#xe646;" glyph-name="uniE646" d="M512 960c-282.77 0-512-229.23-512-512s229.23-512 512-512 512 229.23 512 512-229.23 512-512 512zM512-0.002c-62.958 0-122.872 13.012-177.23 36.452l233.148 262.29c5.206 5.858 8.082 13.422 8.082 21.26v96c0 17.674-14.326 32-32 32-112.99 0-232.204 117.462-233.374 118.626-6 6.002-14.14 9.374-22.626 9.374h-128c-17.672 0-32-14.328-32-32v-192c0-12.122 6.848-23.202 17.69-28.622l110.31-55.156v-187.886c-116.052 80.956-192 215.432-192 367.664 0 68.714 15.49 133.806 43.138 192h116.862c8.488 0 16.626 3.372 22.628 9.372l128 128c6 6.002 9.372 14.14 9.372 22.628v77.412c40.562 12.074 83.518 18.588 128 18.588 70.406 0 137.004-16.26 196.282-45.2-4.144-3.502-8.176-7.164-12.046-11.036-36.266-36.264-56.236-84.478-56.236-135.764s19.97-99.5 56.236-135.764c36.434-36.432 85.218-56.264 135.634-56.26 3.166 0 6.342 0.080 9.518 0.236 13.814-51.802 38.752-186.656-8.404-372.334-0.444-1.744-0.696-3.488-0.842-5.224-81.324-83.080-194.7-134.656-320.142-134.656z" />
</font></defs></svg>

After

Width:  |  Height:  |  Size: 82 KiB

BIN
app/assets/fonts/OFN-v2.ttf Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,399 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
<svg xmlns="http://www.w3.org/2000/svg">
<metadata></metadata>
<defs>
<font id="fontawesomeregular" horiz-adv-x="1536" >
<font-face units-per-em="1792" ascent="1536" descent="-256" />
<missing-glyph horiz-adv-x="448" />
<glyph unicode=" " horiz-adv-x="448" />
<glyph unicode="&#x09;" horiz-adv-x="448" />
<glyph unicode="&#xa0;" horiz-adv-x="448" />
<glyph unicode="&#xa8;" horiz-adv-x="1792" />
<glyph unicode="&#xa9;" horiz-adv-x="1792" />
<glyph unicode="&#xae;" horiz-adv-x="1792" />
<glyph unicode="&#xb4;" horiz-adv-x="1792" />
<glyph unicode="&#xc6;" horiz-adv-x="1792" />
<glyph unicode="&#x2000;" horiz-adv-x="768" />
<glyph unicode="&#x2001;" />
<glyph unicode="&#x2002;" horiz-adv-x="768" />
<glyph unicode="&#x2003;" />
<glyph unicode="&#x2004;" horiz-adv-x="512" />
<glyph unicode="&#x2005;" horiz-adv-x="384" />
<glyph unicode="&#x2006;" horiz-adv-x="256" />
<glyph unicode="&#x2007;" horiz-adv-x="256" />
<glyph unicode="&#x2008;" horiz-adv-x="192" />
<glyph unicode="&#x2009;" horiz-adv-x="307" />
<glyph unicode="&#x200a;" horiz-adv-x="85" />
<glyph unicode="&#x202f;" horiz-adv-x="307" />
<glyph unicode="&#x205f;" horiz-adv-x="384" />
<glyph unicode="&#x2122;" horiz-adv-x="1792" />
<glyph unicode="&#x221e;" horiz-adv-x="1792" />
<glyph unicode="&#x2260;" horiz-adv-x="1792" />
<glyph unicode="&#xe000;" horiz-adv-x="500" d="M0 0z" />
<glyph unicode="&#xf000;" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
<glyph unicode="&#xf001;" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf002;" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
<glyph unicode="&#xf003;" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf004;" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" />
<glyph unicode="&#xf005;" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" />
<glyph unicode="&#xf006;" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
<glyph unicode="&#xf007;" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
<glyph unicode="&#xf008;" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19 t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf009;" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
<glyph unicode="&#xf00a;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf00b;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf00c;" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
<glyph unicode="&#xf00d;" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
<glyph unicode="&#xf00e;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5 t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
<glyph unicode="&#xf010;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z " />
<glyph unicode="&#xf011;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
<glyph unicode="&#xf012;" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf013;" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
<glyph unicode="&#xf014;" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf015;" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
<glyph unicode="&#xf016;" horiz-adv-x="1280" d="M128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280zM768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z " />
<glyph unicode="&#xf017;" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf018;" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
<glyph unicode="&#xf019;" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
<glyph unicode="&#xf01a;" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf01b;" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf01c;" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" />
<glyph unicode="&#xf01d;" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf01e;" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
<glyph unicode="&#xf021;" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
<glyph unicode="&#xf022;" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" />
<glyph unicode="&#xf023;" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf024;" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf025;" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
<glyph unicode="&#xf026;" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
<glyph unicode="&#xf027;" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
<glyph unicode="&#xf028;" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289 t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
<glyph unicode="&#xf029;" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
<glyph unicode="&#xf02a;" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
<glyph unicode="&#xf02b;" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" />
<glyph unicode="&#xf02c;" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
<glyph unicode="&#xf02d;" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5 t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
<glyph unicode="&#xf02e;" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
<glyph unicode="&#xf02f;" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
<glyph unicode="&#xf030;" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
<glyph unicode="&#xf031;" horiz-adv-x="1664" d="M725 977l-170 -450q73 -1 153.5 -2t119 -1.5t52.5 -0.5l29 2q-32 95 -92 241q-53 132 -92 211zM21 -128h-21l2 79q22 7 80 18q89 16 110 31q20 16 48 68l237 616l280 724h75h53l11 -21l205 -480q103 -242 124 -297q39 -102 96 -235q26 -58 65 -164q24 -67 65 -149 q22 -49 35 -57q22 -19 69 -23q47 -6 103 -27q6 -39 6 -57q0 -14 -1 -26q-80 0 -192 8q-93 8 -189 8q-79 0 -135 -2l-200 -11l-58 -2q0 45 4 78l131 28q56 13 68 23q12 12 12 27t-6 32l-47 114l-92 228l-450 2q-29 -65 -104 -274q-23 -64 -23 -84q0 -31 17 -43 q26 -21 103 -32q3 0 13.5 -2t30 -5t40.5 -6q1 -28 1 -58q0 -17 -2 -27q-66 0 -349 20l-48 -8q-81 -14 -167 -14z" />
<glyph unicode="&#xf032;" horiz-adv-x="1408" d="M555 15q76 -32 140 -32q131 0 216 41t122 113q38 70 38 181q0 114 -41 180q-58 94 -141 126q-80 32 -247 32q-74 0 -101 -10v-144l-1 -173l3 -270q0 -15 12 -44zM541 761q43 -7 109 -7q175 0 264 65t89 224q0 112 -85 187q-84 75 -255 75q-52 0 -130 -13q0 -44 2 -77 q7 -122 6 -279l-1 -98q0 -43 1 -77zM0 -128l2 94q45 9 68 12q77 12 123 31q17 27 21 51q9 66 9 194l-2 497q-5 256 -9 404q-1 87 -11 109q-1 4 -12 12q-18 12 -69 15q-30 2 -114 13l-4 83l260 6l380 13l45 1q5 0 14 0.5t14 0.5q1 0 21.5 -0.5t40.5 -0.5h74q88 0 191 -27 q43 -13 96 -39q57 -29 102 -76q44 -47 65 -104t21 -122q0 -70 -32 -128t-95 -105q-26 -20 -150 -77q177 -41 267 -146q92 -106 92 -236q0 -76 -29 -161q-21 -62 -71 -117q-66 -72 -140 -108q-73 -36 -203 -60q-82 -15 -198 -11l-197 4q-84 2 -298 -11q-33 -3 -272 -11z" />
<glyph unicode="&#xf033;" horiz-adv-x="1024" d="M0 -126l17 85q4 1 77 20q76 19 116 39q29 37 41 101l27 139l56 268l12 64q8 44 17 84.5t16 67t12.5 46.5t9 30.5t3.5 11.5l29 157l16 63l22 135l8 50v38q-41 22 -144 28q-28 2 -38 4l19 103l317 -14q39 -2 73 -2q66 0 214 9q33 2 68 4.5t36 2.5q-2 -19 -6 -38 q-7 -29 -13 -51q-55 -19 -109 -31q-64 -16 -101 -31q-12 -31 -24 -88q-9 -44 -13 -82q-44 -199 -66 -306l-61 -311l-38 -158l-43 -235l-12 -45q-2 -7 1 -27q64 -15 119 -21q36 -5 66 -10q-1 -29 -7 -58q-7 -31 -9 -41q-18 0 -23 -1q-24 -2 -42 -2q-9 0 -28 3q-19 4 -145 17 l-198 2q-41 1 -174 -11q-74 -7 -98 -9z" />
<glyph unicode="&#xf034;" horiz-adv-x="1792" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l215 -1h293l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -42.5 2t-103.5 -1t-111 -1 q-34 0 -67 -5q-10 -97 -8 -136l1 -152v-332l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-88 0 -233 -14q-48 -4 -70 -4q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q8 192 6 433l-5 428q-1 62 -0.5 118.5t0.5 102.5t-2 57t-6 15q-6 5 -14 6q-38 6 -148 6q-43 0 -100 -13.5t-73 -24.5q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1744 128q33 0 42 -18.5t-11 -44.5 l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80z" />
<glyph unicode="&#xf035;" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l446 -1h318l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -58.5 2t-138.5 -1t-128 -1 q-94 0 -127 -5q-10 -97 -8 -136l1 -152v52l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-82 0 -233 -13q-45 -5 -70 -5q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q6 137 6 433l-5 44q0 265 -2 278q-2 11 -6 15q-6 5 -14 6q-38 6 -148 6q-50 0 -168.5 -14t-132.5 -24q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1505 113q26 -20 26 -49t-26 -49l-162 -126 q-26 -20 -44.5 -11t-18.5 42v80h-1024v-80q0 -33 -18.5 -42t-44.5 11l-162 126q-26 20 -26 49t26 49l162 126q26 20 44.5 11t18.5 -42v-80h1024v80q0 33 18.5 42t44.5 -11z" />
<glyph unicode="&#xf036;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf037;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf038;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf039;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf03a;" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
<glyph unicode="&#xf03b;" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
<glyph unicode="&#xf03c;" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
<glyph unicode="&#xf03d;" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" />
<glyph unicode="&#xf03e;" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf040;" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" />
<glyph unicode="&#xf041;" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
<glyph unicode="&#xf042;" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf043;" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
<glyph unicode="&#xf044;" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92 l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
<glyph unicode="&#xf045;" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5 t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
<glyph unicode="&#xf046;" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110 q24 -24 24 -57t-24 -57z" />
<glyph unicode="&#xf047;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
<glyph unicode="&#xf048;" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" />
<glyph unicode="&#xf049;" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" />
<glyph unicode="&#xf04a;" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" />
<glyph unicode="&#xf04b;" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
<glyph unicode="&#xf04c;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf04d;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf04e;" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
<glyph unicode="&#xf050;" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
<glyph unicode="&#xf051;" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" />
<glyph unicode="&#xf052;" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
<glyph unicode="&#xf053;" horiz-adv-x="1152" d="M742 -37l-652 651q-37 37 -37 90.5t37 90.5l652 651q37 37 90.5 37t90.5 -37l75 -75q37 -37 37 -90.5t-37 -90.5l-486 -486l486 -485q37 -38 37 -91t-37 -90l-75 -75q-37 -37 -90.5 -37t-90.5 37z" />
<glyph unicode="&#xf054;" horiz-adv-x="1152" d="M1099 704q0 -52 -37 -91l-652 -651q-37 -37 -90 -37t-90 37l-76 75q-37 39 -37 91q0 53 37 90l486 486l-486 485q-37 39 -37 91q0 53 37 90l76 75q36 38 90 38t90 -38l652 -651q37 -37 37 -90z" />
<glyph unicode="&#xf055;" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf056;" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
<glyph unicode="&#xf057;" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf058;" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf059;" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf05a;" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf05b;" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143 q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf05c;" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5 t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf05d;" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf05e;" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
<glyph unicode="&#xf060;" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" />
<glyph unicode="&#xf061;" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
<glyph unicode="&#xf062;" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" />
<glyph unicode="&#xf063;" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
<glyph unicode="&#xf064;" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
<glyph unicode="&#xf065;" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf066;" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
<glyph unicode="&#xf067;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf068;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf069;" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
<glyph unicode="&#xf06a;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
<glyph unicode="&#xf06b;" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5 t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf06c;" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5 t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
<glyph unicode="&#xf06d;" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
<glyph unicode="&#xf06e;" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
<glyph unicode="&#xf070;" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " />
<glyph unicode="&#xf071;" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
<glyph unicode="&#xf072;" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
<glyph unicode="&#xf073;" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
<glyph unicode="&#xf074;" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
<glyph unicode="&#xf075;" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
<glyph unicode="&#xf076;" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf077;" horiz-adv-x="1664" d="M1611 320q0 -53 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-486 485l-486 -485q-36 -38 -90 -38t-90 38l-75 75q-38 36 -38 90q0 53 38 91l651 651q37 37 90 37q52 0 91 -37l650 -651q38 -38 38 -91z" />
<glyph unicode="&#xf078;" horiz-adv-x="1664" d="M1611 832q0 -53 -37 -90l-651 -651q-38 -38 -91 -38q-54 0 -90 38l-651 651q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l486 -486l486 486q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
<glyph unicode="&#xf079;" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " />
<glyph unicode="&#xf07a;" horiz-adv-x="1664" d="M640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5 l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5 t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf07b;" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
<glyph unicode="&#xf07c;" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
<glyph unicode="&#xf07d;" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
<glyph unicode="&#xf07e;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
<glyph unicode="&#xf080;" horiz-adv-x="1920" d="M512 512v-384h-256v384h256zM896 1024v-896h-256v896h256zM1280 768v-640h-256v640h256zM1664 1152v-1024h-256v1024h256zM1792 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5z M1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf081;" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf082;" d="M1307 618l23 219h-198v109q0 49 15.5 68.5t71.5 19.5h110v219h-175q-152 0 -218 -72t-66 -213v-131h-131v-219h131v-635h262v635h175zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf083;" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
<glyph unicode="&#xf084;" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
<glyph unicode="&#xf085;" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
<glyph unicode="&#xf086;" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7 q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
<glyph unicode="&#xf087;" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128 q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
<glyph unicode="&#xf088;" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5 h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -74 49 -163z" />
<glyph unicode="&#xf089;" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
<glyph unicode="&#xf08a;" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5 q224 0 351 -124t127 -344z" />
<glyph unicode="&#xf08b;" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
<glyph unicode="&#xf08c;" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf08d;" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
<glyph unicode="&#xf08e;" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf090;" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf091;" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf092;" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf093;" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
<glyph unicode="&#xf094;" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" />
<glyph unicode="&#xf095;" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
<glyph unicode="&#xf096;" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf097;" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
<glyph unicode="&#xf098;" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf099;" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
<glyph unicode="&#xf09a;" horiz-adv-x="768" d="M511 980h257l-30 -284h-227v-824h-341v824h-170v284h170v171q0 182 86 275.5t283 93.5h227v-284h-142q-39 0 -62.5 -6.5t-34 -23.5t-13.5 -34.5t-3 -49.5v-142z" />
<glyph unicode="&#xf09b;" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf09c;" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
<glyph unicode="&#xf09d;" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
<glyph unicode="&#xf09e;" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />
<glyph unicode="&#xf0a0;" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
<glyph unicode="&#xf0a1;" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
<glyph unicode="&#xf0a2;" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM183 128h1298q-164 181 -246.5 411.5t-82.5 484.5q0 256 -320 256t-320 -256q0 -254 -82.5 -484.5t-246.5 -411.5zM1664 128q0 -52 -38 -90t-90 -38 h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
<glyph unicode="&#xf0a3;" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
<glyph unicode="&#xf0a4;" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
<glyph unicode="&#xf0a5;" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
<glyph unicode="&#xf0a6;" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76 q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
<glyph unicode="&#xf0a7;" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100 q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
<glyph unicode="&#xf0a8;" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf0a9;" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf0aa;" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf0ab;" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf0ac;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5 t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-5 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3 q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25 q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5 t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5 t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10t17 -20q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21 q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5 q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q7 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7 q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
<glyph unicode="&#xf0ad;" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
<glyph unicode="&#xf0ae;" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0b0;" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
<glyph unicode="&#xf0b1;" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf0b2;" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z " />
<glyph unicode="&#xf0c0;" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75 t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5 t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
<glyph unicode="&#xf0c1;" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15 t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207 q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
<glyph unicode="&#xf0c2;" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " />
<glyph unicode="&#xf0c3;" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
<glyph unicode="&#xf0c4;" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148 q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108 q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6 q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
<glyph unicode="&#xf0c5;" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
<glyph unicode="&#xf0c6;" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235 z" />
<glyph unicode="&#xf0c7;" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
<glyph unicode="&#xf0c8;" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf0c9;" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0ca;" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
<glyph unicode="&#xf0cb;" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5 t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 122t0.5 121v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5 t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
<glyph unicode="&#xf0cc;" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23 l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
<glyph unicode="&#xf0cd;" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41 q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472 q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
<glyph unicode="&#xf0ce;" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192 q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192 q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113 z" />
<glyph unicode="&#xf0d0;" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
<glyph unicode="&#xf0d1;" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0d2;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf0d3;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
<glyph unicode="&#xf0d4;" d="M678 -57q0 -38 -10 -71h-380q-95 0 -171.5 56.5t-103.5 147.5q24 45 69 77.5t100 49.5t107 24t107 7q32 0 49 -2q6 -4 30.5 -21t33 -23t31 -23t32 -25.5t27.5 -25.5t26.5 -29.5t21 -30.5t17.5 -34.5t9.5 -36t4.5 -40.5zM385 294q-234 -7 -385 -85v433q103 -118 273 -118 q32 0 70 5q-21 -61 -21 -86q0 -67 63 -149zM558 805q0 -100 -43.5 -160.5t-140.5 -60.5q-51 0 -97 26t-78 67.5t-56 93.5t-35.5 104t-11.5 99q0 96 51.5 165t144.5 69q66 0 119 -41t84 -104t47 -130t16 -128zM1536 896v-736q0 -119 -84.5 -203.5t-203.5 -84.5h-468 q39 73 39 157q0 66 -22 122.5t-55.5 93t-72 71t-72 59.5t-55.5 54.5t-22 59.5q0 36 23 68t56 61.5t65.5 64.5t55.5 93t23 131t-26.5 145.5t-75.5 118.5q-6 6 -14 11t-12.5 7.5t-10 9.5t-10.5 17h135l135 64h-437q-138 0 -244.5 -38.5t-182.5 -133.5q0 126 81 213t207 87h960 q119 0 203.5 -84.5t84.5 -203.5v-96h-256v256h-128v-256h-256v-128h256v-256h128v256h256z" />
<glyph unicode="&#xf0d5;" horiz-adv-x="1664" d="M876 71q0 21 -4.5 40.5t-9.5 36t-17.5 34.5t-21 30.5t-26.5 29.5t-27.5 25.5t-32 25.5t-31 23t-33 23t-30.5 21q-17 2 -50 2q-54 0 -106 -7t-108 -25t-98 -46t-69 -75t-27 -107q0 -68 35.5 -121.5t93 -84t120.5 -45.5t127 -15q59 0 112.5 12.5t100.5 39t74.5 73.5 t27.5 110zM756 933q0 60 -16.5 127.5t-47 130.5t-84 104t-119.5 41q-93 0 -144 -69t-51 -165q0 -47 11.5 -99t35.5 -104t56 -93.5t78 -67.5t97 -26q97 0 140.5 60.5t43.5 160.5zM625 1408h437l-135 -79h-135q71 -45 110 -126t39 -169q0 -74 -23 -131.5t-56 -92.5t-66 -64.5 t-56 -61t-23 -67.5q0 -26 16.5 -51t43 -48t58.5 -48t64 -55.5t58.5 -66t43 -85t16.5 -106.5q0 -160 -140 -282q-152 -131 -420 -131q-59 0 -119.5 10t-122 33.5t-108.5 58t-77 89t-30 121.5q0 61 37 135q32 64 96 110.5t145 71t155 36t150 13.5q-64 83 -64 149q0 12 2 23.5 t5 19.5t8 21.5t7 21.5q-40 -5 -70 -5q-149 0 -255.5 98t-106.5 246q0 140 95 250.5t234 141.5q94 20 187 20zM1664 1152v-128h-256v-256h-128v256h-256v128h256v256h128v-256h256z" />
<glyph unicode="&#xf0d6;" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0d7;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0d8;" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
<glyph unicode="&#xf0d9;" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
<glyph unicode="&#xf0da;" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
<glyph unicode="&#xf0db;" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf0dc;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
<glyph unicode="&#xf0dd;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0de;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
<glyph unicode="&#xf0e0;" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
<glyph unicode="&#xf0e1;" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
<glyph unicode="&#xf0e2;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
<glyph unicode="&#xf0e3;" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14 q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28 q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
<glyph unicode="&#xf0e4;" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29 q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
<glyph unicode="&#xf0e5;" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5 t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
<glyph unicode="&#xf0e6;" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5 t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129 q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
<glyph unicode="&#xf0e7;" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
<glyph unicode="&#xf0e8;" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68 z" />
<glyph unicode="&#xf0e9;" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69 q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
<glyph unicode="&#xf0ea;" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
<glyph unicode="&#xf0eb;" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47 q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5 t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
<glyph unicode="&#xf0ec;" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
<glyph unicode="&#xf0ed;" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
<glyph unicode="&#xf0ee;" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
<glyph unicode="&#xf0f0;" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" />
<glyph unicode="&#xf0f1;" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252 t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
<glyph unicode="&#xf0f2;" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" />
<glyph unicode="&#xf0f3;" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1664 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5 q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
<glyph unicode="&#xf0f4;" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
<glyph unicode="&#xf0f5;" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0f6;" horiz-adv-x="1280" d="M1024 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1024 608v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280z M768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z" />
<glyph unicode="&#xf0f7;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0f8;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0f9;" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf0fa;" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
<glyph unicode="&#xf0fb;" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" />
<glyph unicode="&#xf0fc;" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
<glyph unicode="&#xf0fd;" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf0fe;" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf100;" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
<glyph unicode="&#xf101;" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
<glyph unicode="&#xf102;" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
<glyph unicode="&#xf103;" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
<glyph unicode="&#xf104;" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
<glyph unicode="&#xf105;" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
<glyph unicode="&#xf106;" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
<glyph unicode="&#xf107;" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
<glyph unicode="&#xf108;" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf109;" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
<glyph unicode="&#xf10a;" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
<glyph unicode="&#xf10b;" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
<glyph unicode="&#xf10c;" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf10d;" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
<glyph unicode="&#xf10e;" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
<glyph unicode="&#xf110;" horiz-adv-x="1568" d="M496 192q0 -60 -42.5 -102t-101.5 -42q-60 0 -102 42t-42 102t42 102t102 42q59 0 101.5 -42t42.5 -102zM928 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -66 -47 -113t-113 -47t-113 47t-47 113 t47 113t113 47t113 -47t47 -113zM1360 192q0 -46 -33 -79t-79 -33t-79 33t-33 79t33 79t79 33t79 -33t33 -79zM528 1088q0 -73 -51.5 -124.5t-124.5 -51.5t-124.5 51.5t-51.5 124.5t51.5 124.5t124.5 51.5t124.5 -51.5t51.5 -124.5zM992 1280q0 -80 -56 -136t-136 -56 t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1536 640q0 -40 -28 -68t-68 -28t-68 28t-28 68t28 68t68 28t68 -28t28 -68zM1328 1088q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5z" />
<glyph unicode="&#xf111;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf112;" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
<glyph unicode="&#xf113;" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
<glyph unicode="&#xf114;" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
<glyph unicode="&#xf115;" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
<glyph unicode="&#xf116;" horiz-adv-x="1152" d="M896 608v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h224q14 0 23 -9t9 -23zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28 t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68zM1152 928v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704q93 0 158.5 -65.5t65.5 -158.5z" />
<glyph unicode="&#xf117;" horiz-adv-x="1152" d="M928 1152q93 0 158.5 -65.5t65.5 -158.5v-704q0 -92 -65.5 -158t-158.5 -66h-704q-93 0 -158.5 66t-65.5 158v704q0 93 65.5 158.5t158.5 65.5h704zM1024 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 -28t-28 -68v-704q0 -40 28 -68t68 -28h704q40 0 68 28t28 68z M864 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576z" />
<glyph unicode="&#xf118;" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf119;" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf11a;" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf11b;" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150 t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
<glyph unicode="&#xf11c;" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16 h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96 q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896 h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
<glyph unicode="&#xf11d;" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102 q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
<glyph unicode="&#xf11e;" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266 q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8 q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
<glyph unicode="&#xf120;" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" />
<glyph unicode="&#xf121;" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
<glyph unicode="&#xf122;" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
<glyph unicode="&#xf123;" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
<glyph unicode="&#xf124;" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
<glyph unicode="&#xf125;" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf126;" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497 q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
<glyph unicode="&#xf127;" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18 l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9 t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
<glyph unicode="&#xf128;" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
<glyph unicode="&#xf129;" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf12a;" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
<glyph unicode="&#xf12b;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5t-65.5 -51.5t-30.5 -63h232v80 h126z" />
<glyph unicode="&#xf12c;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73h232v80h126z" />
<glyph unicode="&#xf12d;" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
<glyph unicode="&#xf12e;" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89 q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117 q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
<glyph unicode="&#xf130;" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
<glyph unicode="&#xf131;" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23 t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
<glyph unicode="&#xf132;" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf133;" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
<glyph unicode="&#xf134;" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
<glyph unicode="&#xf135;" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
<glyph unicode="&#xf136;" horiz-adv-x="1792" d="M1708 881l-188 -881h-304l181 849q4 21 1 43q-4 20 -16 35q-10 14 -28 24q-18 9 -40 9h-197l-205 -960h-303l204 960h-304l-205 -960h-304l272 1280h1139q157 0 245 -118q86 -116 52 -281z" />
<glyph unicode="&#xf137;" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf138;" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf139;" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf13a;" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf13b;" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
<glyph unicode="&#xf13c;" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
<glyph unicode="&#xf13d;" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19 t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf13e;" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" />
<glyph unicode="&#xf140;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf141;" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf142;" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
<glyph unicode="&#xf143;" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf144;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" />
<glyph unicode="&#xf145;" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
<glyph unicode="&#xf146;" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
<glyph unicode="&#xf147;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf148;" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
<glyph unicode="&#xf149;" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
<glyph unicode="&#xf14a;" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf14b;" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf14c;" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf14d;" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf14e;" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf150;" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf151;" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf152;" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf153;" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26 l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
<glyph unicode="&#xf154;" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
<glyph unicode="&#xf155;" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" />
<glyph unicode="&#xf156;" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf157;" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
<glyph unicode="&#xf158;" horiz-adv-x="1664" d="M1664 352v-32q0 -132 -94 -226t-226 -94h-128q-132 0 -226 94t-94 226v480h-224q-2 -102 -14.5 -190.5t-30.5 -156t-48.5 -126.5t-57 -99.5t-67.5 -77.5t-69.5 -58.5t-74 -44t-69 -32t-65.5 -25.5q-4 -2 -32 -13q-8 -2 -12 -2q-22 0 -30 20l-71 178q-5 13 0 25t17 17 q7 3 20 7.5t18 6.5q31 12 46.5 18.5t44.5 20t45.5 26t42 32.5t40.5 42.5t34.5 53.5t30.5 68.5t22.5 83.5t17 103t6.5 123h-256q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h1216q14 0 23 -9t9 -23v-160q0 -14 -9 -23t-23 -9h-224v-512q0 -26 19 -45t45 -19h128q26 0 45 19t19 45 v64q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1280 1376v-160q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h960q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf159;" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf15a;" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
<glyph unicode="&#xf15b;" horiz-adv-x="1280" d="M1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
<glyph unicode="&#xf15c;" horiz-adv-x="1280" d="M1024 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1024 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28 t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
<glyph unicode="&#xf15d;" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162 l230 -662h70z" />
<glyph unicode="&#xf15e;" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248 v119h121z" />
<glyph unicode="&#xf160;" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf161;" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf162;" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5 t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
<glyph unicode="&#xf163;" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13 q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
<glyph unicode="&#xf164;" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5 t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
<glyph unicode="&#xf165;" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121 t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
<glyph unicode="&#xf166;" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38 q21 -28 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5 q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78l24 -69t23 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38q-51 0 -78 -38 q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf167;" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51 q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99 q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-37 -51 -106 -51q-67 0 -105 51 q-28 38 -28 118v175q0 80 28 117q38 51 105 51q69 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
<glyph unicode="&#xf168;" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" />
<glyph unicode="&#xf169;" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf16a;" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" />
<glyph unicode="&#xf16b;" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
<glyph unicode="&#xf16c;" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" />
<glyph unicode="&#xf16d;" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-1142q-81 0 -139 58t-58 139v1142q0 81 58 139 t139 58h1142q81 0 139 -58t58 -139z" />
<glyph unicode="&#xf16e;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
<glyph unicode="&#xf170;" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf171;" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5 t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
<glyph unicode="&#xf172;" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf173;" horiz-adv-x="1024" d="M390 1408h219v-388h364v-241h-364v-394q0 -136 14 -172q13 -37 52 -60q50 -31 117 -31q117 0 232 76v-242q-102 -48 -178 -65q-77 -19 -173 -19q-105 0 -186 27q-78 25 -138 75q-58 51 -79 105q-22 54 -22 161v539h-170v217q91 30 155 84q64 55 103 132q39 78 54 196z " />
<glyph unicode="&#xf174;" d="M1123 127v181q-88 -56 -174 -56q-51 0 -88 23q-29 17 -39 45q-11 30 -11 129v295h274v181h-274v291h-164q-11 -90 -40 -147t-78 -99q-48 -40 -116 -63v-163h127v-404q0 -78 17 -121q17 -42 59 -78q43 -37 104 -57q62 -20 140 -20q67 0 129 14q57 13 134 49zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
<glyph unicode="&#xf175;" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
<glyph unicode="&#xf176;" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
<glyph unicode="&#xf177;" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
<glyph unicode="&#xf178;" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
<glyph unicode="&#xf179;" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
<glyph unicode="&#xf17a;" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
<glyph unicode="&#xf17b;" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5 h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
<glyph unicode="&#xf17c;" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5 t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19 q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63 q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18l-4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92 q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152 q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-14 -1 -7 -7l4 -2 q14 -4 18 -31q0 -3 8 2zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5t-30 -18.5 t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43q-19 4 -51 9.5 t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49t-14 -48 q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54q110 143 124 195 q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5t-40.5 -33.5t-61 -14 q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5t15.5 47.5q1 -31 8 -56.5 t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
<glyph unicode="&#xf17d;" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -6 6.5 -17.5t7.5 -16.5q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6 t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf17e;" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80 q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
<glyph unicode="&#xf180;" horiz-adv-x="1664" d="M1483 512l-587 -587q-52 -53 -127.5 -53t-128.5 53l-587 587q-53 53 -53 128t53 128l587 587q53 53 128 53t128 -53l265 -265l-398 -399l-188 188q-42 42 -99 42q-59 0 -100 -41l-120 -121q-42 -40 -42 -99q0 -58 42 -100l406 -408q30 -28 67 -37l6 -4h28q60 0 99 41 l619 619l2 -3q53 -53 53 -128t-53 -128zM1406 1138l120 -120q14 -15 14 -36t-14 -36l-730 -730q-17 -15 -37 -15v0q-4 0 -6 1q-18 2 -30 14l-407 408q-14 15 -14 36t14 35l121 120q13 15 35 15t36 -15l252 -252l574 575q15 15 36 15t36 -15z" />
<glyph unicode="&#xf181;" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf182;" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
<glyph unicode="&#xf183;" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
<glyph unicode="&#xf184;" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
<glyph unicode="&#xf185;" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94 q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
<glyph unicode="&#xf186;" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
<glyph unicode="&#xf187;" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
<glyph unicode="&#xf188;" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
<glyph unicode="&#xf189;" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" />
<glyph unicode="&#xf18a;" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
<glyph unicode="&#xf18b;" horiz-adv-x="1920" d="M805 163q-122 -67 -261 -67q-141 0 -261 67q98 61 167 149t94 191q25 -103 94 -191t167 -149zM453 1176v-344q0 -179 -89.5 -326t-234.5 -217q-129 152 -129 351q0 200 129.5 352t323.5 184zM958 991q-128 -152 -128 -351q0 -201 128 -351q-145 70 -234.5 218t-89.5 328 v341q196 -33 324 -185zM1638 163q-122 -67 -261 -67q-141 0 -261 67q98 61 167 149t94 191q25 -103 94 -191t167 -149zM1286 1176v-344q0 -179 -91 -326t-237 -217v0q133 154 133 351q0 195 -133 351q129 151 328 185zM1920 640q0 -201 -129 -351q-145 70 -234.5 218 t-89.5 328v341q194 -32 323.5 -184t129.5 -352z" />
<glyph unicode="&#xf18c;" horiz-adv-x="1792" />
<glyph unicode="&#xf18d;" horiz-adv-x="1792" />
<glyph unicode="&#xf18e;" horiz-adv-x="1792" />
<glyph unicode="&#xf500;" horiz-adv-x="1792" />
</font>
</defs></svg>

After

Width:  |  Height:  |  Size: 193 KiB

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
id="svg4"
xml:space="preserve"
enable-background="new 0 0 6 3"
viewBox="0 0 6 3"
height="3px"
width="24px"
y="0px"
x="12px"
version="1.1"><metadata
id="metadata10"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs8" /><polygon
style="fill:#000000;fill-opacity:1"
id="polygon2"
points="5.992,0 2.992,3 -0.008,0 " /></svg>

After

Width:  |  Height:  |  Size: 832 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 317 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 619 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 127 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 313 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 153 KiB

After

Width:  |  Height:  |  Size: 67 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 70 KiB

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 107 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 123 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 95 KiB

View File

@@ -1,72 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="386.638px" height="320px" viewBox="-31.319 2 386.638 320" enable-background="new -31.319 2 386.638 320"
xml:space="preserve">
<g>
<path fill="#ABDBD0" d="M331.518,159.254c-13.147,0-23.805,26.723-23.805,59.69c0,32.96,10.658,59.685,23.805,59.685
c13.142,0,23.801-26.725,23.801-59.685C355.319,185.977,344.66,159.254,331.518,159.254z M332.114,255.185
c-8.06,0-14.593-15.746-14.593-35.167s6.533-35.165,14.593-35.165c8.059,0,14.594,15.743,14.594,35.165
S340.173,255.185,332.114,255.185z"/>
<path fill="#ABDBD0" d="M304.557,219.468c0-36.244,11.718-65.623,26.171-65.623c2.107,0,4.154,0.642,6.116,1.823
c-10.469-8.709-35.108-4.515-46.498-2.514c-2.139,3.216-3.572,6.079-4.237,7.624c-3.91,9.023-7.063,22.001-7.063,22.001
l-11.863-0.291l11.689,55.666h-17.909c2.54,25.911,10.809,43.072,25.314,46.94c0,0,30.567,4.944,45.693-0.081
c-0.414,0.046-0.828,0.081-1.243,0.081C316.273,285.091,304.557,255.707,304.557,219.468z"/>
<path fill="#ABDBD0" d="M64.393,237.666c0-46.574,34.058-84.332,76.072-84.332c1.812,0,3.605,0.095,5.386,0.234
c-5.466-1.08-11.117-1.655-16.903-1.655c-47.453,0-85.919,38.074-85.919,85.044c0,46.967,38.467,85.042,85.919,85.042
c2.052,0,4.08-0.097,6.096-0.238C95.562,318.679,64.393,282.219,64.393,237.666z"/>
<path fill="#ABDBD0" d="M122.02,149.109c44.188-2.104,67.371,17.402,79.829,34.057l3.027-2.314l4.452-5.008l28.39,7.793
l10.02,52.325h27.275l-11.689-55.667l11.861,0.291c0,0,3.157-12.974,7.066-22c1.977-4.57,10.576-20.597,24.492-23.378
c13.917-2.784,26.31,15.218,26.31,15.218l-6.824-19.114l-25.606-9.464l-7.794-42.304l11.689-7.236l-1.114-11.69l-64.57-23.38
l-82.387,19.483V66.74l13.361,3.341l-8.908,25.608c0,0-23.709-3.198-47.031-1.02c-27.244,2.543-54.707,10.521-54.707,10.521
l-7.365,14.434l-5.009,66.242l2.983,0.565l5.182-59.414l70.49-6.662L122.02,149.109L122.02,149.109z M65.958,118.276
c-3.541,0.556-6.775-1.29-7.219-4.123c-0.446-2.835,2.065-5.583,5.606-6.139c3.543-0.556,6.776,1.288,7.22,4.124
C72.011,114.972,69.5,117.719,65.958,118.276z M107.793,115.428c-4.711,0.741-9.011-1.713-9.603-5.483
c-0.592-3.77,2.748-7.425,7.458-8.167c4.713-0.741,9.014,1.717,9.604,5.484C115.845,111.034,112.505,114.689,107.793,115.428z
M225.388,109.481h-19.989L166.472,98.96l7.715-25.25l57.162-10.17L225.388,109.481z M252.39,181.723l-17.886-0.702l7.015-117.482
l30.508,9.469l5.612,49.447L252.39,181.723z M282.025,122.017l-6.135-47.956l14.378,7.715l7.015,43.925L282.025,122.017z"/>
<path fill="#ABDBD0" d="M147.008,91.476V57.053h-6.84V41.534c-0.001-8.57-6.945-15.515-15.517-15.519v6.314
c5.083,0.008,9.198,4.123,9.206,9.204v15.519h-6.312v33.7C134.962,90.733,141.75,91.082,147.008,91.476z"/>
<path fill="#ABDBD0" d="M-22.811,227.408c0-33.523,28.628-60.694,63.942-60.694c1.17,0,2.333,0.034,3.487,0.094l0.406-5.338
c-2.084-0.176-4.193-0.274-6.325-0.274c-38.67-0.001-70.018,29.602-70.018,66.12c0,36.522,31.348,66.125,70.018,66.125
c6.585,0,12.95-0.877,18.994-2.483c-1.019-1.387-1.98-2.814-2.918-4.26c-4.397,0.909-8.959,1.4-13.642,1.4
C5.817,288.099-22.811,260.925-22.811,227.408z"/>
<path fill="#ABDBD0" d="M10.539,226.003c0-18.358,16.222-33.24,36.233-33.24c2.119,0,4.189,0.176,6.207,0.497
c0.214-0.435,0.437-0.864,0.675-1.295l-10.952-2.055l1.408-18.469c-1.078-0.059-2.159-0.087-3.249-0.087
c-32.898,0-59.568,25.249-59.568,56.395c0,31.139,26.67,56.388,59.568,56.388c4.363,0,8.614-0.457,12.71-1.299
c-4.71-7.248-8.31-15.242-10.552-23.764C24.771,257.346,10.539,243.2,10.539,226.003z"/>
<g>
<polygon fill="#ABDBD0" points="121.189,130.962 56.135,136.089 56.662,129.208 122.02,123.859 "/>
<polygon fill="#ABDBD0" points="120.531,141.218 55.478,146.347 56.004,139.465 121.364,134.116 "/>
<path fill="#ABDBD0" d="M120.311,143.455l-65.36,5.348l-0.526,6.882l50.139-3.953c4.875-1.368,9.922-2.336,15.109-2.83
L120.311,143.455z"/>
<path fill="#ABDBD0" d="M54.293,159.059l-0.527,6.883l24.851-1.96c4.491-3.131,9.296-5.842,14.364-8.088L54.293,159.059z"/>
<path fill="#ABDBD0" d="M72.954,168.275l-19.187,1.571l-0.526,6.882l11.721-0.926C67.461,173.128,70.129,170.612,72.954,168.275z"
/>
<path fill="#ABDBD0" d="M52.847,179.313l-0.526,6.882l4.571-0.362c1.745-2.542,3.636-4.978,5.641-7.313L52.847,179.313z"/>
</g>
<circle fill="#ABDBD0" cx="140.958" cy="239.852" r="19.726"/>
<ellipse fill="#ABDBD0" cx="328.491" cy="218.807" rx="4.487" ry="12.775"/>
<g>
<circle fill="#ABDBD0" cx="162.134" cy="223.81" r="2.781"/>
<circle fill="#ABDBD0" cx="133.371" cy="215.827" r="2.781"/>
<circle fill="#ABDBD0" cx="115.492" cy="239.462" r="2.781"/>
<circle fill="#ABDBD0" cx="131.915" cy="265.616" r="2.781"/>
<circle fill="#ABDBD0" cx="161.682" cy="255.915" r="2.783"/>
</g>
<path fill="#ABDBD0" d="M126.341,6.21c-9.103,0-16.483,7.379-16.483,16.482c0,2.76,0.686,5.357,1.886,7.641
c-2.135-2.062-3.7-4.699-4.48-7.655l0,0c-0.538,0.587-1.051,1.203-1.509,1.884c-5.088,7.548-3.096,17.791,4.454,22.881
c2.287,1.542,4.825,2.424,7.39,2.708c-4.22,0.898-8.783,0.158-12.644-2.444c-7.548-5.088-9.542-15.333-4.452-22.881
c1.634-2.423,3.81-4.247,6.245-5.472c-0.014-0.289-0.046-0.574-0.046-0.869c0-3.665,1.211-7.038,3.233-9.775l-0.001,0.001
c-0.855-0.185-1.731-0.312-2.642-0.312c-7.101,0-12.857,5.756-12.857,12.858c0,2.152,0.535,4.177,1.472,5.959
c-2.421-2.337-3.933-5.611-3.933-9.241c0-7.101,5.756-12.857,12.856-12.857c2.414,0,4.663,0.675,6.591,1.833
c-0.004,0.002-0.004,0.004-0.006,0.005C114.405,3.9,118.571,2,123.185,2c6.343,0,11.841,3.588,14.598,8.842
C134.817,7.98,130.789,6.21,126.341,6.21z"/>
<path fill="#ABDBD0" d="M188.32,300.982c-0.004,0-0.006,0.002-0.008,0.004c19.094-15.154,31.275-38.079,31.275-63.757
c0-40.085-29.659-73.5-69.016-81.055c-1.782-0.134-3.574-0.227-5.385-0.227c-42.013,0-76.072,36.7-76.072,81.97
c0,43.31,31.169,78.747,70.65,81.743c7.991-0.539,15.673-2.145,22.914-4.642L188.32,300.982z M144.663,286.068
c-23.696,0-42.907-20.166-42.907-45.041c0-24.878,19.211-45.042,42.907-45.042c23.697,0,42.908,20.166,42.908,45.042
C187.571,265.902,168.359,286.068,144.663,286.068z"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 145 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 540 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 534 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 784 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 840 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

View File

@@ -0,0 +1,82 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
viewBox="0 0 300 104"
enable-background="new 0 0 300 104"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="logo-black.svg">
<metadata
id="metadata24">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs22" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1084"
inkscape:window-height="641"
id="namedview20"
showgrid="false"
inkscape:zoom="1.8101934"
inkscape:cx="126.57728"
inkscape:cy="62.030566"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="0"
inkscape:current-layer="g4" />
<g
id="g4"
fill="#fff">
<path
d="M142.7 15.6c.4 3.2.4 7.5 0 10.7-.5 4.6-3.8 8.4-9.1 8.4s-8.5-3.8-9.1-8.4c-.4-3.2-.4-7.5 0-10.7.5-4.6 3.8-8.4 9.1-8.4s8.6 3.8 9.1 8.4m-5.3 10.7c.4-3.2.4-7.5 0-10.7-.2-1.7-1.4-3-3.7-3-2.3 0-3.5 1.4-3.7 3-.4 3.2-.4 7.5 0 10.7.2 1.7 1.4 3 3.7 3 2.3 0 3.5-1.3 3.7-3"
id="path6"
style="fill:#000000" />
<path
d="M156.4 7.6c4.4 0 8 3.6 8 8s-3.6 8-8 8H153c-.2 0-.4.2-.4.4v9.5c0 .4-.3.8-.8.8H148c-.4 0-.8-.3-.8-.8V8.4c0-.4.3-.8.8-.8h8.4zm-3.5 5.3c-.2 0-.4.2-.4.4v4.6c0 .2.2.4.4.4h3.4c1.4 0 2.7-1.2 2.7-2.7 0-1.4-1.2-2.7-2.7-2.7h-3.4zM172.9 28.6c0 .2.2.4.4.4h9c.4 0 .8.3.8.8v3.8c0 .4-.3.8-.8.8h-14c-.4 0-.8-.3-.8-.8V8.4c0-.4.3-.8.8-.8h13.8c.4 0 .8.3.8.8v3.8c0 .4-.3.8-.8.8h-8.9c-.2 0-.4.2-.4.4V18c0 .2.2.4.4.4h8.6c.4 0 .8.3.8.8V23c0 .4-.3.8-.8.8h-8.6c-.2 0-.4.2-.4.4v4.4zM199.4 34.3c-.6 0-.9-.3-1-.6l-5.2-13.4c-.1-.2-.3-.2-.3.1v13.2c0 .4-.3.8-.8.8h-3.8c-.4 0-.8-.3-.8-.8V8.4c0-.4.3-.8.8-.8h4.5c.6 0 .8.3 1 .7l5.2 14.5c.1.2.3.2.3-.1V8.4c0-.4.3-.8.8-.8h3.8c.4 0 .8.3.8.8v25.1c0 .4-.3.8-.8.8h-4.5zM224.4 24v9.5c0 .4-.3.8-.8.8h-3.8c-.4 0-.8-.3-.8-.8V8.4c0-.4.3-.8.8-.8h13.3c.4 0 .8.3.8.8v3.8c0 .4-.3.8-.8.8h-8.4c-.2 0-.4.2-.4.4V18c0 .2.2.4.4.4h8c.4 0 .8.3.8.8V23c0 .4-.3.8-.8.8h-8c-.1-.2-.3 0-.3.2M255.6 15.6c.4 3.2.4 7.5 0 10.7-.5 4.6-3.8 8.4-9.1 8.4s-8.5-3.8-9.1-8.4c-.4-3.2-.4-7.5 0-10.7.5-4.6 3.8-8.4 9.1-8.4s8.6 3.8 9.1 8.4m-5.3 10.7c.4-3.2.4-7.5 0-10.7-.2-1.7-1.4-3-3.7-3-2.3 0-3.5 1.4-3.7 3-.4 3.2-.4 7.5 0 10.7.2 1.7 1.4 3 3.7 3 2.3 0 3.5-1.3 3.7-3M278 15.6c.4 3.2.4 7.5 0 10.7-.5 4.6-3.8 8.4-9.1 8.4s-8.5-3.8-9.1-8.4c-.4-3.2-.4-7.5 0-10.7.5-4.6 3.8-8.4 9.1-8.4s8.5 3.8 9.1 8.4m-5.4 10.7c.4-3.2.4-7.5 0-10.7-.2-1.7-1.4-3-3.7-3-2.3 0-3.5 1.4-3.7 3-.4 3.2-.4 7.5 0 10.7.2 1.7 1.4 3 3.7 3 2.3 0 3.5-1.3 3.7-3"
id="path8"
style="fill:#000000" />
<path
d="M291.2 7.6c4.7 0 8 3.8 8.5 8.4.4 3.2.4 6.6 0 9.8-.5 4.6-3.8 8.4-8.5 8.4h-8c-.4 0-.8-.3-.8-.8v-25c0-.4.3-.8.8-.8h8zm-3 5.3c-.2 0-.4.2-.4.4v15.2c0 .2.2.4.4.4h3c1.8 0 2.9-1.4 3.1-3.1.4-3.2.4-6.6 0-9.8-.2-1.7-1.4-3.1-3.1-3.1h-3zM137.5 67.9c-.4 0-.6-.1-.8-.6l-9.1-20.8c-.1-.1-.3-.1-.3.1v20.6c0 .4-.3.7-.8.7h-.8c-.4 0-.8-.3-.8-.7V43.3c0-.4.3-.7.8-.7h2c.4 0 .6.1.8.6l9.1 20.6c.1.1.3.1.3-.1V43.3c0-.4.3-.7.8-.7h.8c.4 0 .8.3.8.7v23.9c0 .4-.3.7-.8.7h-2zM146.7 65.3c0 .2.2.4.4.4h9.9c.4 0 .8.3.8.7v.9c0 .4-.3.7-.8.7h-12c-.4 0-.8-.3-.8-.7v-24c0-.4.3-.7.8-.7h12c.4 0 .8.3.8.7v.9c0 .4-.3.7-.8.7h-9.9c-.2 0-.4.1-.4.4v8.2c0 .2.2.4.4.4h9.4c.4 0 .8.3.8.7v.8c0 .4-.3.7-.8.7h-9.4c-.2 0-.4.1-.4.4v8.8zM170 45.3v21.9c0 .4-.3.7-.8.7h-1c-.4 0-.8-.3-.8-.7V45.3c0-.2-.2-.4-.4-.4h-5.6c-.4 0-.8-.3-.8-.7v-.9c0-.4.3-.7.8-.7H176c.4 0 .8.3.8.7v.9c0 .4-.3.7-.8.7h-5.6c-.2 0-.4.2-.4.4M187 67.9h-2.1c-.3 0-.6-.2-.7-.5L179 43.3c-.1-.4.2-.7.8-.7h.9c.3 0 .6.1.7.5l4.3 20.7c0 .1.1.2.2.2h.1c.1 0 .2-.1.2-.2l4-20.7c.1-.4.4-.5.7-.5h1.3c.3 0 .6.2.7.5l4.3 20.7c0 .1.1.2.2.2h.1c.1 0 .2-.1.2-.2l4.6-20.7c.1-.4.4-.5.7-.5h.9c.6 0 .8.4.8.7l-5.5 24.1c-.1.4-.4.5-.7.5h-2.1c-.3 0-.6-.2-.7-.5l-4-19.3c0-.2-.3-.2-.3 0l-3.8 19.3c0 .4-.3.5-.6.5M223.9 49.8c.4 2.9.4 7.9 0 10.9-.6 4.7-3.9 7.5-8.5 7.5s-7.8-2.9-8.5-7.5c-.4-2.9-.4-8 0-10.9.6-3.9 3.5-7.5 8.5-7.5s7.9 3.6 8.5 7.5m-2.6 10.9c.5-3 .5-7.9 0-10.9-.4-2.6-2.3-5.2-5.9-5.2-3.6 0-5.5 2.6-5.9 5.2-.5 3-.5 7.9 0 10.9.3 2.1 1.8 5.2 5.9 5.2 4.1 0 5.6-3.1 5.9-5.2"
id="path10"
style="fill:#000000" />
<path
d="M230.9 57.8c-.2 0-.4.1-.4.4v9c0 .4-.3.7-.8.7h-.9c-.4 0-.8-.3-.8-.7V43.3c0-.4.3-.7.8-.7h6.5c4.4 0 8 3.4 8 7.6 0 3.3-1.8 5.2-4.5 6.9-.5.3-.6.6-.3 1.2l4.8 8.6c.3.5 0 1.1-.7 1.1h-.8c-.6 0-.9-.3-1.1-.7l-4.9-9c-.1-.2-.3-.4-.7-.4h-4.2zm0-12.9c-.2 0-.4.1-.4.4v9.8c0 .2.2.4.4.4h4.4c3 0 5.6-2.4 5.6-5.3s-2.5-5.3-5.6-5.3h-4.4zM249.3 57.1c-.1-.1-.3-.1-.3.1v10c0 .4-.3.7-.8.7h-.9c-.4 0-.8-.3-.8-.7V43.3c0-.4.3-.7.8-.7h.9c.4 0 .8.3.8.7v9.6c0 .2.2.2.3.1l8.8-10c.1-.1.4-.4 1-.4h.6c.9 0 1.1.8.6 1.3l-9.4 10.5c-.2.3-.3.5 0 .9L261 66.6c.4.5.3 1.3-.7 1.3h-.8c-.6 0-.8-.3-1-.5l-9.2-10.3zM133.1 91.2c-.1-.3-.3-.4-.6-.4h-6c-.3 0-.5.1-.6.4l-1.4 4.9c-.1.3-.3.4-.6.4h-.7c-.5 0-.7-.3-.6-.6l5.6-19.4c.1-.3.3-.4.6-.4h1.5c.3 0 .5.2.6.4l5.6 19.4c.1.3-.1.6-.6.6h-.7c-.3 0-.5-.2-.6-.4l-1.5-4.9zm-.7-2.6l-2.7-9.9c0-.1-.1-.2-.1-.2h-.1c-.1 0-.1.1-.1.2l-2.7 9.9c-.1.2.1.3.2.3h5.1c.3 0 .4 0 .4-.3"
id="path12"
style="fill:#000000" />
<path
d="M150.4 90.5c0 3.5-2.8 6.3-6.3 6.3s-6.3-2.8-6.3-6.3V76.7c0-.3.3-.6.6-.6h.7c.3 0 .6.3.6.6v13.8c0 2.3 1.9 4.4 4.4 4.4 2.5 0 4.4-2.1 4.4-4.4V76.7c0-.3.3-.6.6-.6h.7c.3 0 .6.3.6.6v13.8zM158.4 86.4c-2.1-.5-4.9-1.6-4.9-5 0-3.5 2.7-5.5 5.7-5.5 3.4 0 5.7 2.5 5.7 5.5v.4c0 .3-.3.6-.6.6h-.7c-.3 0-.6-.3-.6-.6v-.4c0-2.1-1.6-3.6-3.8-3.6-2.6 0-3.8 1.8-3.8 3.6 0 2.6 2.7 2.9 4.8 3.5 3.2 1 5.3 2.2 5.3 5.8 0 3.8-3 6.1-6.3 6.1-3.8 0-6.3-2.7-6.3-6.1v-.5c0-.3.3-.6.6-.6h.7c.3 0 .6.3.6.6v.5c0 2 1.5 4.2 4.4 4.2 2.7 0 4.4-1.7 4.4-4.2 0-2.7-1.9-3.5-5.2-4.3M173.5 78.3V96c0 .3-.3.6-.6.6h-.7c-.3 0-.6-.3-.6-.6V78.3c0-.2-.1-.3-.3-.3H167c-.3 0-.6-.3-.6-.6v-.7c0-.3.3-.6.6-.6h11.1c.3 0 .6.3.6.6v.7c0 .3-.3.6-.6.6h-4.3c-.2 0-.3.1-.3.3"
id="path14"
style="fill:#000000" />
<path
d="M182.9 88.4c-.2 0-.3.1-.3.3V96c0 .3-.3.6-.6.6h-.7c-.3 0-.6-.3-.6-.6V76.7c0-.3.3-.6.6-.6h5c3.4 0 6.1 2.7 6.1 6.1 0 2.6-1.4 4.2-3.5 5.6-.4.2-.4.5-.2.9l3.7 6.9c.2.4 0 .9-.6.9h-.6c-.5 0-.7-.2-.8-.6l-3.7-7.2c-.1-.2-.2-.4-.6-.4h-3.2zm0-10.4c-.2 0-.3.1-.3.3v7.9c0 .2.1.3.3.3h3.4c2.3 0 4.3-1.9 4.3-4.3 0-2.3-1.9-4.3-4.3-4.3h-3.4zM204.8 91.2c-.1-.3-.3-.4-.6-.4h-6c-.3 0-.5.1-.6.4l-1.4 4.9c-.1.3-.3.4-.6.4h-.6c-.5 0-.7-.3-.6-.6l5.6-19.4c.1-.3.3-.4.6-.4h1.5c.3 0 .5.2.6.4l5.6 19.4c.1.3-.1.6-.6.6h-.7c-.3 0-.5-.2-.6-.4l-1.6-4.9zm-.7-2.6l-2.7-9.9c0-.1-.1-.2-.1-.2h-.1c-.1 0-.1.1-.1.2l-2.7 9.9c-.1.2.1.3.2.3h5.1c.3 0 .4 0 .4-.3"
id="path16"
style="fill:#000000" />
<path
d="M212.2 94.4c0 .2.1.3.3.3h7.2c.3 0 .6.3.6.6v.7c0 .3-.3.6-.6.6H211c-.3 0-.6-.3-.6-.6V76.7c0-.3.3-.6.6-.6h.7c.3 0 .6.3.6.6v17.7zM224.5 95.9c0 .3-.3.6-.6.6h-.7c-.3 0-.6-.3-.6-.6V76.7c0-.3.3-.6.6-.6h.7c.3 0 .6.3.6.6v19.2zM237.1 91.2c-.1-.3-.3-.4-.6-.4h-6c-.3 0-.5.1-.6.4l-1.4 4.9c-.1.3-.3.4-.6.4h-.7c-.5 0-.7-.3-.6-.6l5.6-19.4c.1-.3.3-.4.6-.4h1.5c.3 0 .5.2.6.4l5.6 19.4c.1.3-.1.6-.6.6h-.7c-.3 0-.5-.2-.6-.4l-1.5-4.9zm-.7-2.6l-2.7-9.9c0-.1-.1-.2-.1-.2h-.1c-.1 0-.1.1-.1.2l-2.7 9.9c-.1.2.1.3.2.3h5.1c.3 0 .4 0 .4-.3M3 44.3h.5c1.2 0 2.2-.9 2.4-2 .5-2.4 1.1-4.7 2-7 6.6-18.2 23.5-30.4 42-30.4s35.4 12.2 42 30.3c.8 2.2 1.5 4.6 2 6.9.3 1.3 1.6 2.2 2.9 1.9 1.3-.3 2.2-1.6 1.9-2.9-.5-2.6-1.3-5.1-2.2-7.6C89.2 13.5 70.5 0 49.9 0S10.6 13.5 3.3 33.6c-.9 2.5-1.6 5.1-2.2 7.7v.2l2.4.5-2.4-.5c-.3 1.3.6 2.6 1.9 2.8M99.8 53c.1-1-.4-2-1.4-2.5-3.4-1.6-7.7-3.1-12.5-4.2-1.5-.4-3.1-.7-4.7-1-3.3-.6-6.9-1.2-10.7-1.6-.7-7.4-3.9-12.8-9.5-16.6-6.3-4.2-14.1-4.4-20.9-.6-6.6 3.6-10.8 10.1-11.1 17.3-11.1 1.4-20.8 3.8-27.6 7.1-.1 0-.1.1-.2.1s-.1.1-.2.1l-.1.1c-.1.1-.2.1-.2.2-.4.4-.6 1-.6 1.6 0 1.4.1 2.7.2 4.1 0 .4.1.7.1 1.1.3 2.6.8 5.2 1.5 7.7.2.7.3 1.4.5 2 .3.9.6 1.7.9 2.6.7 1.8 1.4 3.6 2.2 5.2.8 1.6 1.7 3.1 2.6 4.6.7 1.2 1.5 2.3 2.4 3.5 1 1.3 2 2.6 3.2 3.8 1.5 1.7 3.1 3.2 4.8 4.6 1.4 1.2 2.9 2.3 4.4 3.3 1.9 1.3 3.8 2.4 5.9 3.4 2 .9 4 1.8 6.1 2.4 2.1.7 4.3 1.2 6.5 1.6 2.8.5 5.7.8 8.7.8h.1c13.6 0 26.5-5.9 35.8-15.9 1.8-1.9 3.4-3.9 4.9-6.1.2-.2.3-.5.5-.7 1.5-2.4 2.9-4.8 4-7.4.9-2 1.6-4 2.2-6 1.3-4.5 2.1-9.5 2.2-14.6 0 .1 0 .1 0 0m-14.1-1.7c3.3.8 6.3 1.8 8.9 2.9-3.4 1.6-6.7 2.9-9.9 4.1-1.9.7-3.7 1.2-5.5 1.7-3.5 1-7.1 1.6-10.7 2 1.3-4.4 2-8.8 2.2-13.4 3.6.4 7 1 10.2 1.6 1.7.4 3.3.7 4.8 1.1m-13 23.1c-3.2.4-6.5.6-9.7.6 1.5-2.5 2.7-5.2 3.8-7.8 3.6-.2 7-.7 10.4-1.5-1.3 2.9-2.8 5.8-4.5 8.7m-9.8 12.5c-2.8 0-5.6-.1-8.4-.5 1.9-2.1 3.7-4.3 5.4-6.5 1.2.1 2.5.1 3.7.1 1.8 0 3.7-.1 5.5-.2-1.9 2.4-4 4.8-6.2 7.1m-22.7-4.5c1.6-1.7 3-3.4 4.4-5.2 3.2.9 6.4 1.6 9.5 2-1.7 2.1-3.5 4.1-5.4 6-2.8-.7-5.6-1.6-8.5-2.8M6.6 65c-.5-1.9-.9-3.8-1.2-5.8 7.2-1.8 16.6-1.4 26.2 1.3-.9 2-2 3.9-3.2 5.8C19.3 64 11.6 64.2 6.6 65m50.7 9.7c-3.2-.3-6.5-.9-9.8-1.7 1.4-2.2 2.6-4.5 3.7-6.9 3.5.6 6.8 1 10.1 1.1-1.1 2.5-2.4 5.1-4 7.5m-14.6-3.3c-1.5-.5-3-1.1-4.5-1.8-1.7-.7-3.3-1.3-4.9-1.9 1.1-1.9 2.2-3.8 3.1-5.8 3.5 1.2 6.8 2.2 10 3-1.1 2.3-2.4 4.5-3.7 6.5m-12.2.6c1.8.6 3.8 1.3 5.7 2.2 1.2.5 2.3 1 3.5 1.4-1.3 1.7-2.8 3.3-4.3 4.8-3.1-1.2-6.2-2.3-9.3-3 1.5-1.8 3-3.6 4.4-5.4m12-41.3c5.2-2.9 11.1-2.7 15.8.4 4.2 2.8 6.5 6.7 7.3 12-5-.4-10.2-.6-15.5-.6-5.5 0-10.9.3-16 .7.4-5.1 3.5-9.8 8.4-12.5M50 47.5h2.1c1 0 2 0 3.1.1 3.6.1 7.2.3 10.6.6-.2 4.8-1 9.5-2.5 14.1-3.2 0-6.5-.3-10-.9-1.6-.3-3.2-.6-4.9-1-3.2-.7-6.6-1.7-10.2-3-.1 0-.2-.1-.3-.1-1.5-.5-2.9-1-4.4-1.4-9.6-2.8-18.9-3.5-26.7-2 10.3-4.1 26.1-6.4 43.2-6.4M8.2 69.7c4.2-.5 10.1-.7 17.2.9-1.5 1.9-3.2 3.8-5 5.5-3.3-.5-6.5-.8-9.6-.7-1-1.8-1.9-3.7-2.6-5.7m9.5 15.2c-1.1-1.2-2.2-2.4-3.2-3.8-.2-.3-.4-.5-.6-.8.5 0 1 0 1.5.1 2 .2 4.2.4 6.5.9 2.8.6 6 1.5 9.3 2.7-2.5 2.1-5.3 4.1-8.2 5.8-1.8-1.4-3.6-3.1-5.3-4.9m9.9 8c3.2-2 6.1-4.3 8.8-6.8 2.7 1.2 5.3 2.2 8 2.9-3 2.6-6.3 5.1-10 7.1-2.4-.8-4.7-1.9-6.8-3.2m13.1 5.2c3.5-2.3 6.6-5 9.4-7.5 2.7.5 5.3.9 7.9 1.1-3.2 3-6.3 5.4-9.4 7.4-2.6-.2-5.3-.5-7.9-1m17.1.2c2.4-1.9 4.7-4.1 7.2-6.6 3.6-.1 7.2-.6 10.8-1.3-5.3 4-11.5 6.7-18 7.9m28.9-19.1c-1.1 1.6-2.3 3.1-3.5 4.5-4.4 1.2-8.8 2.2-13.2 2.7 2.1-2.4 3.9-4.9 5.6-7.5 4.4-.7 8.8-1.7 13.1-3-.7 1.2-1.3 2.2-2 3.3m-7.8-5.9c1.6-3.1 3-6.2 4.1-9.3 3.7-1.2 7.4-2.6 11.3-4.3-.5 3.5-1.5 6.9-2.7 10.2-4.2 1.4-8.4 2.5-12.7 3.4"
id="path18"
style="fill:#000000" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

View File

@@ -1,67 +1,110 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
]>
<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
<metadata>
<sfw xmlns="&ns_sfw;">
<slices></slices>
<sliceSourceBounds height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
</sfw>
</metadata>
<g>
<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
C24.988,26.679,20.059,25,14,25z"/>
<g>
<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
<g>
<path fill="#0B8C61" d="M9.46,8.846L9.458,9.319l-0.003,2.397c1.098-0.034,2.3-0.052,3.438-0.052c0.201,0,0.401,0.001,0.6,0.002
l-0.935-2.824L9.46,8.846z"/>
<circle fill="#0B8C61" cx="8.728" cy="17.454" r="1.569"/>
<path fill="#0B8C61" d="M12.395,17.13c-0.015-0.107-0.027-0.199-0.037-0.282c-0.047-0.382-0.165-0.741-0.325-1.075
c-0.049-0.096-0.097-0.193-0.155-0.285c-0.038-0.063-0.078-0.124-0.119-0.184c-0.514-0.723-1.278-1.251-2.166-1.464
c-0.202-0.04-0.409-0.061-0.619-0.061c-0.295,0-0.592,0.041-0.881,0.122c-0.276,0.077-0.487,0.112-0.685,0.112
c-0.027,0-0.048-0.008-0.074-0.009C5.969,14.557,5,15.892,5,17.455c0,2.055,1.672,3.727,3.728,3.727
c2.035,0,3.689-1.642,3.719-3.671l-0.041-0.296L12.395,17.13z M8.728,19.523c-1.142,0-2.07-0.928-2.07-2.069
s0.928-2.07,2.07-2.07c1.141,0,2.069,0.929,2.069,2.07S9.869,19.523,8.728,19.523z"/>
<circle fill="#0B8C61" cx="20.826" cy="19.013" r="1.006"/>
<path fill="#0B8C61" d="M22.72,15.398c0.13-0.696,0.212-1.403,0.271-2.108c0.055-0.659-0.112-0.814-0.758-0.839
c-0.961-0.034-1.848-0.071-2.808-0.109c-0.029-0.001-0.077-0.022-0.077-0.06c0-0.724,0.037-2.484,0.037-2.484
S19.196,9.66,18.931,9.66c-0.116,0-0.247,0.026-0.383,0.103c0,0.821,0,1.654,0,2.527c0,0-1.172-0.031-2.844-0.065
c-0.074-0.002-0.281-0.128-0.378-0.392c-0.251-0.694-0.8-2.045-1.52-4.126c0,0-0.373-0.888-1.316-0.888c-0.781,0-4.679,0-4.679,0
v5.199c0,0-0.353,0.148-0.649,0.178c-0.078,0.472-0.067,0.711,0.115,0.784c0.46-0.15,0.942-0.252,1.451-0.252
c0.389,0,0.761,0.061,1.122,0.149c1.119,0.237,2.101,0.923,2.748,1.879c0.034,0.048,0.064,0.097,0.096,0.147
c0.094,0.151,0.179,0.306,0.255,0.47c0.083,0.167,0.154,0.338,0.217,0.515c0.004,0.012,0.008,0.024,0.011,0.037
c0.127,0.368,0.206,0.754,0.238,1.156c0.101,0.014,0.196,0.036,0.289,0.036c0.007,0,0.013,0,0.02,0
c2.176-0.056,4.355-0.06,6.529-0.169c-0.906,0.251-1.575,1.082-1.575,2.067c0,1.184,0.962,2.147,2.148,2.147
c1.184,0,2.147-0.963,2.147-2.147c0-1.071-0.79-1.958-1.816-2.119C22.761,16.794,22.451,16.842,22.72,15.398z M12.893,12.163
c-1.343,0-2.729,0.025-3.938,0.069l0.003-2.916l0.004-0.97l3.957-0.006l1.263,3.813l0.045,0.018
C13.793,12.166,13.345,12.163,12.893,12.163z M22.082,19.013c0,0.693-0.564,1.257-1.256,1.257c-0.692,0-1.256-0.564-1.256-1.257
c0-0.692,0.564-1.255,1.256-1.255C21.518,17.758,22.082,18.321,22.082,19.013z"/>
<path fill="#0B8C61" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z M23.973,19.013
c0,1.735-1.412,3.147-3.147,3.147c-1.736,0-3.148-1.412-3.148-3.147c0-0.34,0.055-0.67,0.158-0.98
c-0.652,0.016-1.301,0.027-1.94,0.039c-0.716,0.013-1.431,0.025-2.137,0.043l-0.037,0.001h-0.018
c-0.102,0-0.208-0.014-0.315-0.03c-0.312,2.306-2.272,4.096-4.661,4.096C6.121,22.181,4,20.061,4,17.455
c0-1.725,0.939-3.222,2.323-4.047c-0.278-0.463-0.209-1.002-0.148-1.375L6.3,11.276l0.511-0.051V6.819v-1h1h4.679
c1.269,0,2.003,0.943,2.238,1.5l0.012,0.03l0.011,0.03c0.497,1.435,0.905,2.503,1.203,3.283c0.083,0.217,0.156,0.408,0.217,0.572
c0.531,0.011,0.998,0.022,1.376,0.031V9.763V9.177l0.512-0.286c0.273-0.153,0.566-0.23,0.872-0.23
c0.55,0,0.938,0.254,1.044,0.332l0.419,0.307l-0.011,0.52c0,0.001-0.017,0.815-0.028,1.56c0.635,0.025,1.257,0.05,1.916,0.073
c0.277,0.011,0.925,0.036,1.358,0.525c0.384,0.434,0.393,0.974,0.358,1.396c-0.07,0.848-0.161,1.55-0.284,2.208
c-0.04,0.216-0.066,0.397-0.089,0.547c-0.062,0.425-0.158,0.742-0.292,0.981C23.731,17.644,23.973,18.308,23.973,19.013z"/>
</g>
</g>
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
xmlns:ns="&amp;ns_sfw;"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Layer_1"
x="0px"
y="0px"
width="28px"
height="33px"
viewBox="0 0 28 33"
enable-background="new 0 0 28 33"
xml:space="preserve"
sodipodi:docname="green_producer.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)"><defs
id="defs29" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1803"
inkscape:window-height="857"
id="namedview27"
showgrid="false"
inkscape:zoom="17.609546"
inkscape:cx="3.0055332"
inkscape:cy="16.5"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="g20" />
<metadata
id="metadata2">
<ns:sfw>
<ns:slices />
<ns:sliceSourceBounds
height="96"
width="16383"
y="-85.5"
x="-8112"
bottomLeftOrigin="true" />
</ns:sfw>
<rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
<g
id="g24">
<path
opacity="0.25"
fill="#282828"
d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643 C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643 C24.988,26.679,20.059,25,14,25z"
id="path4" />
<g
id="g22">
<path
fill="#FFFFFF"
d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32 c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"
id="path6" />
<g
id="g20">
<path
fill="#C1122B"
d="M9.46,8.846L9.458,9.319l-0.003,2.397c1.098-0.034,2.3-0.052,3.438-0.052c0.201,0,0.401,0.001,0.6,0.002 l-0.935-2.824L9.46,8.846z"
id="path8"
style="fill:#0b8c61;fill-opacity:1" />
<circle
fill="#C1122B"
cx="8.728"
cy="17.454"
r="1.569"
id="circle10"
style="fill:#0b8c61;fill-opacity:1" />
<path
fill="#C1122B"
d="M12.395,17.13c-0.015-0.107-0.027-0.199-0.037-0.282c-0.047-0.382-0.165-0.741-0.325-1.075 c-0.049-0.096-0.097-0.193-0.155-0.285c-0.038-0.063-0.078-0.124-0.119-0.184c-0.514-0.723-1.278-1.251-2.166-1.464 c-0.202-0.04-0.409-0.061-0.619-0.061c-0.295,0-0.592,0.041-0.881,0.122c-0.276,0.077-0.487,0.112-0.685,0.112 c-0.027,0-0.048-0.008-0.074-0.009C5.969,14.557,5,15.892,5,17.455c0,2.055,1.672,3.727,3.728,3.727 c2.035,0,3.689-1.642,3.719-3.671l-0.041-0.296L12.395,17.13z M8.728,19.523c-1.142,0-2.07-0.928-2.07-2.069 s0.928-2.07,2.07-2.07c1.141,0,2.069,0.929,2.069,2.07S9.869,19.523,8.728,19.523z"
id="path12"
style="fill:#0b8c61;fill-opacity:1" />
<circle
fill="#C1122B"
cx="20.826"
cy="19.013"
r="1.006"
id="circle14"
style="fill:#0b8c61;fill-opacity:1" />
<path
fill="#C1122B"
d="M22.72,15.398c0.13-0.696,0.212-1.403,0.271-2.108c0.055-0.659-0.112-0.814-0.758-0.839 c-0.961-0.034-1.848-0.071-2.808-0.109c-0.029-0.001-0.077-0.022-0.077-0.06c0-0.724,0.037-2.484,0.037-2.484 S19.196,9.66,18.931,9.66c-0.116,0-0.247,0.026-0.383,0.103c0,0.821,0,1.654,0,2.527c0,0-1.172-0.031-2.844-0.065 c-0.074-0.002-0.281-0.128-0.378-0.392c-0.251-0.694-0.8-2.045-1.52-4.126c0,0-0.373-0.888-1.316-0.888c-0.781,0-4.679,0-4.679,0 v5.199c0,0-0.353,0.148-0.649,0.178c-0.078,0.472-0.067,0.711,0.115,0.784c0.46-0.15,0.942-0.252,1.451-0.252 c0.389,0,0.761,0.061,1.122,0.149c1.119,0.237,2.101,0.923,2.748,1.879c0.034,0.048,0.064,0.097,0.096,0.147 c0.094,0.151,0.179,0.306,0.255,0.47c0.083,0.167,0.154,0.338,0.217,0.515c0.004,0.012,0.008,0.024,0.011,0.037 c0.127,0.368,0.206,0.754,0.238,1.156c0.101,0.014,0.196,0.036,0.289,0.036c0.007,0,0.013,0,0.02,0 c2.176-0.056,4.355-0.06,6.529-0.169c-0.906,0.251-1.575,1.082-1.575,2.067c0,1.184,0.962,2.147,2.148,2.147 c1.184,0,2.147-0.963,2.147-2.147c0-1.071-0.79-1.958-1.816-2.119C22.761,16.794,22.451,16.842,22.72,15.398z M12.893,12.163 c-1.343,0-2.729,0.025-3.938,0.069l0.003-2.916l0.004-0.97l3.957-0.006l1.263,3.813l0.045,0.018 C13.793,12.166,13.345,12.163,12.893,12.163z M22.082,19.013c0,0.693-0.564,1.257-1.256,1.257c-0.692,0-1.256-0.564-1.256-1.257 c0-0.692,0.564-1.255,1.256-1.255C21.518,17.758,22.082,18.321,22.082,19.013z"
id="path16"
style="fill:#0b8c61;fill-opacity:1" />
<path
fill="#C1122B"
d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32 c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z M23.973,19.013 c0,1.735-1.412,3.147-3.147,3.147c-1.736,0-3.148-1.412-3.148-3.147c0-0.34,0.055-0.67,0.158-0.98 c-0.652,0.016-1.301,0.027-1.94,0.039c-0.716,0.013-1.431,0.025-2.137,0.043l-0.037,0.001h-0.018 c-0.102,0-0.208-0.014-0.315-0.03c-0.312,2.306-2.272,4.096-4.661,4.096C6.121,22.181,4,20.061,4,17.455 c0-1.725,0.939-3.222,2.323-4.047c-0.278-0.463-0.209-1.002-0.148-1.375L6.3,11.276l0.511-0.051V6.819v-1h1h4.679 c1.269,0,2.003,0.943,2.238,1.5l0.012,0.03l0.011,0.03c0.497,1.435,0.905,2.503,1.203,3.283c0.083,0.217,0.156,0.408,0.217,0.572 c0.531,0.011,0.998,0.022,1.376,0.031V9.763V9.177l0.512-0.286c0.273-0.153,0.566-0.23,0.872-0.23 c0.55,0,0.938,0.254,1.044,0.332l0.419,0.307l-0.011,0.52c0,0.001-0.017,0.815-0.028,1.56c0.635,0.025,1.257,0.05,1.916,0.073 c0.277,0.011,0.925,0.036,1.358,0.525c0.384,0.434,0.393,0.974,0.358,1.396c-0.07,0.848-0.161,1.55-0.284,2.208 c-0.04,0.216-0.066,0.397-0.089,0.547c-0.062,0.425-0.158,0.742-0.292,0.981C23.731,17.644,23.973,18.308,23.973,19.013z"
id="path18"
style="fill:#0b8c61;fill-opacity:1" />
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

@@ -1,69 +1,110 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
]>
<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
<metadata>
<sfw xmlns="&ns_sfw;">
<slices></slices>
<sliceSourceBounds height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
</sfw>
</metadata>
<g>
<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
C24.988,26.679,20.059,25,14,25z"/>
<g>
<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
<g>
<path fill="#0B8C61" d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32
c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M14.002,30.908
C10.865,28.805,1,21.533,1,13.333C1,7.511,6.56,1,14,1c7.44,0,13,6.511,13,12.333C27,21.682,17.14,28.843,14.002,30.908z"/>
<path fill="#0B8C61" d="M23.703,15.582c0.123-0.658,0.214-1.36,0.284-2.208c0.035-0.422,0.026-0.962-0.358-1.396
c-0.433-0.489-1.081-0.514-1.358-0.525c-0.659-0.024-1.281-0.048-1.916-0.073c0.011-0.745,0.028-1.56,0.028-1.56l0.011-0.52
l-0.419-0.307c-0.106-0.078-0.495-0.332-1.044-0.332c-0.306,0-0.599,0.077-0.872,0.23l-0.512,0.286v0.586v1.502
c-0.378-0.009-0.845-0.02-1.376-0.031c-0.062-0.164-0.135-0.355-0.217-0.572c-0.298-0.78-0.706-1.847-1.203-3.283l-0.011-0.03
l-0.013-0.03c-0.234-0.557-0.969-1.5-2.238-1.5H7.811h-1v1v4.407L6.3,11.276l-0.125,0.757c-0.061,0.373-0.13,0.911,0.148,1.375
C4.939,14.233,4,15.729,4,17.455c0,2.606,2.121,4.727,4.728,4.727c2.39,0,4.349-1.79,4.661-4.096
c0.107,0.016,0.212,0.03,0.315,0.03h0.018l0.037-0.001c0.706-0.018,1.421-0.031,2.137-0.043c0.639-0.011,1.288-0.023,1.94-0.039
c-0.103,0.311-0.158,0.641-0.158,0.98c0,1.735,1.412,3.147,3.148,3.147c1.736,0,3.147-1.412,3.147-3.147
c0-0.706-0.242-1.369-0.651-1.903c0.135-0.239,0.23-0.556,0.292-0.981C23.636,15.978,23.662,15.798,23.703,15.582z M8.728,21.181
C6.672,21.181,5,19.51,5,17.455c0-1.562,0.969-2.898,2.335-3.451c0.026,0.001,0.046,0.009,0.074,0.009
c0.197,0,0.409-0.034,0.685-0.112c0.289-0.081,0.586-0.122,0.881-0.122c0.21,0,0.417,0.021,0.619,0.061
c0.888,0.213,1.652,0.741,2.166,1.464c0.041,0.06,0.082,0.121,0.119,0.184c0.057,0.091,0.105,0.188,0.155,0.285
c0.16,0.334,0.279,0.693,0.325,1.075c0.009,0.083,0.022,0.176,0.037,0.283l0.011,0.082l0.041,0.296
C12.417,19.539,10.763,21.181,8.728,21.181z M22.973,19.013c0,1.184-0.964,2.147-2.147,2.147c-1.186,0-2.148-0.963-2.148-2.147
c0-0.985,0.669-1.815,1.575-2.067c-2.174,0.109-4.353,0.113-6.529,0.169c-0.007,0-0.013,0-0.02,0
c-0.092,0-0.188-0.022-0.289-0.036c-0.032-0.402-0.111-0.788-0.238-1.156c-0.004-0.012-0.007-0.024-0.011-0.037
c-0.063-0.177-0.134-0.348-0.217-0.515c-0.076-0.163-0.161-0.318-0.255-0.469c-0.032-0.05-0.062-0.099-0.096-0.147
c-0.646-0.956-1.628-1.642-2.748-1.879c-0.362-0.089-0.734-0.149-1.122-0.149c-0.509,0-0.991,0.102-1.451,0.252
c-0.181-0.073-0.192-0.312-0.115-0.784c0.296-0.029,0.649-0.178,0.649-0.178V6.819c0,0,3.899,0,4.679,0
c0.943,0,1.316,0.888,1.316,0.888c0.72,2.081,1.269,3.432,1.52,4.126c0.097,0.264,0.303,0.39,0.378,0.392
c1.672,0.035,2.844,0.065,2.844,0.065c0-0.873,0-1.706,0-2.527c0.136-0.076,0.267-0.103,0.383-0.103
c0.265,0,0.453,0.138,0.453,0.138s-0.037,1.76-0.037,2.484c0,0.038,0.048,0.059,0.077,0.06c0.961,0.038,1.848,0.075,2.808,0.109
c0.646,0.025,0.813,0.18,0.758,0.839c-0.059,0.705-0.14,1.412-0.271,2.108c-0.269,1.444,0.042,1.395-1.562,1.496
C22.183,17.055,22.973,17.943,22.973,19.013z"/>
<path fill="#0B8C61" d="M19.57,19.013c0,0.693,0.564,1.257,1.256,1.257c0.692,0,1.256-0.564,1.256-1.257
c0-0.692-0.564-1.255-1.256-1.255C20.134,17.758,19.57,18.321,19.57,19.013z M21.832,19.013c0,0.555-0.451,1.007-1.006,1.007
c-0.555,0-1.006-0.452-1.006-1.007c0-0.554,0.451-1.005,1.006-1.005C21.381,18.008,21.832,18.459,21.832,19.013z"/>
<path fill="#0B8C61" d="M12.919,8.341L8.961,8.347l-0.004,0.97l-0.003,2.916c1.209-0.044,2.595-0.069,3.939-0.069
c0.452,0,0.9,0.003,1.334,0.009l-0.045-0.018L12.919,8.341z M12.893,11.663c-1.138,0-2.34,0.018-3.438,0.052l0.003-2.397
L9.46,8.846l3.098-0.005l0.935,2.824C13.294,11.664,13.094,11.663,12.893,11.663z"/>
<path fill="#0B8C61" d="M8.728,15.385c-1.142,0-2.07,0.929-2.07,2.07s0.928,2.069,2.07,2.069c1.141,0,2.069-0.928,2.069-2.069
S9.869,15.385,8.728,15.385z M8.728,19.023c-0.865,0-1.57-0.704-1.57-1.569c0-0.866,0.704-1.57,1.57-1.57
c0.865,0,1.569,0.704,1.569,1.57C10.297,18.32,9.593,19.023,8.728,19.023z"/>
</g>
</g>
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
xmlns:ns="&amp;ns_sfw;"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Layer_1"
x="0px"
y="0px"
width="28px"
height="33px"
viewBox="0 0 28 33"
enable-background="new 0 0 28 33"
xml:space="preserve"
sodipodi:docname="green_producer.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)"><defs
id="defs29" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1803"
inkscape:window-height="857"
id="namedview27"
showgrid="false"
inkscape:zoom="17.609546"
inkscape:cx="3.0055332"
inkscape:cy="16.5"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="g20" />
<metadata
id="metadata2">
<ns:sfw>
<ns:slices />
<ns:sliceSourceBounds
height="96"
width="16383"
y="-85.5"
x="-8112"
bottomLeftOrigin="true" />
</ns:sfw>
<rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
<g
id="g24">
<path
opacity="0.25"
fill="#282828"
d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643 C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643 C24.988,26.679,20.059,25,14,25z"
id="path4" />
<g
id="g22">
<path
fill="#FFFFFF"
d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32 c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"
id="path6" />
<g
id="g20">
<path
fill="#C1122B"
d="M9.46,8.846L9.458,9.319l-0.003,2.397c1.098-0.034,2.3-0.052,3.438-0.052c0.201,0,0.401,0.001,0.6,0.002 l-0.935-2.824L9.46,8.846z"
id="path8"
style="fill:#0b8c61;fill-opacity:1" />
<circle
fill="#C1122B"
cx="8.728"
cy="17.454"
r="1.569"
id="circle10"
style="fill:#0b8c61;fill-opacity:1" />
<path
fill="#C1122B"
d="M12.395,17.13c-0.015-0.107-0.027-0.199-0.037-0.282c-0.047-0.382-0.165-0.741-0.325-1.075 c-0.049-0.096-0.097-0.193-0.155-0.285c-0.038-0.063-0.078-0.124-0.119-0.184c-0.514-0.723-1.278-1.251-2.166-1.464 c-0.202-0.04-0.409-0.061-0.619-0.061c-0.295,0-0.592,0.041-0.881,0.122c-0.276,0.077-0.487,0.112-0.685,0.112 c-0.027,0-0.048-0.008-0.074-0.009C5.969,14.557,5,15.892,5,17.455c0,2.055,1.672,3.727,3.728,3.727 c2.035,0,3.689-1.642,3.719-3.671l-0.041-0.296L12.395,17.13z M8.728,19.523c-1.142,0-2.07-0.928-2.07-2.069 s0.928-2.07,2.07-2.07c1.141,0,2.069,0.929,2.069,2.07S9.869,19.523,8.728,19.523z"
id="path12"
style="fill:#0b8c61;fill-opacity:1" />
<circle
fill="#C1122B"
cx="20.826"
cy="19.013"
r="1.006"
id="circle14"
style="fill:#0b8c61;fill-opacity:1" />
<path
fill="#C1122B"
d="M22.72,15.398c0.13-0.696,0.212-1.403,0.271-2.108c0.055-0.659-0.112-0.814-0.758-0.839 c-0.961-0.034-1.848-0.071-2.808-0.109c-0.029-0.001-0.077-0.022-0.077-0.06c0-0.724,0.037-2.484,0.037-2.484 S19.196,9.66,18.931,9.66c-0.116,0-0.247,0.026-0.383,0.103c0,0.821,0,1.654,0,2.527c0,0-1.172-0.031-2.844-0.065 c-0.074-0.002-0.281-0.128-0.378-0.392c-0.251-0.694-0.8-2.045-1.52-4.126c0,0-0.373-0.888-1.316-0.888c-0.781,0-4.679,0-4.679,0 v5.199c0,0-0.353,0.148-0.649,0.178c-0.078,0.472-0.067,0.711,0.115,0.784c0.46-0.15,0.942-0.252,1.451-0.252 c0.389,0,0.761,0.061,1.122,0.149c1.119,0.237,2.101,0.923,2.748,1.879c0.034,0.048,0.064,0.097,0.096,0.147 c0.094,0.151,0.179,0.306,0.255,0.47c0.083,0.167,0.154,0.338,0.217,0.515c0.004,0.012,0.008,0.024,0.011,0.037 c0.127,0.368,0.206,0.754,0.238,1.156c0.101,0.014,0.196,0.036,0.289,0.036c0.007,0,0.013,0,0.02,0 c2.176-0.056,4.355-0.06,6.529-0.169c-0.906,0.251-1.575,1.082-1.575,2.067c0,1.184,0.962,2.147,2.148,2.147 c1.184,0,2.147-0.963,2.147-2.147c0-1.071-0.79-1.958-1.816-2.119C22.761,16.794,22.451,16.842,22.72,15.398z M12.893,12.163 c-1.343,0-2.729,0.025-3.938,0.069l0.003-2.916l0.004-0.97l3.957-0.006l1.263,3.813l0.045,0.018 C13.793,12.166,13.345,12.163,12.893,12.163z M22.082,19.013c0,0.693-0.564,1.257-1.256,1.257c-0.692,0-1.256-0.564-1.256-1.257 c0-0.692,0.564-1.255,1.256-1.255C21.518,17.758,22.082,18.321,22.082,19.013z"
id="path16"
style="fill:#0b8c61;fill-opacity:1" />
<path
fill="#C1122B"
d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32 c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z M23.973,19.013 c0,1.735-1.412,3.147-3.147,3.147c-1.736,0-3.148-1.412-3.148-3.147c0-0.34,0.055-0.67,0.158-0.98 c-0.652,0.016-1.301,0.027-1.94,0.039c-0.716,0.013-1.431,0.025-2.137,0.043l-0.037,0.001h-0.018 c-0.102,0-0.208-0.014-0.315-0.03c-0.312,2.306-2.272,4.096-4.661,4.096C6.121,22.181,4,20.061,4,17.455 c0-1.725,0.939-3.222,2.323-4.047c-0.278-0.463-0.209-1.002-0.148-1.375L6.3,11.276l0.511-0.051V6.819v-1h1h4.679 c1.269,0,2.003,0.943,2.238,1.5l0.012,0.03l0.011,0.03c0.497,1.435,0.905,2.503,1.203,3.283c0.083,0.217,0.156,0.408,0.217,0.572 c0.531,0.011,0.998,0.022,1.376,0.031V9.763V9.177l0.512-0.286c0.273-0.153,0.566-0.23,0.872-0.23 c0.55,0,0.938,0.254,1.044,0.332l0.419,0.307l-0.011,0.52c0,0.001-0.017,0.815-0.028,1.56c0.635,0.025,1.257,0.05,1.916,0.073 c0.277,0.011,0.925,0.036,1.358,0.525c0.384,0.434,0.393,0.974,0.358,1.396c-0.07,0.848-0.161,1.55-0.284,2.208 c-0.04,0.216-0.066,0.397-0.089,0.547c-0.062,0.425-0.158,0.742-0.292,0.981C23.731,17.644,23.973,18.308,23.973,19.013z"
id="path18"
style="fill:#0b8c61;fill-opacity:1" />
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

@@ -1,67 +1,110 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
]>
<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
<metadata>
<sfw xmlns="&ns_sfw;">
<slices></slices>
<sliceSourceBounds height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
</sfw>
</metadata>
<g>
<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
C24.988,26.679,20.059,25,14,25z"/>
<g>
<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
<g>
<path fill="#C1122B" d="M9.46,8.846L9.458,9.319l-0.003,2.397c1.098-0.034,2.3-0.052,3.438-0.052c0.201,0,0.401,0.001,0.6,0.002
l-0.935-2.824L9.46,8.846z"/>
<circle fill="#C1122B" cx="8.728" cy="17.454" r="1.569"/>
<path fill="#C1122B" d="M12.395,17.13c-0.015-0.107-0.027-0.199-0.037-0.282c-0.047-0.382-0.165-0.741-0.325-1.075
c-0.049-0.096-0.097-0.193-0.155-0.285c-0.038-0.063-0.078-0.124-0.119-0.184c-0.514-0.723-1.278-1.251-2.166-1.464
c-0.202-0.04-0.409-0.061-0.619-0.061c-0.295,0-0.592,0.041-0.881,0.122c-0.276,0.077-0.487,0.112-0.685,0.112
c-0.027,0-0.048-0.008-0.074-0.009C5.969,14.557,5,15.892,5,17.455c0,2.055,1.672,3.727,3.728,3.727
c2.035,0,3.689-1.642,3.719-3.671l-0.041-0.296L12.395,17.13z M8.728,19.523c-1.142,0-2.07-0.928-2.07-2.069
s0.928-2.07,2.07-2.07c1.141,0,2.069,0.929,2.069,2.07S9.869,19.523,8.728,19.523z"/>
<circle fill="#C1122B" cx="20.826" cy="19.013" r="1.006"/>
<path fill="#C1122B" d="M22.72,15.398c0.13-0.696,0.212-1.403,0.271-2.108c0.055-0.659-0.112-0.814-0.758-0.839
c-0.961-0.034-1.848-0.071-2.808-0.109c-0.029-0.001-0.077-0.022-0.077-0.06c0-0.724,0.037-2.484,0.037-2.484
S19.196,9.66,18.931,9.66c-0.116,0-0.247,0.026-0.383,0.103c0,0.821,0,1.654,0,2.527c0,0-1.172-0.031-2.844-0.065
c-0.074-0.002-0.281-0.128-0.378-0.392c-0.251-0.694-0.8-2.045-1.52-4.126c0,0-0.373-0.888-1.316-0.888c-0.781,0-4.679,0-4.679,0
v5.199c0,0-0.353,0.148-0.649,0.178c-0.078,0.472-0.067,0.711,0.115,0.784c0.46-0.15,0.942-0.252,1.451-0.252
c0.389,0,0.761,0.061,1.122,0.149c1.119,0.237,2.101,0.923,2.748,1.879c0.034,0.048,0.064,0.097,0.096,0.147
c0.094,0.151,0.179,0.306,0.255,0.47c0.083,0.167,0.154,0.338,0.217,0.515c0.004,0.012,0.008,0.024,0.011,0.037
c0.127,0.368,0.206,0.754,0.238,1.156c0.101,0.014,0.196,0.036,0.289,0.036c0.007,0,0.013,0,0.02,0
c2.176-0.056,4.355-0.06,6.529-0.169c-0.906,0.251-1.575,1.082-1.575,2.067c0,1.184,0.962,2.147,2.148,2.147
c1.184,0,2.147-0.963,2.147-2.147c0-1.071-0.79-1.958-1.816-2.119C22.761,16.794,22.451,16.842,22.72,15.398z M12.893,12.163
c-1.343,0-2.729,0.025-3.938,0.069l0.003-2.916l0.004-0.97l3.957-0.006l1.263,3.813l0.045,0.018
C13.793,12.166,13.345,12.163,12.893,12.163z M22.082,19.013c0,0.693-0.564,1.257-1.256,1.257c-0.692,0-1.256-0.564-1.256-1.257
c0-0.692,0.564-1.255,1.256-1.255C21.518,17.758,22.082,18.321,22.082,19.013z"/>
<path fill="#C1122B" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z M23.973,19.013
c0,1.735-1.412,3.147-3.147,3.147c-1.736,0-3.148-1.412-3.148-3.147c0-0.34,0.055-0.67,0.158-0.98
c-0.652,0.016-1.301,0.027-1.94,0.039c-0.716,0.013-1.431,0.025-2.137,0.043l-0.037,0.001h-0.018
c-0.102,0-0.208-0.014-0.315-0.03c-0.312,2.306-2.272,4.096-4.661,4.096C6.121,22.181,4,20.061,4,17.455
c0-1.725,0.939-3.222,2.323-4.047c-0.278-0.463-0.209-1.002-0.148-1.375L6.3,11.276l0.511-0.051V6.819v-1h1h4.679
c1.269,0,2.003,0.943,2.238,1.5l0.012,0.03l0.011,0.03c0.497,1.435,0.905,2.503,1.203,3.283c0.083,0.217,0.156,0.408,0.217,0.572
c0.531,0.011,0.998,0.022,1.376,0.031V9.763V9.177l0.512-0.286c0.273-0.153,0.566-0.23,0.872-0.23
c0.55,0,0.938,0.254,1.044,0.332l0.419,0.307l-0.011,0.52c0,0.001-0.017,0.815-0.028,1.56c0.635,0.025,1.257,0.05,1.916,0.073
c0.277,0.011,0.925,0.036,1.358,0.525c0.384,0.434,0.393,0.974,0.358,1.396c-0.07,0.848-0.161,1.55-0.284,2.208
c-0.04,0.216-0.066,0.397-0.089,0.547c-0.062,0.425-0.158,0.742-0.292,0.981C23.731,17.644,23.973,18.308,23.973,19.013z"/>
</g>
</g>
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
xmlns:ns="&amp;ns_sfw;"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Layer_1"
x="0px"
y="0px"
width="28px"
height="33px"
viewBox="0 0 28 33"
enable-background="new 0 0 28 33"
xml:space="preserve"
sodipodi:docname="green_producer.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)"><defs
id="defs29" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1803"
inkscape:window-height="857"
id="namedview27"
showgrid="false"
inkscape:zoom="17.609546"
inkscape:cx="3.0055332"
inkscape:cy="16.5"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="g20" />
<metadata
id="metadata2">
<ns:sfw>
<ns:slices />
<ns:sliceSourceBounds
height="96"
width="16383"
y="-85.5"
x="-8112"
bottomLeftOrigin="true" />
</ns:sfw>
<rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
<g
id="g24">
<path
opacity="0.25"
fill="#282828"
d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643 C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643 C24.988,26.679,20.059,25,14,25z"
id="path4" />
<g
id="g22">
<path
fill="#FFFFFF"
d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32 c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"
id="path6" />
<g
id="g20">
<path
fill="#C1122B"
d="M9.46,8.846L9.458,9.319l-0.003,2.397c1.098-0.034,2.3-0.052,3.438-0.052c0.201,0,0.401,0.001,0.6,0.002 l-0.935-2.824L9.46,8.846z"
id="path8"
style="fill:#0b8c61;fill-opacity:1" />
<circle
fill="#C1122B"
cx="8.728"
cy="17.454"
r="1.569"
id="circle10"
style="fill:#0b8c61;fill-opacity:1" />
<path
fill="#C1122B"
d="M12.395,17.13c-0.015-0.107-0.027-0.199-0.037-0.282c-0.047-0.382-0.165-0.741-0.325-1.075 c-0.049-0.096-0.097-0.193-0.155-0.285c-0.038-0.063-0.078-0.124-0.119-0.184c-0.514-0.723-1.278-1.251-2.166-1.464 c-0.202-0.04-0.409-0.061-0.619-0.061c-0.295,0-0.592,0.041-0.881,0.122c-0.276,0.077-0.487,0.112-0.685,0.112 c-0.027,0-0.048-0.008-0.074-0.009C5.969,14.557,5,15.892,5,17.455c0,2.055,1.672,3.727,3.728,3.727 c2.035,0,3.689-1.642,3.719-3.671l-0.041-0.296L12.395,17.13z M8.728,19.523c-1.142,0-2.07-0.928-2.07-2.069 s0.928-2.07,2.07-2.07c1.141,0,2.069,0.929,2.069,2.07S9.869,19.523,8.728,19.523z"
id="path12"
style="fill:#0b8c61;fill-opacity:1" />
<circle
fill="#C1122B"
cx="20.826"
cy="19.013"
r="1.006"
id="circle14"
style="fill:#0b8c61;fill-opacity:1" />
<path
fill="#C1122B"
d="M22.72,15.398c0.13-0.696,0.212-1.403,0.271-2.108c0.055-0.659-0.112-0.814-0.758-0.839 c-0.961-0.034-1.848-0.071-2.808-0.109c-0.029-0.001-0.077-0.022-0.077-0.06c0-0.724,0.037-2.484,0.037-2.484 S19.196,9.66,18.931,9.66c-0.116,0-0.247,0.026-0.383,0.103c0,0.821,0,1.654,0,2.527c0,0-1.172-0.031-2.844-0.065 c-0.074-0.002-0.281-0.128-0.378-0.392c-0.251-0.694-0.8-2.045-1.52-4.126c0,0-0.373-0.888-1.316-0.888c-0.781,0-4.679,0-4.679,0 v5.199c0,0-0.353,0.148-0.649,0.178c-0.078,0.472-0.067,0.711,0.115,0.784c0.46-0.15,0.942-0.252,1.451-0.252 c0.389,0,0.761,0.061,1.122,0.149c1.119,0.237,2.101,0.923,2.748,1.879c0.034,0.048,0.064,0.097,0.096,0.147 c0.094,0.151,0.179,0.306,0.255,0.47c0.083,0.167,0.154,0.338,0.217,0.515c0.004,0.012,0.008,0.024,0.011,0.037 c0.127,0.368,0.206,0.754,0.238,1.156c0.101,0.014,0.196,0.036,0.289,0.036c0.007,0,0.013,0,0.02,0 c2.176-0.056,4.355-0.06,6.529-0.169c-0.906,0.251-1.575,1.082-1.575,2.067c0,1.184,0.962,2.147,2.148,2.147 c1.184,0,2.147-0.963,2.147-2.147c0-1.071-0.79-1.958-1.816-2.119C22.761,16.794,22.451,16.842,22.72,15.398z M12.893,12.163 c-1.343,0-2.729,0.025-3.938,0.069l0.003-2.916l0.004-0.97l3.957-0.006l1.263,3.813l0.045,0.018 C13.793,12.166,13.345,12.163,12.893,12.163z M22.082,19.013c0,0.693-0.564,1.257-1.256,1.257c-0.692,0-1.256-0.564-1.256-1.257 c0-0.692,0.564-1.255,1.256-1.255C21.518,17.758,22.082,18.321,22.082,19.013z"
id="path16"
style="fill:#0b8c61;fill-opacity:1" />
<path
fill="#C1122B"
d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32 c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z M23.973,19.013 c0,1.735-1.412,3.147-3.147,3.147c-1.736,0-3.148-1.412-3.148-3.147c0-0.34,0.055-0.67,0.158-0.98 c-0.652,0.016-1.301,0.027-1.94,0.039c-0.716,0.013-1.431,0.025-2.137,0.043l-0.037,0.001h-0.018 c-0.102,0-0.208-0.014-0.315-0.03c-0.312,2.306-2.272,4.096-4.661,4.096C6.121,22.181,4,20.061,4,17.455 c0-1.725,0.939-3.222,2.323-4.047c-0.278-0.463-0.209-1.002-0.148-1.375L6.3,11.276l0.511-0.051V6.819v-1h1h4.679 c1.269,0,2.003,0.943,2.238,1.5l0.012,0.03l0.011,0.03c0.497,1.435,0.905,2.503,1.203,3.283c0.083,0.217,0.156,0.408,0.217,0.572 c0.531,0.011,0.998,0.022,1.376,0.031V9.763V9.177l0.512-0.286c0.273-0.153,0.566-0.23,0.872-0.23 c0.55,0,0.938,0.254,1.044,0.332l0.419,0.307l-0.011,0.52c0,0.001-0.017,0.815-0.028,1.56c0.635,0.025,1.257,0.05,1.916,0.073 c0.277,0.011,0.925,0.036,1.358,0.525c0.384,0.434,0.393,0.974,0.358,1.396c-0.07,0.848-0.161,1.55-0.284,2.208 c-0.04,0.216-0.066,0.397-0.089,0.547c-0.062,0.425-0.158,0.742-0.292,0.981C23.731,17.644,23.973,18.308,23.973,19.013z"
id="path18"
style="fill:#0b8c61;fill-opacity:1" />
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

@@ -1,69 +1,110 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
]>
<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
<metadata>
<sfw xmlns="&ns_sfw;">
<slices></slices>
<sliceSourceBounds height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
</sfw>
</metadata>
<g>
<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
C24.988,26.679,20.059,25,14,25z"/>
<g>
<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
<g>
<path fill="#C1122B" d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32
c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M14.002,30.908
C10.865,28.805,1,21.533,1,13.333C1,7.511,6.56,1,14,1c7.44,0,13,6.511,13,12.333C27,21.682,17.14,28.843,14.002,30.908z"/>
<path fill="#C1122B" d="M23.703,15.582c0.123-0.658,0.214-1.36,0.284-2.208c0.035-0.422,0.026-0.962-0.358-1.396
c-0.433-0.489-1.081-0.514-1.358-0.525c-0.659-0.024-1.281-0.048-1.916-0.073c0.011-0.745,0.028-1.56,0.028-1.56l0.011-0.52
l-0.419-0.307c-0.106-0.078-0.495-0.332-1.044-0.332c-0.306,0-0.599,0.077-0.872,0.23l-0.512,0.286v0.586v1.502
c-0.378-0.009-0.845-0.02-1.376-0.031c-0.062-0.164-0.135-0.355-0.217-0.572c-0.298-0.78-0.706-1.847-1.203-3.283l-0.011-0.03
l-0.013-0.03c-0.234-0.557-0.969-1.5-2.238-1.5H7.811h-1v1v4.407L6.3,11.276l-0.125,0.757c-0.061,0.373-0.13,0.911,0.148,1.375
C4.939,14.233,4,15.729,4,17.455c0,2.606,2.121,4.727,4.728,4.727c2.39,0,4.349-1.79,4.661-4.096
c0.107,0.016,0.212,0.03,0.315,0.03h0.018l0.037-0.001c0.706-0.018,1.421-0.031,2.137-0.043c0.639-0.011,1.288-0.023,1.94-0.039
c-0.103,0.311-0.158,0.641-0.158,0.98c0,1.735,1.412,3.147,3.148,3.147c1.736,0,3.147-1.412,3.147-3.147
c0-0.706-0.242-1.369-0.651-1.903c0.135-0.239,0.23-0.556,0.292-0.981C23.636,15.978,23.662,15.798,23.703,15.582z M8.728,21.181
C6.672,21.181,5,19.51,5,17.455c0-1.562,0.969-2.898,2.335-3.451c0.026,0.001,0.046,0.009,0.074,0.009
c0.197,0,0.409-0.034,0.685-0.112c0.289-0.081,0.586-0.122,0.881-0.122c0.21,0,0.417,0.021,0.619,0.061
c0.888,0.213,1.652,0.741,2.166,1.464c0.041,0.06,0.082,0.121,0.119,0.184c0.057,0.091,0.105,0.188,0.155,0.285
c0.16,0.334,0.279,0.693,0.325,1.075c0.009,0.083,0.022,0.176,0.037,0.283l0.011,0.082l0.041,0.296
C12.417,19.539,10.763,21.181,8.728,21.181z M22.973,19.013c0,1.184-0.964,2.147-2.147,2.147c-1.186,0-2.148-0.963-2.148-2.147
c0-0.985,0.669-1.815,1.575-2.067c-2.174,0.109-4.353,0.113-6.529,0.169c-0.007,0-0.013,0-0.02,0
c-0.092,0-0.188-0.022-0.289-0.036c-0.032-0.402-0.111-0.788-0.238-1.156c-0.004-0.012-0.007-0.024-0.011-0.037
c-0.063-0.177-0.134-0.348-0.217-0.515c-0.076-0.163-0.161-0.318-0.255-0.469c-0.032-0.05-0.062-0.099-0.096-0.147
c-0.646-0.956-1.628-1.642-2.748-1.879c-0.362-0.089-0.734-0.149-1.122-0.149c-0.509,0-0.991,0.102-1.451,0.252
c-0.181-0.073-0.192-0.312-0.115-0.784c0.296-0.029,0.649-0.178,0.649-0.178V6.819c0,0,3.899,0,4.679,0
c0.943,0,1.316,0.888,1.316,0.888c0.72,2.081,1.269,3.432,1.52,4.126c0.097,0.264,0.303,0.39,0.378,0.392
c1.672,0.035,2.844,0.065,2.844,0.065c0-0.873,0-1.706,0-2.527c0.136-0.076,0.267-0.103,0.383-0.103
c0.265,0,0.453,0.138,0.453,0.138s-0.037,1.76-0.037,2.484c0,0.038,0.048,0.059,0.077,0.06c0.961,0.038,1.848,0.075,2.808,0.109
c0.646,0.025,0.813,0.18,0.758,0.839c-0.059,0.705-0.14,1.412-0.271,2.108c-0.269,1.444,0.042,1.395-1.562,1.496
C22.183,17.055,22.973,17.943,22.973,19.013z"/>
<path fill="#C1122B" d="M19.57,19.013c0,0.693,0.564,1.257,1.256,1.257c0.692,0,1.256-0.564,1.256-1.257
c0-0.692-0.564-1.255-1.256-1.255C20.134,17.758,19.57,18.321,19.57,19.013z M21.832,19.013c0,0.555-0.451,1.007-1.006,1.007
c-0.555,0-1.006-0.452-1.006-1.007c0-0.554,0.451-1.005,1.006-1.005C21.381,18.008,21.832,18.459,21.832,19.013z"/>
<path fill="#C1122B" d="M12.919,8.341L8.961,8.347l-0.004,0.97l-0.003,2.916c1.209-0.044,2.595-0.069,3.939-0.069
c0.452,0,0.9,0.003,1.334,0.009l-0.045-0.018L12.919,8.341z M12.893,11.663c-1.138,0-2.34,0.018-3.438,0.052l0.003-2.397
L9.46,8.846l3.098-0.005l0.935,2.824C13.294,11.664,13.094,11.663,12.893,11.663z"/>
<path fill="#C1122B" d="M8.728,15.385c-1.142,0-2.07,0.929-2.07,2.07s0.928,2.069,2.07,2.069c1.141,0,2.069-0.928,2.069-2.069
S9.869,15.385,8.728,15.385z M8.728,19.023c-0.865,0-1.57-0.704-1.57-1.569c0-0.866,0.704-1.57,1.57-1.57
c0.865,0,1.569,0.704,1.569,1.57C10.297,18.32,9.593,19.023,8.728,19.023z"/>
</g>
</g>
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
xmlns:ns="&amp;ns_sfw;"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Layer_1"
x="0px"
y="0px"
width="28px"
height="33px"
viewBox="0 0 28 33"
enable-background="new 0 0 28 33"
xml:space="preserve"
sodipodi:docname="green_producer.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)"><defs
id="defs29" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1803"
inkscape:window-height="857"
id="namedview27"
showgrid="false"
inkscape:zoom="17.609546"
inkscape:cx="3.0055332"
inkscape:cy="16.5"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="g20" />
<metadata
id="metadata2">
<ns:sfw>
<ns:slices />
<ns:sliceSourceBounds
height="96"
width="16383"
y="-85.5"
x="-8112"
bottomLeftOrigin="true" />
</ns:sfw>
<rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
<g
id="g24">
<path
opacity="0.25"
fill="#282828"
d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643 C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643 C24.988,26.679,20.059,25,14,25z"
id="path4" />
<g
id="g22">
<path
fill="#FFFFFF"
d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32 c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"
id="path6" />
<g
id="g20">
<path
fill="#C1122B"
d="M9.46,8.846L9.458,9.319l-0.003,2.397c1.098-0.034,2.3-0.052,3.438-0.052c0.201,0,0.401,0.001,0.6,0.002 l-0.935-2.824L9.46,8.846z"
id="path8"
style="fill:#0b8c61;fill-opacity:1" />
<circle
fill="#C1122B"
cx="8.728"
cy="17.454"
r="1.569"
id="circle10"
style="fill:#0b8c61;fill-opacity:1" />
<path
fill="#C1122B"
d="M12.395,17.13c-0.015-0.107-0.027-0.199-0.037-0.282c-0.047-0.382-0.165-0.741-0.325-1.075 c-0.049-0.096-0.097-0.193-0.155-0.285c-0.038-0.063-0.078-0.124-0.119-0.184c-0.514-0.723-1.278-1.251-2.166-1.464 c-0.202-0.04-0.409-0.061-0.619-0.061c-0.295,0-0.592,0.041-0.881,0.122c-0.276,0.077-0.487,0.112-0.685,0.112 c-0.027,0-0.048-0.008-0.074-0.009C5.969,14.557,5,15.892,5,17.455c0,2.055,1.672,3.727,3.728,3.727 c2.035,0,3.689-1.642,3.719-3.671l-0.041-0.296L12.395,17.13z M8.728,19.523c-1.142,0-2.07-0.928-2.07-2.069 s0.928-2.07,2.07-2.07c1.141,0,2.069,0.929,2.069,2.07S9.869,19.523,8.728,19.523z"
id="path12"
style="fill:#0b8c61;fill-opacity:1" />
<circle
fill="#C1122B"
cx="20.826"
cy="19.013"
r="1.006"
id="circle14"
style="fill:#0b8c61;fill-opacity:1" />
<path
fill="#C1122B"
d="M22.72,15.398c0.13-0.696,0.212-1.403,0.271-2.108c0.055-0.659-0.112-0.814-0.758-0.839 c-0.961-0.034-1.848-0.071-2.808-0.109c-0.029-0.001-0.077-0.022-0.077-0.06c0-0.724,0.037-2.484,0.037-2.484 S19.196,9.66,18.931,9.66c-0.116,0-0.247,0.026-0.383,0.103c0,0.821,0,1.654,0,2.527c0,0-1.172-0.031-2.844-0.065 c-0.074-0.002-0.281-0.128-0.378-0.392c-0.251-0.694-0.8-2.045-1.52-4.126c0,0-0.373-0.888-1.316-0.888c-0.781,0-4.679,0-4.679,0 v5.199c0,0-0.353,0.148-0.649,0.178c-0.078,0.472-0.067,0.711,0.115,0.784c0.46-0.15,0.942-0.252,1.451-0.252 c0.389,0,0.761,0.061,1.122,0.149c1.119,0.237,2.101,0.923,2.748,1.879c0.034,0.048,0.064,0.097,0.096,0.147 c0.094,0.151,0.179,0.306,0.255,0.47c0.083,0.167,0.154,0.338,0.217,0.515c0.004,0.012,0.008,0.024,0.011,0.037 c0.127,0.368,0.206,0.754,0.238,1.156c0.101,0.014,0.196,0.036,0.289,0.036c0.007,0,0.013,0,0.02,0 c2.176-0.056,4.355-0.06,6.529-0.169c-0.906,0.251-1.575,1.082-1.575,2.067c0,1.184,0.962,2.147,2.148,2.147 c1.184,0,2.147-0.963,2.147-2.147c0-1.071-0.79-1.958-1.816-2.119C22.761,16.794,22.451,16.842,22.72,15.398z M12.893,12.163 c-1.343,0-2.729,0.025-3.938,0.069l0.003-2.916l0.004-0.97l3.957-0.006l1.263,3.813l0.045,0.018 C13.793,12.166,13.345,12.163,12.893,12.163z M22.082,19.013c0,0.693-0.564,1.257-1.256,1.257c-0.692,0-1.256-0.564-1.256-1.257 c0-0.692,0.564-1.255,1.256-1.255C21.518,17.758,22.082,18.321,22.082,19.013z"
id="path16"
style="fill:#0b8c61;fill-opacity:1" />
<path
fill="#C1122B"
d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32 c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z M23.973,19.013 c0,1.735-1.412,3.147-3.147,3.147c-1.736,0-3.148-1.412-3.148-3.147c0-0.34,0.055-0.67,0.158-0.98 c-0.652,0.016-1.301,0.027-1.94,0.039c-0.716,0.013-1.431,0.025-2.137,0.043l-0.037,0.001h-0.018 c-0.102,0-0.208-0.014-0.315-0.03c-0.312,2.306-2.272,4.096-4.661,4.096C6.121,22.181,4,20.061,4,17.455 c0-1.725,0.939-3.222,2.323-4.047c-0.278-0.463-0.209-1.002-0.148-1.375L6.3,11.276l0.511-0.051V6.819v-1h1h4.679 c1.269,0,2.003,0.943,2.238,1.5l0.012,0.03l0.011,0.03c0.497,1.435,0.905,2.503,1.203,3.283c0.083,0.217,0.156,0.408,0.217,0.572 c0.531,0.011,0.998,0.022,1.376,0.031V9.763V9.177l0.512-0.286c0.273-0.153,0.566-0.23,0.872-0.23 c0.55,0,0.938,0.254,1.044,0.332l0.419,0.307l-0.011,0.52c0,0.001-0.017,0.815-0.028,1.56c0.635,0.025,1.257,0.05,1.916,0.073 c0.277,0.011,0.925,0.036,1.358,0.525c0.384,0.434,0.393,0.974,0.358,1.396c-0.07,0.848-0.161,1.55-0.284,2.208 c-0.04,0.216-0.066,0.397-0.089,0.547c-0.062,0.425-0.158,0.742-0.292,0.981C23.731,17.644,23.973,18.308,23.973,19.013z"
id="path18"
style="fill:#0b8c61;fill-opacity:1" />
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

@@ -1,51 +1,96 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
]>
<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
<metadata>
<sfw xmlns="&ns_sfw;">
<slices></slices>
<sliceSourceBounds height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
</sfw>
</metadata>
<g>
<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
C24.988,26.679,20.059,25,14,25z"/>
<g>
<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
<g>
<path fill="#C1122B" d="M13.999,8.546c-1.24,0-2.249,1.009-2.249,2.248c0,1.242,1.009,2.253,2.249,2.253
c1.241,0,2.251-1.01,2.251-2.253C16.25,9.555,15.24,8.546,13.999,8.546z"/>
<path fill="#C1122B" d="M14,6.348c-2.453,0-4.448,1.995-4.448,4.448c0,0.859,0.468,3.112,3.602,8.541l0.387,0.671l0.134,0.225
l0.09,0.15l0.043,0.072l0.085,0.144l0.108,0.178l0.104-0.172l0.036-0.061l0.088-0.149l0.032-0.054l0.19-0.319l0.395-0.685
c3.134-5.44,3.602-7.687,3.602-8.542C18.448,8.343,16.452,6.348,14,6.348z M13.999,13.797c-1.654,0-2.999-1.347-2.999-3.003
c0-1.655,1.346-2.998,2.999-2.998c1.655,0,3.001,1.345,3.001,2.998C17,12.451,15.654,13.797,13.999,13.797z"/>
<path fill="#C1122B" d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32
c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M19.336,22.021
c-0.002,1.728-2.686,2.632-5.337,2.632c-2.652,0-5.337-0.905-5.337-2.634c0-1.158,1.352-2.099,3.465-2.462
c-1.721-3.01-3.577-6.721-3.577-8.76c0-3.004,2.444-5.448,5.448-5.448s5.448,2.444,5.449,5.447c0,2.036-1.858,5.75-3.578,8.762
C17.984,19.92,19.336,20.86,19.336,22.021z"/>
<path fill="#C1122B" d="M15.175,20.763c-0.029,0.048-0.059,0.1-0.088,0.148c-0.04,0.068-0.084,0.142-0.121,0.204
c-0.111,0.184-0.206,0.339-0.293,0.483c-0.021,0.03-0.042,0.066-0.061,0.096c-0.081,0.133-0.142,0.231-0.194,0.313
c-0.015,0.025-0.032,0.054-0.045,0.073c-0.052,0.082-0.08,0.125-0.08,0.125l-0.295,0.463l-0.293-0.463
c0,0-0.031-0.048-0.085-0.134c-0.006-0.009-0.013-0.023-0.019-0.029c-0.053-0.086-0.123-0.198-0.212-0.345
c-0.025-0.038-0.052-0.086-0.079-0.127c-0.083-0.136-0.17-0.278-0.274-0.448c-0.042-0.072-0.089-0.15-0.134-0.225
c-0.026-0.044-0.053-0.09-0.078-0.132l-0.381,0.061c-1.729,0.277-2.477,0.925-2.477,1.195c0,0.172,0.269,0.481,0.859,0.754
c0.8,0.37,1.926,0.574,3.172,0.574c2.608,0,4.031-0.878,4.031-1.329c0-0.269-0.748-0.917-2.476-1.195L15.175,20.763z"/>
</g>
</g>
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
xmlns:ns="&amp;ns_sfw;"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Layer_1"
x="0px"
y="0px"
width="28px"
height="33px"
viewBox="0 0 28 33"
enable-background="new 0 0 28 33"
xml:space="preserve"
sodipodi:docname="green_hub.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)"><defs
id="defs25" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1041"
inkscape:window-height="590"
id="namedview23"
showgrid="false"
inkscape:zoom="7.1515152"
inkscape:cx="-9.0021186"
inkscape:cy="16.5"
inkscape:window-x="752"
inkscape:window-y="122"
inkscape:window-maximized="0"
inkscape:current-layer="g16" />
<metadata
id="metadata2">
<ns:sfw>
<ns:slices />
<ns:sliceSourceBounds
height="96"
width="16383"
y="-85.5"
x="-8112"
bottomLeftOrigin="true" />
</ns:sfw>
<rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
<g
id="g20">
<path
opacity="0.25"
fill="#282828"
d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643 C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643 C24.988,26.679,20.059,25,14,25z"
id="path4" />
<g
id="g18">
<path
fill="#FFFFFF"
d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32 c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"
id="path6" />
<g
id="g16">
<path
fill="#C1122B"
d="M13.999,8.546c-1.24,0-2.249,1.009-2.249,2.248c0,1.242,1.009,2.253,2.249,2.253 c1.241,0,2.251-1.01,2.251-2.253C16.25,9.555,15.24,8.546,13.999,8.546z"
id="path8"
style="fill:#0b8c61;fill-opacity:1" />
<path
fill="#C1122B"
d="M14,6.348c-2.453,0-4.448,1.995-4.448,4.448c0,0.859,0.468,3.112,3.602,8.541l0.387,0.671l0.134,0.225 l0.09,0.15l0.043,0.072l0.085,0.144l0.108,0.178l0.104-0.172l0.036-0.061l0.088-0.149l0.032-0.054l0.19-0.319l0.395-0.685 c3.134-5.44,3.602-7.687,3.602-8.542C18.448,8.343,16.452,6.348,14,6.348z M13.999,13.797c-1.654,0-2.999-1.347-2.999-3.003 c0-1.655,1.346-2.998,2.999-2.998c1.655,0,3.001,1.345,3.001,2.998C17,12.451,15.654,13.797,13.999,13.797z"
id="path10"
style="fill:#0b8c61;fill-opacity:1" />
<path
fill="#C1122B"
d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32 c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M19.336,22.021 c-0.002,1.728-2.686,2.632-5.337,2.632c-2.652,0-5.337-0.905-5.337-2.634c0-1.158,1.352-2.099,3.465-2.462 c-1.721-3.01-3.577-6.721-3.577-8.76c0-3.004,2.444-5.448,5.448-5.448s5.448,2.444,5.449,5.447c0,2.036-1.858,5.75-3.578,8.762 C17.984,19.92,19.336,20.86,19.336,22.021z"
id="path12"
style="fill:#0b8c61;fill-opacity:1" />
<path
fill="#C1122B"
d="M15.175,20.763c-0.029,0.048-0.059,0.1-0.088,0.148c-0.04,0.068-0.084,0.142-0.121,0.204 c-0.111,0.184-0.206,0.339-0.293,0.483c-0.021,0.03-0.042,0.066-0.061,0.096c-0.081,0.133-0.142,0.231-0.194,0.313 c-0.015,0.025-0.032,0.054-0.045,0.073c-0.052,0.082-0.08,0.125-0.08,0.125l-0.295,0.463l-0.293-0.463 c0,0-0.031-0.048-0.085-0.134c-0.006-0.009-0.013-0.023-0.019-0.029c-0.053-0.086-0.123-0.198-0.212-0.345 c-0.025-0.038-0.052-0.086-0.079-0.127c-0.083-0.136-0.17-0.278-0.274-0.448c-0.042-0.072-0.089-0.15-0.134-0.225 c-0.026-0.044-0.053-0.09-0.078-0.132l-0.381,0.061c-1.729,0.277-2.477,0.925-2.477,1.195c0,0.172,0.269,0.481,0.859,0.754 c0.8,0.37,1.926,0.574,3.172,0.574c2.608,0,4.031-0.878,4.031-1.329c0-0.269-0.748-0.917-2.476-1.195L15.175,20.763z"
id="path14"
style="fill:#0b8c61;fill-opacity:1" />
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

@@ -1,51 +1,96 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
]>
<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
<metadata>
<sfw xmlns="&ns_sfw;">
<slices></slices>
<sliceSourceBounds height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
</sfw>
</metadata>
<g>
<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
C24.988,26.679,20.059,25,14,25z"/>
<g>
<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
<g>
<path fill="#C1122B" d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32
c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M14.002,30.908
C10.865,28.805,1,21.533,1,13.333C1,7.511,6.56,1,14,1s13,6.511,13,12.333C27,21.682,17.14,28.843,14.002,30.908z"/>
<path fill="#C1122B" d="M14,7.796c-1.654,0-3,1.344-3,2.998c0,1.656,1.346,3.003,3,3.003c1.655,0,3-1.347,3-3.003
C17,9.141,15.654,7.796,14,7.796z M14,13.047c-1.24,0-2.25-1.01-2.25-2.253c0-1.24,1.009-2.248,2.25-2.248
c1.241,0,2.25,1.009,2.25,2.248C16.25,12.037,15.24,13.047,14,13.047z"/>
<path fill="#C1122B" d="M14,5.348c-3.004,0-5.448,2.444-5.448,5.448c0,2.039,1.856,5.75,3.577,8.76
c-2.113,0.363-3.465,1.304-3.465,2.462c0,1.729,2.685,2.634,5.337,2.634c2.65,0,5.335-0.904,5.337-2.632
c0-1.16-1.352-2.1-3.465-2.464c1.719-3.012,3.578-6.725,3.578-8.762C19.448,7.792,17.003,5.348,14,5.348z M18.031,22.018
c0,0.451-1.423,1.329-4.031,1.329c-1.246,0-2.372-0.204-3.172-0.574c-0.591-0.273-0.859-0.582-0.859-0.754
c0-0.269,0.748-0.917,2.477-1.195l0.381-0.061c0.025,0.042,0.053,0.088,0.078,0.132c0.045,0.075,0.092,0.153,0.134,0.225
c0.104,0.17,0.191,0.313,0.274,0.448c0.027,0.042,0.054,0.089,0.079,0.127c0.089,0.147,0.159,0.258,0.212,0.345
c0.006,0.007,0.013,0.021,0.019,0.029c0.053,0.086,0.085,0.134,0.085,0.134l0.293,0.463l0.295-0.463c0,0,0.028-0.044,0.08-0.125
c0.012-0.019,0.029-0.048,0.045-0.073c0.052-0.082,0.113-0.18,0.194-0.313c0.019-0.029,0.04-0.066,0.061-0.096
c0.086-0.143,0.181-0.298,0.293-0.483c0.037-0.063,0.081-0.136,0.121-0.204c0.029-0.048,0.06-0.1,0.088-0.148l0.38,0.061
C17.283,21.101,18.031,21.749,18.031,22.018z M14.847,19.337l-0.396,0.688l-0.189,0.316l-0.032,0.054l-0.089,0.151l-0.036,0.06
l-0.104,0.172L13.892,20.6l-0.085-0.144l-0.043-0.072l-0.09-0.15l-0.135-0.227l-0.387-0.67c-3.134-5.43-3.602-7.682-3.602-8.541
c0-2.453,1.995-4.448,4.448-4.448c2.453,0,4.448,1.995,4.449,4.447C18.449,11.65,17.981,13.897,14.847,19.337z"/>
</g>
</g>
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
xmlns:ns="&amp;ns_sfw;"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Layer_1"
x="0px"
y="0px"
width="28px"
height="33px"
viewBox="0 0 28 33"
enable-background="new 0 0 28 33"
xml:space="preserve"
sodipodi:docname="green_hub.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)"><defs
id="defs25" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1041"
inkscape:window-height="590"
id="namedview23"
showgrid="false"
inkscape:zoom="7.1515152"
inkscape:cx="-9.0021186"
inkscape:cy="16.5"
inkscape:window-x="752"
inkscape:window-y="122"
inkscape:window-maximized="0"
inkscape:current-layer="g16" />
<metadata
id="metadata2">
<ns:sfw>
<ns:slices />
<ns:sliceSourceBounds
height="96"
width="16383"
y="-85.5"
x="-8112"
bottomLeftOrigin="true" />
</ns:sfw>
<rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
<g
id="g20">
<path
opacity="0.25"
fill="#282828"
d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643 C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643 C24.988,26.679,20.059,25,14,25z"
id="path4" />
<g
id="g18">
<path
fill="#FFFFFF"
d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32 c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"
id="path6" />
<g
id="g16">
<path
fill="#C1122B"
d="M13.999,8.546c-1.24,0-2.249,1.009-2.249,2.248c0,1.242,1.009,2.253,2.249,2.253 c1.241,0,2.251-1.01,2.251-2.253C16.25,9.555,15.24,8.546,13.999,8.546z"
id="path8"
style="fill:#0b8c61;fill-opacity:1" />
<path
fill="#C1122B"
d="M14,6.348c-2.453,0-4.448,1.995-4.448,4.448c0,0.859,0.468,3.112,3.602,8.541l0.387,0.671l0.134,0.225 l0.09,0.15l0.043,0.072l0.085,0.144l0.108,0.178l0.104-0.172l0.036-0.061l0.088-0.149l0.032-0.054l0.19-0.319l0.395-0.685 c3.134-5.44,3.602-7.687,3.602-8.542C18.448,8.343,16.452,6.348,14,6.348z M13.999,13.797c-1.654,0-2.999-1.347-2.999-3.003 c0-1.655,1.346-2.998,2.999-2.998c1.655,0,3.001,1.345,3.001,2.998C17,12.451,15.654,13.797,13.999,13.797z"
id="path10"
style="fill:#0b8c61;fill-opacity:1" />
<path
fill="#C1122B"
d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32 c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M19.336,22.021 c-0.002,1.728-2.686,2.632-5.337,2.632c-2.652,0-5.337-0.905-5.337-2.634c0-1.158,1.352-2.099,3.465-2.462 c-1.721-3.01-3.577-6.721-3.577-8.76c0-3.004,2.444-5.448,5.448-5.448s5.448,2.444,5.449,5.447c0,2.036-1.858,5.75-3.578,8.762 C17.984,19.92,19.336,20.86,19.336,22.021z"
id="path12"
style="fill:#0b8c61;fill-opacity:1" />
<path
fill="#C1122B"
d="M15.175,20.763c-0.029,0.048-0.059,0.1-0.088,0.148c-0.04,0.068-0.084,0.142-0.121,0.204 c-0.111,0.184-0.206,0.339-0.293,0.483c-0.021,0.03-0.042,0.066-0.061,0.096c-0.081,0.133-0.142,0.231-0.194,0.313 c-0.015,0.025-0.032,0.054-0.045,0.073c-0.052,0.082-0.08,0.125-0.08,0.125l-0.295,0.463l-0.293-0.463 c0,0-0.031-0.048-0.085-0.134c-0.006-0.009-0.013-0.023-0.019-0.029c-0.053-0.086-0.123-0.198-0.212-0.345 c-0.025-0.038-0.052-0.086-0.079-0.127c-0.083-0.136-0.17-0.278-0.274-0.448c-0.042-0.072-0.089-0.15-0.134-0.225 c-0.026-0.044-0.053-0.09-0.078-0.132l-0.381,0.061c-1.729,0.277-2.477,0.925-2.477,1.195c0,0.172,0.269,0.481,0.859,0.754 c0.8,0.37,1.926,0.574,3.172,0.574c2.608,0,4.031-0.878,4.031-1.329c0-0.269-0.748-0.917-2.476-1.195L15.175,20.763z"
id="path14"
style="fill:#0b8c61;fill-opacity:1" />
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

@@ -1,52 +1,91 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
]>
<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
<metadata>
<sfw xmlns="&ns_sfw;">
<slices></slices>
<sliceSourceBounds height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
</sfw>
</metadata>
<g>
<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
C24.988,26.679,20.059,25,14,25z"/>
<g>
<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
<g>
<path fill="#C1122B" d="M21.552,10.282h-3.274l-1.683-2.709c-0.165-0.287-0.533-0.384-0.8-0.228
c-0.135,0.078-0.229,0.201-0.27,0.35c-0.041,0.153-0.019,0.315,0.062,0.457l1.359,2.129h-6.311l1.379-2.161
c0.066-0.114,0.087-0.271,0.046-0.421c-0.04-0.15-0.136-0.275-0.271-0.353c-0.266-0.156-0.64-0.053-0.787,0.202l-1.697,2.733
H6.448c-0.522,0-0.948,0.426-0.948,0.948v0.827c0,0.492,0.363,0.97,0.793,1.041l0.105,0.018h15.156l0.119-0.016
c0.44-0.058,0.827-0.545,0.827-1.043V11.23C22.5,10.708,22.074,10.282,21.552,10.282z"/>
<path fill="#C1122B" d="M8.057,20.02c0.007,0.222,0.122,0.337,0.263,0.337h11.365c0.142,0,0.257-0.115,0.257-0.256l0.007-0.1
l0.971-5.886H7.082L8.057,20.02z M17.116,16.074c0-0.298,0.22-0.539,0.518-0.539c0.297,0,0.516,0.241,0.516,0.539v2.017
c0,0.298-0.219,0.539-0.516,0.539c-0.298,0-0.518-0.241-0.518-0.539V16.074z M14.694,16.074c0-0.298,0.219-0.539,0.517-0.539
s0.517,0.241,0.517,0.539v2.017c0,0.298-0.219,0.539-0.517,0.539s-0.517-0.241-0.517-0.539V16.074z M12.272,16.074
c0-0.298,0.219-0.539,0.517-0.539c0.297,0,0.517,0.241,0.517,0.539v2.017c0,0.298-0.22,0.539-0.517,0.539
c-0.298,0-0.517-0.241-0.517-0.539V16.074z M9.85,16.074c0-0.298,0.219-0.539,0.517-0.539c0.297,0,0.516,0.241,0.516,0.539v2.017
c0,0.298-0.219,0.539-0.516,0.539c-0.298,0-0.517-0.241-0.517-0.539V16.074z"/>
<path fill="#C1122B" d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32
c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M23.5,12.057
c0,0.863-0.567,1.661-1.325,1.942l-1.025,5.889c-0.015,0.976-0.889,1.831-1.94,1.831H8.744c-1.052,0-1.925-0.855-1.947-1.906
l-1.024-5.828C5.036,13.691,4.5,12.91,4.5,12.057V11.23c0-1.074,0.874-1.948,1.948-1.948H8.75l1.396-2.247
c0.4-0.698,1.417-0.978,2.145-0.555c0.755,0.435,1.015,1.403,0.58,2.159l-0.41,0.642h2.662l-0.39-0.61
c-0.227-0.391-0.284-0.823-0.174-1.235c0.109-0.406,0.37-0.745,0.734-0.955c0.716-0.417,1.739-0.148,2.159,0.579l1.381,2.223
h2.718c1.074,0,1.948,0.874,1.948,1.948V12.057z"/>
</g>
</g>
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
xmlns:ns="&amp;ns_sfw;"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Layer_1"
x="0px"
y="0px"
width="28px"
height="33px"
viewBox="0 0 28 33"
enable-background="new 0 0 28 33"
xml:space="preserve"
sodipodi:docname="green_shop.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)"><defs
id="defs23" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1707"
inkscape:window-height="910"
id="namedview21"
showgrid="false"
inkscape:zoom="7.1515152"
inkscape:cx="-9.0021186"
inkscape:cy="16.5"
inkscape:window-x="32"
inkscape:window-y="20"
inkscape:window-maximized="0"
inkscape:current-layer="g14" />
<metadata
id="metadata2">
<ns:sfw>
<ns:slices />
<ns:sliceSourceBounds
height="96"
width="16383"
y="-85.5"
x="-8112"
bottomLeftOrigin="true" />
</ns:sfw>
<rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
<g
id="g18">
<path
opacity="0.25"
fill="#282828"
d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643 C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643 C24.988,26.679,20.059,25,14,25z"
id="path4" />
<g
id="g16">
<path
fill="#FFFFFF"
d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32 c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"
id="path6" />
<g
id="g14">
<path
fill="#C1122B"
d="M21.552,10.282h-3.274l-1.683-2.709c-0.165-0.287-0.533-0.384-0.8-0.228 c-0.135,0.078-0.229,0.201-0.27,0.35c-0.041,0.153-0.019,0.315,0.062,0.457l1.359,2.129h-6.311l1.379-2.161 c0.066-0.114,0.087-0.271,0.046-0.421c-0.04-0.15-0.136-0.275-0.271-0.353c-0.266-0.156-0.64-0.053-0.787,0.202l-1.697,2.733 H6.448c-0.522,0-0.948,0.426-0.948,0.948v0.827c0,0.492,0.363,0.97,0.793,1.041l0.105,0.018h15.156l0.119-0.016 c0.44-0.058,0.827-0.545,0.827-1.043V11.23C22.5,10.708,22.074,10.282,21.552,10.282z"
id="path8"
style="fill:#0b8c61;fill-opacity:1" />
<path
fill="#C1122B"
d="M8.057,20.02c0.007,0.222,0.122,0.337,0.263,0.337h11.365c0.142,0,0.257-0.115,0.257-0.256l0.007-0.1 l0.971-5.886H7.082L8.057,20.02z M17.116,16.074c0-0.298,0.22-0.539,0.518-0.539c0.297,0,0.516,0.241,0.516,0.539v2.017 c0,0.298-0.219,0.539-0.516,0.539c-0.298,0-0.518-0.241-0.518-0.539V16.074z M14.694,16.074c0-0.298,0.219-0.539,0.517-0.539 s0.517,0.241,0.517,0.539v2.017c0,0.298-0.219,0.539-0.517,0.539s-0.517-0.241-0.517-0.539V16.074z M12.272,16.074 c0-0.298,0.219-0.539,0.517-0.539c0.297,0,0.517,0.241,0.517,0.539v2.017c0,0.298-0.22,0.539-0.517,0.539 c-0.298,0-0.517-0.241-0.517-0.539V16.074z M9.85,16.074c0-0.298,0.219-0.539,0.517-0.539c0.297,0,0.516,0.241,0.516,0.539v2.017 c0,0.298-0.219,0.539-0.516,0.539c-0.298,0-0.517-0.241-0.517-0.539V16.074z"
id="path10"
style="fill:#0b8c61;fill-opacity:1" />
<path
fill="#C1122B"
d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32 c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M23.5,12.057 c0,0.863-0.567,1.661-1.325,1.942l-1.025,5.889c-0.015,0.976-0.889,1.831-1.94,1.831H8.744c-1.052,0-1.925-0.855-1.947-1.906 l-1.024-5.828C5.036,13.691,4.5,12.91,4.5,12.057V11.23c0-1.074,0.874-1.948,1.948-1.948H8.75l1.396-2.247 c0.4-0.698,1.417-0.978,2.145-0.555c0.755,0.435,1.015,1.403,0.58,2.159l-0.41,0.642h2.662l-0.39-0.61 c-0.227-0.391-0.284-0.823-0.174-1.235c0.109-0.406,0.37-0.745,0.734-0.955c0.716-0.417,1.739-0.148,2.159,0.579l1.381,2.223 h2.718c1.074,0,1.948,0.874,1.948,1.948V12.057z"
id="path12"
style="fill:#0b8c61;fill-opacity:1" />
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

View File

@@ -1,73 +1,91 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
]>
<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
<metadata>
<sfw xmlns="&ns_sfw;">
<slices></slices>
<sliceSourceBounds height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
</sfw>
</metadata>
<g>
<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
C24.988,26.679,20.059,25,14,25z"/>
<g>
<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
<path fill="#C1122B" d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M14.002,30.908
C10.865,28.805,1,21.533,1,13.333C1,7.511,6.56,1,14,1s13,6.511,13,12.333C27,21.682,17.14,28.843,14.002,30.908z"/>
<g>
<g>
<path fill="#C1122B" d="M19.457,22.366H8.494c-1.074,0-1.965-0.873-1.988-1.946l-1.079-6.143
C4.661,13.986,4.1,13.177,4.1,12.295v-0.866c0-1.097,0.892-1.989,1.988-1.989h2.441l1.479-2.379
c0.408-0.709,1.438-0.99,2.177-0.563c0.37,0.214,0.635,0.559,0.747,0.973c0.11,0.413,0.054,0.846-0.16,1.216l-0.479,0.751h2.98
L14.813,8.72c-0.229-0.395-0.288-0.833-0.177-1.251c0.11-0.413,0.375-0.758,0.745-0.971c0.731-0.428,1.766-0.151,2.191,0.588
l1.463,2.354h2.877c1.096,0,1.988,0.892,1.988,1.989v0.866c0,0.894-0.594,1.719-1.382,1.996l-1.08,6.199
C21.423,21.492,20.532,22.366,19.457,22.366z M6.088,10.383c-0.576,0-1.045,0.47-1.045,1.046v0.866
c0,0.54,0.401,1.064,0.874,1.143l0.33,0.055l1.195,6.836c0.019,0.635,0.488,1.094,1.052,1.094h10.964
c0.565,0,1.034-0.459,1.045-1.023l1.199-6.915l0.344-0.045c0.494-0.064,0.912-0.588,0.912-1.145v-0.866
c0-0.576-0.469-1.046-1.045-1.046H18.51L16.762,7.57c-0.186-0.324-0.605-0.433-0.909-0.256
c-0.153,0.088-0.262,0.229-0.307,0.398c-0.046,0.175-0.021,0.358,0.072,0.518l1.373,2.152h-6.42l1.393-2.183
c0.077-0.134,0.1-0.313,0.055-0.483c-0.046-0.17-0.156-0.313-0.308-0.401c-0.304-0.179-0.729-0.061-0.895,0.23l-1.763,2.838
H6.088z"/>
</g>
<g>
<path fill="#C1122B" d="M19.956,21.986H8.049c-0.697,0-1.264-0.566-1.264-1.263l-1.207-7.266h16.845l-1.204,7.282
C21.22,21.419,20.653,21.986,19.956,21.986z M6.69,14.399l1.031,6.247c0.006,0.253,0.151,0.397,0.328,0.397h11.907
c0.177,0,0.321-0.144,0.321-0.32l0.006-0.097l1.029-6.226H6.69z"/>
</g>
<g>
<g>
<path fill="#C1122B" d="M17.807,19.181c0.311,0,0.541-0.253,0.541-0.565v-2.113c0-0.312-0.23-0.565-0.541-0.565
c-0.312,0-0.542,0.253-0.542,0.565v2.113C17.264,18.929,17.495,19.181,17.807,19.181z"/>
</g>
<g>
<path fill="#C1122B" d="M15.268,19.181c0.312,0,0.542-0.253,0.542-0.565v-2.113c0-0.312-0.23-0.565-0.542-0.565
s-0.542,0.253-0.542,0.565v2.113C14.727,18.929,14.957,19.181,15.268,19.181z"/>
</g>
<g>
<path fill="#C1122B" d="M12.731,19.181c0.311,0,0.542-0.253,0.542-0.565v-2.113c0-0.312-0.23-0.565-0.542-0.565
c-0.312,0-0.542,0.253-0.542,0.565v2.113C12.19,18.929,12.419,19.181,12.731,19.181z"/>
</g>
<g>
<path fill="#C1122B" d="M10.194,19.181c0.311,0,0.541-0.253,0.541-0.565v-2.113c0-0.312-0.23-0.565-0.541-0.565
c-0.312,0-0.542,0.253-0.542,0.565v2.113C9.652,18.929,9.882,19.181,10.194,19.181z"/>
</g>
</g>
</g>
</g>
</g>
</svg>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
xmlns:ns="&amp;ns_sfw;"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Layer_1"
x="0px"
y="0px"
width="28px"
height="33px"
viewBox="0 0 28 33"
enable-background="new 0 0 28 33"
xml:space="preserve"
sodipodi:docname="green_shop.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)"><defs
id="defs23" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1707"
inkscape:window-height="910"
id="namedview21"
showgrid="false"
inkscape:zoom="7.1515152"
inkscape:cx="-9.0021186"
inkscape:cy="16.5"
inkscape:window-x="32"
inkscape:window-y="20"
inkscape:window-maximized="0"
inkscape:current-layer="g14" />
<metadata
id="metadata2">
<ns:sfw>
<ns:slices />
<ns:sliceSourceBounds
height="96"
width="16383"
y="-85.5"
x="-8112"
bottomLeftOrigin="true" />
</ns:sfw>
<rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
<g
id="g18">
<path
opacity="0.25"
fill="#282828"
d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643 C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643 C24.988,26.679,20.059,25,14,25z"
id="path4" />
<g
id="g16">
<path
fill="#FFFFFF"
d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32 c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"
id="path6" />
<g
id="g14">
<path
fill="#C1122B"
d="M21.552,10.282h-3.274l-1.683-2.709c-0.165-0.287-0.533-0.384-0.8-0.228 c-0.135,0.078-0.229,0.201-0.27,0.35c-0.041,0.153-0.019,0.315,0.062,0.457l1.359,2.129h-6.311l1.379-2.161 c0.066-0.114,0.087-0.271,0.046-0.421c-0.04-0.15-0.136-0.275-0.271-0.353c-0.266-0.156-0.64-0.053-0.787,0.202l-1.697,2.733 H6.448c-0.522,0-0.948,0.426-0.948,0.948v0.827c0,0.492,0.363,0.97,0.793,1.041l0.105,0.018h15.156l0.119-0.016 c0.44-0.058,0.827-0.545,0.827-1.043V11.23C22.5,10.708,22.074,10.282,21.552,10.282z"
id="path8"
style="fill:#0b8c61;fill-opacity:1" />
<path
fill="#C1122B"
d="M8.057,20.02c0.007,0.222,0.122,0.337,0.263,0.337h11.365c0.142,0,0.257-0.115,0.257-0.256l0.007-0.1 l0.971-5.886H7.082L8.057,20.02z M17.116,16.074c0-0.298,0.22-0.539,0.518-0.539c0.297,0,0.516,0.241,0.516,0.539v2.017 c0,0.298-0.219,0.539-0.516,0.539c-0.298,0-0.518-0.241-0.518-0.539V16.074z M14.694,16.074c0-0.298,0.219-0.539,0.517-0.539 s0.517,0.241,0.517,0.539v2.017c0,0.298-0.219,0.539-0.517,0.539s-0.517-0.241-0.517-0.539V16.074z M12.272,16.074 c0-0.298,0.219-0.539,0.517-0.539c0.297,0,0.517,0.241,0.517,0.539v2.017c0,0.298-0.22,0.539-0.517,0.539 c-0.298,0-0.517-0.241-0.517-0.539V16.074z M9.85,16.074c0-0.298,0.219-0.539,0.517-0.539c0.297,0,0.516,0.241,0.516,0.539v2.017 c0,0.298-0.219,0.539-0.516,0.539c-0.298,0-0.517-0.241-0.517-0.539V16.074z"
id="path10"
style="fill:#0b8c61;fill-opacity:1" />
<path
fill="#C1122B"
d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32 c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M23.5,12.057 c0,0.863-0.567,1.661-1.325,1.942l-1.025,5.889c-0.015,0.976-0.889,1.831-1.94,1.831H8.744c-1.052,0-1.925-0.855-1.947-1.906 l-1.024-5.828C5.036,13.691,4.5,12.91,4.5,12.057V11.23c0-1.074,0.874-1.948,1.948-1.948H8.75l1.396-2.247 c0.4-0.698,1.417-0.978,2.145-0.555c0.755,0.435,1.015,1.403,0.58,2.159l-0.41,0.642h2.662l-0.39-0.61 c-0.227-0.391-0.284-0.823-0.174-1.235c0.109-0.406,0.37-0.745,0.734-0.955c0.716-0.417,1.739-0.148,2.159,0.579l1.381,2.223 h2.718c1.074,0,1.948,0.874,1.948,1.948V12.057z"
id="path12"
style="fill:#0b8c61;fill-opacity:1" />
</g>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

View File

@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="28px" height="33px" enable-background="new 0 0 28 33" version="1.1" viewBox="0 0 28 33" xmlns="http://www.w3.org/2000/svg"><path d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643 C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643 C24.988,26.679,20.059,25,14,25z" fill="#282828" opacity=".25"/><path d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32 c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z" fill="#fff"/><g><g fill="#0b8c61"><path d="m14 0c-7.72 0-14 6.717-14 13.333 0 9.941 13.132 18.169 13.691 18.571 0.089 0.064 0.2 0.096 0.309 0.096 0.107 0 0.217-0.031 0.305-0.094 0.559-0.395 13.695-8.456 13.695-18.573 0-6.616-6.28-13.333-14-13.333zm9.5 12.057c0 0.863-0.567 1.661-1.325 1.942l-1.025 5.889c-0.015 0.976-0.889 1.831-1.94 1.831h-10.466c-1.052 0-1.925-0.855-1.947-1.906l-1.024-5.828c-0.737-0.294-1.273-1.075-1.273-1.928v-0.827c0-1.074 0.874-1.948 1.948-1.948h2.302l1.396-2.247c0.4-0.698 1.417-0.978 2.145-0.555 0.755 0.435 1.015 1.403 0.58 2.159l-0.41 0.642h2.662l-0.39-0.61c-0.227-0.391-0.284-0.823-0.174-1.235 0.109-0.406 0.37-0.745 0.734-0.955 0.716-0.417 1.739-0.148 2.159 0.579l1.381 2.223h2.718c1.074 0 1.948 0.874 1.948 1.948v0.826z"/><rect x="3.6006" y="6.9915" width="20.415" height="15.521"/><rect x="8.9841" y="5.6631" width="10.487" height="3.6356"/></g><text x="5.0698848" y="20.243376" fill="#000000" font-family="sans-serif" font-size="16px" style="line-height:1.25" xml:space="preserve"><tspan x="5.0698848" y="20.243376" fill="#ffffff" font-family="Arial" font-size="16px" font-weight="bold">1+</tspan></text></g></svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 535 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 759 B

Some files were not shown because too many files have changed in this diff Show More