raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-29 21:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,947 Commits 20 Branches 451 Tags
7d71f217536acf2b65d6bdce85bfe11ea53267f3
Commit Graph

88 Commits

Author SHA1 Message Date
Maikel
52d2d1d23c Merge pull request #4668 from Matt-Yorkley/rails-4-prep-2 
Rails 4 prep: admin dashboard route
 2020-01-16 14:16:32 +11:00
Luis Ramos
4a1b74c136 Merge pull request #4634 from luisramos0/remove_dead_code 
Remove some dead code
 2020-01-13 11:09:04 +00:00
Matt-Yorkley
b9edea7c0e Rename 'admin/overview#index' route from :admin to :admin_dashboard 
Fixes issues with route declarations in Rails 4
 2020-01-12 13:11:33 +01:00
luisramos0
093edb66d3 Remove unused view 
This was introduced in 2013 and removed in 2014, see log below:

git log -Saddress_form_simple
commit 510333288c
Author: Maikel Linke <mkllnk@web.de>
Date:   Sun Mar 2 13:05:15 2014 +1100

    first steps of new design

commit 2e1de9a6d3
Author: Rohan Mitchell <rohan@rohanmitchell.com>
Date:   Fri Aug 23 13:12:36 2013 +1000

    Fix admin create order - remove override on spree address form, update to spree patched to fix respond_override (spree issue #2210), fix nil state error
 2019-12-28 18:25:28 +00:00
cyrillefr
e6d9ec7bd7 Small fixes for default single Hub/Shop options issue 
- removed mode variable
 - reverted html template accordingly
 - added a more specific helper
 - fixed some short variable names
 2019-12-19 21:08:34 +01:00
cyrillefr
e59077e63e Select by default single Hub/Shop option on creation of payment/shipping method 
- added a helper
- added mode(new/edit) in payment/shipping views
- updated checkbox creation
- added tests
 2019-12-18 10:45:00 +01: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
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
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
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
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
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
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
Luis Ramos
1fa6e4bea8 Merge pull request #4385 from chaserx/4304_fixes_missing_translation 
adds missing :spree to i18n scopes
 2019-10-24 17:06:50 +01:00
luisramos0
42cd9a5152 Remove menu entry option types because this page is not really usable 
We keep the underlying data structures because option types and option values are used internally to keep units in OFN: weight, volume and items, but otherwise, custom option types are no longer possible in OFN
 2019-10-23 12:57:47 +01:00
luisramos0
cc342387cc Make all calls to content_for use dash not equals when setting content_for 2019-10-23 12:42:29 +01:00
luisramos0
6715f872e3 Merge duplicated product_sub_menu partials and make all references point to the one located in the spree folder (we keep this one because we still have some views in spree backend referencing this partial 2019-10-23 12:26:18 +01:00
Chase Southard
61ee0f04a6 adds missing :spree to i18n scopes 2019-10-19 13:55:11 -04:00
Matt-Yorkley
ab330e882e Remove product cache 2019-10-18 21:15:11 +01:00
Luis Ramos
500ef901fd Merge pull request #4164 from luisramos0/little_de_deface 
Remove some unused deface overrides and move some others to their views
 2019-09-11 10:26:56 +01:00
Luis Ramos
e3ce2a7486 Merge pull request #4104 from luisramos0/convert_taxons_to_ams 
Convert spree/api/taxons views from rabl to AMS
 2019-09-06 00:04:10 +01:00
Luis Ramos
265e76e8ca Merge pull request #4074 from HugsDaniel/defacepocalypse 
[Defacepocalypse] De-deface product properties index
 2019-08-28 22:18:18 +01:00
luisramos0
ece0652ca3 Adapt spree/admin/shared/_routes.html.erb to new location of the api/taxons routes 2019-08-28 22:06:56 +01:00
luisramos0
8a4e5b445f Delete unused frontend auth toekn script override and move the backend one to the head partial 2019-08-18 21:53:56 +01:00
luisramos0
4c3d15b42b Remove users menu entry override and file and add it directly to the tabs view together with all the other entries 2019-08-18 21:36:50 +01:00
luisramos0
a267848394 Remove unused api routes from views/spree/admin/shared/routes view 2019-07-31 09:32:33 +01:00
Luis Ramos
75c7e0b939 Merge pull request #4089 from luisramos0/undeface-fix 
Add doctype declaration in layouts/admin view
 2019-07-30 19:29:17 +01:00
luisramos0
ddf68444fb Move head scripts from admin layout to haed partial 2019-07-29 17:04:57 +01:00
luisramos0
f64653db14 Add icon to OC menu entry 2019-07-26 10:52:31 +01:00
Hugo Daniel
c83d249147 Impor missing partials from spree to ofn and convert to haml 2019-07-25 14:23:24 +02:00
luisramos0
6064f096a7 Fix a pre-existing problem in orders_tab by moving the links in to the li elements 2019-07-16 20:16:32 +01:00
luisramos0
c81a9fd032 Fix error in js tag in head 2019-07-16 20:16:32 +01:00
luisramos0
9765b1e908 Move admin/shared/_head/replace_spree_title deface to head view 2019-07-16 20:16:32 +01:00
luisramos0
5ccadc1f7d Convert spree/admin/shared/_head view from erb to haml 2019-07-16 20:16:32 +01:00
luisramos0
539805e2c2 Bring spree/admin/shared/head partial from spree_backend 2019-07-16 20:16:32 +01:00
luisramos0
e3c383c61c Convert spree/admin/shared/_tabs.html from erb to haml and move menu entries from layouts/admin to the tabs view 2019-07-16 20:16:32 +01:00
luisramos0
f35972cee9 Remove deleted menu entry product distributions 2019-03-26 09:08:52 +00:00
Luis Ramos
9a771ecbb8 Merge pull request #3613 from luisramos0/2-0-update-variants-stock 
[Spree Upgrade] Add on_hand and on_demand to the variants create and edit pages
 2019-03-26 08:55:34 +00:00
Pau Pérez Fabregat
87f0ddabe7 Merge pull request #3548 from luisramos0/2-0-remove-unused-new-v2-features 
[Spree Upgrade] Remove unused spree v2 features
 2019-03-22 10:35:15 +01:00
luisramos0
9194a711ea De-deface product tabs 
We do not include stock management from v2 because we will use the variants edit page to manage on_hand and on_demand
 2019-03-18 18:47:25 +00:00
luisramos0
7c39c45f79 Stop using inexistent en.order_state translations keys and use existing en.spree.order_state in haml code and new js.admin.orders.order_state in JS code 2019-03-12 19:42:08 +00:00
luisramos0
77655bfffb Rename resource content to contents so that it matches the name of the controller ContentsController. This makes the is_active logic work on the configuration menu 
See the menu is_active code here: f55722b38d/backend/app/helpers/spree/admin/navigation_helper.rb (L145)
 2019-03-12 19:11:37 +00:00
luisramos0
2295981375 Merge branch '2-0-stable' into 2-0-remove-unused-new-v2-features 2019-03-12 16:55:48 +00:00
luisramos0
ebf825e349 De-deface configuration menu 
Remove stock locations and stock transfers from the menu
 2019-02-25 23:38:50 +00:00
luisramos0
0501db1782 Remove changes related to enterprise trials as they dont make sense without business models and account invoices 2019-02-25 14:37:16 +00:00
Hugo Daniel
ae799eb2b6 Use Spree routes 2019-02-04 18:56:28 +00:00
luisramos0
460e010408 Removed shipments from orders tab. This option is removed in spree 2 2018-12-05 11:38:16 +00:00