diff --git a/bin/controls/DiscountEdit.html b/bin/controls/DiscountEdit.html index e793fc96587d9fcf5cb0995641f9781c556618aa..603e89bd91e204f0acc36ca2e2664f81c82922a3 100644 --- a/bin/controls/DiscountEdit.html +++ b/bin/controls/DiscountEdit.html @@ -15,7 +15,7 @@ <span class="field-container-item"> {{id}} </span> - <div class="field-container-field field-id"></div> + <span class="field-container-field field-id"></span> </label> </td> </tr> @@ -25,7 +25,7 @@ <span class="field-container-item"> {{title}} </span> - <div class="field-container-field discount-title"></div> + <span class="field-container-field discount-title"></span> </label> </td> </tr> @@ -179,10 +179,10 @@ <span class="field-container-item" title="{{usageLastSumDiscountDesc}}"> {{usageLastSumDiscount}} </span> - <div class="field-container-field"> + <span class="field-container-field"> <input type="checkbox" name="lastSumDiscount"/> {{usageLastSumDiscountDesc}} - </div> + </span> </label> </td> </tr> @@ -192,10 +192,10 @@ <span class="field-container-item" title="{{usageLastProductDiscountDesc}}"> {{usageLastProductDiscount}} </span> - <div class="field-container-field"> + <span class="field-container-field"> <input type="checkbox" name="lastProductDiscount"/> {{usageLastProductDiscountDesc}} - </div> + </span> </label> </td> </tr> @@ -248,8 +248,7 @@ </span> <span class="field-container-field field-container-field-no-padding"> <input type="text" name="user_groups" - class="users_and_groups" - data-qui="controls/usersAndGroups/Input" + data-qui="controls/usersAndGroups/Select" /> </span> </label> diff --git a/tests/QUITests/ERP/Discount/CaseStudies/Classes/User.php b/tests/QUITests/ERP/Discount/CaseStudies/Classes/User.php index b9a7fec0f9a99f4759576b9008dad8c925abd1a2..d7f31446437b705f1d35e3abf156f500bc33013c 100644 --- a/tests/QUITests/ERP/Discount/CaseStudies/Classes/User.php +++ b/tests/QUITests/ERP/Discount/CaseStudies/Classes/User.php @@ -17,11 +17,17 @@ class User extends QUI\Users\User public $lang = 'de'; public $company = false; + /** + * User constructor. + */ public function __construct() { $this->refresh(); } + /** + * refreshing + */ public function refresh() { $this->Locale = new QUI\Locale();