Luis Ramos
|
75cec3b606
|
Fix issue Style/HashSyntax
|
2020-10-30 16:50:37 +00:00 |
|
Luis Ramos
|
92417d849c
|
Fix rubocop issue Rails/DynamicFindBy
|
2020-10-30 16:50:37 +00:00 |
|
Luis Ramos
|
bf5fcde885
|
Fix Lint/UnusedMethodArgument
|
2020-10-30 16:50:37 +00:00 |
|
Luis Ramos
|
40f8c785a2
|
Fix Lint/UnusedBlockArgument
|
2020-10-30 16:50:37 +00:00 |
|
Luis Ramos
|
403384dbb1
|
Fix rubocop isssues, trailing whitespaces and empty lines
|
2020-10-30 16:50:37 +00:00 |
|
Luis Ramos
|
c30cba8bfe
|
Fix issue Layout/SpaceInsideHashLiteralBraces
|
2020-10-30 16:50:37 +00:00 |
|
Luis Ramos
|
e8138e8c23
|
Fix rubocop issues in models/payment_spec
|
2020-10-30 16:50:37 +00:00 |
|
Luis Ramos
|
4845cde20f
|
Fix rubocop issue Layout/HashAlignment
|
2020-10-30 16:50:37 +00:00 |
|
Luis Ramos
|
a8265aff89
|
Fix rubocop issue Layout/FirstHashElementIndentation
|
2020-10-30 16:50:37 +00:00 |
|
Luis Ramos
|
9cb3b0b14a
|
Fix rubocop issue Layout/FirstArrayElementIndentation
|
2020-10-30 16:50:37 +00:00 |
|
Luis Ramos
|
06433b1be3
|
Fix rubocop issue Layout/ExtraSpacing
|
2020-10-30 16:50:37 +00:00 |
|
Luis Ramos
|
d4c52ce122
|
Fix rubocop issue Layout/EmptyLinesAroundBlockBody
|
2020-10-30 16:50:37 +00:00 |
|
Luis Ramos
|
eb4e732c1a
|
Fix rubocop issue Layout/EmptyLines
|
2020-10-30 16:50:37 +00:00 |
|
Luis Ramos
|
3fe2684270
|
Fix rubocop issue Layout/BlockAlignment
|
2020-10-30 16:50:37 +00:00 |
|
Luis Ramos
|
3e6e338e3d
|
Fix rubocop issue Layout/ArgumentAlignment
|
2020-10-30 16:50:37 +00:00 |
|
Luis Ramos
|
ad14f7f9b0
|
Merge pull request #6203 from luisramos0/rubocop_fix
Fix ~80 rubocop issues in serializers/api/admin
|
2020-10-30 16:48:22 +00:00 |
|
Luis Ramos
|
7cc7c62232
|
Fix long lines
|
2020-10-30 16:14:39 +00:00 |
|
Luis Ramos
|
b6dc46a911
|
Fix rubocop issue by nesting module and class declarations
No file contents changed
|
2020-10-30 16:14:34 +00:00 |
|
Luis Ramos
|
0b70c67908
|
Merge pull request #5994 from openfoodfoundation/tcs_checkbox
Terms and Conditions checkbox on checkout
|
2020-10-30 15:10:06 +00:00 |
|
Luis Ramos
|
71a181341b
|
Fix bug in terms_and_conditions_helper related to guest checkout where current_user is nil and T&Cs must be shown all the time
|
2020-10-30 15:09:13 +00:00 |
|
Luis Ramos
|
cf3f511f4d
|
Add directive spec to validate the dialog template is loaded on element click
|
2020-10-30 15:09:13 +00:00 |
|
Luis Ramos
|
1d1067ebc1
|
Add coverage to T&Cs file opening on a new tab and also for the upload timestamp now displayed in the page
|
2020-10-30 15:09:13 +00:00 |
|
Luis Ramos
|
bd4d0ba5d3
|
Make the warning message work for first upload and for changes
|
2020-10-30 15:09:13 +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
|
ceee89fad0
|
Make Checkout form submit read terms_and_conditions_accepted from the checkout form checkbox
|
2020-10-30 15:09:13 +00:00 |
|
Luis Ramos
|
a942218708
|
Fix post checkout actions spec
|
2020-10-30 15:09:13 +00:00 |
|
Luis Ramos
|
26946ec102
|
Fix edge case and some specs in post checkout actions
|
2020-10-30 15:09:13 +00:00 |
|
Luis Ramos
|
dd31cbe014
|
Cover case where enterprise uploads new T&Cs file and customer has already accepted before
|
2020-10-30 15:09:13 +00:00 |
|
Luis Ramos
|
46733d0c0d
|
Add feature spec to cover T&Cs ticked by default if customer has already accepted them
|
2020-10-30 15:09:13 +00:00 |
|
Luis Ramos
|
57a9d6e1e2
|
Make customer terms_and_conditions_accepted_at be set to current time
after a successful checkout
|
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 |
|
Luis Ramos
|
4d64bf6ece
|
Add column to customers table to register last time enterprise terms and
conditions were accepted so customer doesnt have to accept terms on all
checkouts but only when the enterprise updates the terms file
|
2020-10-30 15:09:13 +00:00 |
|
Luis Ramos
|
3c9c5862d1
|
Verify terms and conditions updated_at timestamp is touched every time the file name changes.
We will need this to check if user already accepted the terms and
conditions of this enterprise.
|
2020-10-30 15:08:26 +00:00 |
|
Luis Ramos
|
78a8f53d8d
|
Change default translations to what's been requested on the issue
|
2020-10-30 15:08:26 +00:00 |
|
Luis Ramos
|
806c8b943d
|
Move small class to label so that rule is actually applied
|
2020-10-30 15:08:26 +00:00 |
|
Luis Ramos
|
85096a997f
|
Add a checkbox to checkout to tick for Terms and Conditions
Checkout button should be disabled if checkbox is not ticked
|
2020-10-30 15:08:26 +00:00 |
|
Luis Ramos
|
6b826423c1
|
Merge pull request #6145 from andrewpbrett/instance-unit-picker
Allow instances to choose available units for products/variants
|
2020-10-29 22:22:33 +00:00 |
|
Luis Ramos
|
412457bb19
|
Merge pull request #6122 from luisramos0/customer_total
Add Customer balance to customer list
|
2020-10-29 22:06:05 +00:00 |
|
Andy Brett
|
2605b9cdf0
|
refactor unitScales function
|
2020-10-29 09:18:24 -07:00 |
|
Andy Brett
|
867947f6b2
|
refactor availableUnitScales into unitScales
|
2020-10-29 09:18:24 -07:00 |
|
Andy Brett
|
8d9b33abe8
|
update spec with new param structure
|
2020-10-29 09:18:24 -07:00 |
|
Andy Brett
|
57fe1db10e
|
guard against nil params[:available_units]
|
2020-10-29 09:18:24 -07:00 |
|
Andy Brett
|
18d2599075
|
indicate block argument is unused
|
2020-10-29 09:18:24 -07:00 |
|