luisramos0
3776b891ce
Merge branch 'master' into 2-0-stable-dec-3rd
2018-12-03 15:30:16 +00:00
Hugo Daniel
d7a148bb75
Fix checkout feature specs
2018-11-22 17:01:39 +01: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
Hugo Daniel
a50786be34
Remove old do_not_remove_referenced_fees method
2018-11-15 17:59:06 +01:00
Hugo Daniel
7b33712f7a
Add an API endpoint for EnterpriseFeesController#destroy
2018-11-15 14:05:08 +01:00
luisramos0
9ba0fc268e
Run transpec and clean up rubocop issues in credit_card_controller and spec
2018-11-15 11:07:43 +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
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
fcdb5cd7af
Merge branch 'master' into 2-0-stable-nov-8th
2018-11-08 11:18:54 +00:00
Pau Perez
26d95b7250
Fix long lines
2018-11-06 13:59:51 +00:00
Maikel
3259b3ecf1
Merge pull request #2912 from Matt-Yorkley/admin_orders_refactor
...
Admin orders refactor
2018-11-02 16:57:28 +11: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
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
Matt-Yorkley
443515dae4
Improve comment in index action
2018-10-29 10:34:05 +00:00
Matt-Yorkley
334eebeab1
Move json to API and strip index action
2018-10-26 21:38:57 +01:00
Matt-Yorkley
77251848ee
Refactor Spree::Admin::OrdersController
2018-10-26 21:38:57 +01:00
luisramos0
90d7b7f4a0
Merge branch 'master' into 2-0-stable-oct-25
2018-10-25 14:28:58 +01: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
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
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
87cd73ddba
Merge branch 'master' into 2-0-stable-oct
2018-10-15 17:09:26 +01: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
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
e7a909e828
Rename supplier to enterprise
2018-10-12 16:57:13 +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
58a99a7f89
Merge pull request #2692 from Matt-Yorkley/bi/angular_orders
...
Angularise orders page
2018-10-04 21:10:48 +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
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
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
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
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
b57c6cf9ac
Add errors when attempting to update non-updatable fields
2018-09-19 21:12:29 +01: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
Matt-Yorkley
b2551b4e0b
Rewrite existing specs
2018-09-19 13:00:30 +01:00
Matt-Yorkley
3b9d9db16b
Add pagination
2018-09-19 13:00:29 +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
luisramos0
238d2f4feb
Removed unnecessary code copied and replaced with call to identical super class
2018-09-14 22:20:21 +01: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
Hugo Daniel
8dd0e01b8e
Use explicit syntax for section objects in preference_sections definition
2018-09-13 12:34:06 +02: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
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
Kristina Lim
f9533f8fb8
Refactor redirecting back after requiring login
2018-09-06 19:46:17 +10:00
