diff --git a/models/Order.php b/models/Order.php index 1f24433..8ce9a07 100755 --- a/models/Order.php +++ b/models/Order.php @@ -247,7 +247,7 @@ if (empty($this->deadline)) { return false; } else { - return time() > $this->deadline; + return time() > strtotime($this->deadline); } } } \ No newline at end of file diff --git a/views/order/_form.php b/views/order/_form.php index 1d270fa..488b9e7 100755 --- a/views/order/_form.php +++ b/views/order/_form.php @@ -57,132 +57,140 @@ JS;
-
-
+
+
isNewRecord ? 'Create' : 'Update', + $model->isNewRecord ? \Yii::t('app', 'Create') : \Yii::t('app', 'Update'), [ 'class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary' ] ) ?> + 'btn btn-info', + 'target' => '_blank', + ] + ) ?>
-
-
-
- - field($model, 'deadline') - ->widget( - DatePicker::className(), - [ +
+
- ] - ) ?> - - field($model, 'pay') - ->widget( - SwitchInput::className(), - [ - 'name' => 'pay', - 'pluginOptions' => [ - 'onText' => \Yii::t('app', 'Оплачено'), - 'offText' => \Yii::t('app', 'Не оплачено'), - ], - ] - ); ?> - - field($model, 'reason') - ->dropDownList( - [ - 1 => 'То', - 2 => 'Сё', - ], - [ 'prompt' => 'Выберите причину' ] - ) ?> - - field($model, 'label') - ->dropDownList( - ArrayHelper::map( - Label::find() - ->asArray() - ->all(), - 'id', - 'label' - ), - [ 'prompt' => 'Выберите метку' ] - ); ?> - - field($model, 'name') ?> - - field($model, 'phone') ?> - - field($model, 'phone2') ?> - - field($model, 'email') ?> - - field( - $model, - 'numbercard' - ) - ->textInput([ 'readonly' => true ]) ?> - - field($model, 'comment') - ->textarea([ 'rows' => '3' ]) ?> - field($model, 'delivery') - ->dropDownList( - ArrayHelper::map( - Delivery::find() - ->joinWith('lang') - ->asArray() - ->all(), - 'id', - 'lang.title' - ), - [ 'prompt' => \Yii::t('app', 'Выберите доставку ...') ] - ) ?> - -
-
- - field($model, 'declaration') ?> - - field($model, 'stock') ?> - - field($model, 'consignment') ?> - - field($model, 'payment') - ->dropDownList( - ArrayHelper::map( - OrderPayment::find() + field($model, 'deadline') + ->widget( + DatePicker::className(), + [ + + ] + ) ?> + + field($model, 'pay') + ->widget( + SwitchInput::className(), + [ + 'name' => 'pay', + 'pluginOptions' => [ + 'onText' => \Yii::t('app', 'Оплачено'), + 'offText' => \Yii::t('app', 'Не оплачено'), + ], + ] + ); ?> + + field($model, 'reason') + ->dropDownList( + [ + 1 => 'То', + 2 => 'Сё', + ], + [ 'prompt' => 'Выберите причину' ] + ) ?> + + field($model, 'label') + ->dropDownList( + ArrayHelper::map( + Label::find() + ->asArray() + ->all(), + 'id', + 'label' + ), + [ 'prompt' => 'Выберите метку' ] + ); ?> + + field($model, 'name') ?> + + field($model, 'phone') ?> + + field($model, 'phone2') ?> + + field($model, 'email') ?> + + field( + $model, + 'numbercard' + ) + ->textInput([ 'readonly' => true ]) ?> + + field($model, 'comment') + ->textarea([ 'rows' => '3' ]) ?> + field($model, 'delivery') + ->dropDownList( + ArrayHelper::map( + Delivery::find() ->joinWith('lang') - ->where([ 'status' => OrderPayment::ACTIVE ]) ->asArray() ->all(), - 'id', - 'lang.title' - ), - [ 'prompt' => 'Способ оплаты ...' ] - ); ?> - - field($model, 'insurance') ?> + 'id', + 'lang.title' + ), + [ 'prompt' => \Yii::t('app', 'Выберите доставку ...') ] + ) ?> - field($model, 'amount_imposed') ?> - - field($model, 'shipping_by') - ->dropDownList( - ArrayHelper::getColumn(Order::SHIPPING_BY, 'label'), - [ 'prompt' => 'Оплата доставки ...' ] - ); ?> - - field($model, 'city') ?> - - field($model, 'adress') ?> +
+
+ + field($model, 'declaration') ?> + + field($model, 'stock') ?> + + field($model, 'consignment') ?> + + field($model, 'payment') + ->dropDownList( + ArrayHelper::map( + OrderPayment::find() + ->joinWith('lang') + ->where([ 'status' => OrderPayment::ACTIVE ]) + ->asArray() + ->all(), + 'id', + 'lang.title' + ), + [ 'prompt' => 'Способ оплаты ...' ] + ); ?> + + field($model, 'insurance') ?> + + field($model, 'amount_imposed') ?> + + field($model, 'shipping_by') + ->dropDownList( + ArrayHelper::getColumn(Order::SHIPPING_BY, 'label'), + [ 'prompt' => 'Оплата доставки ...' ] + ); ?> + + field($model, 'city') ?> + + field($model, 'adress') ?> + + field($model, 'body') + ->textarea([ 'rows' => '3' ]) ?> + + field($model, 'check') ?> + + field($model, 'sms') ?> - field($model, 'body') - ->textarea([ 'rows' => '3' ]) ?> - - field($model, 'check') ?> - - field($model, 'sms') ?> - +
-- libgit2 0.21.4