Laclic
/
Souke
Sledovat 5
Oblíbit 0
Rozštěpit 1
Zdrojový kód Úkoly 1 Požadavky na natažení 0 Vydání 0 Wiki Aktivita
Procházet zdrojové kódy

Merge branch 'develop'

prodstable
Guillaume Bourgeois před 1 rokem
rodič
5e48c7ec69 ba07671971
revize
0a48d77cf2
10 změnil soubory, kde provedl 19 přidání a 19 odebrání
Jednotný pohled Ukázat statistiku rozdílových dat
  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 Zobrazit soubor

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

+ 1
- 1
backend/views/producer-admin/index.php Zobrazit soubor

'<span class="glyphicon glyphicon-pencil"></span>', '<span class="glyphicon glyphicon-pencil"></span>',
$url, $url,
[ [
'title' => Yii::t('app', 'Modifier'),
'title' => 'Modifier',
'class' => 'btn btn-default' 'class' => 'btn btn-default'
] ]
); );

+ 2
- 2
backend/views/producer-price-range-admin/index.php Zobrazit soubor

'buttons' => [ 'buttons' => [
'update' => function ($url, $model) { 'update' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-pencil"></span>', $url, [ 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) { 'delete' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-trash"></span>', $url, [ 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 Zobrazit soubor

'buttons' => [ 'buttons' => [
'update' => function ($url, $model) { 'update' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-pencil"></span>', $url, [ 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) { 'delete' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-trash"></span>', $url, [ 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 Zobrazit soubor

'buttons' => [ 'buttons' => [
'update' => function ($url, $model) { 'update' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-pencil"></span>', $url, [ 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) { 'delete' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-trash"></span>', $url, [ 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 Zobrazit soubor

'buttons' => [ 'buttons' => [
'update' => function ($url, $model) { 'update' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-pencil"></span>', $url, [ 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) { 'delete' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-trash"></span>', $url, [ 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 Zobrazit soubor

'buttons' => [ 'buttons' => [
'update' => function ($url, $model) { 'update' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-pencil"></span>', $url, [ 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) { 'delete' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-trash"></span>', $url, [ 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 Zobrazit soubor

'buttons' => [ 'buttons' => [
'update' => function ($url, $model) { 'update' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-pencil"></span>', $url, [ 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) { 'delete' => function ($url, $model) {
return Html::a('<span class="glyphicon glyphicon-trash"></span>', $url, [ 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 Zobrazit soubor

$html = ''; $html = '';
if ($countOrders) { if ($countOrders) {
$html .= Html::a('<span class="glyphicon glyphicon-eye-open"></span> ' . $countOrders, $url, [ $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 { } else {
$html .= 'Aucune commande'; $html .= 'Aucune commande';
$url = Yii::$app->urlManager->createUrl(['user/update', 'id' => $model->id]); $url = Yii::$app->urlManager->createUrl(['user/update', 'id' => $model->id]);
$user = User::find()->with('userProducer')->where(['id' => $model->id])->one(); $user = User::find()->with('userProducer')->where(['id' => $model->id])->one();
return Html::a('<span class="glyphicon glyphicon-pencil"></span>', $url, [ 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) { '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())), [ 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 Zobrazit soubor

'update' => function ($url, $model) { 'update' => function ($url, $model) {
$url = Yii::$app->urlManager->createUrl(['distribution/index', 'idOrderUpdate' => $model->id]); $url = Yii::$app->urlManager->createUrl(['distribution/index', 'idOrderUpdate' => $model->id]);
return Html::a('<span class="glyphicon glyphicon-pencil"></span>', $url, [ 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'
]); ]);
}, },
], ],

Zapsat Náhled
Načítá se…
Zrušit
Uložit