Browse Source

Merge branch 'develop'

master
Guillaume Bourgeois 5 months ago
parent
commit
6a1d4ca2a9
3 changed files with 27 additions and 2 deletions
  1. +1
    -1
      common/config/params.php
  2. +24
    -0
      common/versions/24.5.A.php
  3. +2
    -1
      producer/web/js/vuejs/order-order.js

+ 1
- 1
common/config/params.php View File

@@ -37,7 +37,7 @@
*/

return [
'version' => '24.4.B',
'version' => '24.5.A',
'maintenanceMode' => false,
'siteName' => 'Souke',
'tinyMcePlugins' => 'preview searchreplace autolink autosave save directionality code visualblocks visualchars fullscreen image link lists wordcount help',

+ 24
- 0
common/versions/24.5.A.php View File

@@ -0,0 +1,24 @@
<?php

require_once dirname(__FILE__).'/_macros.php';

version(
'02/05/2024',
[
[
"Graphisme Souke",
"Points de vente : modes de paiements (sur place, cagnotte, paiement en ligne)",
],
[
]
],
[
[
],
[
]
],
$userCurrent
);

?>

+ 2
- 1
producer/web/js/vuejs/order-order.js View File

@@ -230,7 +230,8 @@ var app = new Vue({
}

if(app.pointSaleActive) {
if(app.pointSaleActive.payment_method_credit
if(app.producer.credit
&& app.pointSaleActive.payment_method_credit
&& (app.pointSaleActive.credit_functioning == 'mandatory'
|| (app.pointSaleActive.credit_functioning == 'user' && app.user.credit_active)
|| (app.pointSaleActive.credit_functioning == 'optional' && response.data.producer.use_credit_checked_default))) {

Loading…
Cancel
Save