Revision 553

Date:
2016/03/16 22:55:39
Author:
ahitrov
Revision Log:
Payment field now is a status field.
Class webshop::Order now has 'pay_amount' field for pay balance.

Files:

Legend:

 
Added
 
Removed
 
Modified

  • utf8/plugins/webshop/comps/contenido/webshop/components/order_browse.msn

     
    246 246 } elsif ( $status == 4 && !$active_rights ) {
    247 247 $href = 'delivery.html';
    248 248 @actions = { href => $href, name => 'просмотр' };
    249 } elsif ( $status == 5 && !$active_rights ) {
    250 $href = 'delivery.html';
    251 @actions = { href => $href, name => 'просмотр' };
    249 252 }
    250 253
    251 254 </%init>

  • utf8/plugins/webshop/lib/webshop/Order.pm

     
    32 32 },
    33 33 { 'attr' => 'pay_alias', 'type' => 'string', 'rusname' => 'Название метода оплаты', shortname => 'Оплата',
    34 34 postshow => 1, facilshow => 1 },
    35 { 'attr' => 'pay_amount', 'type' => 'string', 'rusname' => 'Оплаченная сумма',
    36 postshow => 1, facilshow => 1 },
    35 37 { 'attr' => 'btime', 'type' => 'datetime', 'rusname' => 'Заказ отдан на комплектацию',
    36 38 postshow => 1, facilshow => 1 },
    37 39 { 'attr' => 'ftime', 'type' => 'datetime', 'rusname' => 'Заказ передан в доставку',

  • utf8/plugins/webshop/lib/webshop/SQL/Order.pm

     
    173 173 },
    174 174 {
    175 175 'attr' => 'payment',
    176 'type' => 'checkbox',
    176 'type' => 'status',
    177 177 'postshow' => 1,
    178 178 'facilshow' => 1,
    179 179 'column' => 8,
    180 'cases' => [
    181 [0, 'Не оплачен'],
    182 [1, 'Оплачен'],
    183 [2, 'Частично'],
    184 [3, 'Средства заблокированы'],
    185 [4, 'Возврат'],
    186 ],
    180 187 'rusname' => 'Оплачен',
    181 188 'db_field' => 'payment',
    182 189 'db_type' => 'integer',