Yarik / artbox-order

Commit 45b67d1e34a65546984467eb69381f27e64ed26f

Authored by Anastasia
1 parent e271f357

delete wish from account

Showing 6 changed files with 28 additions and 3 deletions   Show diff stats
Inline Side-by-side
migrations/m170714_090429_add_default_columns.php
  Show/Hide comments   View file @45b67d1
@@ -13,9 +13,9 @@ class m170714_090429_add_default_columns extends Migration @@ -13,9 +13,9 @@ class m170714_090429_add_default_columns extends Migration
13 13
14 public function safeDown() 14 public function safeDown()
15 { 15 {
16 - echo "m170714_090429_add_default_columns cannot be reverted.\n";  
17 -  
18 - return false; 16 + $this->dropColumn('label', 'default');
  17 + $this->dropColumn('delivery', 'default');
  18 + $this->dropColumn('payment', 'default');
19 } 19 }
20 20
21 /* 21 /*
models/Delivery.php
  Show/Hide comments   View file @45b67d1
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
16 * @property integer $sort 16 * @property integer $sort
17 * @property float $value 17 * @property float $value
18 * @property boolean $status 18 * @property boolean $status
  19 + * @property boolean $default
19 * @property DeliveryLang[] $deliveryLangs 20 * @property DeliveryLang[] $deliveryLangs
20 * @property Language[] $languages 21 * @property Language[] $languages
21 * @property Order[] $orders 22 * @property Order[] $orders
@@ -83,6 +84,10 @@ @@ -83,6 +84,10 @@
83 [ 'status' ], 84 [ 'status' ],
84 'boolean', 85 'boolean',
85 ], 86 ],
  87 + [
  88 + [ 'default' ],
  89 + 'boolean',
  90 + ],
86 ]; 91 ];
87 } 92 }
88 93
@@ -96,6 +101,7 @@ @@ -96,6 +101,7 @@
96 'sort' => Yii::t('order', 'Sort'), 101 'sort' => Yii::t('order', 'Sort'),
97 'value' => Yii::t('order', 'Value'), 102 'value' => Yii::t('order', 'Value'),
98 'status' => Yii::t('order', 'Status'), 103 'status' => Yii::t('order', 'Status'),
  104 + 'default'=> Yii::t('order', 'Default'),
99 ]; 105 ];
100 } 106 }
101 107
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
17 * @property string $value 17 * @property string $value
18 * @property boolean $status 18 * @property boolean $status
19 * @property string $color 19 * @property string $color
  20 + * @property boolean $default
20 * @property LabelLang[] $labelLangs 21 * @property LabelLang[] $labelLangs
21 * @property Language[] $languages 22 * @property Language[] $languages
22 * @property Order[] $orders 23 * @property Order[] $orders
models/Payment.php
  Show/Hide comments   View file @45b67d1
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 * @property integer $id 15 * @property integer $id
16 * @property integer $sort 16 * @property integer $sort
17 * @property boolean $status 17 * @property boolean $status
  18 + * @property boolean $default
18 * @property Order[] $orders 19 * @property Order[] $orders
19 * @property PaymentLang[] $paymentLangs 20 * @property PaymentLang[] $paymentLangs
20 * @property Language[] $languages 21 * @property Language[] $languages
@@ -78,6 +79,10 @@ @@ -78,6 +79,10 @@
78 [ 'status' ], 79 [ 'status' ],
79 'boolean', 80 'boolean',
80 ], 81 ],
  82 + [
  83 + [ 'default' ],
  84 + 'boolean',
  85 + ],
81 ]; 86 ];
82 } 87 }
83 88
@@ -90,6 +95,7 @@ @@ -90,6 +95,7 @@
90 'id' => Yii::t('order', 'ID'), 95 'id' => Yii::t('order', 'ID'),
91 'sort' => Yii::t('order', 'Sort'), 96 'sort' => Yii::t('order', 'Sort'),
92 'status' => Yii::t('order', 'Status'), 97 'status' => Yii::t('order', 'Status'),
  98 + 'default'=> Yii::t('order', 'Default'),
93 ]; 99 ];
94 } 100 }
95 101
views/delivery/_form.php
  Show/Hide comments   View file @45b67d1
@@ -35,6 +35,12 @@ @@ -35,6 +35,12 @@
35 'class' => 'flat', 35 'class' => 'flat',
36 ] 36 ]
37 ) ?> 37 ) ?>
  38 + <?= $form->field($model, 'default')
  39 + ->checkbox(
  40 + [
  41 + 'class' => 'flat',
  42 + ]
  43 + ) ?>
38 44
39 <div class="form-group"> 45 <div class="form-group">
40 <?= Html::submitButton( 46 <?= Html::submitButton(
views/payment/_form.php
  Show/Hide comments   View file @45b67d1
@@ -33,6 +33,12 @@ @@ -33,6 +33,12 @@
33 'class' => 'flat', 33 'class' => 'flat',
34 ] 34 ]
35 ) ?> 35 ) ?>
  36 + <?= $form->field($model, 'default')
  37 + ->checkbox(
  38 + [
  39 + 'class' => 'flat',
  40 + ]
  41 + ) ?>
36 42
37 <div class="form-group"> 43 <div class="form-group">
38 <?= Html::submitButton( 44 <?= Html::submitButton(