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
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
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
Pau Pérez Fabregat
8a3f621b42
Merge pull request #2893 from luisramos0/deleted_products_break_inventory
...
Fix bug in inventory management page
2018-10-25 18:20:42 +02:00
Pau Pérez Fabregat
7cac4637fe
Merge pull request #2916 from luisramos0/date-transl-fix
...
Add Portuguese and German to list of momentJS locales
2018-10-25 18:18:53 +02:00
Kristina Lim
2cc594dc98
Proceed to hide off-canvas when resized to >1024px
2018-10-25 20:36:27 +08:00
Kristina Lim
14eaa49204
Disable hiding the off-canvas upon window resize.
...
In some browsers for mobile devices, the address bar is automatically
hidden when scrolling down the page. This is not workable if the height
of the contents of the off-canvas exceeds the height of the screen,
because the latter portion of the contents stays hidden to the user.
https://github.com/openfoodfoundation/angular-foundation/blob/0.9.0-20180826174721/src/offcanvas/offcanvas.js
2018-10-25 19:29:19 +08:00
Maikel
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
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
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
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
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
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
luisramos0
fe9f4a1c95
Move countryStates service from ofn.admin to admin.utils to remove bad dependency from admin modules (customers and subscriptions) to main ofn.admin module. Now the dependency admin.utils is used instead
2018-10-17 12:16:33 +01:00
luisramos0
c281927372
Fix subscription address form. It now clears the state selection when a different country is selected
2018-10-16 23:02:26 +01:00
luisramos0
1804bf5a2b
Extract countryStates logic from customer_address modal and re-use new CountryStates service
2018-10-16 22:45:38 +01:00
luisramos0
5c5a2194d6
Extract country states logic out of subscriptions address controller into new service CountryStates
2018-10-16 21:58:27 +01:00
luisramos0
feaf16d878
Fix bug in subscriptions address controller where the country id lookup was not exact and states returned were incorrect. Add unit tests to cover different cases
2018-10-16 20:59:34 +01:00
fabricio.albarnaz
419493f153
Move instagram regex to an method to fix codeclimate
2018-10-16 16:09:15 -03:00
fabricio.albarnaz
93a051bf5a
Regex ajust
2018-10-16 15:33:10 -03:00
Pau Pérez Fabregat
590091c42a
Merge pull request #2842 from Matt-Yorkley/pi/missing_variable
...
Fix missing local variable in EntryProcessor
2018-10-16 13:19:23 +02:00
Maikel Linke
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
Pau Pérez Fabregat
f8bccda6ab
Merge pull request #2847 from Matt-Yorkley/emails/validation
...
Emails/validation
2018-10-15 15:54:41 +02:00
Pau Pérez Fabregat
8946fe3ce8
Merge pull request #2829 from Matt-Yorkley/bi/results_per_page
...
Add per_page controls to admin orders index
2018-10-15 12:17:39 +02:00
Pau Pérez Fabregat
0e4a3dbc26
Merge pull request #2845 from coopdevs/fix-invalid-variant-creation
...
Fix invalid variant creation
2018-10-15 12:16:39 +02:00
Pau Pérez Fabregat
fe149967e4
Merge pull request #2521 from luisramos0/cookies_in_engine
...
[OFN Domains] Breaking OFN into domains - POC cookies inside an engine
2018-10-15 10:03:30 +02:00
Matt-Yorkley
fcff835922
Update results on dropdown select
2018-10-12 17:06:42 +01:00
Matt-Yorkley
a2828ea305
Use :for_hubs scope
2018-10-12 17:00:19 +01:00
Matt-Yorkley
123d1963ad
Remove duplicate method
2018-10-12 17:00:19 +01:00
Matt-Yorkley
3cb43121d5
Refactor long lines for new character limit
2018-10-12 17:00:18 +01:00
Matt-Yorkley
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
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
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
e87075aed7
Add before save to check the instagram link pattern
2018-10-11 15:27:46 -03:00
Matt-Yorkley
57c6530e46
DRY code and use more flexible I18n
2018-10-11 16:38:14 +01:00
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
