luisramos0
|
7f7e7ea65e
|
Remove hide class from the hide button in the inventory list
The hide button should not be hidden. The hide css class was no active in v1 but it is in v2, so we need to remove it
|
2018-12-04 10:55:55 +00:00 |
|
luisramos0
|
3776b891ce
|
Merge branch 'master' into 2-0-stable-dec-3rd
|
2018-12-03 15:30:16 +00:00 |
|
Pau Pérez Fabregat
|
08297863be
|
Merge pull request #3047 from mllocs/feature/expand-all-steps-in-checkout-page
Expand all steps in the checkout page by default
|
2018-11-29 16:28:42 +01:00 |
|
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 |
|
Pau Pérez Fabregat
|
64c12c7a65
|
Merge pull request #2955 from HugsDaniel/import-spree-views-for-orders#edit
Import Spree views for orders#edit in our codebase
|
2018-11-28 17:02:40 +01:00 |
|
Pau Pérez Fabregat
|
438cff6e6d
|
Merge pull request #3080 from Matt-Yorkley/pi/french_issue
Pi/french issue
|
2018-11-28 13:39:04 +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 |
|
luisramos0
|
e153510a71
|
Merge branch 'master' into 2-0-stable-nov-24th
|
2018-11-24 15:19:38 +00:00 |
|
Matt-Yorkley
|
a5407d780c
|
Include unexpected validation errors
|
2018-11-21 19:16:07 +00: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 |
|
luisramos0
|
d282823d3a
|
Fix missing translation in user transaction history
|
2018-11-18 16:15:35 +00:00 |
|
Maxim Colls
|
3301b5850a
|
Improved UX in the accordion steps in the checkout page
|
2018-11-17 18:48:10 +01: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 |
|
luisramos0
|
0a77eeb4b6
|
Merge branch 'master' into 2-0-stable-nov-14th
|
2018-11-14 11:35:58 +00: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 |
|
Luis Ramos
|
ed7c12bd26
|
Merge pull request #2997 from luisramos0/2-0-stable-nov-8th
[Spree Upgrade] Merging master into 2-0-stable (first run in Nov2018)
|
2018-11-08 19:20:42 +00:00 |
|
Luis Ramos
|
30bca40ed0
|
Merge pull request #2996 from coopdevs/update-products-new-js-template
[Spree Upgrade] Bring Spree changes on admin/products/new.js.erb
|
2018-11-08 12:13:47 +00:00 |
|
luisramos0
|
fcdb5cd7af
|
Merge branch 'master' into 2-0-stable-nov-8th
|
2018-11-08 11:18:54 +00:00 |
|
Pau Perez
|
18c51dc596
|
Bring Spree changes on admin/products/new.js.erb
We copied it from Spree to then append a little change on it. Since the
original version changed in Spree 2.0 we need to update our copy.
|
2018-11-08 10:45:04 +00:00 |
|
Matt-Yorkley
|
d0b7b57017
|
Remove OrderSerializer#show_path and adjust to use #edit over #show
|
2018-11-06 11:07:14 +00:00 |
|
Maikel
|
3259b3ecf1
|
Merge pull request #2912 from Matt-Yorkley/admin_orders_refactor
Admin orders refactor
|
2018-11-02 16:57:28 +11: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 |
|
Maikel
|
d63670d675
|
Merge pull request #2846 from Matt-Yorkley/pi/rename_enterprise_fields
[Product Import] Rename enterprise fields and update template
|
2018-10-30 15:11:02 +11:00 |
|
Matt-Yorkley
|
77251848ee
|
Refactor Spree::Admin::OrdersController
|
2018-10-26 21:38:57 +01:00 |
|
Pau Pérez Fabregat
|
9a06c1ef98
|
Merge pull request #2899 from luisramos0/2898-2-0-fix-orders-admin
[Spree Upgrade] Fix orders admin page by removing a filter that is gone in spree 2
|
2018-10-23 18:59:01 +02:00 |
|
luisramos0
|
d0d9038308
|
Removed order.shipments_path from order serializer. In order list page the shipment state is now a label, not a link. The shipmeents page is gone in spree 2
|
2018-10-22 11:24:01 +01:00 |
|
luisramos0
|
653c67971f
|
Remove order admin page filter 'show only unfulfilled orders' as done on spree 2
|
2018-10-20 15:11:47 +01:00 |
|
luisramos0
|
87cd73ddba
|
Merge branch 'master' into 2-0-stable-oct
|
2018-10-15 17:09:26 +01:00 |
|
Pau Pérez Fabregat
|
8946fe3ce8
|
Merge pull request #2829 from Matt-Yorkley/bi/results_per_page
Add per_page controls to admin orders index
|
2018-10-15 12:17:39 +02:00 |
|
Pau Pérez Fabregat
|
fe149967e4
|
Merge pull request #2521 from luisramos0/cookies_in_engine
[OFN Domains] Breaking OFN into domains - POC cookies inside an engine
|
2018-10-15 10:03:30 +02:00 |
|
Matt-Yorkley
|
fcff835922
|
Update results on dropdown select
|
2018-10-12 17:06:42 +01:00 |
|
Matt-Yorkley
|
e7a909e828
|
Rename supplier to enterprise
|
2018-10-12 16:57:13 +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 |
|
Pau Pérez Fabregat
|
58a99a7f89
|
Merge pull request #2692 from Matt-Yorkley/bi/angular_orders
Angularise orders page
|
2018-10-04 21:10:48 +02:00 |
|
Matt-Yorkley
|
55d7d5d1e4
|
Rename #capture_path to #payment_capture_path
|
2018-10-02 11:10:51 +01:00 |
|
Pau Pérez Fabregat
|
060b3c55f1
|
Merge pull request #2751 from luisramos0/2-0-order-details
[Spree Upgrade] Refactored spree/order_details, extracted delivery and pickup details into separate partials
|
2018-09-27 14:30:42 +02:00 |
|
Maikel
|
267edbdb45
|
Merge pull request #2752 from HugsDaniel/apply_overrides_to_shipping_methods_new
[Spree Upgrade] Replace Spree::ShippingMethods new view by our own and apply overrides
|
2018-09-25 11:37:46 +10:00 |
|
Maikel
|
51f9a0afa1
|
Merge pull request #2562 from Matt-Yorkley/pi/product_attributes
[Product Import] Product attributes
|
2018-09-25 11:36:03 +10:00 |
|