Hugo Daniel
f3b1a5dd35
Convert variants/edit from erb to haml
2019-08-01 10:45:04 +02:00
Hugo Daniel
07ccbf7f98
Import variants/edit.html.erb from spree_backend
2019-07-31 16:55:47 +02:00
Hugo Daniel
ec6f6056a8
Remove data-hooks
2019-07-25 14:34:06 +02:00
Hugo Daniel
a11562e4dd
Fix incorrect indentation in variants table
2019-07-25 12:05:50 +02:00
Hugo Daniel
986837d601
Import variants/_form.html.erb from spree_backend to ofn and de-deface it
2019-07-25 11:07:35 +02:00
Hugo Daniel
353d6fbc5f
Import variants/index from spree_backend to ofn and convert to Haml
2019-07-24 16:57:11 +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
fa25991f0f
Fix problem in previous de-deface, move sections around in general settings page to keep order. No changes in code, just moving
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
e36b4ed01a
Move temp_controller_list deface to shipping_categories index view
2019-07-16 20:16:23 +01:00
luisramos0
4f60273198
Move temperature_controlled_form_element deface to shipping_categories form view
2019-07-16 14:50:16 +01:00
luisramos0
856fa8685a
Convert spree/admin/shipping_categories views from erb to haml
2019-07-16 14:48:47 +01:00
luisramos0
9ac4c0ba30
Bring spree/admin/shipping categories from spree_backend so we can de-deface it
2019-07-16 14:46:26 +01:00
luisramos0
2709f237f5
Move image_format deface to image settings view
2019-07-16 14:44:38 +01:00
luisramos0
9db4edcd0d
Convert spree/admin/image_settings/edit.html from erb to haml
2019-07-16 14:43:20 +01:00
luisramos0
22c9f33f4c
Bring image_settings view from spree_backend
2019-07-16 14:39:14 +01:00
luisramos0
24ea2a4398
Move number_localization deface to general settings view
2019-07-16 14:28:47 +01:00
luisramos0
8178f5388c
Move legal settings deface to general settings view
2019-07-16 14:27:32 +01:00
luisramos0
c0c5e9d7dd
Move embedded_shopfronts deface to general settings view
2019-07-16 14:26:33 +01:00
luisramos0
19f8f5c6fa
Convert general_settings/edit.html from erb to haml
2019-07-16 14:15:51 +01:00
luisramos0
d6020cdb6f
Bring general_settings/edit.html.erb from spree_backend to de-deface it
2019-07-16 13:57:35 +01:00
luisramos0
95170bacd5
Show print invoices button in orders list page only if invoices are enabled in the backoffice
2019-06-26 14:17:25 +01:00
Luis Ramos
fd64e53f61
Merge pull request #3841 from luisramos0/2-0-fix-ship-methods-translations
...
Move shipping methods translations to lazy lookups
2019-06-04 15:15:31 +01:00
luisramos0
86b0d71c7e
Result of rubocop auto-correct and rebuilding rubocop_manual_todo
2019-05-28 12:57:29 +01:00
Luis Ramos
9ccf502365
Merge pull request #3797 from lin-d-hop/variant-master-price
...
Remove non-functional Price field from Edit Product screen
2019-05-28 10:30:05 +01:00
luisramos0
07e9043e34
Move shipping methods translations to lazy lookups
2019-05-10 11:44:49 +01:00
idanceinbetween
7790401d59
added buttons to form and updated sanitizer to allow extra formatting
2019-05-08 14:45:05 +01:00
lin-d-hop
585072302c
Remove non-functional Price field from Edit Product screen
...
Update initializer to override Product Price as required field.
Revert "Update initializer to override Product Price as required field."
This reverts commit 1bfca09c5cf9245fbc3d30a23e9d80ac545adcf5.
2019-05-05 16:41:54 +01:00
Maikel
736ac49581
Merge pull request #3701 from luisramos0/2-0-fix-order-edit-issues
...
[Spree Upgrade] Fix two issues in admin orders edit page
2019-04-19 07:33:26 +10:00
Luis Ramos
ddd3443a86
Merge pull request #3659 from mkllnk/missing-translation
...
Fix "What's this?" on admin dashboard
2019-04-10 22:05:19 +01:00
luisramos0
5989a654d1
Remove stock location from stock levels table and fix Spree.t entry bug
2019-04-05 14:01:27 +01:00
Maikel Linke
7035d57267
Better helper naming and spec cover
2019-04-03 11:13:56 +11:00
Maikel Linke
0c846758dd
Add missing translation to order form
...
I saw the following error:
translation missing: en.spree.line_item_adjustments
In this commit I change all three translations in the view file to use
lazy lookup.
2019-04-02 17:47:36 +11:00
Maikel Linke
2a6236823f
Move adjustment filtering from view to helper
2019-04-02 17:25:33 +11:00
Maikel Linke
11c12787f6
Move adjustment selection to helper
2019-04-02 17:02:05 +11:00
Maikel Linke
d78c709ad2
Remove unused variables from view
2019-04-02 16:58:08 +11:00
Maikel Linke
500cf925ad
Fix HTML validity and element finding in spec
...
The fixed partial was used twice on the same page. So the used element
id appeared twice on the page which is invalid HTML. It also confused
the spec.
Now we look at the actually displayed text to select the correct
element.
2019-04-02 16:50:44 +11:00
Maikel Linke
f630738b2c
Fix HTML syntax in admin view
2019-03-29 18:42:06 +11:00
Maikel Linke
5760aed6a6
Render only eligible adjustments on the order page
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/3477
The admin orders edit form was displaying adjustments even if they were
"not eligible". For example, an additional fee with amount `0` is not
eligible. They were already hidden in the adjustments view and we are
hiding them in reports.
2019-03-29 18:41:38 +11:00
Maikel Linke
bcebb99967
Fix "What's this?" on admin dashboard
...
When a user has no enterprises, the admin dashboard displays a "What's
this?" hint in the right corner of the enterprises tab. The link text
and the tooltip were both broken (missing translation).
2019-03-27 11:04:08 +11:00
luisramos0
f35972cee9
Remove deleted menu entry product distributions
2019-03-26 09:08:52 +00:00
luisramos0
010007a2c7
Merge branch '2-0-stable' into 2-0-stable-Mar22
2019-03-26 09:07:48 +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
luisramos0
c1d14686a6
Merge branch 'master' into 2-0-stable-Mar22
2019-03-22 10:55:17 +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
Maikel
f1ac33f304
Merge pull request #3590 from mkllnk/3576-bulk-order-spec
...
3576 Fix bulk order management race condition
2019-03-21 12:40:41 +11:00
