wandji20
fa004d0897
Remove wicked pdf stylsheet include tag in order report pdf [OFN-12214]
2024-08-13 17:11:29 +01:00
Gaetan Craig-Riou
1f55ff4b72
Merge pull request #12729 from mkllnk/fdc-update
...
Remove now unneeded FDC compatibility code from product import
2024-08-12 11:14:44 +10:00
Maikel Linke
93edf4e3ad
Load MiniMagick before use
...
We only reference MiniMagick when rescuing errors but when it's not
loaded, that code fails to find the error class itself to apply the
rescue block.
The rescue block is covered by a spec but the code passes there as
MiniMagick is loaded.
We can see this error only in development, staging and production.
2024-08-09 14:25:29 +10:00
Ahmed Ejaz
787205dcca
Merge branch 'master' into bugfix/12739-fix-number-rounding-with-hu-locale
2024-08-09 01:59:50 +05:00
Filipe
fcb0996a76
Merge pull request #12713 from dacook/buu/style-fixes2
...
[BUU] Style fixes
2024-08-08 17:31:20 +01:00
Filipe
76d874d5f9
Merge pull request #12710 from chahmedejaz/bugfix/12705-fix-products-index-page
...
[BUU] Fixes Products Page ActionView::Template::Error
2024-08-08 16:20:26 +01:00
Rachel Arnould
81711e4c43
Merge pull request #12721 from dacook/connected-apps-settings-12549
...
New settings screen to activate each connected app type
2024-08-08 16:56:33 +02:00
Ahmed Ejaz
6757c8df74
12739 - fix number_with_precision method
2024-08-07 18:54:35 +05:00
Maikel Linke
ec828c335d
Remove superfluous FDC-specific request class
2024-08-07 15:09:05 +10:00
David Cook
40c77948b9
Show success message
...
I'm not sure, but I assume that Config.set will raise an exception if it failed.
2024-08-07 10:31:06 +10:00
David Cook
a95aa1b3e9
Submit blank value if nothing selected
...
If a checkbox is not selected, the browser does not submit it at all.
2024-08-07 10:30:45 +10:00
Konrad
cb42e7e119
Merge pull request #12671 from wandji20/wb-OFN-12591
...
Ensure product category error message is shown when creating new product [OFN-12591]
2024-08-06 14:09:59 +02:00
David Cook
5d732d80a6
Add connected apps settings screen
...
I considered adding a request spec, but figured it still doesnt' test the form, so better to use a full system spec.
2024-08-06 11:26:03 +02:00
David Cook
254e11aa36
Use whitelist
...
It wasn't really necessary, but I'm going to need this list in a moment, so we might as well use it.
Also it allows us to ensure the options are listed in a certain order.
Also maybe it will help protect against corrupt preferences.
2024-08-06 11:26:03 +02:00
David Cook
4223b36bc3
Only show enabled connected app types
...
The preference will be set from the admin interface in a new commit
It would be nice if we had an array/list type for preferences. Probably not too hard to implement, but this will do.
2024-08-06 11:26:03 +02:00
David Cook
fcea437d7e
Only show connected apps in enterprise settings, if system setting is enabled
2024-08-06 11:26:03 +02:00
Gaetan Craig-Riou
7e1af9e04b
Merge pull request #12723 from johansenja/optimise-shops-page
...
Preload enterprise logos and promo images for /shops page
2024-08-05 13:54:20 +10:00
Filipe
7939bf8038
Revert "Pluralize admin products search result [OFN-12532]"
2024-08-05 10:03:58 +10:00
Ahmed Ejaz
1014a50aff
12705 - incorporate old UI behavior
...
- if unit_value is not present and unit_description then display unit_description only.
- if both are not present then display empty fields
2024-08-04 17:47:02 +05:00
Filipe
5012c52438
Merge pull request #12711 from cillian/wider-item-column-on-invoice-pdf
...
Make Item column wider and tax and quantity columns narrower in invoice PDF
2024-08-02 10:20:24 +01:00
Konrad
1a72b5b227
Merge pull request #12563 from abdulazizali77/bugfix/11326-incoming-exchange-per-item-calculator
...
Display only per_item fees for oc incoming exchange #11326
2024-08-02 03:11:27 +02:00
Joseph Johansen
ffe4603f2f
Preload enterprise logos and promo images for shops page
2024-08-01 14:10:53 +01:00
wandji20
ebc794194f
Add product spec when supplier is empty and remove error status code from product create action [OFN-12591]
2024-08-01 09:03:26 +01:00
wandji20
287f65ec8e
Ensure product category error message is shown when creating new product [OFN-12591]
2024-08-01 08:58:54 +01:00
Filipe
ce44f19b4a
Merge pull request #12704 from cyrillefr/FilteringProductBySupplierPropertyBreaksWhenEnterpriseHasCustomSortingByCategorySet
...
Fixes 422 error due to bad sql building
2024-07-31 19:45:09 +01:00
Filipe
6c214543ad
Merge pull request #12690 from wandji20/wb-OFN-12666
...
Require variant category and supplier when creating new product variants [OFN-12666]
2024-07-31 19:28:31 +01:00
Filipe
8b1713d169
Merge pull request #12665 from wandji20/wb-OFN-12532
...
Pluralize admin products search result [OFN-12532]
2024-07-31 18:55:53 +01:00
Rachel Arnould
f51705cb57
Merge pull request #12676 from dacook/add-affiliate_sales_data-connected_app-12550
...
Add "Affiliate Sales Data" connected app option
2024-07-30 16:14:27 +02:00
wandji20
2709479bf2
Require varian t category when creating new product variant [OFN-12666]
2024-07-30 12:07:50 +01:00
David Cook
c5fc621aa4
Use scope to determine which enterprises are ready to be affiliated
2024-07-30 15:21:29 +10:00
David Cook
ec3c157f1e
Add gap between elements
...
It could be done better, but requires more code cleanup than it's worth.
2024-07-29 15:20:36 +10:00
David Cook
32aacbd2b0
Don't use fixed heights 🔥
...
Just don't. It makes life hard and doesn't solve the problem properly.
Now, when the content doesn't fit within the screen width, it will flow naturally and not jump up and down all over other elements.
2024-07-29 15:13:30 +10:00
David Cook
655dc92246
Clean up wacky input styles 🔥
...
Trying to style a pretend input just doesn't work in practice, it resulted in a couple of style issues.
Let's keep it simple,
2024-07-29 15:02:06 +10:00
Konrad
00a0006ff2
Merge pull request #12691 from ccozkan/use-vertical-transitions-for-cloning-and-deleting
...
Use vertical transitions for cloning and deleting products
2024-07-28 18:25:07 +02:00
Konrad
325f9aa6f3
Merge pull request #12664 from wandji20/wb-OFN-12551
...
Remove SR from clear search button [OFN-12551]
2024-07-28 14:31:08 +02:00
wandji20
ef87cdb167
Revert changes and use selectable locales for helper local_options [OFN-11513]
2024-07-28 12:52:01 +02:00
wandji20
a9e295bc11
(Fix) [User->New] Language is displayed twice [OFN-11513]
2024-07-28 12:52:01 +02:00
Abdul Aziz Ali
ac8caf7710
Revert to use .order_cycle_id #11326
2024-07-28 17:57:56 +08:00
Abdul Aziz Ali
8a1e61fd60
Fix incoming_controller_spec. Remove .order_cycle_id usage #11326
2024-07-27 17:54:39 +08:00
Abdul Aziz Ali
baf38b6b30
Only set per_item flag in order_cycle incoming controller #11326
2024-07-27 16:12:26 +08:00
Cillian O'Ruanaidh
3507405dae
Make Item column wider and tax and quantity columns narrower in invoice PDF
2024-07-26 15:36:42 +01:00
Filipe
c25fe6ae57
Merge pull request #12654 from wandji20/wb-OFN-112509
...
Use public contact email at the bottom of order confirmation email [OFN-12509]
2024-07-25 20:14:47 +01:00
Filipe
7bcf3206d8
Merge pull request #12678 from chahmedejaz/bugfix/11640-products-page-broken-URL
...
Fix URL State management on the Products page
2024-07-25 20:00:49 +01:00
Ahmed Ejaz
e808c7fb2b
12705 - set 1 as default for variant's unit_value
2024-07-25 23:42:03 +05:00
David Cook
e9d7a0b099
Add User#affiliate_enterprises
2024-07-25 21:14:01 +10:00
David Cook
da7bbcf82f
Enable/disable affiliate sales data
2024-07-25 17:06:13 +10:00
David Cook
1742d2807f
Add affiliate sales data to form
2024-07-25 17:06:13 +10:00
David Cook
d3c5e2365a
Add AffiliateSalesData model
...
Using namespace subfolder to help organise it and show the inheritance.
Hmm, instead of scopes, we could have different has_many relationships on the Enterprise. Maybe it should be in a concern. We can refactor later I guess.
2024-07-25 17:06:13 +10:00
David Cook
27e53f9dcc
Scope spec to section
...
Because there's going to be a new section with the same button label
2024-07-25 17:06:13 +10:00
David Cook
9d89b4726b
Move connect logic to model
...
Then subtypes can override as needed.
2024-07-25 17:06:13 +10:00
