Laurel16
bfd396e644
Add instagram handler validator
...
update entreprise model to match the correct pattern for instagram attribute & add migration to correct wrong links in db + test
2022-12-08 15:22:05 +01:00
Konrad
e288c7a551
Merge pull request #9956 from jibees/9626-resize-and-crop-logo-instead-of-just-resizing-should-fit-into-a-square
...
Enterprise logo: Resize and crop logo instead of just resizing --> logo should fit into a square
2022-11-27 20:28:55 +01:00
Konrad
c6178f5df9
Merge pull request #9877 from mkllnk/ignored-columns
...
Remove outdated ignoring of Paperclip columns
2022-11-11 21:08:42 +01:00
Jean-Baptiste Bellet
58c8eae08c
Enterprise logo: resize and crop at the center of image instead of just resize
...
Should fit in a square format
2022-11-08 14:54:11 +01:00
Maikel Linke
3ebd896c3e
Remove outdated ignoring of columns
...
Those columns have been removed from the database and don't need to be
ignored any more.
2022-10-26 10:42:19 +11:00
Cillian O'Ruanaidh
4e6d64c0a1
Let people choose which payment methods are available to customers on order cycles
2022-10-21 17:21:31 +01:00
Cillian O'Ruanaidh
5423c1c02e
Resolve conflict in db/schema.rb
2022-10-21 17:21:24 +01:00
Maikel Linke
46fde6bd40
Remove now unused scope
2022-10-12 16:48:32 +11:00
Ashwini Seshadri
590a09f069
Fixed the permissions relationship, so the shop displays only suppliers and does not display distributors in producers list
...
and updated relevant tests
2022-10-12 16:48:31 +11:00
AthiraKadampatta
1f161bee1f
Add paperclip columns to ignored columns list for enterprise, enterprise group, terms_of_service_file, spree/image models
2022-10-10 16:52:02 +02:00
Cillian O'Ruanaidh
81730f725d
Enterprises shouldn't be considered ready for checkout if it only has backend shipping methods
2022-09-30 13:13:39 +01:00
Maikel Linke
b419f063dc
Support WEBP images again
...
We introduced a list of formats we support and forgot to add webp. Now I
added that as allowed format again and modified the error message.
I removed the first sentence from the error message because it's very
similar to the default error which is shown as well.
2022-07-26 11:09:41 +10:00
jibees
20ee0d5009
Merge pull request #9301 from mkllnk/3975-unsupported-image
...
Allow SVG images for products and show errors when uploading unsupported file
2022-07-21 16:56:11 +02:00
Jean-Baptiste Bellet
2b67a0fa80
Specify a list of content-types
...
Then remove specific image format that aren't handled by a web browser (such as `image/x+xcf)`
+ List allowed image formats for enterprises and groups
2022-07-21 08:42:17 +02:00
Arthur Vieira
0deb3cd782
Replace url generation with 'whatsapp_url' method
...
As suggested by mkllnk's following comment:
1eda7d8a4c (r890656117)
2022-06-30 19:19:10 -03:00
Arthur Vieira
77360f41af
Show WhatsApp link on contact modal on map
...
Strips '+' and ' ' characters from the phone number for the generated
link, but doesn't guarantee the link is valid because the number
registered isn't validated for now.
2022-06-30 19:19:10 -03:00
Jean-Baptiste Bellet
bb6298d06d
Check for enterprise_number_required_on_invoices boolean
...
if true, then can edit invoice ;
if false, then print a confirm alert popup to specify that a enterprise number must be set for this enterprise
2022-06-28 09:53:46 +02:00
Maikel Linke
4facab0335
Guard against invariable file types
...
Australian production had one JPG image which was not recognised as
such. The `content_type` was missing and trying to generate a URL for a
variant raised an error and crashed the page.
Testing for `variable?` includes testing for `attached?` and is more
defensive.
2022-06-01 17:16:55 +10:00
Maikel Linke
4a0ed99919
Replace Paperclip on Enterprise model
...
We configured Paperclip to convert images to JPG in some cases but I
omitted that here because we don't need it. If an image is better
represented as PNG or another format then the user should be able to
choose that.
Some specs were also testing the generated URL but the Active Storage
URL doesn't contain a style name anymore and it's not helpful to test
the URL.
2022-06-01 17:16:55 +10:00
Maikel Linke
7bcfda0a52
Duplicate all new Paperclip files to ActiveStorage
...
We do this for all models in the code base. There's one special case,
the ConentConfiguration which is not a model and we can't use the same
approach there. We will have to deal with that separately later.
2022-04-25 13:00:31 +10:00
GeorgeThoppil
898c470c00
Change enterprise visibility scope
2022-04-21 20:27:28 -04:00
Nihal Mohammed
15e7a5a4df
Rename product_stock_display to product_low_stock_display
...
Rename product_stock_display to product_low_stock_display in enterprise_serializer and shop_variant_controller
2022-04-15 10:59:42 +10:00
Nihal M. Kelanthodika
f7a767988c
Add preferred_product_stock_display to Enterprise model, serializer and permitted attributes. (Fixed alignment of guest orders radio button as well)
2022-04-15 10:53:28 +10:00
Nihal Mohammed
992cb9d920
Add invoice_order_by_supplier attribute to enterprise
2022-03-21 20:29:19 +05:30
Matt-Yorkley
18ac9b5335
Add support for generating valid/unique permalinks for Enterprises with non-roman characters in their name
2022-01-15 13:21:09 +00:00
Filipe
4978c95e75
Merge pull request #8467 from SarvarKh/validate-social-links
...
Fix the issue with 'at' in enterprise twitter and instagram
2022-01-11 12:53:11 +00:00
Matt-Yorkley
aecdfee364
Reorganise :though associations on line_item and allow searching/filtering on product, supplier, order_cycle
2021-12-12 13:23:56 +00:00
SarvarKhalimov
c202c52d8b
Refactor correct_social_url method in enterprise model and its tests
2021-11-22 23:31:56 +05:00
SarvarKhalimov
f8c45b3e31
Update app/models/enterprise.rb - optimise delete @ method
...
Co-authored-by: Maikel <maikel@email.org.au >
2021-11-15 13:21:19 +11:00
SarvarKhalimov
5d2a5e63ec
Fix the issue with 'at' in interprise twitter and insgram
2021-11-15 13:21:04 +11:00
Matt-Yorkley
d46ed59699
Remove preference from Enterprise class
2021-11-04 11:48:30 +00:00
Maikel
1cef0dd2ac
Merge pull request #8428 from Matt-Yorkley/enterprise-dead-code
...
Remove Enterprise #inheritance_column
2021-11-03 17:29:42 +11:00
Matt-Yorkley
462ff15f76
Remove Enterprise #inheritance_column
...
Apparently this was part of an old feature from 2014...
2021-10-28 10:44:23 +01:00
Luis Azcuaga
e8fd89a6d2
Run rubocop over existing todo
2021-10-25 21:28:28 -05:00
Nihal
f72f182363
Redo business_address_empty? method
2021-10-06 15:06:56 +05:30
Nihal
372326debc
Updated validation to include phone and edit address_spec to requires phone
2021-10-06 15:06:56 +05:30
Nihal Mohammed
496319b539
Reject changes to business_address if fields are empty
2021-10-06 15:06:56 +05:30
Nihal Mohammed
3cd5ed58c0
Add checkbox to clear business_address form
2021-10-06 15:06:56 +05:30
Nihal Mohammed
9007418455
Set belongs_to association for business_address and accept nested attributes on enterprise model
2021-10-06 15:06:56 +05:30
Maikel
9affc6a945
Merge pull request #8108 from Matt-Yorkley/andand
...
Remove `andand` gem
2021-09-10 15:06:00 +10:00
Matt-Yorkley
1d5077061e
Remove andand
...
This old gem implemented some functionality for handling nils which is no longer needed, as it's provided natively by Ruby with the &. operator.
2021-09-08 14:28:31 +01:00
Matt-Yorkley
3fc0278776
Whitelist searchable attributes on primary models
2021-09-02 14:06:15 +01:00
Andy Brett
46cd05c54a
Merge pull request #7712 from guidoDutra/1861-enable-shopfront-sorting-by-producer
...
Enable sorting by producer in shopfront
2021-07-06 09:27:42 -07:00
Luis Ramos
23627c5453
Run rubocop -a (safe corrections) removing all exceptions so all possible fixes are applied
...
9290 issues fixed
2021-06-17 22:19:26 +01:00
Guido Oliveira
baca89c575
allow select producers for ordering
2021-06-16 15:02:27 -03:00
Guido Oliveira
c5471fc25c
enable ordering shopfront by producer id
2021-06-16 15:02:27 -03:00
Andy Brett
d197b81351
Merge pull request #7606 from luisramos0/deprecation
...
[Rails 6.1] Fix deprecation warning in rails 6.0
2021-06-04 07:42:50 -07:00
Luis Ramos
d308e20871
Fix deprecation warning in rails 6.0
...
Warning: Class level methods will no longer inherit scoping from create in Rails 6.1
2021-05-10 21:03:24 +01:00
Matt-Yorkley
2560757ea2
Change Enterprise after_create callback to after_create_commit
...
As a general rule, if you're triggering an email job as part of an after create/save callback, it should use after commit instead.
Why? The transaction can't finish until after the record is persisted (the data is committed) which includes the logic in all callbacks. So for example if the transaction fails after the email job has been placed it will be rolled back, but the email job will already be in the queue, and it'll be referencing a record that doesn't actually exist (due to the rollback).
2021-05-02 13:23:31 +01:00
Cillian O'Ruanaidh
c41476423b
Merge latest master into julesemmac/6584-map-location-confirm and resolve conflict in api/enterprises_controller.rb
2021-04-22 19:43:49 +01:00
