Luis Ramos
92d0a5b735
Change default user from spree@example.com to ofn@example.com
2020-05-03 10:12:43 +01: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
9404aacfb2
run rubocop --auto-correct
2019-11-10 18:42:43 +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
luisramos0
25451eed6b
Bring api spec helpers from spree_api into ofn/api_helper
2019-07-31 09:36:48 +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
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
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
17448699f9
Bring devise initializer from spree_auth_devise and fix spree initializer details
2019-07-05 22:45:59 +01:00
luisramos0
86b0d71c7e
Result of rubocop auto-correct and rebuilding rubocop_manual_todo
2019-05-28 12:57:29 +01: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
Hugo Daniel
bc9af7c45f
Add an API key for admin user
2018-11-07 16:47:35 +01:00
Luis Ramos
3e4f92fe92
Merge branch '2-0-stable' into 2-0-adjust-basic-spec-fix
2018-10-16 17:33:33 +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
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
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
Kristina Lim
f9533f8fb8
Refactor redirecting back after requiring login
2018-09-06 19:46:17 +10:00
Pau Perez
b23cb55525
Fix current violations of Style/Send cop
2018-09-05 12:05:05 +02:00
Pau Perez
daf12d1300
Revert "Refactor Order#current_order argument"
...
This reverts commit ae935202be
2018-06-05 18:42:41 +02:00
Hugo Daniel
abe5d3596c
Refactor Order#current_order argument
2018-04-17 16:10:41 +02: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
920900b619
Add Spree::LocalizedNumber module
2017-12-01 13:37:24 +11:00
Rob Harrington
c835b4eb1a
Replacing stub_model objects with actual factory generated instances
2017-11-10 08:47:12 +11:00
Rohan Mitchell
3135ef6b7f
Reinstate explicit class name Spree::Calculator on calculated_adjustments association
2017-09-08 23:55:48 +10:00
Rohan Mitchell
858576d870
CalculatedAdjustments requires include first
2017-09-08 23:55:48 +10:00
Rob Harrington
7bb58342fc
Rubocop: Auto-correct Style/EmptyLineBetweenDefs offences
2017-06-23 16:49:08 +10:00
Pierre de Lacroix
db63f30a76
cosmetic fixes to the ticket view
2017-05-24 13:35:59 +10:00
Rohan Mitchell
6546d2763b
Add Spree::Money#to_html (from Spree 2.0)
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
a0b740f52d
Generalise fix for missing EnterpriseFee::Calculator to any use of calculated_adjustments
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
Rob Harrington
5b72f53738
Adding helper for describing monthly billing charges
2015-12-16 19:18:57 +11: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
Maikel Linke
903bd21577
Merge remote-tracking branch 'origin/master' into group-pages-merge
...
Conflicts:
README.markdown
db/schema.rb
2015-02-13 15:42:36 +11:00
Maikel Linke
6b5a1255f8
fixing a bunch of tests
2015-02-12 16:36:18 +11:00
Rohan Mitchell
0431e0048c
Merge branch 'master' into variant-overrides-frontend
...
Conflicts:
app/controllers/shop_controller.rb
app/views/shop/products/_form.html.haml
spec/controllers/shop_controller_spec.rb
2015-01-12 16:48:51 +11:00
Rohan Mitchell
20bde803c8
Display overridden prices when products are in the cart
2015-01-12 14:58:35 +11:00
Rohan Mitchell
d2e0d4f44a
Fix grammar
2015-01-08 10:39:51 +11:00
Rohan Mitchell
ab26902e4e
Move money decorator to lib dir, as it's a decorator for a lib class, not a model
2015-01-08 10:39:14 +11:00
Rohan Mitchell
6c86254a90
Extract sign_in_as_user method, test managed orders API access for normal user and enterprise user
2014-04-24 13:20:16 +10:00
Rohan Mitchell
95a6e34523
Spec access denied to regular user when soft-deleting variants
2014-04-24 13:20:16 +10:00
Rohan Mitchell
e28a450875
Add API call to soft-delete a variant
2014-04-24 13:20:16 +10:00
Rohan Mitchell
5fac29d2ed
Do not merge current and incomplete orders when logging in - fixes #20
2013-08-14 10:44:02 +10:00
Rohan Mitchell
02b524bfce
Fix our monkey-patch of spree's order merging to accomodate orders having an order cycle
2013-04-05 15:00:42 +11:00
Rob H
c956706d78
Move set_current_order override to new location in lib (Spree 1.3 Upgrade), and update home controller test
2013-02-14 15:12:50 +11:00
Rohan Mitchell
077098e6c1
Refactor libs to use enterprise instead of supplier and distributor
2012-10-29 14:57:03 +11:00
Rohan Mitchell
c46019d68c
WIP: Move Supplier, Distributor, DistributorSet and ProductDistribution models out of Spree namespace
2012-10-25 10:45:39 +11:00
Rohan Mitchell
9adfe58086
Display distributor filter as links instead of checkboxes, style in the same way as taxonomy selectors
2012-06-20 15:05:54 +10:00
Rohan Mitchell
1207062f7c
Filter products by distributor
2012-06-20 14:20:07 +10:00
