[cvs] commit: merk browse.php categories.php direct.php images.php sellers.php merk/admin/categories delete.php edit.php index.php merk/carts delete.php edit.php index.php quantity.php merk/categories delete.php edit.php index.php merk/checkout ...

Mon Jun 25 16:09:45 UTC 2007

duck        2007-06-25 12:09:45 EDT

  Modified files:
    .                    browse.php categories.php direct.php 
                         images.php sellers.php 
    carts                delete.php edit.php index.php 
                         quantity.php 
    checkout             index.php process.php 
    deliveries           delete.php edit.php index.php 
    docs                 CHANGES 
    invoices             delete.php 
    items                delete.php edit.php index.php 
    lib                  Categories.php Deliveries.php Driver.php 
                         Invoices.php Merk.php Sellers.php 
                         Stock.php api.php base.php 
    lib/Block            categories.php items.php 
    lib/Deliveries       sql.php 
    lib/Driver           sql.php 
    lib/Invoices         sql.php 
    lib/SQL              Attributes.php 
    lib/Sellers          sql.php 
    lib/Stock            null.php sql.php 
    options              delete_option.php delete_value.php 
                         edit_name.php edit_value.php index.php 
    po                   merk.pot 
    scripts              all_options.php update_stock.php 
    scripts/sql          merk.mysql.sql merk.sql 
    scripts/upgrades     2006-12-02_category.php 
                         2006-12-02_locale.php 
                         2007-01-10_images.php 
    sellers              delete.php edit.php index.php 
    stocks               delete.php edit.php index.php 
                         quantity.php 
    thomas/templates/categories index.php 
    templates/prefs      display_category.inc 
  Added files:
    admin/categories     delete.php edit.php index.php 
    lib                  View.php 
    scripts/upgrades     2007-07-25_categories.php 
                         2007-07-25_categories.sql 
  Removed files:
    categories           delete.php edit.php index.php 
  Log:
  move categories out of DT
  php5 style methods definition
  move vfs path constant to merk object
  
  Revision  Changes    Path
  1.2       +1 -0      incubator/thomas/templates/categories/index.php
  1.1       +43 -0     merk/admin/categories/delete.php (new)
  1.1       +58 -0     merk/admin/categories/edit.php (new)
  1.1       +49 -0     merk/admin/categories/index.php (new)
  1.37      +3 -4      merk/browse.php
  1.26      +2 -2      merk/carts/delete.php
  1.50      +2 -2      merk/carts/edit.php
  1.39      +2 -2      merk/carts/index.php
  1.19      +2 -2      merk/carts/quantity.php
  1.4       +2 -2      merk/categories.php
  1.33      +0 -67     merk/categories/Attic/delete.php (dead)
  1.29      +0 -83     merk/categories/Attic/edit.php (dead)
  1.13      +0 -34     merk/categories/Attic/index.php (dead)
  1.69      +3 -3      merk/checkout/index.php
  1.23      +10 -10    merk/checkout/process.php
  1.22      +2 -2      merk/deliveries/delete.php
  1.28      +2 -2      merk/deliveries/edit.php
  1.25      +2 -2      merk/deliveries/index.php
  1.16      +4 -4      merk/direct.php
  1.8       +1 -0      merk/docs/CHANGES
  1.8       +2 -2      merk/images.php
  1.21      +2 -2      merk/invoices/delete.php
  1.28      +4 -4      merk/items/delete.php
  1.53      +3 -3      merk/items/edit.php
  1.31      +3 -12     merk/items/index.php
  1.14      +2 -5      merk/lib/Block/categories.php
  1.18      +2 -2      merk/lib/Block/items.php
  1.50      +395 -362  merk/lib/Categories.php
  1.3       +2 -2      merk/lib/Deliveries.php
  1.14      +11 -11    merk/lib/Deliveries/sql.php
  1.42      +26 -26    merk/lib/Driver.php
  1.113     +128 -135  merk/lib/Driver/sql.php
  1.18      +4 -4      merk/lib/Invoices.php
  1.21      +7 -7      merk/lib/Invoices/sql.php
  1.54      +52 -28    merk/lib/Merk.php
  1.5       +5 -5      merk/lib/SQL/Attributes.php
  1.7       +12 -12    merk/lib/Sellers.php
  1.8       +27 -27    merk/lib/Sellers/sql.php
  1.8       +6 -6      merk/lib/Stock.php
  1.8       +2 -3      merk/lib/Stock/null.php
  1.18      +12 -12    merk/lib/Stock/sql.php
  1.1       +52 -0     merk/lib/View.php (new)
  1.35      +5 -5      merk/lib/api.php
  1.27      +5 -5      merk/lib/base.php
  1.25      +4 -4      merk/options/delete_option.php
  1.24      +2 -2      merk/options/delete_value.php
  1.25      +2 -2      merk/options/edit_name.php
  1.34      +2 -2      merk/options/edit_value.php
  1.26      +2 -2      merk/options/index.php
  1.81      +18 -22    merk/po/merk.pot
  1.4       +2 -2      merk/scripts/all_options.php
  1.15      +15 -67    merk/scripts/sql/merk.mysql.sql
  1.17      +20 -2     merk/scripts/sql/merk.sql
  1.4       +4 -4      merk/scripts/update_stock.php
  1.3       +3 -3      merk/scripts/upgrades/2006-12-02_category.php
  1.3       +6 -6      merk/scripts/upgrades/2006-12-02_locale.php
  1.4       +12 -12    merk/scripts/upgrades/2007-01-10_images.php
  1.1       +62 -0     merk/scripts/upgrades/2007-07-25_categories.php (new)
  1.1       +19 -0     merk/scripts/upgrades/2007-07-25_categories.sql (new)
  1.5       +2 -2      merk/sellers.php
  1.5       +2 -2      merk/sellers/delete.php
  1.5       +2 -2      merk/sellers/edit.php
  1.6       +2 -2      merk/sellers/index.php
  1.23      +2 -2      merk/stocks/delete.php
  1.22      +2 -2      merk/stocks/edit.php
  1.36      +3 -3      merk/stocks/index.php
  1.23      +2 -2      merk/stocks/quantity.php
  1.3       +3 -5      merk/templates/prefs/display_category.inc

  Chora Links:
  http://cvs.horde.org/diff.php/incubator/thomas/templates/categories/index.php?r1=1.1&r2=1.2&ty=u
  http://cvs.horde.org/co.php/merk/admin/categories/delete.php?r=1.1
  http://cvs.horde.org/co.php/merk/admin/categories/edit.php?r=1.1
  http://cvs.horde.org/co.php/merk/admin/categories/index.php?r=1.1
  http://cvs.horde.org/diff.php/merk/browse.php?r1=1.36&r2=1.37&ty=u
  http://cvs.horde.org/diff.php/merk/carts/delete.php?r1=1.25&r2=1.26&ty=u
  http://cvs.horde.org/diff.php/merk/carts/edit.php?r1=1.49&r2=1.50&ty=u
  http://cvs.horde.org/diff.php/merk/carts/index.php?r1=1.38&r2=1.39&ty=u
  http://cvs.horde.org/diff.php/merk/carts/quantity.php?r1=1.18&r2=1.19&ty=u
  http://cvs.horde.org/diff.php/merk/categories.php?r1=1.3&r2=1.4&ty=u
  http://cvs.horde.org/co.php/merk/categories/Attic/delete.php?r=1.32
  http://cvs.horde.org/co.php/merk/categories/Attic/edit.php?r=1.28
  http://cvs.horde.org/co.php/merk/categories/Attic/index.php?r=1.12
  http://cvs.horde.org/diff.php/merk/checkout/index.php?r1=1.68&r2=1.69&ty=u
  http://cvs.horde.org/diff.php/merk/checkout/process.php?r1=1.22&r2=1.23&ty=u
  http://cvs.horde.org/diff.php/merk/deliveries/delete.php?r1=1.21&r2=1.22&ty=u
  http://cvs.horde.org/diff.php/merk/deliveries/edit.php?r1=1.27&r2=1.28&ty=u
  http://cvs.horde.org/diff.php/merk/deliveries/index.php?r1=1.24&r2=1.25&ty=u
  http://cvs.horde.org/diff.php/merk/direct.php?r1=1.15&r2=1.16&ty=u
  http://cvs.horde.org/diff.php/merk/docs/CHANGES?r1=1.7&r2=1.8&ty=u
  http://cvs.horde.org/diff.php/merk/images.php?r1=1.7&r2=1.8&ty=u
  http://cvs.horde.org/diff.php/merk/invoices/delete.php?r1=1.20&r2=1.21&ty=u
  http://cvs.horde.org/diff.php/merk/items/delete.php?r1=1.27&r2=1.28&ty=u
  http://cvs.horde.org/diff.php/merk/items/edit.php?r1=1.52&r2=1.53&ty=u
  http://cvs.horde.org/diff.php/merk/items/index.php?r1=1.30&r2=1.31&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Block/categories.php?r1=1.13&r2=1.14&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Block/items.php?r1=1.17&r2=1.18&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Categories.php?r1=1.49&r2=1.50&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Deliveries.php?r1=1.2&r2=1.3&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Deliveries/sql.php?r1=1.13&r2=1.14&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Driver.php?r1=1.41&r2=1.42&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Driver/sql.php?r1=1.112&r2=1.113&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Invoices.php?r1=1.17&r2=1.18&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Invoices/sql.php?r1=1.20&r2=1.21&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Merk.php?r1=1.53&r2=1.54&ty=u
  http://cvs.horde.org/diff.php/merk/lib/SQL/Attributes.php?r1=1.4&r2=1.5&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Sellers.php?r1=1.6&r2=1.7&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Sellers/sql.php?r1=1.7&r2=1.8&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Stock.php?r1=1.7&r2=1.8&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Stock/null.php?r1=1.7&r2=1.8&ty=u
  http://cvs.horde.org/diff.php/merk/lib/Stock/sql.php?r1=1.17&r2=1.18&ty=u
  http://cvs.horde.org/co.php/merk/lib/View.php?r=1.1
  http://cvs.horde.org/diff.php/merk/lib/api.php?r1=1.34&r2=1.35&ty=u
  http://cvs.horde.org/diff.php/merk/lib/base.php?r1=1.26&r2=1.27&ty=u
  http://cvs.horde.org/diff.php/merk/options/delete_option.php?r1=1.24&r2=1.25&ty=u
  http://cvs.horde.org/diff.php/merk/options/delete_value.php?r1=1.23&r2=1.24&ty=u
  http://cvs.horde.org/diff.php/merk/options/edit_name.php?r1=1.24&r2=1.25&ty=u
  http://cvs.horde.org/diff.php/merk/options/edit_value.php?r1=1.33&r2=1.34&ty=u
  http://cvs.horde.org/diff.php/merk/options/index.php?r1=1.25&r2=1.26&ty=u
  http://cvs.horde.org/diff.php/merk/po/merk.pot?r1=1.80&r2=1.81&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/all_options.php?r1=1.3&r2=1.4&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/sql/merk.mysql.sql?r1=1.14&r2=1.15&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/sql/merk.sql?r1=1.16&r2=1.17&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/update_stock.php?r1=1.3&r2=1.4&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/upgrades/2006-12-02_category.php?r1=1.2&r2=1.3&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/upgrades/2006-12-02_locale.php?r1=1.2&r2=1.3&ty=u
  http://cvs.horde.org/diff.php/merk/scripts/upgrades/2007-01-10_images.php?r1=1.3&r2=1.4&ty=u
  http://cvs.horde.org/co.php/merk/scripts/upgrades/2007-07-25_categories.php?r=1.1
  http://cvs.horde.org/co.php/merk/scripts/upgrades/2007-07-25_categories.sql?r=1.1
  http://cvs.horde.org/diff.php/merk/sellers.php?r1=1.4&r2=1.5&ty=u
  http://cvs.horde.org/diff.php/merk/sellers/delete.php?r1=1.4&r2=1.5&ty=u
  http://cvs.horde.org/diff.php/merk/sellers/edit.php?r1=1.4&r2=1.5&ty=u
  http://cvs.horde.org/diff.php/merk/sellers/index.php?r1=1.5&r2=1.6&ty=u
  http://cvs.horde.org/diff.php/merk/stocks/delete.php?r1=1.22&r2=1.23&ty=u
  http://cvs.horde.org/diff.php/merk/stocks/edit.php?r1=1.21&r2=1.22&ty=u
  http://cvs.horde.org/diff.php/merk/stocks/index.php?r1=1.35&r2=1.36&ty=u
  http://cvs.horde.org/diff.php/merk/stocks/quantity.php?r1=1.22&r2=1.23&ty=u
  http://cvs.horde.org/diff.php/merk/templates/prefs/display_category.inc?r1=1.2&r2=1.3&ty=u