Maikel Linke
f0021be53c
Style I18n call
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
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
Maikel
51f9a0afa1
Merge pull request #2562 from Matt-Yorkley/pi/product_attributes
...
[Product Import] Product attributes
2018-09-25 11:36:03 +10: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
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
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
a2b3d8372e
Reduce complexity of OrderUpdater decorator
2018-09-19 16:03:33 +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 Pérez Fabregat
0f627cdf39
Merge pull request #2661 from kristinalim/translations-copy_of_order_cycle
...
Translate "COPY OF" when cloning an OC
2018-09-17 12:38:29 +02:00
Pau Pérez Fabregat
0520f2187c
Merge pull request #2540 from luisramos0/delete_dead_store
...
removed assets related to spree store: dead code
2018-09-17 11:33:56 +02:00
Kristina Lim
798a6ed391
Translate more text in OC filters
2018-09-17 10:09:17 +10:00
Maikel
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
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
6b56def649
Merge pull request #2697 from mkllnk/2655-fix-admin-payments
...
2655 fix admin payments
2018-09-14 11:26:20 +10:00
Hugo Daniel
8dd0e01b8e
Use explicit syntax for section objects in preference_sections definition
2018-09-13 12:34:06 +02: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 Linke
81f60aab46
Make PaymentMethod serialisable with fees
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/2655
2018-09-13 12:01:17 +10:00
Maikel Linke
a447fe4f40
Require lib file where needed
...
We can't always rely on other parts of the code been loaded first. We
need to declare dependencies so that they are always present.
I just ran into this problem in my dev environment.
2018-09-13 12:01:16 +10:00
luisramos0
478dd68072
In cookies policy helper, added string interpolation to variable to avoid variable (Spree::Config entry) to break the concatenation. Added unit test to validate the error case
2018-09-12 18:30:24 +01:00
luisramos0
409f084bd4
Added matomo opt out iframe to cookies policy page
2018-09-12 18:30:24 +01:00
Pau Pérez Fabregat
3f5c799166
Merge pull request #2648 from kristinalim/fix-ask_anonymous_users_to_login_for_order_page
...
Fix ask anonymous users to login for order page
2018-09-12 16:17:34 +02:00
Hugo Daniel
cc43d789e2
Refacto edit method for content controller and enable custom user guide link
2018-09-12 14:51:53 +02:00
Pau Pérez Fabregat
e474271698
Merge pull request #2637 from Vadlusk/remove_css_splitter
...
Remove duplicate css_splitter references, delete split css file.
2018-09-12 13:07:15 +02:00
Pau Pérez Fabregat
64e71a1ee7
Merge pull request #2544 from kristinalim/fix-scrolling_in_modals
...
Fix top position, height, and scrolling with modals
2018-09-12 13:05:20 +02:00
Matt-Yorkley
4d9ebf0550
Apply submenu override
2018-09-11 12:17:28 +01:00
Matt-Yorkley
f08d6389d8
Apply capture order override
2018-09-11 12:06:58 +01:00
Matt-Yorkley
507f4d0878
OCD tidy up of visually misaligned filter
2018-09-11 11:53:37 +01:00
Matt-Yorkley
afedaea2b5
Apply special instructions override
2018-09-11 11:49:28 +01:00
Matt-Yorkley
8f174b1308
Apply ship shortcut override
2018-09-11 11:43:38 +01:00
Matt-Yorkley
ba0701457e
Apply distributor td override
2018-09-11 11:42:08 +01:00
Matt-Yorkley
6389c552ca
Apply distributor th override
2018-09-11 11:41:25 +01:00
Matt-Yorkley
1958ac9932
Apply distributor filter inputs override
2018-09-11 11:39:05 +01:00
Matt-Yorkley
c7e2f817ed
Apply colgroup override
2018-09-11 11:34:34 +01:00
Matt-Yorkley
5a2491cb47
Apply ng-app override
2018-09-11 11:30:14 +01:00
Matt-Yorkley
980c46c63f
Convert Spree view to HAML
2018-09-11 11:22:54 +01:00
Kristina Lim
02a909c1b1
Do not use image_tag for enterprise image previews
...
If Rails config.assets.compile is false and config.assets.digest is
true, which is the case for staging and production, image_tag fails when
the image file is not found.
We do not need sprockets to ensure presence of the image file for these
tags, because the correct SRC values are assigned through the JS.
Inserting HTML should be sufficient.
2018-09-08 23:23:49 +08:00
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
