Laclic
/
Souke
關注 5
收藏 0
複製 1
程式碼 問題 1 合併請求 0 版本發佈 0 Wiki 活動
瀏覽代碼

[Administration] Ergonomie formulaires produit, point de vente, abonnement et utilisateur

feature/souke
Guillaume Bourgeois 10 月之前
父節點
611ed8903f
當前提交
bd6b689ada
共有 10 個檔案被更改，包括 352 行新增 和 172 行删除
分割檢視 顯示文件統計
  1. +0
    -1
      backend/views/product-category/_form.php
  2. +109
    -59
      backend/views/subscription/_form.php
  3. +18
    -10
      backend/views/user-group/_form.php
  4. +146
    -54
      backend/views/user/_form.php
  5. +0
    -9
      backend/views/user/_menu.php
  6. +54
    -34
      backend/web/css/screen.css
  7. +3
    -0
      backend/web/sass/product/_form.scss
  8. +0
    -5
      backend/web/sass/screen.scss
  9. +3
    -0
      backend/web/sass/subscription/_form.scss
  10. +19
    -0
      backend/web/sass/user/_form.scss

+ 0
- 1
backend/views/product-category/_form.php 查看文件

@@ -56,7 +56,6 @@ use yii\widgets\ActiveForm;
<?= $form->field($model, 'name')->textInput(['maxlength' => 255]) ?>
</div>
</div>

</div>
<div class="clr"></div>
<div class="form-group form-actions">

+ 109
- 59
backend/views/subscription/_form.php 查看文件

@@ -53,77 +53,127 @@ $pointSaleModule = $this->getPointSaleModule();
<?php if($model->id): ?>
<?= $form->field($model, 'id')->hiddenInput() ?>
<?php endif; ?>
<div class="col-md-5" id="bloc-select-user">
<?= $form->field($model, 'id_user')->dropDownList($userModule->populateUserDropdownList(), ['class' => 'select2']); ?>
</div>
<div class="col-md-1" id="or-user">
<span>OU</span>

<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
<i class="fa fa-th-list"></i>
Général
</h3>
</div>
<div class="panel-body">
<div class="col-md-5" id="bloc-select-user">
<?= $form->field($model, 'id_user')->dropDownList($userModule->populateUserDropdownList(), ['class' => 'select2']); ?>
</div>
<div class="col-md-1" id="or-user">
<span>OU</span>
</div>
<div class="col-md-6">
<?= $form->field($model, 'username')->textInput() ?>
</div>
<div class="clr"></div>

<?= $form->field($model, 'id_producer')->hiddenInput() ?>
<?= $form->field($model, 'id_point_sale')->dropDownList(ArrayHelper::map($pointSaleModule->findPointSales(), 'id', function($model, $defaultValue) {
return $model['name'];
}), ['prompt' => '--','class' => 'form-control user-id']) ?>
<?= $form->field($model, 'date_begin') ?>
<?= $form->field($model, 'date_end')->hint('Laisser vide pour une durée indéterminée') ?>
</div>
</div>
<div class="col-md-6">
<?= $form->field($model, 'username')->textInput() ?>

<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
<i class="fa fa-calendar"></i>
Jours et fréquence
</h3>
</div>
<div class="panel-body">
<div class="days">
<?= $form->field($model, 'monday')->checkbox() ?>
<?= $form->field($model, 'tuesday')->checkbox() ?>
<?= $form->field($model, 'wednesday')->checkbox() ?>
<?= $form->field($model, 'thursday')->checkbox() ?>
<?= $form->field($model, 'friday')->checkbox() ?>
<?= $form->field($model, 'saturday')->checkbox() ?>
<?= $form->field($model, 'sunday')->checkbox() ?>
</div>
<div class="clr"></div>
<?= $form->field($model, 'week_frequency')->dropDownList([1=>1, 2=>2, 3=>3, 4=>4]) ?>
</div>
</div>
<div class="clr"></div>
<?= $form->field($model, 'id_producer')->hiddenInput() ?>
<?= $form->field($model, 'id_point_sale')->dropDownList(ArrayHelper::map($pointSaleModule->findPointSales(), 'id', function($model, $defaultValue) {
return $model['name'];
}), ['prompt' => '--','class' => 'form-control user-id']) ?>
<?= $form->field($model, 'date_begin') ?>
<?= $form->field($model, 'date_end')->hint('Laisser vide pour une durée indéterminée') ?>
<div class="days">
<h2>Jours</h2>
<?= $form->field($model, 'monday')->checkbox() ?>
<?= $form->field($model, 'tuesday')->checkbox() ?>
<?= $form->field($model, 'wednesday')->checkbox() ?>
<?= $form->field($model, 'thursday')->checkbox() ?>
<?= $form->field($model, 'friday')->checkbox() ?>
<?= $form->field($model, 'saturday')->checkbox() ?>
<?= $form->field($model, 'sunday')->checkbox() ?>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
<span class="glyphicon glyphicon-piggy-bank"></span>
Crédit
</h3>
</div>
<div class="panel-body">
<?= $form->field($model, 'auto_payment')
->dropDownList([
Subscription::AUTO_PAYMENT_DEDUCTED => 'Déduit',
Subscription::AUTO_PAYMENT_YES => 'Oui',
Subscription::AUTO_PAYMENT_NO => 'Non'
])
->hint('Attention, un compte client existant doit être spécifié en haut de ce formulaire.') ?>
</div>
</div>
<div class="clr"></div>
<?= $form->field($model, 'week_frequency')->dropDownList([1=>1, 2=>2, 3=>3, 4=>4]) ?>

<?= $form->field($model, 'auto_payment')
->dropDownList([
Subscription::AUTO_PAYMENT_DEDUCTED => 'Déduit',
Subscription::AUTO_PAYMENT_YES => 'Oui',
Subscription::AUTO_PAYMENT_NO => 'Non'
])
->hint('Attention, un compte client existant doit être spécifié en haut de ce formulaire.') ?>
<div class="products">
<h2>Produits</h2>
<?php if(isset($model->errors['products']) && count($model->errors['products']))
{
echo '<div class="alert alert-danger">'.$model->errors['products'][0].'</div>' ;
}
?>
<table class="table table-bordered table-condensed table-hover" id="products">
<tr v-for="product in products">
<td>{{ product.name }}</td>
<td>
<input type="hidden" :value="product.step" :name="'product_step_'+product.step" />
<input type="hidden" :value="product.price" :name="'product_price_'+product.price" />
<div class="input-group">

<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
<i class="fa fa-clone"></i>
Produits
</h3>
</div>
<div class="panel-body">
<div class="products">
<?php if(isset($model->errors['products']) && count($model->errors['products']))
{
echo '<div class="alert alert-danger">'.$model->errors['products'][0].'</div>' ;
}
?>
<table class="table table-bordered table-condensed table-hover" id="products">
<tr v-for="product in products">
<td>{{ product.name }}</td>
<td>
<input type="hidden" :value="product.step" :name="'product_step_'+product.step" />
<input type="hidden" :value="product.price" :name="'product_price_'+product.price" />
<div class="input-group">
<span class="input-group-btn">
<button class="btn btn-default" type="button" @click="changeQuantityProductSubscription(false, product)"><span class="glyphicon glyphicon-minus"></span></button>
</span>
<input v-model="product.quantity" :name="'SubscriptionForm[products][product_'+product.id+']'" class="form-control input-quantity" />
<div class="input-group-addon">
<input v-model="product.quantity" :name="'SubscriptionForm[products][product_'+product.id+']'" class="form-control input-quantity" />
<div class="input-group-addon">
<span>
{{ product.wording_unit }}
</span>
</div>
<span class="input-group-btn">
</div>
<span class="input-group-btn">
<button class="btn btn-default" type="button" @click="changeQuantityProductSubscription(true, product)"><span class="glyphicon glyphicon-plus"></span></button>
</span>
</div>
</td>
</tr>
</table>
</div>
</td>
</tr>
</table>
</div>
</div>
</div>

<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
<i class="fa fa-comment"></i>
Commentaire
</h3>
</div>
<div class="panel-body">
<?= $form->field($model, 'comment')->textarea(['rows' => 6]) ?>
</div>
</div>
<?= $form->field($model, 'comment')->textarea(['rows' => 6]) ?>

<div class="form-group form-actions">
<?= Html::a('Retour', ['subscription/index'], ['class' => 'btn btn-default']) ?>

+ 18
- 10
backend/views/user-group/_form.php 查看文件

@@ -43,16 +43,24 @@ use yii\helpers\ArrayHelper;
?>

<div class="user-group-form">

<?php $form = ActiveForm::begin(); ?>
<div class="col-md-8">
<?php $form = ActiveForm::begin(); ?>
<div class="col-md-8">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
<i class="fa fa-th-list"></i>
Général
</h3>
</div>
<div class="panel-body">
<?= $form->field($model, 'name')->textInput(['maxlength' => 255]) ?>
</div>
</div>
<div class="clr"></div>
<div class="form-group">
<?= Html::submitButton($model->isNewRecord ? 'Ajouter' : 'Modifier', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
</div>

<?php ActiveForm::end(); ?>
</div>
<div class="clr"></div>
<div class="form-group form-actions">
<?= Html::a('Retour', ['user-group/index'], ['class' => 'btn btn-default']) ?>
<?= Html::submitButton($model->isNewRecord ? 'Ajouter' : 'Modifier', ['class' => 'btn btn-primary']) ?>
</div>
<?php ActiveForm::end(); ?>
</div>

+ 146
- 54
backend/views/user/_form.php 查看文件

@@ -40,6 +40,7 @@ use common\logic\Distribution\Distribution\Module\DistributionModule;
use common\logic\Distribution\Distribution\Service\ExportManager;
use common\logic\Producer\Producer\Module\ProducerModule;
use common\logic\User\User\Module\UserModule;
use lo\widgets\Toggle;
use yii\helpers\Html;
use yii\widgets\ActiveForm;
use yii\helpers\ArrayHelper;
@@ -59,52 +60,114 @@ $distributionModule = DistributionModule::getInstance();
'enableClientValidation' => false
]); ?>

<?= $form->field($model, 'type')
->dropDownList($userModule->getTypeChoicesArray(), [
'v-model' => 'type'
]); ?>
<?= $form->field($model, 'name_legal_person', ['options' => ['v-show' => "type == 'legal-person'"]])->textInput() ?>
<?= $form->field($model, 'lastname')->textInput() ?>
<?= $form->field($model, 'name')->textInput() ?>
<?= $form->field($model, 'phone')->textInput() ?>
<?= $form->field($model, 'email')->textInput() ?>
<?php if(!$model->email): ?>
<?= $form->field($model, 'send_mail_welcome')->checkbox() ?>
<?php endif; ?>
<?= $form->field($model, 'address')->textarea() ?>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
<i class="fa fa-th-list"></i>
Général
</h3>
</div>
<div class="panel-body">
<?= $form->field($model, 'type')
->dropDownList($userModule->getTypeChoicesArray(), [
'v-model' => 'type'
]); ?>
<?= $form->field($model, 'name_legal_person', ['options' => ['v-show' => "type == 'legal-person'"]])->textInput() ?>
<?= $form->field($model, 'lastname')->textInput() ?>
<?= $form->field($model, 'name')->textInput() ?>
<?= $form->field($model, 'phone')->textInput() ?>
<?= $form->field($model, 'email')->textInput() ?>
<?php if(!$model->email): ?>
<?= $form->field($model, 'send_mail_welcome')->checkbox() ?>
<?php endif; ?>
<?= $form->field($model, 'address')->textarea() ?>
</div>
</div>

<?php if ($producerModule->getSolver()->getConfig('option_export_evoliz')): ?>
<?= $form->field($model, 'evoliz_code')->textInput() ?>
<?php endif; ?>
<?= $form->field($model, 'newsletter')->checkbox() ?>
<div class="panel panel-default panel-newsletter">
<div class="panel-heading">
<h3 class="panel-title">
<i class="fa fa-paper-plane"></i>
Bulletin d'information
</h3>
</div>
<div class="panel-body">
<?= $form->field($model, 'newsletter')->widget(Toggle::class,
[
'options' => [
'data-id' => $model->id,
'data-on' => 'Oui',
'data-off' => 'Non',
],
]
); ?>
</div>
</div>

<?php if($distributionModule->getExportManager()->isEnabled(ExportManager::SHOPPING_CART_LABELS_PDF)): ?>
<?= $form->field($model, 'exclude_export_shopping_cart_labels')->checkbox(); ?>
<?php if (
$distributionModule->getExportManager()->isEnabled(ExportManager::SHOPPING_CART_LABELS_PDF)
|| $producerModule->getSolver()->getConfig('option_export_evoliz')): ?>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
<i class="fa fa-download"></i>
Exports
</h3>
</div>
<div class="panel-body">
<?php if($distributionModule->getExportManager()->isEnabled(ExportManager::SHOPPING_CART_LABELS_PDF)): ?>
<?= $form->field($model, 'exclude_export_shopping_cart_labels')->checkbox(); ?>
<?php endif; ?>
<?php if ($producerModule->getSolver()->getConfig('option_export_evoliz')): ?>
<?= $form->field($model, 'evoliz_code')->textInput() ?>
<?php endif; ?>
</div>
</div>
<?php endif; ?>

<?php if($pointsSaleArray && count($pointsSaleArray) > 0): ?>
<?= $form->field($model, 'points_sale')->checkboxlist(
ArrayHelper::map($pointsSaleArray, 'id', function ($pointSale) use ($model) {
$commentUserPointSale = isset($pointSale->userPointSale[0]) ? $pointSale->userPointSale[0]->comment : '';
$html = Html::encode($pointSale->name);
if ($pointSale->restricted_access) {
$html .= '<input type="text" placeholder="Commentaire" class="form-control" name="User[comment_point_sale_' . $pointSale->id . ']" value="' . (($model->id) ? Html::encode($commentUserPointSale) : '') . '" />';
}
return $html;
}), [
'encode' => false
]);
?>
<div class="panel panel-default panel-point-sales">
<div class="panel-heading">
<h3 class="panel-title">
<i class="fa fa-map-marker"></i>
Points de vente
</h3>
</div>
<div class="panel-body">
<?= $form->field($model, 'points_sale')->checkboxlist(
ArrayHelper::map($pointsSaleArray, 'id', function ($pointSale) use ($model) {
$commentUserPointSale = isset($pointSale->userPointSale[0]) ? $pointSale->userPointSale[0]->comment : '';
$html = Html::encode($pointSale->name);
if ($pointSale->restricted_access) {
$html .= '<input type="text" placeholder="Commentaire" class="form-control" name="User[comment_point_sale_' . $pointSale->id . ']" value="' . (($model->id) ? Html::encode($commentUserPointSale) : '') . '" />';
}
return $html;
}), [
'encode' => false
]);
?>
</div>
</div>
<?php endif; ?>

<?php if($userGroupsArray && count($userGroupsArray) > 0): ?>
<?= $form->field($model, 'user_groups')->checkboxlist(
ArrayHelper::map($userGroupsArray, 'id', function ($userGroup) use ($model) {
return Html::encode($userGroup->name);
}), [
'encode' => false
]);
?>
<div class="panel panel-default panel-user-groups">
<div class="panel-heading">
<h3 class="panel-title">
<i class="fa fa-users"></i>
Groupes
</h3>
</div>
<div class="panel-body">
<?= $form->field($model, 'user_groups')->checkboxlist(
ArrayHelper::map($userGroupsArray, 'id', function ($userGroup) use ($model) {
return Html::encode($userGroup->name);
}), [
'encode' => false
]);
?>
</div>
</div>
<?php endif; ?>

<?php /* $form->field($model, 'product_price_percent')
@@ -119,25 +182,54 @@ $distributionModule = DistributionModule::getInstance();
</div>

<div class="col-md-4">
<h3>Email de bienvenue</h3>
<?php $form = ActiveForm::begin(); ?>
<div class="form-group">
<?= Html::submitButton("Envoyer l'email de bienvenue", ['class' => 'btn btn-primary', 'name' => 'submit_mail_welcome', 'value' => 1]) ?>
</div>
<?php ActiveForm::end(); ?>

<h3>Mot de passe</h3>
<?php $form = ActiveForm::begin(); ?>
<div class="form-group">
<?= Html::submitButton('Envoyer un nouveau mot de passe', ['class' => 'btn btn-primary', 'name' => 'submit_new_password', 'value' => 1]) ?>
</div>
<?php ActiveForm::end(); ?>
<?php if($model->email): ?>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
<i class="fa fa-envelope"></i>
Envoi d'emails
</h3>
</div>
<div class="panel-body">
<?php $form = ActiveForm::begin(); ?>
<div class="form-group">
<?= Html::submitButton(
'<i class="fa fa-home"></i> Envoyer l\'email de bienvenue',
['class' => 'btn btn-default', 'name' => 'submit_mail_welcome', 'value' => 1]
) ?>
</div>
<?php ActiveForm::end(); ?>

<?php $form = ActiveForm::begin(); ?>
<div class="form-group">
<?= Html::submitButton(
'<i class="fa fa-key"></i> Envoyer un nouveau mot de passe',
['class' => 'btn btn-default', 'name' => 'submit_new_password', 'value' => 1]
) ?>
</div>
<?php ActiveForm::end(); ?>
</div>
</div>
<?php endif; ?>

<?php if(isset($pointSaleBillingArray) && $pointSaleBillingArray && count($pointSaleBillingArray) > 0): ?>
<h3>Facturation</h3>
<?php foreach($pointSaleBillingArray as $pointSale): ?>
<a href="<?= Yii::$app->urlManager->createUrl(['point-sale/update', 'id' => $pointSale->id]) ?>"><?= $pointSale->name ?></a><br />
<?php endforeach; ?>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
<i class="fa fa-sticky-note-o"></i>
Facturation
</h3>
</div>
<div class="panel-body">
<?php foreach($pointSaleBillingArray as $pointSale): ?>
<a class="btn btn-default btn-sm" href="<?= Yii::$app->urlManager->createUrl(['point-sale/update', 'id' => $pointSale->id]) ?>">
<i class="fa fa-map-marker"></i>
<?= $pointSale->name ?>
</a><br />
<?php endforeach; ?>
</div>
</div>
<?php endif; ?>
</div>
</div>

+ 0
- 9
backend/views/user/_menu.php 查看文件

@@ -67,13 +67,4 @@ use yii\helpers\Html;
</a>
<?php endforeach; ?>
</div>

<div id="submenu">
<a class="btn btn-xs <?php if($section == 'index'): ?>btn-primary<?php else: ?>btn-default<?php endif; ?>" href="<?= Yii::$app->urlManager->createUrl(['user/index','idPointSale' => $idPointSaleActive]); ?>">
<span class="glyphicon glyphicon-th-list"></span> Liste
</a>
<a class="btn btn-xs <?php if($section == 'mail'): ?>btn-primary<?php else: ?>btn-default<?php endif; ?>" href="<?= Yii::$app->urlManager->createUrl(['user/mail','idPointSale' => $idPointSaleActive]); ?>">
<span class="glyphicon glyphicon-envelope"></span> Envoyer un email
</a>
</div>
</div>

+ 54
- 34
backend/web/css/screen.css 查看文件

@@ -1388,25 +1388,20 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
margin-bottom: 30px;
}
/* line 1362, ../sass/screen.scss */
#menu-users #submenu {
margin-bottom: 30px;
text-align: left;
}
/* line 1367, ../sass/screen.scss */
#menu-users a {
margin-bottom: 15px;
}

/* line 1373, ../sass/screen.scss */
/* line 1368, ../sass/screen.scss */
.user-index .input-group {
width: 180px;
}
/* line 1376, ../sass/screen.scss */
/* line 1371, ../sass/screen.scss */
.user-index .input-group .input-credit {
text-align: center;
}

/* line 1383, ../sass/screen.scss */
/* line 1378, ../sass/screen.scss */
.user-credit .the-credit {
float: right;
font-weight: bold;
@@ -1422,16 +1417,16 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
}

/* facturation */
/* line 1398, ../sass/screen.scss */
/* line 1393, ../sass/screen.scss */
#free-price {
padding: 20px;
background-color: #F9F9F9;
}
/* line 1402, ../sass/screen.scss */
/* line 1397, ../sass/screen.scss */
#free-price h2 {
font-family: "myriadpro-it";
}
/* line 1406, ../sass/screen.scss */
/* line 1401, ../sass/screen.scss */
#free-price .amount span {
font-size: 25px;
color: white;
@@ -1443,25 +1438,25 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
padding-top: 7px;
font-family: "myriadpro-regular";
}
/* line 1417, ../sass/screen.scss */
/* line 1412, ../sass/screen.scss */
#free-price label {
text-transform: uppercase;
font-family: "myriadpro-light";
font-size: 20px;
}
/* line 1422, ../sass/screen.scss */
/* line 1417, ../sass/screen.scss */
#free-price label span {
font-size: 16px;
}
/* line 1428, ../sass/screen.scss */
/* line 1423, ../sass/screen.scss */
#free-price .field-producer-free_price .input-group {
width: 200px;
}
/* line 1434, ../sass/screen.scss */
/* line 1429, ../sass/screen.scss */
#free-price .field-user-free_price label {
display: none;
}
/* line 1439, ../sass/screen.scss */
/* line 1434, ../sass/screen.scss */
#free-price #producer-free_price {
width: 100px;
height: 60px;
@@ -1470,37 +1465,37 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
text-align: center;
}

/* line 1449, ../sass/screen.scss */
/* line 1444, ../sass/screen.scss */
.development-index ul#tabs-status-developments {
margin-bottom: 30px;
border-bottom: solid 3px #F39C12;
}
/* line 1453, ../sass/screen.scss */
/* line 1448, ../sass/screen.scss */
.development-index ul#tabs-status-developments a {
text-transform: uppercase;
}
/* line 1456, ../sass/screen.scss */
/* line 1451, ../sass/screen.scss */
.development-index ul#tabs-status-developments .active {
border: 0px none;
background: none;
}
/* line 1459, ../sass/screen.scss */
/* line 1454, ../sass/screen.scss */
.development-index ul#tabs-status-developments .active a {
background-color: #F39C12;
color: white;
}
/* line 1467, ../sass/screen.scss */
/* line 1462, ../sass/screen.scss */
.development-index #tab-developments .btn-group-priority {
width: 100%;
margin-bottom: 5px;
}
/* line 1471, ../sass/screen.scss */
/* line 1466, ../sass/screen.scss */
.development-index #tab-developments .btn-group-priority .btn-priority {
display: block;
float: none;
width: 100%;
}
/* line 1478, ../sass/screen.scss */
/* line 1473, ../sass/screen.scss */
.development-index #tab-developments .label-priority {
display: block;
width: 100%;
@@ -1509,24 +1504,24 @@ a.btn.btn-primary .glyphicon-triangle-bottom, button.btn.btn-primary .glyphicon-
}

/* stats */
/* line 1491, ../sass/screen.scss */
/* line 1486, ../sass/screen.scss */
.stats-products #nav-year {
float: right;
}
/* line 1496, ../sass/screen.scss */
/* line 1491, ../sass/screen.scss */
.stats-products tr.month th {
text-align: center;
}
/* line 1501, ../sass/screen.scss */
/* line 1496, ../sass/screen.scss */
.stats-products tr.sub-head th {
font-weight: normal;
font-size: 12px;
}
/* line 1507, ../sass/screen.scss */
/* line 1502, ../sass/screen.scss */
.stats-products td.name {
text-transform: uppercase;
}
/* line 1511, ../sass/screen.scss */
/* line 1506, ../sass/screen.scss */
.stats-products td.align-center {
text-align: center;
}
@@ -1954,15 +1949,19 @@ body.login-page .login-box .login-box-body a:hover {
}

/* line 3, ../sass/subscription/_form.scss */
.subscription-form #bloc-select-user {
padding-left: 0px;
}
/* line 6, ../sass/subscription/_form.scss */
.subscription-form .field-subscriptionform-id {
display: none;
}
/* line 7, ../sass/subscription/_form.scss */
/* line 10, ../sass/subscription/_form.scss */
.subscription-form table#products .input-quantity {
text-align: center;
border-right: 0px none;
}
/* line 11, ../sass/subscription/_form.scss */
/* line 14, ../sass/subscription/_form.scss */
.subscription-form table#products .input-group-addon {
padding: 5px;
padding-left: 0px;
@@ -1970,14 +1969,14 @@ body.login-page .login-box .login-box-body a:hover {
border-left: 0px none;
border-right: 0px none;
}
/* line 18, ../sass/subscription/_form.scss */
/* line 21, ../sass/subscription/_form.scss */
.subscription-form table#products .select-unit {
padding: 0px;
width: 58px;
text-align: center;
height: 22px;
}
/* line 24, ../sass/subscription/_form.scss */
/* line 27, ../sass/subscription/_form.scss */
.subscription-form table#products .glyphicon-warning-sign {
position: relative;
top: 10px;
@@ -2093,7 +2092,13 @@ body.login-page .login-box .login-box-body a:hover {
position: relative;
top: 3px;
}
/* line 87, ../sass/product/_form.scss */
/* line 86, ../sass/product/_form.scss */
.product-create #availability-points-sale #product-pointssale,
.product-update #availability-points-sale #product-pointssale {
max-height: 300px;
overflow-y: scroll;
}
/* line 90, ../sass/product/_form.scss */
.product-create #availability-points-sale #product-pointssale label,
.product-update #availability-points-sale #product-pointssale label {
display: block;
@@ -2562,6 +2567,21 @@ termes.
}

/* line 6, ../sass/user/_form.scss */
.user-create .panel-newsletter label,
.user-update .panel-newsletter label {
display: block;
}
/* line 12, ../sass/user/_form.scss */
.user-create .panel-point-sales label.control-label,
.user-update .panel-point-sales label.control-label {
display: none;
}
/* line 18, ../sass/user/_form.scss */
.user-create .panel-user-groups label.control-label,
.user-update .panel-user-groups label.control-label {
display: none;
}
/* line 25, ../sass/user/_form.scss */
.user-create #user-points_sale label,
.user-create #user-user_groups label,
.user-update #user-points_sale label,
@@ -2573,7 +2593,7 @@ termes.
padding: 5px 10px;
border: solid 1px #e0e0e0;
}
/* line 14, ../sass/user/_form.scss */
/* line 33, ../sass/user/_form.scss */
.user-create #user-points_sale label .form-control,
.user-create #user-user_groups label .form-control,
.user-update #user-points_sale label .form-control,

+ 3
- 0
backend/web/sass/product/_form.scss 查看文件

@@ -84,6 +84,9 @@
}

#product-pointssale {
max-height: 300px;
overflow-y: scroll ;

label {
display: block;
font-weight: normal;

+ 0
- 5
backend/web/sass/screen.scss 查看文件

@@ -1359,11 +1359,6 @@ a.btn, button.btn {
margin-bottom: 30px ;
}
#submenu {
margin-bottom: 30px ;
text-align: left ;
}
a {
margin-bottom: 15px ;
}

+ 3
- 0
backend/web/sass/subscription/_form.scss 查看文件

@@ -1,5 +1,8 @@

.subscription-form {
#bloc-select-user {
padding-left: 0px;
}
.field-subscriptionform-id {
display: none;
}

+ 19
- 0
backend/web/sass/user/_form.scss 查看文件

@@ -1,6 +1,25 @@

.user-create,
.user-update {

.panel-newsletter {
label {
display: block;
}
}

.panel-point-sales {
label.control-label {
display: none;
}
}

.panel-user-groups {
label.control-label {
display: none;
}
}

#user-points_sale,
#user-user_groups {
label {

Write Preview
Loading…
取消
儲存