Andy Brett
18dcbbd892
Merge pull request #6613 from Matt-Yorkley/variant-override-serialization
...
Don't serialize all variant override objects where they are not needed
2021-01-14 10:59:11 -08:00
Andy Brett
81ea71af94
Merge pull request #6652 from jibees/6651-remove-trailing-asterisk-on-non-mandatory-field
...
remove asterisk on 'display as' field unit value for a product
2021-01-14 10:09:15 -08:00
Pau Pérez Fabregat
929ae82e00
Merge pull request #6574 from Matt-Yorkley/bye-bye-spree-paypal
...
Bye Bye Spree Paypal
2021-01-14 18:16:44 +01:00
Matt-Yorkley
5f2dc38241
Merge pull request #6098 from brymut/item-counter-fix
...
Fix #5989 Item counter accepts higher amount than available stock
2021-01-13 22:33:08 +01:00
Jean-Baptiste Bellet
dcbf02bc47
remove asterisk on 'display as' field unit value for a product
...
as it's not a mandatory field
2021-01-13 11:30:08 +01:00
Andy Brett
c8c576ce38
keep size attribute
2021-01-09 17:49:47 -08:00
Bryan Mutai
eef6396de3
Add max attribute to item counter input
2021-01-09 17:36:35 -08:00
Matt-Yorkley
c07a4fcb5e
Remove data-hooks from views
2021-01-09 13:26:30 +00:00
Matt-Yorkley
2e5810d64d
Fix more Rubocop offences
2021-01-09 13:26:30 +00:00
Matt-Yorkley
5c7dc6621b
Bring in views (and convert from ERB to HAML)
2021-01-09 13:22:25 +00:00
Jean-Baptiste Bellet
5869eb1841
add new div container
...
to use flexbox properties for its two child divs
named: select-and-closing-container
2021-01-08 11:23:23 +01:00
Matt-Yorkley
bd4560cff6
Don't serialize all variant override objects where they are not needed
...
This is only needed in one place, and only as a count, and can cause huge amounts of superfluous data to be fetched and serialized, for example in the admin products index page (where variant override data is not used at all).
2021-01-06 16:04:47 +00:00
Paulo Vilarinho
4839b7bd63
remove choose currency from admin general settings
2021-01-02 15:00:15 -08:00
Andy Brett
cad8a018f9
put SetupIntent on the connected Stripe account
2020-12-08 07:52:41 -08:00
Andy Brett
d0098e190f
close #4175
2020-12-08 07:46:10 -08:00
Andy Brett
c60dcc75cd
confirm changes to default card
2020-12-08 07:46:10 -08:00
Andy Brett
747345ece9
only show authorized shops if there is a default card
2020-12-08 07:46:10 -08:00
Matt-Yorkley
0ceba7c0a8
Update orders closing message
2020-12-03 15:29:14 -08:00
Luis Ramos
f71de8123a
Dont show 'closing in' message when oc closes in more than 3 months
2020-12-03 15:29:14 -08:00
Matt-Yorkley
9de3370a8a
Fix precision in adjustment form display
...
The tests here were looking for values with a format like "10.00" but the output had changed to "10.0"
2020-11-27 14:00:29 +00:00
Luis Ramos
78cfcd905f
Adapt more & and no & when using sum
2020-11-27 13:59:46 +00:00
Luis Ramos
9bbef16804
Converting all calls to ActiveRelation#sum to use a symbol with &
...
This is only applicable to database columns, if we are summing using a method in the model than the & is required!
2020-11-27 13:59:46 +00:00
Andy Brett
8dfd3f624d
paginate zones using spree routes as well
2020-11-12 14:24:04 -08:00
Andy Brett
9cf30b431a
specify Spree routes for pagination
2020-11-12 14:09:59 -08:00
Pau Pérez Fabregat
777cedd90d
Merge pull request #6305 from efgalvao/issue#6292
...
Fixed issue #6292 .
2020-11-12 17:42:42 +01:00
Pau Pérez Fabregat
7c4691ab33
Merge pull request #6339 from andrewpbrett/fix-instance-unit-picker
...
Fix #6304 (Product edit: Cannot change Variant unit scale of an existing product)
2020-11-12 16:15:00 +01:00
Andy Brett
99301e1fb2
fix #6304
2020-11-06 12:49:07 -08:00
Pau Perez
b5f27d48df
Fix .top-bar-section not to wrap the icons-menu
...
This line-wrap makes the icons-menu overlap the OC selector. The menu's
background is transparent, what makes it look even more broken.
The fix involves refactoring the `.top-bar-section` into using flexbox
instead of this highly coupled CSS and floats. With flexbox it becomes
as easy as telling the browser to space the three sections evenly
filling-up the window, while scaling down the logo if there's not enough
room.
The root cause is that every instance uses a custom logo, which wasn't
the one we used while designing and implementing. This is why using
fixed-sizes in pixels won't work.
2020-11-06 17:35:24 +01:00
Matt-Yorkley
db3576f469
Merge pull request #6308 from luisramos0/translations
...
Fix some missing translations in orders edit page
2020-11-05 18:33:51 +01:00
Matt-Yorkley
c2362921fa
Merge pull request #6272 from tsara27/fix-alignment-order
...
Align center order adjustment and order total title
2020-11-05 18:33:08 +01:00
Matt-Yorkley
0668dd2591
Merge pull request #6307 from efgalvao/issue#6262
...
Fixes issue #6262 .
2020-11-05 18:31:49 +01:00
Luis Ramos
0ae3bf985a
Fix some missing translations in orders edit page
2020-11-04 21:54:27 +00:00
efgalvao
5260c01f16
Update registration.html.haml
...
Removed spaces.
2020-11-04 17:37:11 -03:00
efgalvao
42d5f377e0
Fixes issue #6262 .
2020-11-04 13:11:37 -03:00
Luis Ramos
5cde085241
Fix a number of spree translations
2020-11-04 13:55:36 +00:00
efgalvao
1f1da3eb6d
Fixed issue #6292 .
2020-11-04 09:37:51 -03:00
Luis Ramos
eada388534
Add handle_extensions to get Spree.translations (archaic spree js translations) in handlebars templates
...
This is all legacy from spree that can be cleaned up at some point, we only have two handlebars templates in OFN
2020-11-04 12:15:45 +00:00
Luis Ramos
80cbe6b30f
Add route helper to call to sort_link so that it can find the necessary routes
2020-11-04 12:15:45 +00:00
Luis Ramos
09aef524f3
Make route helpers use spree helper
2020-11-04 12:15:45 +00:00
Matt-Yorkley
0af20e48b0
Add missing translation key for enterprise taxon ordering
2020-10-31 19:17:19 +00:00
Luis Ramos
eea73aa989
Merge pull request #5919 from luisramos0/injector_refactor_for_rails41
...
[Rails 4.1, works in master] Convert relations with to_a so that they work in rails 4.1
2020-10-31 09:33:27 +00:00
Luis Ramos
3b682bc47f
Add warning when uploading a file
2020-10-30 15:09:13 +00:00
Luis Ramos
be35f97622
Add tooltip icon to terms and conditions
2020-10-30 15:09:13 +00:00
Luis Ramos
ca79270ba3
Show T&Cs warning when uploading a new file
2020-10-30 15:09:13 +00:00
Luis Ramos
2cf7b1b36c
Make label translatable
2020-10-30 15:09:13 +00:00
Luis Ramos
f7c07f492c
Make TCs file input onoy accept pdf files
2020-10-30 15:09:13 +00:00
Luis Ramos
9f17e4fd8f
Add upload timestamp to TCs upload form in enterprise business details
2020-10-30 15:09:13 +00:00
Luis Ramos
c980d22826
Make TCs link open in a new tab in the backoffice
2020-10-30 15:09:13 +00:00
Luis Ramos
ad592785cf
Rename methods to follwo ruby convention and improve readability
2020-10-30 15:09:13 +00:00
Luis Ramos
f3ba0ebdbb
Move code to a new helper
2020-10-30 15:09:13 +00:00
