Explorar el Código

[Administration] Origine commande : distinction "Visiteur" et "Utilisateur"

feature/rotating_product
Guillaume Bourgeois hace 5 meses
padre
commit
d78a6b9c40
Se han modificado 3 ficheros con 3 adiciones y 6 borrados
  1. +1
    -0
      backend/controllers/DistributionController.php
  2. +1
    -5
      backend/views/distribution/index.php
  3. +1
    -1
      domain/Order/Order/OrderSolver.php

+ 1
- 0
backend/controllers/DistributionController.php Ver fichero

@@ -407,6 +407,7 @@ class DistributionController extends BackendController
'debitCredit' => false,
'deliveryNote' => $order->deliveryNote ? $order->deliveryNote->getAttributes() : null,
'labelDeleteAction' => $orderModule->getSolver()->getLabelDeleteAction($order),
'labelOrigin' => $orderModule->getSolver()->getLabelOrigin($order, true),
'orderStatusHistorySummaryTitleTag' => $orderModule->getSolver()->getOrderStatusHistorySummaryTitleTag($order, "\n"),
]);
}

+ 1
- 5
backend/views/distribution/index.php Ver fichero

@@ -378,11 +378,7 @@ $this->setPageTitle('Distributions') ;
<span v-if="order.order_status_alias == 'updated'" class="label label-warning" :title="order.orderStatusHistorySummaryTitleTag"><span class="glyphicon glyphicon-pencil"></span></span>
<span v-if="order.order_status_alias == 'ordered'" class="label label-success" :title="order.orderStatusHistorySummaryTitleTag"><span class="glyphicon glyphicon-check"></span></span>
</td>
<td class="column-origin">
<label class="label label-success outline" v-if="order.origin == 'user'">Utilisateur</label>
<label class="label label-default outline" v-else-if="order.origin == 'auto'">Abonnement</label>
<label class="label label-warning outline" v-else>Producteur</label>
</td>
<td class="column-origin" v-html="order.labelOrigin"></td>
<td class="column-user">
<a v-if="order.user" :href="baseUrl+'/user/view?id='+order.id_user" target="_blank" :class="order.user.trust_alert ? 'user-trust-alert' : ''" :title="order.user.trust_alert ? order.user.trust_alert_comment : ''">
<template v-if="order.user.name_legal_person && order.user.name_legal_person.length">

+ 1
- 1
domain/Order/Order/OrderSolver.php Ver fichero

@@ -349,7 +349,7 @@ class OrderSolver extends AbstractService implements SolverInterface

if ($order->origin == Order::ORIGIN_USER) {
$classLabel = 'success';
$str = 'Utilisateur';
$str = $this->userSolver->isTypeGuest($order->user) ? 'Visiteur' : 'Utilisateur';
} elseif ($order->origin == Order::ORIGIN_AUTO) {
$classLabel = 'default';
$str = 'Abonnement';

Cargando…
Cancelar
Guardar