raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-20 00:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,270 Commits 15 Branches 453 Tags
75277e92e400a5d1997b69e83cf0959e06ceb9e6
Commit Graph

637 Commits

Author SHA1 Message Date
Pau Pérez Fabregat
3ea7fac25f Merge pull request #3095 from luisramos0/admin-users-transl 
In admin/users, convert Spree.t calls to t calls and use lazy lookup
 2018-11-28 17:37:42 +01:00
Hugo Daniel
69e186f482 Define dynamic classes in variables as a turnaround to HAML bug 2018-11-28 10:31:47 +01:00
Hugo Daniel
65dd3eb5b9 Change line items controller HTML response spec to look for form order_edit class 2018-11-28 10:31:47 +01:00
Hugo Daniel
60214b9a90 Fix failing specs 2018-11-28 10:31:47 +01:00
Hugo Daniel
422a68630f Remove data-hook tags 2018-11-28 10:31:47 +01:00
Hugo Daniel
652191a4c5 Fixing missing variable none 2018-11-28 10:31:47 +01:00
Hugo Daniel
c233ea38cf Import Spree views for orders#edit in our codebase and integrate deface modifications 2018-11-28 10:31:47 +01:00
Pau Pérez Fabregat
5c8a638320 Merge pull request #3055 from HugsDaniel/3051-products-edit-views 
[Defacepocalypse] Import products#edit and form partial in our codebase and apply overrides
 2018-11-27 17:32:25 +01:00
Pau Pérez Fabregat
6a1776b84a Merge pull request #3053 from HugsDaniel/3050-products-new-views 
[Defacepocalypse] Import products#new view into our codebase and apply overrides
 2018-11-21 14:43:22 +01:00
luisramos0
783e0eed3c In admin/users, convert Spree.t calls to t calls using lazy lookup and move translations to ofn's en.yml 2018-11-21 11:46:14 +00:00
Pau Perez
23bda74ecb Match name of filter and db column for consistency 2018-11-15 19:09:17 +01:00
Hugo Daniel
1309d80f65 Import products#edit and form partial in our codebase and apply overrides 2018-11-15 17:39:36 +01:00
Hugo Daniel
094d88d03a Import products#new view into our codebase and apply overrides 2018-11-15 16:35:31 +01:00
Pau Perez
52e58a1c31 Remove unused @show_only_completed from view 
Now there's no difference in behavior. In both cases we sort by
completed_at in the second column of the orders page.
 2018-11-15 15:40:13 +01:00
Pau Perez
b7a3255dbe Replace completed_at in orders table w/ created_at 2018-11-15 15:40:13 +01:00
Pau Pérez Fabregat
e66f406ea6 Merge pull request #2946 from luisramos0/improve_taxons 
Sort Product categories alphabetically by name
 2018-11-14 11:23:59 +01:00
luisramos0
82befd945b Sort Product categories alphabetically by name and fixsample data by fixing taxons taxonomy id 2018-10-30 18:00:48 +00:00
Matt-Yorkley
77251848ee Refactor Spree::Admin::OrdersController 2018-10-26 21:38:57 +01:00
Matt-Yorkley
fcff835922 Update results on dropdown select 2018-10-12 17:06:42 +01:00
Matt-Yorkley
dafcd0ddc2 Add per_page controls to admin orders index 2018-10-10 18:32:12 +01:00
Matt-Yorkley
37a7cceead Fix bindings on angular orders data 2018-10-08 15:42:46 +01:00
Matt-Yorkley
55d7d5d1e4 Rename #capture_path to #payment_capture_path 2018-10-02 11:10:51 +01:00
Matt-Yorkley
6f2760cf92 Move translations into their namespace and use '.key' format 2018-09-24 15:54:05 +01:00
Matt-Yorkley
9f57b43a13 Move sortble header elements to a partial 2018-09-23 22:14:12 +01:00
Matt-Yorkley
897e43fe0b Remove Spree's Deface data-hooks from new view 2018-09-20 11:33:22 +01:00
Matt-Yorkley
3cbb576b4f Move payment object logic out of order serializer and delete code 2018-09-19 13:00:30 +01:00
Matt-Yorkley
ba254802f8 Move angular_pagination to /views/admin/shared/ 2018-09-19 13:00:30 +01:00
Matt-Yorkley
6768055b4d Split orders into 2 angular controllers 2018-09-19 13:00:30 +01:00
Matt-Yorkley
68f0c80016 Add loading message and spinner 2018-09-19 13:00:30 +01:00
Matt-Yorkley
9da6a5a9b3 Add column sorting to table 2018-09-19 13:00:30 +01:00
Matt-Yorkley
2112f296e4 Angularise filters 2018-09-19 13:00:30 +01:00
Matt-Yorkley
3b9d9db16b Add pagination 2018-09-19 13:00:29 +01:00
Matt-Yorkley
93d273f94a Convert orders index table to use angular ng-repeat 2018-09-19 09:33:25 +01:00
Matt-Yorkley
e577bcb46f Prepare angular controller and serialized data 2018-09-17 14:18:23 +01:00
Maikel
6b56def649 Merge pull request #2697 from mkllnk/2655-fix-admin-payments 
2655 fix admin payments
 2018-09-14 11:26:20 +10:00
Maikel
065df96872 Merge pull request #2675 from Matt-Yorkley/bi/remake_views 
Remake orders index view
 2018-09-13 12:29:54 +10:00
Maikel Linke
81f60aab46 Make PaymentMethod serialisable with fees 
https://github.com/openfoodfoundation/openfoodnetwork/issues/2655
 2018-09-13 12:01:17 +10:00
Matt-Yorkley
4d9ebf0550 Apply submenu override 2018-09-11 12:17:28 +01:00
Matt-Yorkley
f08d6389d8 Apply capture order override 2018-09-11 12:06:58 +01:00
Matt-Yorkley
507f4d0878 OCD tidy up of visually misaligned filter 2018-09-11 11:53:37 +01:00
Matt-Yorkley
afedaea2b5 Apply special instructions override 2018-09-11 11:49:28 +01:00
Matt-Yorkley
8f174b1308 Apply ship shortcut override 2018-09-11 11:43:38 +01:00
Matt-Yorkley
ba0701457e Apply distributor td override 2018-09-11 11:42:08 +01:00
Matt-Yorkley
6389c552ca Apply distributor th override 2018-09-11 11:41:25 +01:00
Matt-Yorkley
1958ac9932 Apply distributor filter inputs override 2018-09-11 11:39:05 +01:00
Matt-Yorkley
c7e2f817ed Apply colgroup override 2018-09-11 11:34:34 +01:00
Matt-Yorkley
5a2491cb47 Apply ng-app override 2018-09-11 11:30:14 +01:00
Matt-Yorkley
980c46c63f Convert Spree view to HAML 2018-09-11 11:22:54 +01:00
Kristina Lim
f5c44ef0e6 Rename "entreprise" in i18n keys to "enterprise" 2018-08-31 15:26:30 +08:00
stveep
17f2ba47ca Add label for card field 2018-08-19 12:00:31 +01:00