Filipe
7ca5927411
Merge pull request #12996 from chahmedejaz/bugfix/12993-fix-order-cycle-report-text-version
...
Order cycle mail reports to producers display different data in html and txt versions
2024-12-09 16:32:46 -06:00
Ahmed Ejaz
42940f4729
12993: add total tax incl.
2024-12-08 01:05:21 +05:00
Ahmed Ejaz
f2da3bb11c
12993: html sanitize city and zip
2024-12-08 01:05:02 +05:00
Ahmed Ejaz
f8003b00db
12993: translate tax incl and qty
2024-12-08 01:03:38 +05:00
Maikel
de938f6f10
Merge pull request #12949 from rioug/12859-use-VINE-voucher
...
[City OFN Voucher] A shopper can use a VINE voucher
2024-12-03 14:04:44 +11:00
Ahmed Ejaz
4c6c1eedb1
12993: use html safe strings wherever required
2024-12-02 18:23:24 +05:00
Ahmed Ejaz
bbdee7c0f3
12993: add included tax in text report
2024-12-02 18:04:18 +05:00
Ahmed Ejaz
11959515b8
12993: update the condition to display details
2024-12-02 18:04:17 +05:00
Filipe
58d174fad9
Merge pull request #12969 from chahmedejaz/task/12919-remove-empty-option-from-unit-scale-dropdown
...
[Products] Empty option on unit scale dropdown
2024-11-28 09:31:42 -06:00
Gaetan Craig-Riou
d413a142c9
Update various voucher related file to use the new Vouchers::Vine
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
7726c7d129
Per review, rename not_vine scope to local
...
- use IS DISTINCT FROM instead of two conditions
- added spec for scope
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
d4d995851f
Display voucher section if connected to VINE
2024-11-28 13:35:01 +01:00
Gaetan Craig-Riou
6251814152
Hide VINE voucher from admin voucher page
2024-11-28 13:35:01 +01:00
Ahmed Ejaz
77f9c6587c
fix specs
2024-11-15 11:09:56 +01:00
Ahmed Ejaz
add973f1ff
12776: add new line
2024-11-15 11:09:56 +01:00
Ahmed Ejaz
7cb28fd064
12776: add supplier report
2024-11-15 11:09:56 +01:00
Ahmed Ejaz
bafb881c46
12919: add unit scale prompt
2024-11-10 14:57:45 +05:00
Maikel Linke
2b8487cc6d
Parse given datetime for reports properly
2024-10-17 15:08:02 +11:00
Maikel Linke
ea8e925077
Show default date range to user in date picker
2024-10-17 13:16:12 +11:00
Maikel Linke
a13e5ced3d
Select default dates for Packing report, too
2024-10-17 13:16:12 +11:00
Maikel Linke
aa7fffa5a2
Filter reports by last 3 months by default
...
The values are not shown on the screen and the user doesn't know which
default dates are applied but the filtering works.
2024-10-17 13:16:12 +11:00
Gaetan Craig-Riou
b461d499ad
Merge pull request #12914 from mkllnk/remove-stock-location-from-return-authorization
...
Remove StockLocation from ReturnAuthorization
2024-10-16 10:26:09 +11:00
Filipe
97b6289263
Merge pull request #12787 from rioug/move-variant-unit-attributes-to-variant
...
[Product Refactor] Move variant unit sizes to variant
2024-10-15 19:58:45 +01:00
Maikel Linke
a64aea4b9c
Remove StockLocation from ReturnAuthorization
...
We have only one default location and don't need it associated to
anything.
2024-10-15 13:36:57 +11:00
Rachel Arnould
f54552f939
Merge pull request #12886 from rioug/12855-VINE-connected-app
...
[Citi OFN Voucher] Add VINE connected app
2024-10-14 15:32:09 +02:00
Gaetan Craig-Riou
67c11333f3
Use AdminTooltipComponent, instead of partial
2024-10-14 15:02:35 +11:00
Gaetan Craig-Riou
ce0c7929a7
Per review, remove the use of raw
2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
0695b434a2
Fix rebase issue
2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
a500c75ee9
Add stying for the unit pop out
2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
83a619b097
Fix bulk order management page
2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
893b541dca
Fix product system spec
...
The pending spec are to be fix after a rebase, master currently as
some changes which will make this easier
2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
4ae392490b
Fix variant system spec
2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
4ad6971121
Fix Bulk product edit system spec after rebase
2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
8f38762393
Add missing translations for variant form
2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
058d7eeb69
Use unit_value_with_description
2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
7f16b6acde
Update variant form and rip out angular
2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
768825d689
Fix Bulk Edit product part 2
...
Note, the empty entry for unit scale need a css fix , currently showing
at half height
2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
e8234ee4a0
Fix Bulk products edit page , part 1
2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
6ff9650eaf
Fix legacy bulk edit products UI
2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
5b8e0d734f
Use Spree::Money to display prices
...
This is to ensure the correct currency and currency configuration is
applied.
2024-10-09 11:02:24 +11:00
Gaetan Craig-Riou
b14a1e72f3
Handle api secret
...
The VINE Api require a secret and an API key to be used. The secret is
used to sign the request. The secret is linked to the API key so we need
to store it along side the key.
2024-10-07 15:09:58 +11:00
Maikel Linke
99c098f567
Ignore StockLocation#active, it's always active
2024-10-03 08:24:16 +10:00
Maikel
196956140e
Merge pull request #12856 from mkllnk/dfc-order
...
Place backorders for linked products via DFC integration
2024-10-01 10:51:00 +10:00
Gaetan Craig-Riou
91f2ca9286
Merge pull request #12734 from cillian/replace-text-angular-with-trix
...
Replace text angular editor with trix editor in About Us and Shopfront message fields
2024-09-30 09:40:48 +10:00
Filipe
852dd41f89
Merge pull request #12836 from wandji20/wb-OFN-11600
...
Add browser unsaved changes modal when navigating from order summary page [OFN-11600]
2024-09-27 17:41:04 -06:00
wandji20
84a2e6c24d
Add browser unsaved changes modal when navigation form order sumary page [OFN-11600]
2024-09-27 16:52:55 -06:00
David Cook
be4e0a259e
Specify alternate html_title
...
Because the page title has extra content.
2024-09-27 15:48:28 -06:00
David Cook
c362e8dd0d
Use page titles in HTML head
...
This is much more meaningful than the controller name, and is helpful for browser tab history.
2024-09-27 15:48:28 -06:00
Cillian O'Ruanaidh
f474afaceb
Merge in latest :master and resolve conflict in app/models/enterprise.rb
2024-09-27 10:11:26 +01:00
wandji20
37ab832b86
Remove window unload event listener from edit order cycle cancel link
2024-09-27 10:02:49 +02:00
