[cvs] commit: merk browse.php merk/carts index.php merk/checkout index.php merk/deliveries index.php merk/invoices index.php merk/items edit.php index.php merk/lib Categories.php Merk.php api.php merk/lib/Block item.php merk/lib/Driver sql.php ...

Chuck Hagenbuch chuck at horde.org
Sat Apr 15 20:22:05 PDT 2006 

chuck       2006-04-15 20:22:05 PDT

  Modified files:
    .                    browse.php 
    carts                index.php 
    checkout             index.php 
    deliveries           index.php 
    invoices             index.php 
    items                edit.php index.php 
    lib                  Categories.php Merk.php api.php 
    lib/Block            item.php 
    lib/Driver           sql.php 
    options              index.php 
    scripts/sql          merk.mssql.sql merk.sql 
    stocks               index.php 
    taxes                index.php 
    templates/block      cart_content.html cart_total.html 
                         categories.html item.html items.html 
    templates/browse     browse.html 
    templates/carts      edit.html index.html 
    templates/categories delete.html edit.html index.html 
    templates/checkout   index.html 
    templates/deliveries index.html 
    templates/invoices   index.html 
    templates/items      delete.html edit.html index.html 
    templates/options    index.html 
    templates/stocks     index.html 
    templates/taxes      index.html 
  Removed files:
    templates/deliveries edit.html 
  Log:
  - make item delivery non-required. Make it Boolean since we have only two
  options (default and non-default). This is not used anywhere.
  - added item_model field: stores product model IDs. Allows to import/sync data
  from client based items databases/categories (bridge from merk to companies
  internal ids)
  - Categories: suppress errors if the current language used is not present in
  categories data (log error and return empty array)
  - deleted not used /templates/deliveries/edit.html
  - clean up and simplify templates: use more divs, styles, use stripe.js for
  lists
  Submitted by: Duck <duck at obala.net>
  
  Revision  Changes    Path
  1.15      +2 -1      merk/browse.php
  1.19      +2 -1      merk/carts/index.php
  1.22      +2 -1      merk/checkout/index.php
  1.15      +2 -1      merk/deliveries/index.php
  1.15      +2 -2      merk/invoices/index.php
  1.25      +3 -2      merk/items/edit.php
  1.21      +2 -1      merk/items/index.php
  1.14      +5 -5      merk/lib/Block/item.php
  1.38      +6 -1      merk/lib/Categories.php
  1.50      +15 -32    merk/lib/Driver/sql.php
  1.19      +4 -8      merk/lib/Merk.php
  1.9       +11 -10    merk/lib/api.php
  1.16      +2 -1      merk/options/index.php
  1.3       +3 -2      merk/scripts/sql/merk.mssql.sql
  1.7       +3 -2      merk/scripts/sql/merk.sql
  1.15      +2 -1      merk/stocks/index.php
  1.3       +1 -0      merk/taxes/index.php
  1.3       +6 -6      merk/templates/block/cart_content.html
  1.3       +3 -5      merk/templates/block/cart_total.html
  1.2       +3 -5      merk/templates/block/categories.html
  1.3       +7 -7      merk/templates/block/item.html
  1.4       +4 -4      merk/templates/block/items.html
  1.9       +36 -62    merk/templates/browse/browse.html
  1.7       +20 -33    merk/templates/carts/edit.html
  1.6       +11 -11    merk/templates/carts/index.html
  1.5       +6 -11     merk/templates/categories/delete.html
  1.5       +6 -11     merk/templates/categories/edit.html
  1.5       +2 -4      merk/templates/categories/index.html
  1.8       +9 -9      merk/templates/checkout/index.html
  1.6       +0 -27     merk/templates/deliveries/Attic/edit.html (dead)
  1.7       +6 -6      merk/templates/deliveries/index.html
  1.6       +9 -9      merk/templates/invoices/index.html
  1.5       +6 -11     merk/templates/items/delete.html
  1.5       +6 -11     merk/templates/items/edit.html
  1.6       +43 -52    merk/templates/items/index.html
  1.6       +6 -6      merk/templates/options/index.html
  1.5       +7 -7      merk/templates/stocks/index.html
  1.4       +7 -9      merk/templates/taxes/index.html

  Chora Links:
  http://cvs.horde.org/diff.php/merk/browse.php?r1=1.14&r2=1.15&ty=u
  http://cvs.horde.org/diff.php/merk/carts/index.php?r1=1.18&r2=1.19&ty=u
  http://cvs.horde.org/diff.php/merk/checkout/index.php?r1=1.21&r2=1.22&ty=u
  http://cvs.horde.org/diff.php/merk/deliveries/index.php?r1=1.14&r2=1.15&ty=u
  http://cvs.horde.org/diff.php/merk/invoices/index.php?r1=1.14&r2=1.15&ty=u
  http://cvs.horde.org/diff.php/merk/items/edit.php?r1=1.24&r2=1.25&ty=u
  http://cvs.horde.org/diff.php/merk/items/index.php?r1=1.20&r2=1.21&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Block/item.php?r1=1.13&r2=1.14&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Categories.php?r1=1.37&r2=1.38&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Driver/sql.php?r1=1.49&r2=1.50&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Merk.php?r1=1.18&r2=1.19&ty=u
  http://cvs.horde.org/diff.php/merk/lib/api.php?r1=1.8&r2=1.9&ty=u
  http://cvs.horde.org/diff.php/merk/options/index.php?r1=1.15&r2=1.16&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/sql/merk.mssql.sql?r1=1.2&r2=1.3&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/sql/merk.sql?r1=1.6&r2=1.7&ty=u
  http://cvs.horde.org/diff.php/merk/stocks/index.php?r1=1.14&r2=1.15&ty=u
  http://cvs.horde.org/diff.php/merk/taxes/index.php?r1=1.2&r2=1.3&ty=u
  http://cvs.horde.org/diff.php/merk/templates/block/cart_content.html?r1=1.2&r2=1.3&ty=u
  http://cvs.horde.org/diff.php/merk/templates/block/cart_total.html?r1=1.2&r2=1.3&ty=u
  http://cvs.horde.org/diff.php/merk/templates/block/categories.html?r1=1.1&r2=1.2&ty=u
  http://cvs.horde.org/diff.php/merk/templates/block/item.html?r1=1.2&r2=1.3&ty=u
  http://cvs.horde.org/diff.php/merk/templates/block/items.html?r1=1.3&r2=1.4&ty=u
  http://cvs.horde.org/diff.php/merk/templates/browse/browse.html?r1=1.8&r2=1.9&ty=u
  http://cvs.horde.org/diff.php/merk/templates/carts/edit.html?r1=1.6&r2=1.7&ty=u
  http://cvs.horde.org/diff.php/merk/templates/carts/index.html?r1=1.5&r2=1.6&ty=u
  http://cvs.horde.org/diff.php/merk/templates/categories/delete.html?r1=1.4&r2=1.5&ty=u
  http://cvs.horde.org/diff.php/merk/templates/categories/edit.html?r1=1.4&r2=1.5&ty=u
  http://cvs.horde.org/diff.php/merk/templates/categories/index.html?r1=1.4&r2=1.5&ty=u
  http://cvs.horde.org/diff.php/merk/templates/checkout/index.html?r1=1.7&r2=1.8&ty=u
  http://cvs.horde.org/co.php/merk/templates/deliveries/Attic/edit.html?r=1.5
  http://cvs.horde.org/diff.php/merk/templates/deliveries/index.html?r1=1.6&r2=1.7&ty=u
  http://cvs.horde.org/diff.php/merk/templates/invoices/index.html?r1=1.5&r2=1.6&ty=u
  http://cvs.horde.org/diff.php/merk/templates/items/delete.html?r1=1.4&r2=1.5&ty=u
  http://cvs.horde.org/diff.php/merk/templates/items/edit.html?r1=1.4&r2=1.5&ty=u
  http://cvs.horde.org/diff.php/merk/templates/items/index.html?r1=1.5&r2=1.6&ty=u
  http://cvs.horde.org/diff.php/merk/templates/options/index.html?r1=1.5&r2=1.6&ty=u
  http://cvs.horde.org/diff.php/merk/templates/stocks/index.html?r1=1.4&r2=1.5&ty=u
  http://cvs.horde.org/diff.php/merk/templates/taxes/index.html?r1=1.3&r2=1.4&ty=u

More information about the cvs mailing list