Laclic
/
Souke
Tarkkaile 5
Äänestä 0
Fork 1
Koodi Ongelmat 1 Pull-pyynnöt 0 Julkaisut 0 Wiki Activity
Selaa lähdekoodia

Merge branch 'develop'

prodstable
Guillaume Bourgeois 1 vuosi sitten
vanhempi
5e48c7ec69 ba07671971
commit
0a48d77cf2
10 muutettua tiedostoa jossa 19 lisäystä ja 19 poistoa
Jaettu näkymä Näytä diff tilastot
  1. +2
    -2
      backend/views/point-sale/index.php
  2. +1
    -1
      backend/views/producer-admin/index.php
  3. +2
    -2
      backend/views/producer-price-range-admin/index.php
  4. +2
    -2
      backend/views/product-category/index.php
  5. +2
    -2
      backend/views/product/index.php
  6. +2
    -2
      backend/views/subscription/index.php
  7. +2
    -2
      backend/views/tax-rate-admin/index.php
  8. +2
    -2
      backend/views/user-group/index.php
  9. +3
    -3
      backend/views/user/index.php
  10. +1
    -1
      backend/views/user/orders.php

+ 2
- 2
backend/views/point-sale/index.php Näytä tiedosto

@@ -179,7 +179,7 @@ $this->addButton(
'<span class="glyphicon glyphicon-pencil"></span>',
$url,
[
'title' => Yii::t('app', 'Modifier'),
'title' => 'Modifier',
'class' => 'btn btn-default'
]
);
@@ -189,7 +189,7 @@ $this->addButton(
'<span class="glyphicon glyphicon-trash"></span>',
$url,
[
'title' => Yii::t('app', 'Supprimer'),
'title' => 'Supprimer',
'class' => 'btn btn-default'
]
);

+ 1
- 1
backend/views/producer-admin/index.php Näytä tiedosto

@@ -210,7 +210,7 @@ $this->addButton(['label' => 'Nouveau producteur <span class="glyphicon glyphico
'<span class="glyphicon glyphicon-pencil"></span>',
$url,
[
'title' => Yii::t('app', 'Modifier'),
'title' => 'Modifier',
'class' => 'btn btn-default'
]
);

+ 2
- 2
backend/views/producer-price-range-admin/index.php Näytä tiedosto

@@ -80,12 +80,12 @@ $this->addButton(['label' => 'Nouvelle tranche de prix <span class="glyphicon gl
'buttons' => [
'update' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-pencil"></span>', $url, [
'title' => Yii::t('app', 'Modifier'), 'class' => 'btn btn-default'
'title' => 'Modifier', 'class' => 'btn btn-default'
]);
},
'delete' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-trash"></span>', $url, [
'title' => Yii::t('app', 'Supprimer'), 'class' => 'btn btn-default'
'title' => 'Supprimer', 'class' => 'btn btn-default'
]);
}
],

+ 2
- 2
backend/views/product-category/index.php Näytä tiedosto

@@ -69,12 +69,12 @@ $this->addButton(['label' => 'Nouvelle catégorie <span class="glyphicon glyphic
'buttons' => [
'update' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-pencil"></span>', $url, [
'title' => Yii::t('app', 'Modifier'), 'class' => 'btn btn-default'
'title' => 'Modifier', 'class' => 'btn btn-default'
]);
},
'delete' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-trash"></span>', $url, [
'title' => Yii::t('app', 'Supprimer'), 'class' => 'btn btn-default'
'title' => 'Supprimer', 'class' => 'btn btn-default'
]);
}
],

+ 2
- 2
backend/views/product/index.php Näytä tiedosto

@@ -150,12 +150,12 @@ $this->addButton(['label' => 'Nouveau produit <span class="glyphicon glyphicon-p
'buttons' => [
'update' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-pencil"></span>', $url, [
'title' => Yii::t('app', 'Modifier'), 'class' => 'btn btn-default'
'title' => 'Modifier', 'class' => 'btn btn-default'
]);
},
'delete' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-trash"></span>', $url, [
'title' => Yii::t('app', 'Supprimer'), 'class' => 'btn btn-default'
'title' => 'Supprimer', 'class' => 'btn btn-default'
]);
}
],

+ 2
- 2
backend/views/subscription/index.php Näytä tiedosto

@@ -218,12 +218,12 @@ $subscriptionsArray = Subscription::searchAll() ;
'buttons' => [
'update' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-pencil"></span>', $url, [
'title' => Yii::t('app', 'Modifier'), 'class' => 'btn btn-default'
'title' => 'Modifier', 'class' => 'btn btn-default'
]);
},
'delete' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-trash"></span>', $url, [
'title' => Yii::t('app', 'Supprimer'), 'class' => 'btn btn-default'
'title' => 'Supprimer', 'class' => 'btn btn-default'
]);
}
],

+ 2
- 2
backend/views/tax-rate-admin/index.php Näytä tiedosto

@@ -66,12 +66,12 @@ $this->addButton(['label' => 'Nouvelle taxe <span class="glyphicon glyphicon-plu
'buttons' => [
'update' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-pencil"></span>', $url, [
'title' => Yii::t('app', 'Modifier'), 'class' => 'btn btn-default'
'title' => 'Modifier', 'class' => 'btn btn-default'
]);
},
'delete' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-trash"></span>', $url, [
'title' => Yii::t('app', 'Supprimer'), 'class' => 'btn btn-default'
'title' => 'Supprimer', 'class' => 'btn btn-default'
]);
}
],

+ 2
- 2
backend/views/user-group/index.php Näytä tiedosto

@@ -60,12 +60,12 @@ $this->addButton(['label' => 'Nouveau groupe d\'utilisateur <span class="glyphic
'buttons' => [
'update' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-pencil"></span>', $url, [
'title' => Yii::t('app', 'Modifier'), 'class' => 'btn btn-default'
'title' => 'Modifier', 'class' => 'btn btn-default'
]);
},
'delete' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-trash"></span>', $url, [
'title' => Yii::t('app', 'Supprimer'), 'class' => 'btn btn-default'
'title' => 'Supprimer', 'class' => 'btn btn-default'
]);
}
],

+ 3
- 3
backend/views/user/index.php Näytä tiedosto

@@ -114,7 +114,7 @@ $this->render('_menu', [
$html = '';
if ($countOrders) {
$html .= Html::a('<span class="glyphicon glyphicon-eye-open"></span> ' . $countOrders, $url, [
'title' => Yii::t('app', 'Commandes'), 'class' => 'btn btn-default '
'title' => 'Commandes', 'class' => 'btn btn-default '
]);;
} else {
$html .= 'Aucune commande';
@@ -161,12 +161,12 @@ $this->render('_menu', [
$url = Yii::$app->urlManager->createUrl(['user/update', 'id' => $model->id]);
$user = User::find()->with('userProducer')->where(['id' => $model->id])->one();
return Html::a('<span class="glyphicon glyphicon-pencil"></span>', $url, [
'title' => Yii::t('app', 'Modifier'), 'class' => 'btn btn-default'
'title' => 'Modifier', 'class' => 'btn btn-default'
]);
},
'delete' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-trash"></span>', Yii::$app->urlManager->createUrl(array_merge(['user/delete', 'id' => $model->id], Yii::$app->getRequest()->getQueryParams())), [
'title' => Yii::t('app', 'Supprimer'), 'class' => 'btn btn-default btn-confirm-delete'
'title' => 'Supprimer', 'class' => 'btn btn-default btn-confirm-delete'
]);
}
],

+ 1
- 1
backend/views/user/orders.php Näytä tiedosto

@@ -95,7 +95,7 @@ $this->addBreadcrumb('Commandes');
'update' => function ($url, $model) {
$url = Yii::$app->urlManager->createUrl(['distribution/index', 'idOrderUpdate' => $model->id]);
return Html::a('<span class="glyphicon glyphicon-pencil"></span>', $url, [
'title' => Yii::t('app', 'Modifier'), 'class' => 'btn btn-default'
'title' => 'Modifier', 'class' => 'btn btn-default'
]);
},
],

Write Preview
Loading…
Peruuta
Tallenna