raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-12 23:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,190 Commits 19 Branches 453 Tags
ebe7456b666c19450cb4e30ca55f74c8abe470b3
Commit Graph

1525 Commits

Author SHA1 Message Date
Luis Ramos
9313a57d19 Merge pull request #4511 from luisramos0/backend_ctrl_search 
Bring spree_backend search controller to OFN
 2020-02-05 15:54:30 +00:00
Luis Ramos
81103f3f71 Merge pull request #4742 from CSCI-462-01-2020/Issue4109 
Edit new_resource partial
 2020-02-04 19:44:16 +00:00
Luis Ramos
ea75714561 Merge pull request #4635 from luisramos0/main_app_routes 
Replace use of spree.root_path and root_url with main_app.root_path and main_app.root_url
 2020-02-04 16:02:48 +00:00
luisramos0
b7d19dd34c Remove unused route from Spree.routes 2020-02-04 14:55:34 +00:00
blainebillings
577fb88843 Move Create and Cancel References to Actions Namespace 2020-02-04 09:39:01 -05:00
blainebillings
22db2e99f0 Merge branch 'Issue4109' of https://github.com/CSCI-462-01-2020/openfoodnetwork into Issue4109 2020-02-04 09:38:19 -05:00
blainebillings
ef4aa488c3 Moves Create and Cancel References to Actions Namespace 2020-02-04 09:34:28 -05:00
luisramos0
d32e106bf0 Add partials needed in the orders edit page 2020-02-04 11:51:13 +00:00
Luis Ramos
c4bf4f001f Merge pull request #4509 from luisramos0/backend_ctrl_payments 
Bring spree_backend payments controller to OFN
 2020-02-04 11:46:23 +00:00
blainebillings
9218008530 Edit new_resource Partial 2020-02-02 11:22:54 -05:00
myersca1
f36c5b8938 Edit new_resource partial 2020-02-02 11:19:10 -05:00
Luis Ramos
a0475ee8a4 Merge pull request #4613 from luisramos0/autocomplete 
Bring remaining variants autocomplete (and related) JS code from spree_backend
 2020-01-31 16:08:50 +00:00
luisramos0
844731061c Add needed generic partials 2020-01-28 18:04:36 +00:00
Luis Ramos
5e61ba8136 Merge pull request #4587 from luisramos0/navigation_helper 
Bring navigation helper from spree_backend
 2020-01-28 17:58:18 +00:00
luisramos0
b8aee4e857 Bring address_states as is from spre_backend 2020-01-28 13:53:04 +00:00
luisramos0
ee3c9563d8 Add all submenus entries to the main tabs list so that the main menu keeps selected when user selects the submenus 2020-01-23 14:31:25 +00:00
Luis Ramos
43d7609b81 Merge pull request #4707 from Matt-Yorkley/mobile-checkout-tabs 
Remove tabs from cart and checkout
 2020-01-23 10:19:50 +00:00
Luis Ramos
494cb00774 Merge pull request #4585 from luisramos0/backend_partial_calc_fields 
Bring spree_backend calculator fields partial to OFN
 2020-01-22 20:27:10 +00:00
Luis Ramos
d782bea458 Merge pull request #4633 from luisramos0/fix_prod_link_bug 
Fix bug in frontoffice order details where the product image was a broken link
 2020-01-22 20:25:24 +00:00
luisramos0
afddaed9fc Add empty but needed payments templates for check payment method 2020-01-22 20:21:21 +00:00
Matt-Yorkley
444747c8b2 Split shopping_shared/details partial into header and tabs partials and only include tabs in shop page (not cart and checkout). 2020-01-22 11:30:43 +01:00
luisramos0
b4e6c5307e Convert orders submenu partial to haml 2020-01-21 22:51:23 +00:00
luisramos0
fb4f96eb4a Remove unused submenu entries from _tabs partial and convert hash syntax 2020-01-21 22:51:23 +00:00
Luis Ramos
6bb4f2477c Merge pull request #4586 from luisramos0/states_erb 
Make states/new.js template depend on the states/new.haml template in OFN (not the states/new.erb in spree)
 2020-01-21 22:47:28 +00:00
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
3171b60d6f Merge pull request #4580 from Matt-Yorkley/order_capture 
Use asynchronous requests for order capture and ship actions
 2020-01-13 17:14:40 +00: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
Luis Ramos
e9a5b889de Merge pull request #4606 from cyrillefr/lone-hub-checked-by-default-4428 
Select by default single Hub/Shop option on creation of payment/shipping method
 2020-01-08 11:44:16 +00:00
luisramos0
55bb328d48 Prefix all calls to root_url with main_app 2019-12-28 18:46:50 +00: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
60677a2414 Make login nav use main_app router 2019-12-28 18:41:16 +00: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
luisramos0
1295d33fa7 Fix bug in frontoffice order details where the product image was a link to nowhere 2019-12-28 17:54:28 +00:00
Luis Ramos
0e7dafea46 Merge pull request #4560 from kshlyk/fix_billing_addres_in_pdf_invoice 
Billing address in pdf invoice fixed
 2019-12-27 16:45:06 +00:00
Luis Ramos
9f1eaf0b66 Merge pull request #4512 from luisramos0/backend_ctrl_base 
Bring spree_backend base controller to OFN
 2019-12-24 12:01:07 +00:00
Luis Ramos
1606f9900f Merge pull request #4507 from luisramos0/backend_ctrl_reports 
Bring spree_backend reports controller to OFN
 2019-12-23 16:14:07 +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
Matt-Yorkley
a3ee6674ea Use asynchronous requests for order capture and ship actions 2019-12-18 14:15:46 +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
luisramos0
9648693329 Fix a problem in states/new template where erb instead of haml was referenced 2019-12-15 21:42:52 +00:00
luisramos0
9df9061ec1 Bring missing translation from spree and use root namespace for translations instead of the spre namespace 2019-12-15 21:39:26 +00:00
luisramos0
67526df420 Convert calculator fields partial to haml 2019-12-15 21:32:31 +00:00
luisramos0
766f8ab407 Add partial needed in payment and shipping methods 2019-12-15 21:24:50 +00:00
luisramos0
795f13d73a Remove spree alerts feature that would check spree website for security alerts 
This is not something we need running such an old version of spree
 2019-12-15 21:03:53 +00:00
luisramos0
c59326743b Remove sales total report 2019-12-13 16:44:46 +00:00
luisramos0
cb3397fd1a Convert reports index and sales_total views from erb to haml 2019-12-13 16:44:46 +00:00
luisramos0
2bd4de3e29 Add sales total report view 2019-12-13 16:44:46 +00:00
Matt-Yorkley
f189ca8004 Fix route on "continue" button on admin adjustments page 2019-12-13 13:51:41 +01:00
Konstantin Shlyk
c5229dd763 billing address in pdf invoice fixed 2019-12-11 23:10:51 +03:00