luisramos0
9404aacfb2
run rubocop --auto-correct
2019-11-10 18:42:43 +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
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
Matt-Yorkley
34f4bbe06c
Eager-load variant associations in admin ProductsController
2019-11-08 10:44:47 +00: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
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
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
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
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
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
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
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
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
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
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
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
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
5846593637
Remove dependency to spree_api rabl responders, we should only use AMS from now on
2019-10-28 16:00:36 +00:00