Yarik / artbox-ecommerce

Commit eb15a89c4416b52ab171ffa4d70927a8f890fd98

Authored by Alexey Boroda
1 parent ce75bc1d

-Dancing with composer lock

Showing 2 changed files with 125 additions and 117 deletions   Show diff stats
Inline Side-by-side
models/Order.php
  Show/Hide comments   View file @eb15a89
... ... @@ -247,7 +247,7 @@
247 247 if (empty($this->deadline)) {
248 248 return false;
249 249 } else {
250   - return time() > $this->deadline;
  250 + return time() > strtotime($this->deadline);
251 251 }
252 252 }
253 253 }
254 254 \ No newline at end of file
... ...
views/order/_form.php
  Show/Hide comments   View file @eb15a89
... ... @@ -57,132 +57,140 @@ JS;
57 57  
58 58 <?php $form = ActiveForm::begin(); ?>
59 59 <div class="container">
60   - <div class="row">
61   - <div class="form-group">
  60 + <div class="form-group">
  61 + <div class="row">
62 62 <?= Html::submitButton(
63   - $model->isNewRecord ? 'Create' : 'Update',
  63 + $model->isNewRecord ? \Yii::t('app', 'Create') : \Yii::t('app', 'Update'),
64 64 [ 'class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary' ]
65 65 ) ?>
  66 + <?= Html::a(
  67 + \Yii::t('app', 'Печать'),
  68 + '#',
  69 + [
  70 + 'class' => 'btn btn-info',
  71 + 'target' => '_blank',
  72 + ]
  73 + ) ?>
66 74 </div>
67   - </div>
68   - <div class="row">
69   - <div class="col-sm-6">
70   -
71   - <?= $form->field($model, 'deadline')
72   - ->widget(
73   - DatePicker::className(),
74   - [
  75 + <div class="row">
  76 + <div class="col-sm-6">
75 77  
76   - ]
77   - ) ?>
78   -
79   - <?php
80   - echo $form->field($model, 'pay')
81   - ->widget(
82   - SwitchInput::className(),
83   - [
84   - 'name' => 'pay',
85   - 'pluginOptions' => [
86   - 'onText' => \Yii::t('app', 'Оплачено'),
87   - 'offText' => \Yii::t('app', 'Не оплачено'),
88   - ],
89   - ]
90   - ); ?>
91   -
92   - <?= $form->field($model, 'reason')
93   - ->dropDownList(
94   - [
95   - 1 => 'То',
96   - 2 => 'Сё',
97   - ],
98   - [ 'prompt' => 'Выберите причину' ]
99   - ) ?>
100   -
101   - <?= $form->field($model, 'label')
102   - ->dropDownList(
103   - ArrayHelper::map(
104   - Label::find()
105   - ->asArray()
106   - ->all(),
107   - 'id',
108   - 'label'
109   - ),
110   - [ 'prompt' => 'Выберите метку' ]
111   - ); ?>
112   -
113   - <?= $form->field($model, 'name') ?>
114   -
115   - <?= $form->field($model, 'phone') ?>
116   -
117   - <?= $form->field($model, 'phone2') ?>
118   -
119   - <?= $form->field($model, 'email') ?>
120   -
121   - <?= $form->field(
122   - $model,
123   - 'numbercard'
124   - )
125   - ->textInput([ 'readonly' => true ]) ?>
126   -
127   - <?= $form->field($model, 'comment')
128   - ->textarea([ 'rows' => '3' ]) ?>
129   - <?= $form->field($model, 'delivery')
130   - ->dropDownList(
131   - ArrayHelper::map(
132   - Delivery::find()
133   - ->joinWith('lang')
134   - ->asArray()
135   - ->all(),
136   - 'id',
137   - 'lang.title'
138   - ),
139   - [ 'prompt' => \Yii::t('app', 'Выберите доставку ...') ]
140   - ) ?>
141   -
142   - </div>
143   - <div class="col-sm-6">
144   -
145   - <?= $form->field($model, 'declaration') ?>
146   -
147   - <?= $form->field($model, 'stock') ?>
148   -
149   - <?= $form->field($model, 'consignment') ?>
150   -
151   - <?= $form->field($model, 'payment')
152   - ->dropDownList(
153   - ArrayHelper::map(
154   - OrderPayment::find()
  78 + <?= $form->field($model, 'deadline')
  79 + ->widget(
  80 + DatePicker::className(),
  81 + [
  82 +
  83 + ]
  84 + ) ?>
  85 +
  86 + <?php
  87 + echo $form->field($model, 'pay')
  88 + ->widget(
  89 + SwitchInput::className(),
  90 + [
  91 + 'name' => 'pay',
  92 + 'pluginOptions' => [
  93 + 'onText' => \Yii::t('app', 'Оплачено'),
  94 + 'offText' => \Yii::t('app', 'Не оплачено'),
  95 + ],
  96 + ]
  97 + ); ?>
  98 +
  99 + <?= $form->field($model, 'reason')
  100 + ->dropDownList(
  101 + [
  102 + 1 => 'То',
  103 + 2 => 'Сё',
  104 + ],
  105 + [ 'prompt' => 'Выберите причину' ]
  106 + ) ?>
  107 +
  108 + <?= $form->field($model, 'label')
  109 + ->dropDownList(
  110 + ArrayHelper::map(
  111 + Label::find()
  112 + ->asArray()
  113 + ->all(),
  114 + 'id',
  115 + 'label'
  116 + ),
  117 + [ 'prompt' => 'Выберите метку' ]
  118 + ); ?>
  119 +
  120 + <?= $form->field($model, 'name') ?>
  121 +
  122 + <?= $form->field($model, 'phone') ?>
  123 +
  124 + <?= $form->field($model, 'phone2') ?>
  125 +
  126 + <?= $form->field($model, 'email') ?>
  127 +
  128 + <?= $form->field(
  129 + $model,
  130 + 'numbercard'
  131 + )
  132 + ->textInput([ 'readonly' => true ]) ?>
  133 +
  134 + <?= $form->field($model, 'comment')
  135 + ->textarea([ 'rows' => '3' ]) ?>
  136 + <?= $form->field($model, 'delivery')
  137 + ->dropDownList(
  138 + ArrayHelper::map(
  139 + Delivery::find()
155 140 ->joinWith('lang')
156   - ->where([ 'status' => OrderPayment::ACTIVE ])
157 141 ->asArray()
158 142 ->all(),
159   - 'id',
160   - 'lang.title'
161   - ),
162   - [ 'prompt' => 'Способ оплаты ...' ]
163   - ); ?>
164   -
165   - <?= $form->field($model, 'insurance') ?>
  143 + 'id',
  144 + 'lang.title'
  145 + ),
  146 + [ 'prompt' => \Yii::t('app', 'Выберите доставку ...') ]
  147 + ) ?>
166 148  
167   - <?= $form->field($model, 'amount_imposed') ?>
168   -
169   - <?= $form->field($model, 'shipping_by')
170   - ->dropDownList(
171   - ArrayHelper::getColumn(Order::SHIPPING_BY, 'label'),
172   - [ 'prompt' => 'Оплата доставки ...' ]
173   - ); ?>
174   -
175   - <?= $form->field($model, 'city') ?>
176   -
177   - <?= $form->field($model, 'adress') ?>
  149 + </div>
  150 + <div class="col-sm-6">
  151 +
  152 + <?= $form->field($model, 'declaration') ?>
  153 +
  154 + <?= $form->field($model, 'stock') ?>
  155 +
  156 + <?= $form->field($model, 'consignment') ?>
  157 +
  158 + <?= $form->field($model, 'payment')
  159 + ->dropDownList(
  160 + ArrayHelper::map(
  161 + OrderPayment::find()
  162 + ->joinWith('lang')
  163 + ->where([ 'status' => OrderPayment::ACTIVE ])
  164 + ->asArray()
  165 + ->all(),
  166 + 'id',
  167 + 'lang.title'
  168 + ),
  169 + [ 'prompt' => 'Способ оплаты ...' ]
  170 + ); ?>
  171 +
  172 + <?= $form->field($model, 'insurance') ?>
  173 +
  174 + <?= $form->field($model, 'amount_imposed') ?>
  175 +
  176 + <?= $form->field($model, 'shipping_by')
  177 + ->dropDownList(
  178 + ArrayHelper::getColumn(Order::SHIPPING_BY, 'label'),
  179 + [ 'prompt' => 'Оплата доставки ...' ]
  180 + ); ?>
  181 +
  182 + <?= $form->field($model, 'city') ?>
  183 +
  184 + <?= $form->field($model, 'adress') ?>
  185 +
  186 + <?= $form->field($model, 'body')
  187 + ->textarea([ 'rows' => '3' ]) ?>
  188 +
  189 + <?= $form->field($model, 'check') ?>
  190 +
  191 + <?= $form->field($model, 'sms') ?>
178 192  
179   - <?= $form->field($model, 'body')
180   - ->textarea([ 'rows' => '3' ]) ?>
181   -
182   - <?= $form->field($model, 'check') ?>
183   -
184   - <?= $form->field($model, 'sms') ?>
185   -
  193 + </div>
186 194 </div>
187 195 </div>
188 196 </div>
... ...