@@ -216,6 +216,10 @@ $this->addBreadcrumb($this->getTitle()) ; | |||
Producer::BEHAVIOR_ORDER_SELECT_DISTRIBUTION_CALENDAR => 'Calendrier', | |||
Producer::BEHAVIOR_ORDER_SELECT_DISTRIBUTION_LIST => 'Liste', | |||
]); ?> | |||
<?= $form->field($model, 'option_payment_info') | |||
->textarea(['rows' => 6]) | |||
->hint('Affiché au client à la fin de la prise de commande')?> | |||
</div> | |||
</div> | |||
@@ -133,7 +133,7 @@ class Producer extends ActiveRecordCommon | |||
} | |||
}], | |||
[['description', 'mentions', 'gcs', 'order_infos', 'slug', 'secret_key_payplug', 'background_color_logo', 'option_behavior_cancel_order', 'tiller_provider_token', 'tiller_restaurant_token', 'status', | |||
'document_infos_bottom', 'document_infos_quotation', 'document_infos_invoice', 'document_infos_delivery_note', 'address', 'behavior_home_point_sale_day_list', 'behavior_order_select_distribution'], 'string'], | |||
'document_infos_bottom', 'document_infos_quotation', 'document_infos_invoice', 'document_infos_delivery_note', 'address', 'behavior_home_point_sale_day_list', 'behavior_order_select_distribution', 'option_payment_info'], 'string'], | |||
[['negative_balance', 'credit', 'active', 'online_payment', 'user_manage_subscription', 'option_allow_user_gift', 'use_credit_checked_default', 'tiller', 'document_display_orders_invoice', 'document_display_orders_delivery_note', 'document_display_prices_delivery_note'], 'boolean'], | |||
[['name', 'siret', 'logo', 'photo', 'postcode', 'city', 'code', 'type', 'credit_functioning', 'option_behavior_cancel_order', 'document_quotation_prefix', 'document_quotation_first_reference', 'document_invoice_prefix', 'document_invoice_first_reference', 'document_delivery_note_prefix', 'document_delivery_note_first_reference'], 'string', 'max' => 255], | |||
[['free_price', 'credit_limit_reminder', 'credit_limit'], 'double'], | |||
@@ -213,6 +213,7 @@ class Producer extends ActiveRecordCommon | |||
'document_display_prices_delivery_note' => 'Afficher le chiffrage dans les bons de livraison', | |||
'behavior_home_point_sale_day_list' => 'Accueil : affichage des jours de distribution', | |||
'behavior_order_select_distribution' => 'Sélection de la date de distribution', | |||
'option_payment_info' => 'Informations liées au paiement' | |||
]; | |||
} | |||
@@ -0,0 +1,19 @@ | |||
<?php | |||
use yii\db\Migration; | |||
use yii\db\Schema; | |||
class m200602_073010_add_producer_option_payment_text extends Migration | |||
{ | |||
public function safeUp() | |||
{ | |||
$this->addColumn('producer', 'option_payment_info', Schema::TYPE_TEXT); | |||
} | |||
public function safeDown() | |||
{ | |||
$this->dropColumn('producer', 'option_payment_info'); | |||
return false; | |||
} | |||
} |
@@ -37,9 +37,12 @@ termes. | |||
*/ | |||
use common\models\Order ; | |||
use common\helpers\GlobalParam ; | |||
$this->setTitle('Confirmation de commande') ; | |||
$producer = GlobalParam::getCurrentProducer() ; | |||
?> | |||
<div id="order-success"> | |||
@@ -63,8 +66,30 @@ $this->setTitle('Confirmation de commande') ; | |||
<li><span class="glyphicon glyphicon-map-marker"></span><?= Html::encode($order->pointSale->name) ?><?php if(strlen($order->pointSale->name)): ?> <span class="locality">à <?= Html::encode($order->pointSale->locality) ?></span><?php endif; ?></li> | |||
<li><span class="glyphicon glyphicon-th-list"></span><?= $order->countProducts(); ?> produit<?php if($order->countProducts() > 1): ?>s<?php endif; ?></li> | |||
<li><span class="glyphicon glyphicon-chevron-right"></span><?= $order->getAmountWithTax(Order::AMOUNT_TOTAL, true); ?></li> | |||
</ul> | |||
</ul> | |||
</div> | |||
<div class="clr"></div> | |||
</div> | |||
</div> | |||
<?php if($producer->option_payment_info && strlen($producer->option_payment_info) > 0): ?> | |||
<div class="panel panel-warning payment-info"> | |||
<div class="panel-heading"> | |||
<h3>Paiement de votre commande</h3> | |||
</div> | |||
<div class="panel-body"> | |||
<?= nl2br($producer->option_payment_info); ?> | |||
</div> | |||
</div> | |||
<?php endif; ?> | |||
<?php if ($producer->order_infos && strlen($producer->order_infos) > 0): ?> | |||
<div class="panel panel-info"> | |||
<div class="panel-heading"> | |||
<h3>Informations</h3> | |||
</div> | |||
<div class="panel-body"> | |||
<?= nl2br($producer->order_infos); ?> | |||
</div> | |||
</div> | |||
<?php endif; ?> | |||
</div> |
@@ -299,7 +299,18 @@ $producer = GlobalParam::getCurrentProducer() ; | |||
</div> | |||
</div> | |||
<div v-else> | |||
<span class="glyphicon glyphicon-chevron-right"></span> La commande sera à régler sur place. | |||
<?php if($producer->option_payment_info && strlen($producer->option_payment_info) > 0): ?> | |||
<div class="panel panel-warning payment-info"> | |||
<div class="panel-heading"> | |||
<h3>Paiement de votre commande</h3> | |||
</div> | |||
<div class="panel-body"> | |||
<?= nl2br($producer->option_payment_info); ?> | |||
</div> | |||
</div> | |||
<?php else: ?> | |||
<span class="glyphicon glyphicon-chevron-right"></span> La commande sera à régler sur place. | |||
<?php endif; ?> | |||
</div> | |||
</div> | |||
<div class="block-actions"> |
@@ -1537,6 +1537,15 @@ termes. | |||
white-space: pre-line; | |||
} | |||
/* line 295, ../sass/order/_order.scss */ | |||
#main #content .panel h3 { | |||
font-family: "highvoltageregular"; | |||
margin: 0px; | |||
padding-top: 10px; | |||
padding-bottom: 4px; | |||
font-size: 20px; | |||
} | |||
/* line 5, ../sass/order/_confirm.scss */ | |||
.order-confirm #main #order-success .alert.alert-success .glyphicon-big { | |||
background-color: #00A65A; |
@@ -288,6 +288,16 @@ | |||
} | |||
} | |||
} | |||
} | |||
#main #content { | |||
.panel { | |||
h3 { | |||
font-family: "highvoltageregular" ; | |||
margin: 0px ; | |||
padding-top: 10px ; | |||
padding-bottom: 4px ; | |||
font-size: 20px ; | |||
} | |||
} | |||
} |