diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/ChangeLog zen-cart-v1.2.0-l10n-jp-2/ChangeLog *** zen-cart-v1.2.0-l10n-jp-1/ChangeLog Thu Jan 1 09:00:00 1970 --- zen-cart-v1.2.0-l10n-jp-2/ChangeLog Sat Apr 23 11:34:07 2005 *************** *** 0 **** --- 1,169 ---- + 2005-04-22 18:15 shida + + * zc_install/mysql_zencart.sql: + ¾¦ÉÊ¥ª¥×¥·¥ç¥ó¤Î¡É¥Æ¥­¥¹¥È¥Ü¥Ã¥¯¥¹¡É¤¬»ÈÍѤǤ­¤Ê¤¤ + http://zen-cart.jp/pukiwiki/pukiwiki.php?%A5%D7%A5%ED%A5%B8%A5%A7%A5%AF%A5%C8%2Fv1.2.0%C6%FC%CB%DC%B8%EC%B2%BD%2F%A5%D0%A5%B0%A5%C8%A5%E9%A5%C3%A5%AF%2F70 + + ¤Î·ï¤Î¥Ð¥°¥Õ¥£¥¯¥¹ + + ¤¢¤ê¤¬¤È¤¦¤´¤¶¤¤¤Þ¤¹¡£¡ä º´¡¹ÌÚ2¹æ¤µ¤ó + + 2005-04-22 07:06 shida + + * includes/classes/email.php: ¥Ç¥Ð¥Ã¥°Ê¸¤ò¾Ã¤·Ëº¤ì¤Æ¤·¤Þ¤¤¤Þ¤·¤¿ + m(_ _)m ºï½ü¡£ + + 2005-04-22 06:50 shida + + * includes/modules/order_total/ot_cod_fee.php: nittsu, + yamato¤ÎÂå°ú¤­¼ê¿ôÎÁ¤ËÂбþ¤¹¤ë·ï¤Ç½¤Àµ¤ÎºÝ¡¢ + nittsu¤Ë½¤Àµ¤·Ëº¤ì¤¿ÅÀ¤ò ½¤Àµ + + 2005-04-22 06:46 shida + + * includes/modules/order_total/ot_cod_fee.php: + hira¤µ¤ó¤¬1.2->1.3¤ÇÂбþ¤·¤Æ¤¯¤À¤µ¤Ã¤¿¡¢yamato + nittsu¤ÎÂå°ú¤­¼ê¿ôÎÁ¤Îº¹Ê¬¤ò JPN¥Ö¥é¥ó¥Á¤Ë¤âcommit + + 2005-04-22 01:02 t_hira + + * includes/modules/order_total/ot_cod_fee.php: Yamato&Nittsu add + + 2005-04-16 14:37 shida + + * includes/modules/shipping/yamato.php: + ¥ä¥Þ¥È¤Ïº´Àî¤ò¥³¥Ô¡¼¤·¤¿¤Î¤Çº´Àî¤ÈƱÍͤΥХ°¥Õ¥£¥¯¥¹ + + ¡Öº´ÀîµÞÊؤÇÉ÷Âޤη׻»¤¬¤ª¤«¤·¤¤¡×¤ÎÂбþ + http://zen-cart.jp/pukiwiki/pukiwiki.php?%A5%D7%A5%ED%A5%B8%A5%A7%A5%AF%A5%C8%2Fv1.2.0%C6%FC%CB%DC%B8%EC%B2%BD%2F%A5%D0%A5%B0%A5%C8%A5%E9%A5%C3%A5%AF%2F60 + + 2005-04-15 10:14 shida + + * includes/: + languages/english/modules/payment/kuroneko_at_payment.php, + languages/japanese/modules/payment/kuroneko_at_payment.php, + templates/template_default/buttons/english/button_kuroneko_at_payment.gif, + templates/template_default/buttons/japanese/button_kuroneko_at_payment.gif, + modules/payment/kuroneko_at_payment.php, + templates/template_default/templates/tpl_checkout_success_default.php: + ¥¯¥í¥Í¥³@¥Ú¥¤¥á¥ó¥È¤Î¥Ç¥Õ¥©¥ë¥ÈÁȤ߹þ¤ß + + º´¡¹ÌÚ2¹æ¤µ¤ó¤¢¤ê¤¬¤È¤¦¤´¤¶¤¤¤Þ¤¹¡£ m(_ _)m + http://zen-cart.jp/bbs/7/tree.php?all=230 + + 2005-04-10 15:13 shida + + * includes/: classes/_nittsu.php, + languages/english/modules/shipping/nittsu.php, + languages/japanese/modules/shipping/nittsu.php, + modules/shipping/nittsu.php: + Yatts¤µ¤ó¤¬ºî¤Ã¤Æ¤¯¤À¤µ¤Ã¤¿ÆüËÜÄ̱¿¥Ú¥ê¥«¥óÊØ¡¢ÊØÁ÷¥â¥¸¥å¡¼¥ë¤òÆüËܸìÈÇZen + Cart¤Ë¥Ç¥Õ¥©¥ë¥ÈÁȤ߹þ¤ß + + 2005-04-10 14:42 shida + + * includes/: classes/_yamato.php, + languages/english/modules/shipping/yamato.php, + languages/japanese/modules/shipping/yamato.php, + modules/shipping/yamato.php: + hira¤µ¤ó¤¬ºî¤Ã¤Æ¤¯¤À¤µ¤Ã¤¿¥ä¥Þ¥È±¿Í¢ÇÛÁ÷¥â¥¸¥å¡¼¥ë¤òÆüËܸìÈÇZen + Cart¤Ë¥Ç¥Õ¥©¥ë¥ÈÁȤ߹þ¤ß + + 2005-04-10 12:45 shida + + * includes/modules/pages/download/: header_php.php: + http://www.zen-cart.jp/bbs/4/tree.php?n=387 + http://www.zen-cart.com/modules/ipb/index.php?showtopic=17339&hl= + http://zen-cart.jp/pukiwiki/pukiwiki.php?%A5%D7%A5%ED%A5%B8%A5%A7%A5%AF%A5%C8%2Fv1.2.0%C6%FC%CB%DC%B8%EC%B2%BD%2F%A5%D0%A5%B0%A5%C8%A5%E9%A5%C3%A5%AF%2F69 + + ¤Çhira¤µ¤ó¤¬½¤Àµ¤·¤Æ¤¯¤À¤µ¤¤¤Þ¤·¤¿¡£ + + ¤Ê¤¼¡¢¤³¤¦¤¤¤Ã¤¿¾É¾õ¤¬½Ð¤ë¤Î¤«¤ï¤«¤ê¤Þ¤»¤ó¤¬¡¢ + ³ºÅö²Õ½ê¤Îexit()¤Ï¤Ê¤¤¤ÈÌÀ¤é¤«¤Ë¤ª¤«¤·¤¤¤Ç¤¹¤è¤Í¡£ + + ¥Õ¥¡¥¤¥ë¥À¥¦¥ó¥í¡¼¥É¤Î¸å¡¢HTML¤È¤«½ÐÎϤ·¤Æ¤·¤Þ¤¦¤È»×¤¤¤Þ¤¹¤·¡£ + ¤³¤Á¤é¤Î½¤Àµ¤ÇÂç¾æÉפÀ¤È»×¤¤¤Þ¤¹¡£ + + 2005-04-10 12:07 shida + + * admin/includes/classes/email.php, includes/classes/email.php: + ¥æ¡¼¥¶¡¼ÅÐÏ¿¥á¡¼¥ë¤Ç¥á¡¼¥ë¥Ø¥Ã¥À¡¼¤¬ËÜʸ¤ËÆþ¤Ã¤Æ¤­¤Æ¤·¤Þ¤¦ + http://zen-cart.jp/pukiwiki/pukiwiki.php?%A5%D7%A5%ED%A5%B8%A5%A7%A5%AF%A5%C8%2Fv1.2.0%C6%FC%CB%DC%B8%EC%B2%BD%2F%A5%D0%A5%B0%A5%C8%A5%E9%A5%C3%A5%AF%2F52 + + http://www.zen-cart.jp/bbs/4/tree.php?n=427 + ¤Çstone¤µ¤ó¤¬¶µ¤¨¤Æ¤¯¤À¤µ¤Ã¤¿ÊýË¡¤Çbug fix¡£ + + mb_send_mail¤Ë½ñ¤­´¹¤¨¤ëÊýË¡¤â¹Í¤¨¤¿¤¬¡¢ + + http://www.zen-cart.jp/bbs/1/tree.php?n=168 + + ¤È¤¤¤¦·Ð°Þ¤â¤¢¤ê¡¢º£²ó¤Ï¤È¤ê¤¢¤¨¤ºÃÇÇ°¡£ + + ¾­ÍèŪ¤Ë¤Ï¤â¤Ã¤È¤è¤¤Â¿¸À¸ì²½¤ò¤·¤¿¤¤¡£ + + 2005-04-08 07:37 shida + + * includes/languages/japanese.php: + http://zen-cart.jp/pukiwiki/pukiwiki.php?%A5%D7%A5%ED%A5%B8%A5%A7%A5%AF%A5%C8%2Fv1.2.0%C6%FC%CB%DC%B8%EC%B2%BD%2F%A5%D0%A5%B0%A5%C8%A5%E9%A5%C3%A5%AF%2F68 + ¤ªÕü¤±»þ´ÖÂÓ ¤Î·ï + + 2005-04-08 07:30 shida + + * includes/application_top.php: + http://zen-cart.jp/pukiwiki/pukiwiki.php?%A5%D7%A5%ED%A5%B8%A5%A7%A5%AF%A5%C8%2Fv1.2.0%C6%FC%CB%DC%B8%EC%B2%BD%2F%A5%D0%A5%B0%A5%C8%A5%E9%A5%C3%A5%AF%2F64 + ¾¦ÉʤȲÁ³Ê¥Ö¥é¥¦¥º¤ÎÀ©¸Â¤Ë¤Æ¥Ö¥é¥¦¥¹¤Ë¤Ï¥í¥°¥¤¥ó¤¬É¬¿Ü¤Î¾ì¹ç¤Ë¡Ö¥Ñ¥¹¥ï¡¼¥É¤ò˺¤ì¤¿¤é¡×¤¬ÍøÍѤǤ­¤Ê¤¤ + + ¤Î·ï¤ò½¤Àµ¤·¡¢commit + + 2005-04-02 08:42 shida + + * extras/remise-result.php: ¥ê¥Ó¥¸¥ç¥ó1.1.2.1¤«¤é¤Î¥Þ¡¼¥¸Ï³¤ì¡£ + ²¿¸Î¤À¤í¤¦¡Ä + + http://zen-cart.jp/bbs/2/tree.php?n=938 ¤Ç¡¢tasukus + ¤µ¤ó¤«¤é¤Î¤´»ØŦ¡£ + + ¤¢¤ê¤¬¤È¤¦¤´¤¶¤¤¤Þ¤¹¡£ m(_ _)m + + 2005-03-30 19:29 shida + + * admin/includes/languages/japanese/: product.php, + product_free_shipping.php, product_music.php: + %s¤Îs¤¬È´¤±¤Æ¤¤¤¿¤â¤Î¤ò½¤Àµ + miyamoo¤µ¤ó¤Î¤´»ØŦ¡£¤¢¤ê¤¬¤È¤¦¤´¤¶¤¤¤Þ¤¹¡£m(_ _)m + http://zen-cart.jp/bbs/4/tree.php?n=483 + + 2005-03-17 16:30 shida + + * includes/functions/functions_general.php: + mbÂбþ¡£¤³¤ì¤Ç¥ì¥Ó¥å¡¼¤Îʸ»ú²½¤±¤Ê¤É¤ò²ò¾Ã + + 2005-03-13 17:18 shida + + * includes/modules/shipping/sagawaex.php: + ¡Öº´ÀîµÞÊؤÇÉ÷Âޤη׻»¤¬¤ª¤«¤·¤¤¡×¤ÎÂбþ + http://zen-cart.jp/pukiwiki/pukiwiki.php?%A5%D7%A5%ED%A5%B8%A5%A7%A5%AF%A5%C8%2Fv1.2.0%C6%FC%CB%DC%B8%EC%B2%BD%2F%A5%D0%A5%B0%A5%C8%A5%E9%A5%C3%A5%AF%2F60 + + 2005-02-13 13:53 shida + + * includes/functions/functions_general.php: + strtolower¤ò2¥Ð¥¤¥Èʸ»ú¤ËÂФ·¤Æ¹Ô¤¦¤È¡¢Ê¸»ú¤¬²õ¤ì¤ë + + 2005-02-13 09:24 shida + + * includes/modules/order_total/ot_cod_fee.php: + e-¥³¥ì¥¯¥È¤Ç¤âÂå°ú¤­¼ê¿ôÎÁ¤¬É½¼¨¤µ¤ì¤ë¤è¤¦¤Ë½¤Àµ + + 2005-02-13 01:06 shida + + * includes/classes/email.php: + ¥ê¥Ó¥¸¥ç¥ó1.4¤«¤é1.5¤Ç¥Ð¥°¥Õ¥£¥¯¥¹¤·¤¿¤Ä¤â¤ê¤¬¥Ð¥°¤òÆþ¤ì¤Æ¤¿¡£ + Windows¥µ¡¼¥Ð¡¼¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿PHP¤Îmail´Ø¿ô¤Ï¡¢ + + To: Yuki SHIDA + + ¤Î¤è¤¦¤ÊTo¥Ø¥Ã¥À¤Ï¥Ñ¡¼¥¹¤Ç¤­¤Ê¤¤¤Î¤Ç¡¢$to_addr¤Ç¤¢¤ëɬÍפ¬¤¢¤ë¡£ + + »²¹Í: http://jp.php.net/manual/ja/function.mail.php + + ËܲȤοͤϤ³¤ó¤Ê¤È¤³¤í¤Þ¤Çºî¤ê¤³¤ó¤Ç¤Æ¤¹¤´¤¤¤Ê¤¡¡¢¤È²þ¤á¤Æ´¶¿´¡£(¥³¡¼¥É¤Ï±ø¤¤¤±¤É) diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/ChangeLog-en zen-cart-v1.2.0-l10n-jp-2/ChangeLog-en *** zen-cart-v1.2.0-l10n-jp-1/ChangeLog-en Thu Jan 1 09:00:00 1970 --- zen-cart-v1.2.0-l10n-jp-2/ChangeLog-en Sat Apr 23 11:34:07 2005 *************** *** 0 **** --- 1,866 ---- + Zen-Cart : The Art of E-Commerce + + + Release v1.1.1d + + NOTE: This is a Bugfix release + NOTE: There are changes to the database (see UPGRADING.TXT file) + Files altered for this release + + admin/attributes_controller.php,v + admin/categories.php,v + admin/configuration.php,v + admin/countries.php,v + admin/coupon_admin.php,v + admin/coupon_restrict.php,v + admin/currencies.php,v + admin/geo_zones.php,v + admin/gv_mail.php,v + admin/gv_queue.php,v + admin/gv_sent.php,v + admin/index.php,v + admin/languages.php,v + admin/layout_controller.php,v + admin/manufacturers.php,v + admin/modules.php,v + admin/orders.php,v + admin/password_forgotten.php,v + admin/products_attributes.php,v + admin/salemaker.php,v + admin/server_info.php,v + admin/specials.php,v + admin/tax_classes.php,v + admin/tax_rates.php,v + admin/zones.php,v + admin/includes/application_bottom.php,v + admin/includes/application_top.php,v + admin/includes/footer.php,v + admin/includes/functions/general.php,v + admin/includes/functions/gzip_compression.php,v + admin/includes/languages/english/attributes_controller.php,v + admin/includes/languages/english/categories.php,v + admin/includes/languages/english/products_attributes.php,v + admin/includes/languages/english/salemaker.php,v + admin/includes/languages/english/salemaker_info.php,v + includes/application_bottom.php,v + includes/application_top.php,v + includes/classes/currencies.php,v + includes/classes/order.php,v + includes/classes/shipping.php,v + includes/functions/general.php,v + includes/functions/gzip_compression.php,v + includes/functions/html_output.php,v + includes/languages/english.php,v + includes/languages/english/email_extras.php,v + includes/languages/english/password_forgotten.php,v + includes/languages/english/popup_cvv_help.php,v + includes/languages/english/product_info.php,v + includes/languages/english/shopping_cart.php,v + includes/languages/english/classic/index.php,v + includes/modules/header.php,v + includes/modules/product_listing.php,v + includes/modules/order_total/ot_gv.php,v + includes/modules/pages/checkout_confirmation/header_php.php,v + includes/modules/pages/checkout_process/header_php.php,v + includes/modules/pages/contact_us/header_php.php,v + includes/modules/pages/create_account/header_php.php,v + includes/modules/pages/gv_send/header_php.php,v + includes/modules/pages/password_forgotten/header_php.php,v + includes/modules/pages/popup_image/jscript_main.php,v + includes/modules/pages/popup_image_additional/jscript_main.php,v + includes/modules/pages/product_info/main_template_vars.php,v + includes/modules/pages/product_info/main_template_vars_attributes.php,v + includes/modules/pages/tell_a_friend/header_php.php,v + includes/modules/payment/cc.php,v + includes/modules/shipping/ups.php,v + includes/modules/sideboxes/categories.php,v + includes/modules/sideboxes/shopping_cart.php,v + includes/templates/template_default/popup_image/tpl_main_page.php,v + includes/templates/template_default/popup_image_additional/tpl_main_page.php,v + includes/templates/template_default/sideboxes/tpl_categories.php,v + includes/templates/template_default/templates/tpl_checkout_confirmation_default.php,v + includes/templates/template_default/templates/tpl_gv_send_default.php,v + includes/templates/template_default/templates/tpl_shopping_cart_default.php,v + install/mysql_upgrade_zencart.sql,v + install/mysql_zencart.sql,v + install/demo/mysql_demo.sql,v + install/modules/database_upgrade.php,v + install/templates/database_upgrade.tpl.php,v + install/templates/main_page.tpl.php,v + install/templates/main_page_upgrade.tpl.php,v + + + + Release v1.1.0 + + NOTE: This is a version release + NOTE: There are changes to the database (see UPGRADING.TXT file) + NOTE: There are changes to the configure.php format (see UPGRADING.TXT file) + NOTE: See http://www.zen-cart.com/modules/freecontent/index.php?id=19 for feature addittions + Files altered for this release + + index.php + admin/admin.php + admin/attributes_controller.php + admin/backup.php + admin/categories.php + admin/configuration.php + admin/countries.php + admin/coupon_admin.php + admin/currencies.php + admin/customers.php + admin/define_language.php + admin/file_manager.php + admin/geo_zones.php + admin/gv_mail.php + admin/gv_queue.php + admin/index.php + admin/languages.php + admin/login.php + admin/mail.php + admin/manufacturers.php + admin/modules.php + admin/newsletters.php + admin/option_name.php + admin/option_values.php + admin/orders.php + admin/orders_status.php + admin/password_forgotten.php + admin/popup_image.php + admin/products_attributes.php + admin/reviews.php + admin/specials.php + admin/tax_classes.php + admin/tax_rates.php + admin/template_select.php + admin/whos_online.php + admin/zones.php + admin/includes/application_top.php + admin/includes/database_tables.php + admin/includes/dist-configure.php + admin/includes/filenames.php + admin/includes/footer.php + admin/includes/header.php + admin/includes/stylesheet.css + admin/includes/boxes/catalog_dhtml.php + admin/includes/boxes/tools_dhtml.php + admin/includes/classes/language.php + admin/includes/classes/logger.php + admin/includes/classes/order.php + admin/includes/classes/shopping_cart.php + admin/includes/classes/upload.php + admin/includes/functions/general.php + admin/includes/functions/gzip_compression.php + admin/includes/functions/html_output.php + admin/includes/languages/english.php + admin/includes/languages/english/admin.php + admin/includes/languages/english/categories.php + admin/includes/languages/english/email_extras.php + admin/includes/languages/english/geo_zones.php + admin/includes/languages/english/gv_queue.php + admin/includes/languages/english/login.php + admin/includes/languages/english/orders.php + admin/includes/languages/english/password_forgotten.php + admin/includes/languages/english/products_attributes.php + admin/includes/languages/english/specials.php + admin/includes/modules/newsletters/newsletter.php + admin/includes/modules/newsletters/product_notification.php + includes/application_bottom.php + includes/application_top.php + includes/database_tables.php + includes/dist-configure.php + includes/filenames.php + includes/classes/currencies.php + includes/classes/language.php + includes/classes/message_stack.php + includes/classes/order.php + includes/classes/order_total.php + includes/classes/payment.php + includes/classes/shopping_cart.php + includes/classes/template_func.php + includes/classes/upload.php + includes/classes/adodb/adodb-cryptsession.php + includes/classes/adodb/adodb-csvlib.inc.php + includes/classes/adodb/adodb-datadict.inc.php + includes/classes/adodb/adodb-error.inc.php + includes/classes/adodb/adodb-errorhandler.inc.php + includes/classes/adodb/adodb-errorpear.inc.php + includes/classes/adodb/adodb-exceptions.inc.php + includes/classes/adodb/adodb-iterator.inc.php + includes/classes/adodb/adodb-lib.inc.php + includes/classes/adodb/adodb-pager.inc.php + includes/classes/adodb/adodb-pear.inc.php + includes/classes/adodb/adodb-perf.inc.php + includes/classes/adodb/adodb-php4.inc.php + includes/classes/adodb/adodb-session-clob.php + includes/classes/adodb/adodb-session.php + includes/classes/adodb/adodb-time.inc.php + includes/classes/adodb/adodb-xmlschema.inc.php + includes/classes/adodb/adodb-xmlschema.zip + includes/classes/adodb/adodb.inc.php + includes/classes/adodb/crypt.inc.php + includes/classes/adodb/pivottable.inc.php + includes/classes/adodb/rsfilter.inc.php + includes/classes/adodb/server.php + includes/classes/adodb/toexport.inc.php + includes/classes/adodb/tohtml.inc.php + includes/classes/adodb/datadict/datadict-access.inc.php + includes/classes/adodb/datadict/datadict-db2.inc.php + includes/classes/adodb/datadict/datadict-generic.inc.php + includes/classes/adodb/datadict/datadict-ibase.inc.php + includes/classes/adodb/datadict/datadict-informix.inc.php + includes/classes/adodb/datadict/datadict-mssql.inc.php + includes/classes/adodb/datadict/datadict-mysql.inc.php + includes/classes/adodb/datadict/datadict-oci8.inc.php + includes/classes/adodb/datadict/datadict-postgres.inc.php + includes/classes/adodb/datadict/datadict-sybase.inc.php + includes/classes/adodb/drivers/adodb-access.inc.php + includes/classes/adodb/drivers/adodb-ado.inc.php + includes/classes/adodb/drivers/adodb-ado_access.inc.php + includes/classes/adodb/drivers/adodb-ado_mssql.inc.php + includes/classes/adodb/drivers/adodb-borland_ibase.inc.php + includes/classes/adodb/drivers/adodb-csv.inc.php + includes/classes/adodb/drivers/adodb-db2.inc.php + includes/classes/adodb/drivers/adodb-fbsql.inc.php + includes/classes/adodb/drivers/adodb-firebird.inc.php + includes/classes/adodb/drivers/adodb-ibase.inc.php + includes/classes/adodb/drivers/adodb-informix.inc.php + includes/classes/adodb/drivers/adodb-informix72.inc.php + includes/classes/adodb/drivers/adodb-mssql.inc.php + includes/classes/adodb/drivers/adodb-mssqlpo.inc.php + includes/classes/adodb/drivers/adodb-mysql.inc.php + includes/classes/adodb/drivers/adodb-mysqlt.inc.php + includes/classes/adodb/drivers/adodb-oci8.inc.php + includes/classes/adodb/drivers/adodb-oci805.inc.php + includes/classes/adodb/drivers/adodb-oci8po.inc.php + includes/classes/adodb/drivers/adodb-odbc.inc.php + includes/classes/adodb/drivers/adodb-odbc_mssql.inc.php + includes/classes/adodb/drivers/adodb-odbc_oracle.inc.php + includes/classes/adodb/drivers/adodb-oracle.inc.php + includes/classes/adodb/drivers/adodb-postgres.inc.php + includes/classes/adodb/drivers/adodb-postgres64.inc.php + includes/classes/adodb/drivers/adodb-postgres7.inc.php + includes/classes/adodb/drivers/adodb-proxy.inc.php + includes/classes/adodb/drivers/adodb-sapdb.inc.php + includes/classes/adodb/drivers/adodb-sqlanywhere.inc.php + includes/classes/adodb/drivers/adodb-sqlite.inc.php + includes/classes/adodb/drivers/adodb-sybase.inc.php + includes/classes/adodb/drivers/adodb-vfp.inc.php + includes/classes/adodb/lang/adodb-de.inc.php + includes/classes/adodb/lang/adodb-es.inc.php + includes/classes/adodb/lang/adodb-it.inc.php + includes/classes/adodb/lang/adodb-pt-br.inc.php + includes/classes/adodb/lang/adodb-ru1251.inc.php + includes/classes/adodb/lang/adodb-sv.inc.php + includes/functions/banner.php + includes/functions/cache.php + includes/functions/compatibility.php + includes/functions/general.php + includes/functions/gzip_compression.php + includes/functions/html_output.php + includes/functions/password_funcs.php + includes/functions/sessions.php + includes/functions/specials.php + includes/functions/validations.php + includes/functions/whos_online.php + includes/languages/english.php + includes/languages/english/checkout_payment.php + includes/languages/english/checkout_shipping.php + includes/languages/english/checkout_shipping_address.php + includes/languages/english/checkout_success.php + includes/languages/english/create_account.php + includes/languages/english/classic/index.php + includes/languages/english/classic/page_3.php + includes/languages/english/classic/page_4.php + includes/languages/english/email_extras.php + includes/languages/english/gv_faq.php + includes/languages/english/gv_send.php + includes/languages/english/index.php + includes/languages/english/login.php + includes/languages/english/page_2.php + includes/languages/english/page_3.php + includes/languages/english/page_4.php + includes/languages/english/product_info.php + includes/languages/english/modules/payment/cc.php + includes/modules/address_book_details.php + includes/modules/also_purchased_products.php + includes/modules/checkout_new_address.php + includes/modules/column_left.php + includes/modules/column_right.php + includes/modules/column_single.php + includes/modules/downloads.php + includes/modules/extra_definitions.php + includes/modules/footer.php + includes/modules/header.php + includes/modules/meta_tags.php + includes/modules/new_products.php + includes/modules/product_listing.php + includes/modules/products_new_listing.php + includes/modules/upcoming_products.php + includes/modules/order_total/ot_gv.php + includes/modules/pages/checkout_payment/jscript_main.php + includes/modules/pages/checkout_payment_address/jscript_main.php + includes/modules/pages/checkout_shipping_address/jscript_main.php + includes/modules/pages/checkout_success/header_php.php + includes/modules/pages/index/category_row.php + includes/modules/pages/index/main_template_vars.php + includes/modules/pages/login/jscript_form_check.php + iincludes/modules/pages/popup_image/jscript_main.php + includes/modules/pages/product_info/main_template_vars.php + includes/modules/pages/product_reviews/main_template_vars_images.php + includes/modules/pages/product_reviews_info/main_template_vars_images.php + includes/modules/pages/product_reviews_write/main_template_vars_images.php + includes/modules/pages/account/header_php.php + includes/modules/pages/account_edit/header_php.php + includes/modules/pages/account_history/header_php.php + includes/modules/pages/account_history_info/header_php.php + includes/modules/pages/account_newsletters/header_php.php + includes/modules/pages/account_notifications/header_php.php + includes/modules/pages/account_password/header_php.php + includes/modules/pages/address_book/header_php.php + includes/modules/pages/address_book_process/header_php.php + includes/modules/pages/advanced_search/header_php.php + includes/modules/pages/advanced_search_result/header_php.php + includes/modules/pages/checkout_confirmation/header_php.php + includes/modules/pages/checkout_payment/header_php.php + includes/modules/pages/checkout_payment_address/header_php.php + includes/modules/pages/checkout_process/header_php.php + includes/modules/pages/checkout_shipping/header_php.php + includes/modules/pages/checkout_shipping_address/header_php.php + includes/modules/pages/checkout_success/header_php.php + includes/modules/pages/conditions/header_php.php + includes/modules/pages/contact_us/header_php.php + includes/modules/pages/cookie_usage/header_php.php + includes/modules/pages/create_account/header_php.php + includes/modules/pages/create_account_success/header_php.php + includes/modules/pages/down_for_maintenance/header_php.php + includes/modules/pages/download/header_php.php + includes/modules/pages/gv_faq/header_php.php + includes/modules/pages/gv_redeem/header_php.php + includes/modules/pages/gv_send/header_php.php + includes/modules/pages/index/header_php.php + includes/modules/pages/info_shopping_cart/header_php.php + includes/modules/pages/login/header_php.php + includes/modules/pages/logoff/header_php.php + includes/modules/pages/page_2/header_php.php + includes/modules/pages/page_3/header_php.php + includes/modules/pages/page_4/header_php.php + includes/modules/pages/password_forgotten/header_php.php + includes/modules/pages/popup_coupon_help/header_php.php + includes/modules/pages/popup_cvv_help/header_php.php + includes/modules/pages/popup_search_help/header_php.php + includes/modules/pages/privacy/header_php.php + includes/modules/pages/product_info/header_php.php + includes/modules/pages/product_reviews/header_php.php + includes/modules/pages/product_reviews_info/header_php.php + includes/modules/pages/product_reviews_write/header_php.php + includes/modules/pages/products_new/header_php.php + includes/modules/pages/reviews/header_php.php + includes/modules/pages/shippinginfo/header_php.php + includes/modules/pages/shopping_cart/header_php.php + includes/modules/pages/specials/header_php.php + includes/modules/pages/ssl_check/header_php.php + includes/modules/pages/tell_a_friend/header_php.php + includes/modules/pages/time_out/header_php.php + includes/modules/payment/cc.php + includes/modules/payment/cod.php + includes/modules/shipping/flat.php + includes/modules/shipping/item.php + includes/modules/shipping/table.php + includes/modules/shipping/ups.php + includes/modules/shipping/usps.php + includes/modules/shipping/zones.php + includes/modules/sideboxes/banner_box.php + includes/modules/sideboxes/best_sellers.php + includes/modules/sideboxes/categories.php + includes/modules/sideboxes/currencies.php + includes/modules/sideboxes/information.php + includes/modules/sideboxes/languages.php + includes/modules/sideboxes/manufacturer_info.php + includes/modules/sideboxes/manufacturers.php + includes/modules/sideboxes/more_information.php + includes/modules/sideboxes/order_history.php + includes/modules/sideboxes/product_notifications.php + includes/modules/sideboxes/reviews.php + includes/modules/sideboxes/search.php + includes/modules/sideboxes/search_header.php + includes/modules/sideboxes/shopping_cart.php + includes/modules/sideboxes/specials.php + includes/modules/sideboxes/tell_a_friend.php + includes/modules/sideboxes/whats_new.php + includes/templates/template_default/template_info.php + includes/templates/template_default/common/html_header.php + includes/templates/template_default/common/tpl_box_default.php + includes/templates/template_default/common/tpl_footer.php + includes/templates/template_default/common/tpl_header.php + includes/templates/template_default/common/tpl_header_test_info.php + includes/templates/template_default/common/tpl_main_page.php + includes/templates/template_default/css/stylesheet.css + includes/templates/template_default/popup_image/tpl_main_page.php + includes/templates/template_default/popup_image_additional/tpl_main_page.php + includes/templates/template_default/sideboxes/tpl_best_sellers.php + includes/templates/template_default/sideboxes/tpl_categories.php + includes/templates/template_default/sideboxes/tpl_no_notifications.php + includes/templates/template_default/sideboxes/tpl_order_history.php + includes/templates/template_default/sideboxes/tpl_search.php + includes/templates/template_default/sideboxes/tpl_search_header.php + includes/templates/template_default/sideboxes/tpl_shopping_cart.php + includes/templates/template_default/sideboxes/tpl_specials.php + includes/templates/template_default/sideboxes/tpl_whats_new.php + includes/templates/template_default/templates/tpl_account_default.php + includes/templates/template_default/templates/tpl_account_edit_default.php + includes/templates/template_default/templates/tpl_account_history_default.php + includes/templates/template_default/templates/tpl_account_history_info_default.php + includes/templates/template_default/templates/tpl_account_notifications_default.php + includes/templates/template_default/templates/tpl_address_book_default.php + includes/templates/template_default/templates/tpl_advanced_search_result_default.php + includes/templates/template_default/templates/tpl_checkout_confirmation_default.php + includes/templates/template_default/templates/tpl_checkout_payment_address_default.php + includes/templates/template_default/templates/tpl_checkout_payment_default.php + includes/templates/template_default/templates/tpl_checkout_shipping_address_default.php + includes/templates/template_default/templates/tpl_create_account_default.php + includes/templates/template_default/templates/tpl_gv_faq_default.php + includes/templates/template_default/templates/tpl_gv_send_default.php + includes/templates/template_default/templates/tpl_login_default.php + includes/templates/template_default/templates/tpl_modules_whats_new.php + includes/templates/template_default/templates/tpl_product_info_display.php + includes/templates/template_default/templates/tpl_product_reviews_default.php + includes/templates/template_default/templates/tpl_product_reviews_info_default.php + includes/templates/template_default/templates/tpl_product_reviews_write_default.php + includes/templates/template_default/templates/tpl_shopping_cart_default.php + includes/templates/template_default/templates/tpl_specials_default.php + includes/templates/template_default/templates/tpl_tell_a_friend_default.php + install/mysql_zencart.sql + install/postgres7_zencart.sql + install/upgrade.php + install/demo/mysql_demo.sql + install/lib/admin_configure.php + install/lib/store_configure.php + install/modules/system_setup.php + + New Files added + + admin/layout_controller.php + admin/salemaker.php + admin/salemaker_info.php + admin/salemaker_popup.php + admin/backups/empty.txt + admin/images/graphs/empty.txt + admin/includes/attributes_preview.php + admin/includes/languages/english/attributes_controller.php + admin/includes/languages/english/salemaker.php + admin/includes/languages/english/salemaker_info.php + admin/includes/languages/english/salemaker_popup.php + admin/includes/languages/english/images/buttons/button_display.gif + admin/includes/languages/english/images/buttons/button_edit_attribs.gif + admin/includes/languages/english/images/buttons/button_edit_product.gif + admin/includes/languages/english/images/buttons/button_new_sale.gif + admin/includes/languages/english/images/buttons/button_options_values.gif + admin/includes/languages/english/images/buttons/button_update_sort.gif + admin/includes/local/empty.txt + extras/mysql_diff/mysqldiff.pl + images/1_small.jpg + images/1_small_00.jpg + images/1_small_02.jpg + images/1_small_03.jpg + images/2_small.jpg + images/3_small.jpg + images/b_b_grid.gif + images/b_c_grid.gif + images/b_g_grid.gif + images/b_p_grid.gif + images/b_w_grid.gif + images/call_for_price.jpg + images/free.gif + images/freedown.jpg + images/no_picture.gif + images/sample_image.gif + images/small_00.jpg + images/test_demo.jpg + images/waybkgnd.gif + images/attributes/a_bugs_life_blue.gif + images/attributes/a_bugs_life_brown.gif + images/attributes/a_bugs_life_green.gif + images/attributes/a_bugs_life_orange.gif + images/attributes/a_bugs_life_purple.gif + images/attributes/a_bugs_life_red.gif + images/attributes/a_bugs_life_silver.gif + images/attributes/a_bugs_life_white.gif + images/attributes/a_bugs_life_yellow.gif + images/attributes/beloved_orange.gif + images/attributes/beloved_red.gif + images/attributes/beloved_yellow.gif + images/attributes/color_blue.gif + images/attributes/color_green.gif + images/attributes/color_orange.gif + images/attributes/color_red.gif + images/attributes/color_silver.gif + images/attributes/color_yellow.gif + images/banners/crw-zen-banner.gif + images/banners/think_anim.gif + images/banners/zencart_468_60_02.gif + images/categories/category_free.gif + images/dvd/a_bugs_life_00.gif + images/dvd/a_bugs_life_01.gif + images/dvd/a_bugs_life_02.gif + images/dvd/a_bugs_life_03.gif + images/dvd/a_bugs_life_04.gif + images/dvd/a_bugs_life_05.gif + images/dvd/a_bugs_life_06.gif + images/dvd/a_bugs_life_07.gif + images/dvd/a_bugs_life_08.gif + images/dvd/a_bugs_life_09.gif + images/large/1_small_00_LRG.jpg + images/large/1_small_02_LRG.jpg + images/large/1_small_03_LRG.jpg + images/large/1_small_LRG.jpg + images/large/2_small_LRG.jpg + images/large/dvd/a_bugs_life_00_LRG.gif + images/large/dvd/a_bugs_life_01_LRG.gif + images/large/dvd/a_bugs_life_02_LRG.gif + images/large/dvd/a_bugs_life_03_LRG.gif + images/large/dvd/a_bugs_life_04_LRG.gif.HIDE + images/large/dvd/a_bugs_life_05_LRG.gif + images/large/dvd/a_bugs_life_06_LRG.gif + images/large/dvd/a_bugs_life_07_LRG.gif + images/large/dvd/a_bugs_life_08_LRG.gif + images/large/dvd/a_bugs_life_09_LRG.gif + images/large/dvd/a_bugs_life_LRG.gif + images/large/dvd/beloved_LRG.gif + images/large/dvd/blade_runner_LRG.gif + images/large/dvd/courage_under_fire_LRG.gif + images/large/dvd/die_hard_3_LRG.gif + images/large/dvd/fire_down_below_LRG.gif + images/large/dvd/frantic_LRG.gif + images/large/dvd/lethal_weapon_LRG.gif + images/large/dvd/red_corner_LRG.gif + images/large/dvd/replacement_killers_LRG.gif + images/large/dvd/speed_2_LRG.gif + images/large/dvd/speed_LRG.gif + images/large/dvd/the_matrix_LRG.gif + images/large/dvd/theres_something_about_mary_LRG.gif + images/large/dvd/under_siege2_LRG.gif + images/large/dvd/under_siege_LRG.gif + images/large/dvd/youve_got_mail_LRG.gif + images/large/microsoft/imexplorer_A37_LRG.gif + images/large/microsoft/imexplorer_LRG.gif + images/large/microsoft/imexplorer_b3c_LRG.gif + images/large/microsoft/imexplorer_jgk_LRG.gif + images/large/microsoft/intkeyboardps2_LRG.gif + images/large/microsoft/msimpro_LRG.gif + images/medium/dvd/a_bugs_life_MED.gif + images/medium/dvd/beloved_MED.gif + images/medium/dvd/blade_runner_MED.gif + images/medium/dvd/courage_under_fire_MED.gif + images/medium/dvd/die_hard_3_MED.gif + images/medium/dvd/fire_down_below_MED.gif + images/medium/dvd/frantic_MED.gif + images/medium/dvd/lethal_weapon_MED.gif + images/medium/dvd/red_corner_MED.gif + images/medium/dvd/replacement_killers_MED.gif + images/medium/dvd/speed_2_MED.gif + images/medium/dvd/speed_MED.gif + images/medium/dvd/the_matrix_MED.gif + images/medium/dvd/theres_something_about_mary_MED.gif + images/medium/dvd/under_siege2_MED.gif + images/medium/dvd/under_siege_MED.gif + images/medium/dvd/youve_got_mail_MED.gif + images/medium/microsoft/imexplorer_MED.gif + images/medium/microsoft/intkeyboardps2_MED.gif + images/medium/microsoft/msimpro_MED.gif + images/microsoft/imexplorer_A37.gif + images/microsoft/imexplorer_b3c.gif + images/microsoft/imexplorer_jgk.gif + images/uploads/.htaccess + includes/blocks/blk_account_history.php + includes/blocks/blk_account_history_info.php + includes/blocks/blk_account_notifications.php + includes/blocks/blk_address_book.php + includes/blocks/blk_advanced_search_result.php + includes/blocks/blk_checkout_payment_address.php + includes/blocks/blk_checkout_shipping_address.php + includes/blocks/blk_previous_orders.php + includes/extra_datafiles/empty.txt + includes/functions/extra_functions/empty.txt + includes/languages/blue_strip/empty.txt + includes/languages/classic/empty.txt + includes/languages/english/down_for_maintenance.php + includes/languages/english/popup_cvv_help.php + includes/languages/english/classic/header.php + includes/languages/english/classic/index.php + includes/languages/english/classic/page_2.php + includes/languages/english/classic/page_3.php + includes/languages/english/classic/page_4.php + includes/languages/english/extra_definitions/classic/empty.txt + includes/languages/english/modules/payment/freecharger.php + includes/languages/english/modules/shipping/freeshipper.php + includes/languages/english/modules/shipping/storepickup.php + includes/modules/extra_datafiles.php + U includes/modules/require_languages.php + includes/modules/extra_functions.php + includes/modules/pages/down_for_maintenance/header_php.php + includes/modules/pages/install/header_php.php + includes/modules/pages/popup_cvv_help/header_php.php + includes/modules/pages/popup_cvv_help/jscript_main.php + includes/modules/pages/popup_image_additional/header_php.php + includes/modules/pages/popup_image_additional/jscript_main.php + includes/modules/pages/product_info/main_template_vars_attributes.php + includes/modules/pages/product_info/main_template_vars_images.php + includes/modules/pages/product_info/main_template_vars_images_additional.php + includes/modules/payment/freecharger.php + includes/modules/shipping/freeshipper.php + includes/modules/shipping/storepickup.php + includes/templates/blue_strip/template_info.php + includes/templates/blue_strip/common/tpl_box_default.php + includes/templates/blue_strip/css/stylesheet.css + includes/templates/blue_strip/images/arrow_down.gif + includes/templates/blue_strip/images/arrow_east_south.gif + includes/templates/blue_strip/images/arrow_green.gif + includes/templates/blue_strip/images/arrow_south_east.gif + includes/templates/blue_strip/images/block_left_01.gif + includes/templates/blue_strip/images/block_left_02.gif + includes/templates/blue_strip/images/block_left_03.gif + includes/templates/blue_strip/images/block_left_04.gif + includes/templates/blue_strip/images/block_left_05.gif + includes/templates/blue_strip/images/block_left_06.gif + includes/templates/blue_strip/images/block_left_07.gif + includes/templates/blue_strip/images/box_products_notifications_remove.gif + includes/templates/blue_strip/images/box_write_review.gif + includes/templates/blue_strip/images/call_for_prices.jpg + includes/templates/blue_strip/images/checkout_bullet.gif + includes/templates/blue_strip/images/free.jpg + includes/templates/blue_strip/images/header_03.gif + includes/templates/blue_strip/images/header_06.gif + includes/templates/blue_strip/images/header_bg.jpg + includes/templates/blue_strip/images/pixel_black.gif + includes/templates/blue_strip/images/pixel_silver.gif + includes/templates/blue_strip/images/pixel_trans.gif + includes/templates/blue_strip/images/scr_template_default.jpg + includes/templates/blue_strip/images/stars_1.gif + includes/templates/blue_strip/images/stars_2.gif + includes/templates/blue_strip/images/stars_3.gif + includes/templates/blue_strip/images/stars_4.gif + includes/templates/blue_strip/images/stars_5.gif + includes/templates/blue_strip/images/tile_back.jpg + includes/templates/classic/template_info.php + includes/templates/classic/css/stylesheet.css + includes/templates/classic/images/arrow_down.gif + includes/templates/classic/images/arrow_east_south.gif + includes/templates/classic/images/arrow_green.gif + includes/templates/classic/images/arrow_south_east.gif + includes/templates/classic/images/box_products_notifications.gif + includes/templates/classic/images/box_products_notifications_remove.gif + includes/templates/classic/images/box_write_review.gif + includes/templates/classic/images/call_for_prices.jpg + includes/templates/classic/images/checkout_bullet.gif + includes/templates/classic/images/free.jpg + includes/templates/classic/images/header_bg.jpg + includes/templates/classic/images/pixel_black.gif + includes/templates/classic/images/pixel_silver.gif + includes/templates/classic/images/pixel_trans.gif + includes/templates/classic/images/scr_template_default.jpg + includes/templates/classic/images/stars_1.gif + includes/templates/classic/images/stars_2.gif + includes/templates/classic/images/stars_3.gif + includes/templates/classic/images/stars_4.gif + includes/templates/classic/images/stars_5.gif + includes/templates/classic/images/tile_back.jpg + includes/templates/classic/images/icons/Thumbs.db + includes/templates/classic/images/icons/cart.gif + includes/templates/classic/images/icons/error.gif + includes/templates/classic/images/icons/shipping_ups.gif + includes/templates/classic/images/icons/shipping_usps.gif + includes/templates/classic/images/icons/success.gif + includes/templates/classic/images/icons/warning.gif + includes/templates/template_default/buttons/english/button_download.gif + includes/templates/template_default/buttons/english/button_sold_out.gif + includes/templates/template_default/buttons/english/button_sold_out_sm.gif + includes/templates/template_default/images/call_for_prices.jpg + includes/templates/template_default/images/down_for_maintenance.gif + includes/templates/template_default/images/free.jpg + includes/templates/template_default/jscript/read_me.txt + includes/templates/template_default/jscript/on_load/read_me.txt + includes/templates/template_default/popup_cvv_help/tpl_main_page.php + includes/templates/template_default/templates/tpl_block_account_history.php + includes/templates/template_default/templates/tpl_block_account_history_info.php + includes/templates/template_default/templates/tpl_block_account_notifications.php + includes/templates/template_default/templates/tpl_block_address_book.php + includes/templates/template_default/templates/tpl_block_checkout_payment_address.php + includes/templates/template_default/templates/tpl_block_checkout_shipping_address.php + includes/templates/template_default/templates/tpl_block_no_account_history.php + includes/templates/template_default/templates/tpl_block_previous_orders.php + includes/templates/template_default/templates/tpl_down_for_maintenance_default.php + includes/templates/template_default/templates/tpl_popup_image_additional_default.php + install/load-xml.php + install/save-xml.php + install/schema.xml.sql + install/languages/english/database_upgrade.lang.php + install/modules/database_upgrade.php + install/templates/database_upgrade.tpl.php + install/templates/main_page_upgrade.tpl.php + + + Release V1.0.4 + NOTE : This is a bug fix release + + admin/includes/application_top.php + admin/includes/classes/language.php + admin/includes/classes/logger.php + admin/backup.php + admin/categories.php + includes/functions/general.php + includes/functions/whos_online.php + includes/classes/language.php + includes/classes/order.php + includes/application_bottom.php + includes/application_top.php + includes/modules/pages/checkout_shipping/header_php.php + includes/languages/english/gv_faq.php + + + Release V1.0.3 + NOTE : This is a bug fix release + NOTE : Changes to database structure ****** + + admin/categories.php + admin/coupon_admin.php + admin/login.php + admin/mail.php + admin/option_name.php# + admin/option_values.php + admin/popup_image.php + admin/includes/application_top.php + admin/includes/classes/language.php + admin/includes/classes/logger.php + admin/includes/languages/english.php + admin/includes/languages/english/categories.php + admin/includes/languages/english/login.php + admin/includes/modules/newsletters/newsletter.php + admin/includes/modules/newsletters/product_notification.php + includes/application_bottom.php + includes/application_top.php + includes/filenames.php + includes/classes/language.php + includes/functions/general.php + includes/functions/whos_online.php + includes/languages/english/email_extras.php + includes/modules/product_listing.php + includes/modules/pages/checkout_process/header_php.php + includes/modules/pages/index/category_row.php + includes/modules/sideboxes/template_default/banner_box.php + includes/templates/template_default/common/tpl_footer.php + includes/templates/template_default/common/tpl_header_test_info.php + includes/templates/zencss/common/tpl_footer.php + includes/templates/zencss/common/tpl_header_test_info.php + includes/templates/zencss/sideboxes/tpl_search.php + includes/templates/zencss/sideboxes/tpl_shopping_cart.php + includes/templates/zencss/templates/tpl_account_default.php + includes/templates/zencss/templates/tpl_checkout_payment_default.php + includes/templates/zencss/templates/tpl_checkout_shipping_default.php + includes/templates/zencss/templates/tpl_gv_faq_default.php + install/mysql_zencart.sql + install/modules/system_setup.php + + Release V1.002 + NOTE : This is a bug fix release + NOTE : No changes to database structure + + admin/popup_image.php + Fix for banner image popup + + admin/images/graphs/index.html + NEW FILE/DIRECTORY + + admin/includes/classes/upload.php + Bug fix + + includes/classes/shopping_cart.php + content_type bug + + includes/classes/template_funcs.php + missing language buttons bugfix + + includes/functions/html_output.php + missing language buttons bugfix + + includes/languages/english/time_out.php + NEW FILE/DIRECTORY + + includes/modules/pages/checkout_process/header_php.php + Timeout bugfix + + includes/modules/pages/download/header_php.php + Timeout bugfix + + includes/modules/pages/gv_redeem/header_php.php + NEW FILE/DIRECTORY + + includes/modules/pages/gv_send/header_php.php + NEW FILE/DIRECTORY + + includes/templates/template_default/templates/tpl_time_out_default.php + NEW FILE/DIRECTORY + + includes/templates/zencss/templates/tpl_time_out_default.php + NEW FILE/DIRECTORY + + install/schema.xml.sql + NEW FILE/DIRECTORY + + includes/modules/column_left.php + box id's added + + includes/modules/column_right.php + box id's added + + includes/modules/column_single.php + box id's added + + includes/modules/pages/password_forgotten/header_php.php + bug fix + + includes/templates/template_default/css/stylesheet.css + minor style fixes + + includes/templates/template_default/common/tpl_box_default.php + box id's + + includes/templates/template_default/common/tpl_header_test_info.php + includes/templates/zencss/common/tpl_header_test_info.php + + + Release V1.001 + NOTE : This is a bug fix release + NOTE : No changes to database structure + + admin/admin.php + changes to fix new password bug + changes to copyright notice + + admin/index.php + Update to copyright footer + + admin/login.php + changes to fix new password bug + + admin/password_forgotten.php + changes to fix new password bug + + admin/products_attributes.php + Bug Fix + + admin/includes/functions/general.php + function zen_get_language_icon updated to fix bug where language icon not being returned correctly + + admin/includes/languages/english/password_forgotten.php + changes to fix new password bug + + admin/includes/index.css + new styles for copyright + + admin/includes/footer.php + changes to copyright notice + + + + diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/INSTALL.TXT zen-cart-v1.2.0-l10n-jp-2/INSTALL.TXT *** zen-cart-v1.2.0-l10n-jp-1/INSTALL.TXT Sun Feb 6 14:41:45 2005 --- zen-cart-v1.2.0-l10n-jp-2/INSTALL.TXT Sat Apr 23 13:30:37 2005 *************** *** 1,6 **** Zen Cart - The Art of E-Commerce ! Version 1.2.0-l10n-jp-1 Zen Cart¤ÎƳÆþ¤Ï¼«Æ°¥¤¥ó¥¹¥È¡¼¥ë¥·¥¹¥Æ¥à¤Ë¤è¤Ã¤Æ¹Ô¤¤¤Þ¤¹¡£ --- 1,6 ---- Zen Cart - The Art of E-Commerce ! Version 1.2.0-l10n-jp-2 Zen Cart¤ÎƳÆþ¤Ï¼«Æ°¥¤¥ó¥¹¥È¡¼¥ë¥·¥¹¥Æ¥à¤Ë¤è¤Ã¤Æ¹Ô¤¤¤Þ¤¹¡£ diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/admin/includes/classes/email.php zen-cart-v1.2.0-l10n-jp-2/admin/includes/classes/email.php *** zen-cart-v1.2.0-l10n-jp-1/admin/includes/classes/email.php Mon Nov 22 17:53:22 2004 --- zen-cart-v1.2.0-l10n-jp-2/admin/includes/classes/email.php Sat Apr 16 15:00:59 2005 *************** *** 17,23 **** // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ ! // $Id: email.php,v 1.2 2004/11/22 08:53:22 shidairiki Exp $ // /* mail.php - a class to assist in building mime-HTML eMails --- 17,23 ---- // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ ! // $Id: email.php,v 1.3 2005/04/16 06:00:59 shida Exp $ // /* mail.php - a class to assist in building mime-HTML eMails *************** *** 551,560 **** function send($to_name, $to_addr, $from_name, $from_addr, $subject = '', $headers = '') { if( $subject != ''){ ! $subject = mb_encode_mimeheader( mb_convert_kana( $subject, 'KV' ), 'ISO-2022-JP' ); } ! $to = (($to_name != '') ? '"' . mb_encode_mimeheader( mb_convert_kana($to_name, 'KV'), 'ISO-2022-JP') . '" <' . $to_addr . '>' : $to_addr); ! $from = (($from_name != '') ? '"' . mb_encode_mimeheader( mb_convert_kana($from_name, 'KV'), 'ISO-2022-JP') . '" <' . $from_addr . '>' : $from_addr); if (is_string($headers)) { $headers = explode($this->lf, trim($headers)); --- 551,560 ---- function send($to_name, $to_addr, $from_name, $from_addr, $subject = '', $headers = '') { if( $subject != ''){ ! $subject = mb_encode_mimeheader( mb_convert_kana( $subject, 'KV' ), 'ISO-2022-JP', 'B', $this->lf ); } ! $to = (($to_name != '') ? '"' . mb_encode_mimeheader( mb_convert_kana($to_name, 'KV'), 'ISO-2022-JP', 'B', $this->lf) . '" <' . $to_addr . '>' : $to_addr); ! $from = (($from_name != '') ? '"' . mb_encode_mimeheader( mb_convert_kana($from_name, 'KV'), 'ISO-2022-JP', 'B', $this->lf) . '" <' . $from_addr . '>' : $from_addr); if (is_string($headers)) { $headers = explode($this->lf, trim($headers)); diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/admin/includes/languages/japanese/product.php zen-cart-v1.2.0-l10n-jp-2/admin/includes/languages/japanese/product.php *** zen-cart-v1.2.0-l10n-jp-1/admin/includes/languages/japanese/product.php Sat Nov 20 16:23:11 2004 --- zen-cart-v1.2.0-l10n-jp-2/admin/includes/languages/japanese/product.php Wed Mar 30 19:29:22 2005 *************** *** 17,23 **** // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ ! // $Id: product.php,v 1.3 2004/11/20 07:23:11 shidairiki Exp $ // define('HEADING_TITLE', '¥«¥Æ¥´¥ê¡¦¾¦ÉÊ'); --- 17,23 ---- // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ ! // $Id: product.php,v 1.4 2005/03/30 10:29:22 shida Exp $ // define('HEADING_TITLE', '¥«¥Æ¥´¥ê¡¦¾¦ÉÊ'); *************** *** 46,53 **** define('TEXT_IMAGE_NONEXISTENT', '¥¤¥á¡¼¥¸¤Ê¤·'); define('TEXT_NO_CHILD_CATEGORIES_OR_PRODUCTS', '¤³¤Î¥ì¥Ù¥ë¤Ë¿·¤·¤¤¥«¥Æ¥´¥ê¤«¾¦ÉʤòÄɲ䷤ƤÀ¤µ¤¤¡£.'); define('TEXT_PRODUCT_MORE_INFORMATION', '¤µ¤é¤Ë¾ÜºÙ¤Ê¾ðÊó¤ò¤´Í÷¤Ë¤Ê¤ë¤Ë¤Ï¡¢¤³¤Î¾¦ÉʤΠWeb¥Ú¡¼¥¸ ¤Ø¡£'); ! define('TEXT_PRODUCT_DATE_ADDED', 'Åö¥·¥ç¥Ã¥×¤Ø¤Î¤³¤Î¾¦ÉʤÎÅÐÏ¿Æü¡§ %'); ! define('TEXT_PRODUCT_DATE_AVAILABLE', '¤³¤Î¾¦ÉʤÎÄ󶡲ÄǽÆü¡§ %'); define('TEXT_EDIT_INTRO', 'ɬÍפÊÊѹ¹¤ò¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡£'); define('TEXT_EDIT_CATEGORIES_ID', '¥«¥Æ¥´¥êID:'); --- 46,53 ---- define('TEXT_IMAGE_NONEXISTENT', '¥¤¥á¡¼¥¸¤Ê¤·'); define('TEXT_NO_CHILD_CATEGORIES_OR_PRODUCTS', '¤³¤Î¥ì¥Ù¥ë¤Ë¿·¤·¤¤¥«¥Æ¥´¥ê¤«¾¦ÉʤòÄɲ䷤ƤÀ¤µ¤¤¡£.'); define('TEXT_PRODUCT_MORE_INFORMATION', '¤µ¤é¤Ë¾ÜºÙ¤Ê¾ðÊó¤ò¤´Í÷¤Ë¤Ê¤ë¤Ë¤Ï¡¢¤³¤Î¾¦ÉʤΠWeb¥Ú¡¼¥¸ ¤Ø¡£'); ! define('TEXT_PRODUCT_DATE_ADDED', 'Åö¥·¥ç¥Ã¥×¤Ø¤Î¤³¤Î¾¦ÉʤÎÅÐÏ¿Æü¡§ %s'); ! define('TEXT_PRODUCT_DATE_AVAILABLE', '¤³¤Î¾¦ÉʤÎÄ󶡲ÄǽÆü¡§ %s'); define('TEXT_EDIT_INTRO', 'ɬÍפÊÊѹ¹¤ò¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡£'); define('TEXT_EDIT_CATEGORIES_ID', '¥«¥Æ¥´¥êID:'); *************** *** 69,76 **** define('TEXT_DELETE_CATEGORY_INTRO', '¤³¤Î¥«¥Æ¥´¥ê¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«?'); define('TEXT_DELETE_PRODUCT_INTRO', '¤³¤Î¾¦Éʤò±Êµ×¤Ëºï½ü¤·¤Þ¤¹¤«?'); ! define('TEXT_DELETE_WARNING_CHILDS', '·Ù¹ð: ¤³¤Î¥«¥Æ¥´¥ê¤Ë¤Ï % ¸Ä¤Î (¥µ¥Ö)¥«¥Æ¥´¥ê¤¬¥ê¥ó¥¯¤·¤Æ¤¤¤Þ¤¹!'); ! define('TEXT_DELETE_WARNING_PRODUCTS', '·Ù¹ð: ¤³¤Î¥«¥Æ¥´¥ê¤Ë¤Ï % ¸Ä¤Î¾¦Éʤ¬¥ê¥ó¥¯¤·¤Æ¤¤¤Þ¤¹!'); define('TEXT_MOVE_PRODUCTS_INTRO', '¾¦ÉÊ %s ¤ò°ÜÆ°¤µ¤»¤¿¤¤¥«¥Æ¥´¥ê¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤¡£'); define('TEXT_MOVE_CATEGORIES_INTRO', '¥«¥Æ¥´¥ê %s ¤ò°ÜÆ°¤µ¤»¤¿¤¤¥«¥Æ¥´¥ê¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤¡£'); --- 69,76 ---- define('TEXT_DELETE_CATEGORY_INTRO', '¤³¤Î¥«¥Æ¥´¥ê¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«?'); define('TEXT_DELETE_PRODUCT_INTRO', '¤³¤Î¾¦Éʤò±Êµ×¤Ëºï½ü¤·¤Þ¤¹¤«?'); ! define('TEXT_DELETE_WARNING_CHILDS', '·Ù¹ð: ¤³¤Î¥«¥Æ¥´¥ê¤Ë¤Ï %s ¸Ä¤Î (¥µ¥Ö)¥«¥Æ¥´¥ê¤¬¥ê¥ó¥¯¤·¤Æ¤¤¤Þ¤¹!'); ! define('TEXT_DELETE_WARNING_PRODUCTS', '·Ù¹ð: ¤³¤Î¥«¥Æ¥´¥ê¤Ë¤Ï %s ¸Ä¤Î¾¦Éʤ¬¥ê¥ó¥¯¤·¤Æ¤¤¤Þ¤¹!'); define('TEXT_MOVE_PRODUCTS_INTRO', '¾¦ÉÊ %s ¤ò°ÜÆ°¤µ¤»¤¿¤¤¥«¥Æ¥´¥ê¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤¡£'); define('TEXT_MOVE_CATEGORIES_INTRO', '¥«¥Æ¥´¥ê %s ¤ò°ÜÆ°¤µ¤»¤¿¤¤¥«¥Æ¥´¥ê¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤¡£'); diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/admin/includes/languages/japanese/product_free_shipping.php zen-cart-v1.2.0-l10n-jp-2/admin/includes/languages/japanese/product_free_shipping.php *** zen-cart-v1.2.0-l10n-jp-1/admin/includes/languages/japanese/product_free_shipping.php Sun Nov 21 10:37:02 2004 --- zen-cart-v1.2.0-l10n-jp-2/admin/includes/languages/japanese/product_free_shipping.php Wed Mar 30 19:29:22 2005 *************** *** 17,23 **** // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ ! // $Id: product_free_shipping.php,v 1.4 2004/11/21 01:37:02 shidairiki Exp $ // define('HEADING_TITLE', '¥«¥Æ¥´¥ê¡¦¾¦ÉÊ'); --- 17,23 ---- // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ ! // $Id: product_free_shipping.php,v 1.5 2005/03/30 10:29:22 shida Exp $ // define('HEADING_TITLE', '¥«¥Æ¥´¥ê¡¦¾¦ÉÊ'); *************** *** 46,53 **** define('TEXT_IMAGE_NONEXISTENT', '²èÁü¤Ê¤·'); define('TEXT_NO_CHILD_CATEGORIES_OR_PRODUCTS', '¤³¤Î¥ì¥Ù¥ë¤Ë¿·¤·¤¤¥«¥Æ¥´¥ê¤«¾¦ÉʤòÄɲ䷤Ƥ¯¤À¤µ¤¤¡£'); define('TEXT_PRODUCT_MORE_INFORMATION', '¤µ¤é¤Ë¾ÜºÙ¤Ê¾ðÊó¤ò¤´Í÷¤Ë¤Ê¤ë¤Ë¤Ï¡¢¤³¤Î¾¦ÉʤΠWeb¥Ú¡¼¥¸ ¤Ø¡£'); ! define('TEXT_PRODUCT_DATE_ADDED', 'Åö¥·¥ç¥Ã¥×¤Ø¤Î¤³¤Î¾¦ÉʤÎÅÐÏ¿Æü¡§ %'); ! define('TEXT_PRODUCT_DATE_AVAILABLE', '¤³¤Î¾¦ÉʤÎÄ󶡲ÄǽÆü¡§ %'); define('TEXT_EDIT_INTRO', 'ɬÍפÊÊѹ¹¤ò¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡£'); define('TEXT_EDIT_CATEGORIES_ID', '¥«¥Æ¥´¥êID:'); --- 46,53 ---- define('TEXT_IMAGE_NONEXISTENT', '²èÁü¤Ê¤·'); define('TEXT_NO_CHILD_CATEGORIES_OR_PRODUCTS', '¤³¤Î¥ì¥Ù¥ë¤Ë¿·¤·¤¤¥«¥Æ¥´¥ê¤«¾¦ÉʤòÄɲ䷤Ƥ¯¤À¤µ¤¤¡£'); define('TEXT_PRODUCT_MORE_INFORMATION', '¤µ¤é¤Ë¾ÜºÙ¤Ê¾ðÊó¤ò¤´Í÷¤Ë¤Ê¤ë¤Ë¤Ï¡¢¤³¤Î¾¦ÉʤΠWeb¥Ú¡¼¥¸ ¤Ø¡£'); ! define('TEXT_PRODUCT_DATE_ADDED', 'Åö¥·¥ç¥Ã¥×¤Ø¤Î¤³¤Î¾¦ÉʤÎÅÐÏ¿Æü¡§ %s'); ! define('TEXT_PRODUCT_DATE_AVAILABLE', '¤³¤Î¾¦ÉʤÎÄ󶡲ÄǽÆü¡§ %s'); define('TEXT_EDIT_INTRO', 'ɬÍפÊÊѹ¹¤ò¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡£'); define('TEXT_EDIT_CATEGORIES_ID', '¥«¥Æ¥´¥êID:'); *************** *** 69,80 **** define('TEXT_DELETE_CATEGORY_INTRO', '¤³¤Î¥«¥Æ¥´¥ê¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«?'); define('TEXT_DELETE_PRODUCT_INTRO', '¤³¤Î¾¦Éʤò±Êµ×¤Ëºï½ü¤·¤Þ¤¹¤«?'); ! define('TEXT_DELETE_WARNING_CHILDS', '·Ù¹ð: ¤³¤Î¥«¥Æ¥´¥ê¤Ë¤Ï % ¸Ä¤Î (¥µ¥Ö)¥«¥Æ¥´¥ê¤¬¥ê¥ó¥¯¤·¤Æ¤¤¤Þ¤¹!'); ! define('TEXT_DELETE_WARNING_PRODUCTS', '·Ù¹ð: ¤³¤Î¥«¥Æ¥´¥ê¤Ë¤Ï % ¸Ä¤Î¾¦Éʤ¬¥ê¥ó¥¯¤·¤Æ¤¤¤Þ¤¹!'); define('TEXT_MOVE_PRODUCTS_INTRO', '¾¦ÉÊ %s ¤ò°ÜÆ°¤µ¤»¤¿¤¤¥«¥Æ¥´¥ê¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤¡£'); define('TEXT_MOVE_CATEGORIES_INTRO', '¥«¥Æ¥´¥ê %s ¤ò°ÜÆ°¤µ¤»¤¿¤¤¥«¥Æ¥´¥ê¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤¡£'); ! define('TEXT_MOVE', ' % ¤ò°ÜÆ°:'); define('TEXT_NEW_CATEGORY_INTRO', '¿·¤·¤¤¥«¥Æ¥´¥ê¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£'); define('TEXT_CATEGORIES_NAME', '¥«¥Æ¥´¥ê̾:'); --- 69,80 ---- define('TEXT_DELETE_CATEGORY_INTRO', '¤³¤Î¥«¥Æ¥´¥ê¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«?'); define('TEXT_DELETE_PRODUCT_INTRO', '¤³¤Î¾¦Éʤò±Êµ×¤Ëºï½ü¤·¤Þ¤¹¤«?'); ! define('TEXT_DELETE_WARNING_CHILDS', '·Ù¹ð: ¤³¤Î¥«¥Æ¥´¥ê¤Ë¤Ï %s ¸Ä¤Î (¥µ¥Ö)¥«¥Æ¥´¥ê¤¬¥ê¥ó¥¯¤·¤Æ¤¤¤Þ¤¹!'); ! define('TEXT_DELETE_WARNING_PRODUCTS', '·Ù¹ð: ¤³¤Î¥«¥Æ¥´¥ê¤Ë¤Ï %s ¸Ä¤Î¾¦Éʤ¬¥ê¥ó¥¯¤·¤Æ¤¤¤Þ¤¹!'); define('TEXT_MOVE_PRODUCTS_INTRO', '¾¦ÉÊ %s ¤ò°ÜÆ°¤µ¤»¤¿¤¤¥«¥Æ¥´¥ê¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤¡£'); define('TEXT_MOVE_CATEGORIES_INTRO', '¥«¥Æ¥´¥ê %s ¤ò°ÜÆ°¤µ¤»¤¿¤¤¥«¥Æ¥´¥ê¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤¡£'); ! define('TEXT_MOVE', ' %s ¤ò°ÜÆ°:'); define('TEXT_NEW_CATEGORY_INTRO', '¿·¤·¤¤¥«¥Æ¥´¥ê¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£'); define('TEXT_CATEGORIES_NAME', '¥«¥Æ¥´¥ê̾:'); diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/admin/includes/languages/japanese/product_music.php zen-cart-v1.2.0-l10n-jp-2/admin/includes/languages/japanese/product_music.php *** zen-cart-v1.2.0-l10n-jp-1/admin/includes/languages/japanese/product_music.php Sat Nov 20 16:23:11 2004 --- zen-cart-v1.2.0-l10n-jp-2/admin/includes/languages/japanese/product_music.php Wed Mar 30 19:29:22 2005 *************** *** 17,23 **** // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ ! // $Id: product_music.php,v 1.3 2004/11/20 07:23:11 shidairiki Exp $ // define('HEADING_TITLE', '¥«¥Æ¥´¥ê / ¾¦ÉÊ'); --- 17,23 ---- // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ ! // $Id: product_music.php,v 1.4 2005/03/30 10:29:22 shida Exp $ // define('HEADING_TITLE', '¥«¥Æ¥´¥ê / ¾¦ÉÊ'); *************** *** 49,56 **** define('TEXT_IMAGE_NONEXISTENT', '²èÁü¤Ê¤·'); define('TEXT_NO_CHILD_CATEGORIES_OR_PRODUCTS', '¤³¤Î¥ì¥Ù¥ë¤Ë¿·¤·¤¤¥«¥Æ¥´¥ê¤«¾¦ÉʤòÄɲ䷤Ƥ¯¤À¤µ¤¤¡£'); define('TEXT_PRODUCT_MORE_INFORMATION', '¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤ò¸«¤ë¤Ë¤Ï¤³¤Î¾¦ÉʤΠWeb¥Ú¡¼¥¸ ¤Ø¡£'); ! define('TEXT_PRODUCT_DATE_ADDED', '¤³¤Î¾¦ÉʤÎÅö¥·¥ç¥Ã¥×¤Ø¤ÎÅÐÏ¿Æü¡§%'); ! define('TEXT_PRODUCT_DATE_AVAILABLE', '¤³¤Î¾¦ÉʤÎÆþ²ÙͽÄêÆü¡§ %'); define('TEXT_EDIT_INTRO', 'ɬÍפÊÊѹ¹¤ò¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡£'); define('TEXT_EDIT_CATEGORIES_ID', '¥«¥Æ¥´¥êID:'); --- 49,56 ---- define('TEXT_IMAGE_NONEXISTENT', '²èÁü¤Ê¤·'); define('TEXT_NO_CHILD_CATEGORIES_OR_PRODUCTS', '¤³¤Î¥ì¥Ù¥ë¤Ë¿·¤·¤¤¥«¥Æ¥´¥ê¤«¾¦ÉʤòÄɲ䷤Ƥ¯¤À¤µ¤¤¡£'); define('TEXT_PRODUCT_MORE_INFORMATION', '¤è¤ê¾ÜºÙ¤Ê¾ðÊó¤ò¸«¤ë¤Ë¤Ï¤³¤Î¾¦ÉʤΠWeb¥Ú¡¼¥¸ ¤Ø¡£'); ! define('TEXT_PRODUCT_DATE_ADDED', '¤³¤Î¾¦ÉʤÎÅö¥·¥ç¥Ã¥×¤Ø¤ÎÅÐÏ¿Æü¡§%s'); ! define('TEXT_PRODUCT_DATE_AVAILABLE', '¤³¤Î¾¦ÉʤÎÆþ²ÙͽÄêÆü¡§ %s'); define('TEXT_EDIT_INTRO', 'ɬÍפÊÊѹ¹¤ò¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡£'); define('TEXT_EDIT_CATEGORIES_ID', '¥«¥Æ¥´¥êID:'); *************** *** 72,83 **** define('TEXT_DELETE_CATEGORY_INTRO', '¤³¤Î¥«¥Æ¥´¥ê¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«?'); define('TEXT_DELETE_PRODUCT_INTRO', '¤³¤Î¾¦Éʤò±Êµ×¤Ëºï½ü¤·¤Þ¤¹¤«?'); ! define('TEXT_DELETE_WARNING_CHILDS', '·Ù¹ð: % ¸Ä¤Î(¥µ¥Ö)¥«¥Æ¥´¥ê¤¬¤³¤Î¥«¥Æ¥´¥ê¤Ë¤Þ¤À¥ê¥ó¥¯¤µ¤ì¤Æ¤¤¤Þ¤¹!'); define('TEXT_DELETE_WARNING_PRODUCTS', '·Ù¹ð: %s ¸Ä¤Î¾¦Éʤ¬¤³¤Î¥«¥Æ¥´¥ê¤Ë¤Þ¤À¥ê¥ó¥¯¤µ¤ì¤Æ¤¤¤Þ¤¹!'); ! define('TEXT_MOVE_PRODUCTS_INTRO', '% ¤ò°ÜÆ°¤µ¤»¤¿¤¤¥«¥Æ¥´¥ê¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤¡£'); define('TEXT_MOVE_CATEGORIES_INTRO', ' %s ¥«¥Æ¥´¥ê¤ò°ÜÆ°¤µ¤»¤¿¤¤¥«¥Æ¥´¥ê¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤¡£'); ! define('TEXT_MOVE', ' % ¤ò°ÜÆ°:'); define('TEXT_NEW_CATEGORY_INTRO', '¿·¤·¤¤¥«¥Æ¥´¥ê¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£'); define('TEXT_CATEGORIES_NAME', '¥«¥Æ¥´¥ê̾:'); --- 72,83 ---- define('TEXT_DELETE_CATEGORY_INTRO', '¤³¤Î¥«¥Æ¥´¥ê¤òËÜÅö¤Ëºï½ü¤·¤Þ¤¹¤«?'); define('TEXT_DELETE_PRODUCT_INTRO', '¤³¤Î¾¦Éʤò±Êµ×¤Ëºï½ü¤·¤Þ¤¹¤«?'); ! define('TEXT_DELETE_WARNING_CHILDS', '·Ù¹ð: %s ¸Ä¤Î(¥µ¥Ö)¥«¥Æ¥´¥ê¤¬¤³¤Î¥«¥Æ¥´¥ê¤Ë¤Þ¤À¥ê¥ó¥¯¤µ¤ì¤Æ¤¤¤Þ¤¹!'); define('TEXT_DELETE_WARNING_PRODUCTS', '·Ù¹ð: %s ¸Ä¤Î¾¦Éʤ¬¤³¤Î¥«¥Æ¥´¥ê¤Ë¤Þ¤À¥ê¥ó¥¯¤µ¤ì¤Æ¤¤¤Þ¤¹!'); ! define('TEXT_MOVE_PRODUCTS_INTRO', '%s ¤ò°ÜÆ°¤µ¤»¤¿¤¤¥«¥Æ¥´¥ê¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤¡£'); define('TEXT_MOVE_CATEGORIES_INTRO', ' %s ¥«¥Æ¥´¥ê¤ò°ÜÆ°¤µ¤»¤¿¤¤¥«¥Æ¥´¥ê¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤¡£'); ! define('TEXT_MOVE', ' %s ¤ò°ÜÆ°:'); define('TEXT_NEW_CATEGORY_INTRO', '¿·¤·¤¤¥«¥Æ¥´¥ê¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£'); define('TEXT_CATEGORIES_NAME', '¥«¥Æ¥´¥ê̾:'); diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/extras/remise-result.php zen-cart-v1.2.0-l10n-jp-2/extras/remise-result.php *** zen-cart-v1.2.0-l10n-jp-1/extras/remise-result.php Fri Dec 17 15:45:43 2004 --- zen-cart-v1.2.0-l10n-jp-2/extras/remise-result.php Sat Apr 2 08:42:19 2005 *************** *** 10,17 **** // include server parameters require('../includes/configure.php'); - require('../includes/database_tables.php'); require('../includes/classes/db/' . DB_TYPE . '/query_factory.php'); // make a connection to the database... now $db = new queryFactory(); --- 10,26 ---- // include server parameters require('../includes/configure.php'); require('../includes/classes/db/' . DB_TYPE . '/query_factory.php'); + require('../includes/database_tables.php'); + // include the list of extra database tables and filenames + // include(DIR_WS_MODULES . 'extra_datafiles.php'); + if ($za_dir = @dir("../" . DIR_WS_INCLUDES . 'extra_datafiles')) { + while ($zv_file = $za_dir->read()) { + if (strstr($zv_file, '.php')) { + require("../" . DIR_WS_INCLUDES . 'extra_datafiles/' . $zv_file); + } + } + } // make a connection to the database... now $db = new queryFactory(); diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/includes/application_top.php zen-cart-v1.2.0-l10n-jp-2/includes/application_top.php *** zen-cart-v1.2.0-l10n-jp-1/includes/application_top.php Mon Nov 22 17:53:23 2004 --- zen-cart-v1.2.0-l10n-jp-2/includes/application_top.php Sat Apr 16 14:46:32 2005 *************** *** 17,23 **** // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ ! // $Id: application_top.php,v 1.2 2004/11/22 08:53:23 shidairiki Exp $ // // start the timer for the page parse time log --- 17,23 ---- // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ ! // $Id: application_top.php,v 1.3 2005/04/16 05:46:32 shida Exp $ // // start the timer for the page parse time log *************** *** 412,418 **** case (CUSTOMERS_APPROVAL == '1' and $_SESSION['customer_id'] == ''): // customer must be logged in to browse //die('I see ' . $_GET['main_page'] . ' vs ' . FILENAME_LOGIN); ! if ($_GET['main_page'] != FILENAME_LOGIN and $_GET['main_page'] != FILENAME_CREATE_ACCOUNT ) { if (!isset($_GET['set_session_login'])) { $_GET['set_session_login'] = 'true'; $_SESSION['navigation']->set_snapshot(); --- 412,418 ---- case (CUSTOMERS_APPROVAL == '1' and $_SESSION['customer_id'] == ''): // customer must be logged in to browse //die('I see ' . $_GET['main_page'] . ' vs ' . FILENAME_LOGIN); ! if ($_GET['main_page'] != FILENAME_LOGIN and $_GET['main_page'] != FILENAME_CREATE_ACCOUNT and $_GET['main_page'] != FILENAME_PASSWORD_FORGOTTEN ) { if (!isset($_GET['set_session_login'])) { $_GET['set_session_login'] = 'true'; $_SESSION['navigation']->set_snapshot(); diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/includes/classes/_nittsu.php zen-cart-v1.2.0-l10n-jp-2/includes/classes/_nittsu.php *** zen-cart-v1.2.0-l10n-jp-1/includes/classes/_nittsu.php Thu Jan 1 09:00:00 1970 --- zen-cart-v1.2.0-l10n-jp-2/includes/classes/_nittsu.php Sat Apr 16 15:00:59 2005 *************** *** 0 **** --- 1,258 ---- + SetOrigin('Ë̳¤Æ»', 'JP'); // Ë̳¤Æ»¤«¤é + $rate->SetDest('ÅìµþÅÔ', 'JP'); // ÅìµþÅÔ¤Þ¤Ç + $rate->SetWeight(10); // kg + $quote = $rate->GetQuote(); + print $quote['type'] . "
"; + print $quote['cost'] . "\n"; + */ + class _Nittsu { + var $quote; + var $OriginZone; + var $OriginCountryCode = 'JP'; + var $DestZone; + var $DestCountryCode = 'JP'; + var $Weight = 0; + var $Length = 0; + var $Width = 0; + var $Height = 0; + + // ¥³¥ó¥¹¥È¥é¥¯¥¿ + // $id: module id + // $titl: module name + // $zone: ÅÔÆ»Éܸ©¥³¡¼¥É '01'¡Á'47' + // $country: country code + function _Nittsu($id, $title, $zone = NULL, $country = NULL) { + $this->quote = array('id' => $id, 'title' => $title); + if($zone) { + $this->SetOrigin($zone, $country); + } + } + // ȯÁ÷¸µ¤ò¥»¥Ã¥È¤¹¤ë + // $zone: ÅÔÆ»Éܸ©¥³¡¼¥É '01'¡Á'47' + // $country: country code + function SetOrigin($zone, $country = NULL) { + $this->OriginZone = $zone; + if($country) { + $this->OriginCountryCode = $country; + } + } + function SetDest($zone, $country = NULL) { + $this->DestZone = $zone; + if($country) { + $this->DestCountryCode = $country; + } + } + function SetWeight($weight) { + //$this->Weight = $weight; + $this->Weight = $weight; + } + function SetSize($length = NULL, $width = NULL, $height = NULL) { + if($length) { + $this->Length = $length; + } + if($width) { + $this->Width = $width; + } + if($height) { + $this->Height = $height; + } + } + // ¥µ¥¤¥º¶èʬ(0¡Á4)¤òÊÖ¤¹ + // µ¬³Ê³°¤Î¾ì¹ç¤Ï9¤òÊÖ¤¹ + // + // ¶èʬ ¥µ¥¤¥ºÌ¾ £³ÊÕ·× ½ÅÎÌ + // ---------------------------------- + // 0 60¥µ¥¤¥º 60cm¤Þ¤Ç 2kg¤Þ¤Ç + // 1 80¥µ¥¤¥º 80cm¤Þ¤Ç 5kg¤Þ¤Ç + // 2 100¥µ¥¤¥º 100cm¤Þ¤Ç 10kg¤Þ¤Ç + // 3 120¥µ¥¤¥º 120cm¤Þ¤Ç 15kg¤Þ¤Ç + // 4 140¥µ¥¤¥º 140cm¤Þ¤Ç 20kg¤Þ¤Ç + // 5 170¥µ¥¤¥º 170cm¤Þ¤Ç 30kg¤Þ¤Ç + // 9 µ¬³Ê³° + function GetSizeClass() { + $a_classes = array( + array(0, 60, 2), // ¶èʬ,£³ÊÕ·×,½ÅÎÌ + array(1, 80, 5), + array(2, 100, 10), + array(3, 120, 15), + array(4, 140, 20), + array(5, 170, 30) + ); + + $n_totallength = $this->Length + $this->Width + $this->Height; + + while (list($n_index, $a_limit) = each($a_classes)) { + if ($n_totallength <= $a_limit[1] && $this->Weight <= $a_limit[2]) { + return $a_limit[0]; + } + } + return -1; // µ¬³Ê³° + } + // Á÷ÉÕ¸µ¤ÈÁ÷ÉÕÀ褫¤é¥­¡¼¤òºîÀ®¤¹¤ë + // + function GetDistKey() { + $s_key = ''; + $s_z1 = $this->GetLZone($this->OriginZone); + $s_z2 = $this->GetLZone($this->DestZone); + if ( $s_z1 && $s_z2 ) { + // ÃÏÂÓ¥³¡¼¥É¤ò¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç¤ËÏ¢·ë¤¹¤ë + if ( ord($s_z1) < ord($s_z2) ) { + $s_key = $s_z1 . $s_z2; + } else { + $s_key = $s_z2 . $s_z1; + } + } + return $s_key; + } + // ÅÔÆ»Éܸ©¥³¡¼¥É¤«¤éÃÏÂÓ¥³¡¼¥É¤ò¼èÆÀ¤¹¤ë + // $zone: ÅÔÆ»Éܸ©¥³¡¼¥É + function GetLZone($zone) { + // ÅÔÆ»Éܸ©¥³¡¼¥É¤òÃÏÂÓ¥³¡¼¥É('A'¡Á'M')¤ËÊÑ´¹¤¹¤ë + // Ë̳¤Æ»¡¡:'A' = Ë̳¤Æ» + // ÅìËÌ¡¡¡¡:'B' = ÀÄ¿¹¸©,´ä¼ê¸©,½©Åĸ©,µÜ¾ë¸©,»³·Á¸©,Ê¡Å縩 + // ´ØÅì¿®±Û:'C' = °ñ¾ë¸©,ÆÊÌÚ¸©,·²Çϸ©,ºë¶Ì¸©,ÀéÍÕ¸©,ÅìµþÅÔ,¿ÀÆàÀ,»³Íü¸©,¿·³ã¸©,ĹÌ + // ÃæÉôËÌΦ:'D' = ´ôÉ츩,ÀŲ¬¸©,°¦Ãθ©,»°½Å¸©,ÉÙ»³¸©,ÀÐÀ,Ê¡°æ¸© + // ´ØÀ¾ ¡¡:'E' = ¼¢²ì¸©,µþÅÔÉÜ,ÂçºåÉÜ,ʼ¸Ë¸©,ÆàÎɸ©,Ï²λ³¸© + // Ãæ¹ñ ¡¡:'F' = Ä»¼è¸©,Å纬¸©,²¬»³¸©,¹­Å縩,»³¸ý¸© + // »Í¹ñ ¡¡:'G' = ÆÁÅ縩,¹áÀ,°¦É²¸©,¹âÃθ© + // ¶å½£¡¡¡¡:'H' = Ê¡²¬¸©,º´²ì¸©,Ĺºê¸©,Âçʬ¸©,·§Ëܸ©,µÜºê¸©,¼¯»ùÅ縩 + // ²­Æì ¡¡ :'I' = ²­Æ츩 (Ä̾ïÊؤÏÇÛã¶è°è³°) + $a_zonemap = array( + 'Ë̳¤Æ»'=>'A', + 'ÀÄ¿¹¸©'=>'B', + '´ä¼ê¸©'=>'B', + 'µÜ¾ë¸©'=>'B', + '½©Åĸ©'=>'B', + '»³·Á¸©'=>'B', + 'Ê¡Å縩'=>'B', + '°ñ¾ë¸©'=>'C', + 'ÆÊÌÚ¸©'=>'C', + '·²Çϸ©'=>'C', + 'ºë¶Ì¸©'=>'C', + 'ÀéÍÕ¸©'=>'C', + 'ÅìµþÅÔ'=>'C', + '¿ÀÆàÀ'=>'C', + '¿·³ã¸©'=>'C', + 'ÉÙ»³¸©'=>'D', + 'ÀÐÀ'=>'D', + 'Ê¡°æ¸©'=>'D', + '»³Íü¸©'=>'C', + 'ĹÌ'=>'C', + '´ôÉ츩'=>'D', + 'ÀŲ¬¸©'=>'D', + '°¦Ãθ©'=>'D', + '»°½Å¸©'=>'D', + '¼¢²ì¸©'=>'E', + 'µþÅÔÉÜ'=>'E', + 'ÂçºåÉÜ'=>'E', + 'ʼ¸Ë¸©'=>'E', + 'ÆàÎɸ©'=>'E', + 'Ï²λ³¸©'=>'E', + 'Ä»¼è¸©'=>'F', + 'Å纬¸©'=>'F', + '²¬»³¸©'=>'F', + '¹­Å縩'=>'F', + '»³¸ý¸©'=>'F', + 'ÆÁÅ縩'=>'G', + '¹áÀ'=>'G', + '°¦É²¸©'=>'G', + '¹âÃθ©'=>'G', + 'Ê¡²¬¸©'=>'H', + 'º´²ì¸©'=>'H', + 'Ĺºê¸©'=>'H', + '·§Ëܸ©'=>'H', + 'Âçʬ¸©'=>'H', + 'µÜºê¸©'=>'H', + '¼¯»ùÅ縩'=>'H', + '²­Æ츩'=>'I' + ); + return $a_zonemap[$zone]; + } + + function GetQuote() { + // µ÷Î¥Ê̤βÁ³Ê¥é¥ó¥¯: ¥é¥ó¥¯¥³¡¼¥É => ²Á³Ê(60,80,100,120,140,170) + $a_pricerank = array( + 'N01'=>array( 740, 950,1160,1370,1580,1790), // Ä̾ïÊØ(01) ¶áµ÷Î¥ + 'N02'=>array( 840,1050,1260,1470,1680,1890), // Ä̾ïÊØ(02) ¢¬ + 'N03'=>array( 950,1160,1370,1580,1790,2000), // Ä̾ïÊØ(03) + 'N04'=>array(1050,1260,1470,1680,1890,2100), // Ä̾ïÊØ(04) + 'N05'=>array(1160,1370,1580,1790,2000,2210), // Ä̾ïÊØ(05) + 'N06'=>array(1260,1470,1680,1890,2100,2310), // Ä̾ïÊØ(06) + 'N07'=>array(1370,1580,1790,2000,2210,2420), // Ä̾ïÊØ(07) + 'N08'=>array(1470,1680,1890,2100,2310,2520), // Ä̾ïÊØ(08) + 'N09'=>array(1580,1790,2000,2210,2420,2630), // Ä̾ïÊØ(09) + 'N10'=>array(1680,1890,2100,2310,2520,2730), // Ä̾ïÊØ(10) + 'N11'=>array(1790,2000,2210,2420,2630,2840), // Ä̾ïÊØ(11) + 'N12'=>array(1160,1680,2210,2730,3260,3780), // Ä̾ïÊØ(12) + 'N13'=>array(1260,1790,2310,2840,3360,3890), // Ä̾ïÊØ(13) + 'N14'=>array(1470,2000,2520,3050,3570,4100), // Ä̾ïÊØ(14) ¢­ + 'N15'=>array(1890,2420,2940,3470,3990,4520) // Ä̾ïÊØ(15) ±óµ÷Î¥ + ); + // ÃÏÂÓ - ÃÏÂӴ֤βÁ³Ê¥é¥ó¥¯ + // (»²¾È) http://www.nittsu.co.jp/pelican/fare/index.htm + $a_dist_to_rank = array( + 'AA'=>'N01', + 'AB'=>'N03','BB'=>'N01', + 'AC'=>'N05','BC'=>'N01','CC'=>'N01', + 'AD'=>'N06','BD'=>'N02','CD'=>'N01','DD'=>'N01', + 'AE'=>'N08','BE'=>'N03','CE'=>'N02','DE'=>'N01','EE'=>'N01', + 'AF'=>'N09','BF'=>'N05','CF'=>'N03','DF'=>'N02','EF'=>'N01','FF'=>'N01', + 'AG'=>'N10','BG'=>'N06','CG'=>'N04','DG'=>'N03','EG'=>'N02','FG'=>'N02','GG'=>'N01', + 'AH'=>'N11','BH'=>'N07','CH'=>'N05','DH'=>'N03','EH'=>'N02','FH'=>'N01','GH'=>'N02','HH'=>'N01', + 'AI'=>'N15','BI'=>'N14','CI'=>'N13','DI'=>'N13','EI'=>'N13','FI'=>'N13','GI'=>'N13','HI'=>'N12','II'=>'' + ); + + $s_key = $this->GetDistKey(); + if ( $s_key ) { + $s_rank = $a_dist_to_rank[$s_key]; + if ( $s_rank ) { + $n_sizeclass = $this->GetSizeClass(); + if ($n_sizeclass < 0) { + $this->quote['error'] = MODULE_SHIPPING_NITTSU_TEXT_OVERSIZE; + } else { + $this->quote['cost'] = $a_pricerank[$s_rank][$n_sizeclass]; + } + //$this->quote['DEBUG'] = ' zone=' . $this->OriginZone . '=>' . $this->DestZone //DEBUG + // . ' cost=' . $a_pricerank[$s_rank][$n_sizeclass]; //DEBUG + } else { + $this->quote['error'] = MODULE_SHIPPING_NITTSU_TEXT_OUT_OF_AREA . '(' . $s_key .')'; + } + } else { + $this->quote['error'] = MODULE_SHIPPING_NITTSU_TEXT_ILLEGAL_ZONE . '(' . $this->OriginZone . '=>' . $this->DestZone . ')'; + } + return $this->quote; + } + } + ?> \ No newline at end of file diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/includes/classes/_yamato.php zen-cart-v1.2.0-l10n-jp-2/includes/classes/_yamato.php *** zen-cart-v1.2.0-l10n-jp-1/includes/classes/_yamato.php Thu Jan 1 09:00:00 1970 --- zen-cart-v1.2.0-l10n-jp-2/includes/classes/_yamato.php Sat Apr 16 15:00:59 2005 *************** *** 0 **** --- 1,268 ---- + SetOrigin('Ë̳¤Æ»', 'JP'); // Ë̳¤Æ»¤«¤é + $rate->SetDest('ÅìµþÅÔ', 'JP'); // ÅìµþÅÔ¤Þ¤Ç + $rate->SetWeight(10); // kg + $quote = $rate->GetQuote(); + print $quote['type'] . "
"; + print $quote['cost'] . "\n"; + */ + class _Yamato { + var $quote; + var $OriginZone; + var $OriginCountryCode = 'JP'; + var $DestZone; + var $DestCountryCode = 'JP'; + var $Weight = 0; + var $Length = 0; + var $Width = 0; + var $Height = 0; + + // ¥³¥ó¥¹¥È¥é¥¯¥¿ + // $id: module id + // $titl: module name + // $zone: ÅÔÆ»Éܸ©¥³¡¼¥É '01'¡Á'47' + // $country: country code + function _Yamato($id, $title, $zone = NULL, $country = NULL) { + $this->quote = array('id' => $id, 'title' => $title); + if($zone) { + $this->SetOrigin($zone, $country); + } + } + // ȯÁ÷¸µ¤ò¥»¥Ã¥È¤¹¤ë + // $zone: ÅÔÆ»Éܸ©¥³¡¼¥É '01'¡Á'47' + // $country: country code + function SetOrigin($zone, $country = NULL) { + $this->OriginZone = $zone; + if($country) { + $this->OriginCountryCode = $country; + } + } + function SetDest($zone, $country = NULL) { + $this->DestZone = $zone; + if($country) { + $this->DestCountryCode = $country; + } + } + function SetWeight($weight) { + //$this->Weight = $weight; + $this->Weight = $weight; + } + function SetSize($length = NULL, $width = NULL, $height = NULL) { + if($length) { + $this->Length = $length; + } + if($width) { + $this->Width = $width; + } + if($height) { + $this->Height = $height; + } + } + // ¥µ¥¤¥º¶èʬ(0¡Á4)¤òÊÖ¤¹ + // µ¬³Ê³°¤Î¾ì¹ç¤Ï9¤òÊÖ¤¹ + // + // ¶èʬ ¥µ¥¤¥ºÌ¾ £³ÊÕ·× ½ÅÎÌ + // ---------------------------------- + // 0 60¥µ¥¤¥º 60cm¤Þ¤Ç 2kg¤Þ¤Ç + // 1 80¥µ¥¤¥º 80cm¤Þ¤Ç 5kg¤Þ¤Ç + // 2 100¥µ¥¤¥º 100cm¤Þ¤Ç 10kg¤Þ¤Ç + // 3 120¥µ¥¤¥º 120cm¤Þ¤Ç 15kg¤Þ¤Ç + // 4 140¥µ¥¤¥º 140cm¤Þ¤Ç 20kg¤Þ¤Ç + // 5 160¥µ¥¤¥º 160cm¤Þ¤Ç 25kg¤Þ¤Ç + // 9 µ¬³Ê³° + function GetSizeClass() { + $a_classes = array( + array(0, 60, 2), // ¶èʬ,£³ÊÕ·×,½ÅÎÌ + array(1, 80, 5), + array(2, 100, 10), + array(3, 120, 15), + array(4, 140, 20), + array(5, 160, 25) + ); + + $n_totallength = $this->Length + $this->Width + $this->Height; + + while (list($n_index, $a_limit) = each($a_classes)) { + if ($n_totallength <= $a_limit[1] && $this->Weight <= $a_limit[2]) { + return $a_limit[0]; + } + } + return -1; // µ¬³Ê³° + } + // Á÷ÉÕ¸µ¤ÈÁ÷ÉÕÀ褫¤é¥­¡¼¤òºîÀ®¤¹¤ë + // + function GetDistKey() { + $s_key = ''; + $s_z1 = $this->GetLZone($this->OriginZone); + $s_z2 = $this->GetLZone($this->DestZone); + if ( $s_z1 && $s_z2 ) { + // ÃÏÂÓ¥³¡¼¥É¤ò¥¢¥ë¥Õ¥¡¥Ù¥Ã¥È½ç¤ËÏ¢·ë¤¹¤ë + if ( ord($s_z1) < ord($s_z2) ) { + $s_key = $s_z1 . $s_z2; + } else { + $s_key = $s_z2 . $s_z1; + } + } + return $s_key; + } + // ÅÔÆ»Éܸ©¥³¡¼¥É¤«¤éÃÏÂÓ¥³¡¼¥É¤ò¼èÆÀ¤¹¤ë + // $zone: ÅÔÆ»Éܸ©¥³¡¼¥É + function GetLZone($zone) { + // ÅÔÆ»Éܸ©¥³¡¼¥É¤òÃÏÂÓ¥³¡¼¥É('A'¡Á'M')¤ËÊÑ´¹¤¹¤ë + // Ë̳¤Æ»:'A' = Ë̳¤Æ» + // ËÌÅìËÌ:'B' = ÀÄ¿¹¸©,´ä¼ê¸©,½©Åĸ© + // ÆîÅìËÌ:'C' = µÜ¾ë¸©,»³·Á¸©,Ê¡Å縩 + // ´ØÅì :'D' = °ñ¾ë¸©,ÆÊÌÚ¸©,·²Çϸ©,ºë¶Ì¸©,ÀéÍÕ¸©,ÅìµþÅÔ,¿ÀÆàÀ,»³Íü¸© + // ¿®±Û :'E' = ¿·³ã¸©,ĹÌ + // Å쳤 :'F' = ´ôÉ츩,ÀŲ¬¸©,°¦Ãθ©,»°½Å¸© + // ËÌΦ :'G' = ÉÙ»³¸©,ÀÐÀ,Ê¡°æ¸© + // ´ØÀ¾ :'H' = ¼¢²ì¸©,µþÅÔÉÜ,ÂçºåÉÜ,ʼ¸Ë¸©,ÆàÎɸ©,Ï²λ³¸© + // Ãæ¹ñ :'I' = Ä»¼è¸©,Å纬¸©,²¬»³¸©,¹­Å縩,»³¸ý¸© + // »Í¹ñ :'J' = ÆÁÅ縩,¹áÀ,°¦É²¸©,¹âÃθ© + // ¶å½£ :'K' = Ê¡²¬¸©,º´²ì¸©,Ĺºê¸©,Âçʬ¸©,·§Ëܸ©,µÜºê¸©,¼¯»ùÅ縩 + // ²­Æì :'L' = ²­Æ츩 + $a_zonemap = array( + 'Ë̳¤Æ»'=>'A', + 'ÀÄ¿¹¸©'=>'B', + '´ä¼ê¸©'=>'B', + 'µÜ¾ë¸©'=>'C', + '½©Åĸ©'=>'B', + '»³·Á¸©'=>'C', + 'Ê¡Å縩'=>'C', + '°ñ¾ë¸©'=>'D', + 'ÆÊÌÚ¸©'=>'D', + '·²Çϸ©'=>'D', + 'ºë¶Ì¸©'=>'D', + 'ÀéÍÕ¸©'=>'D', + 'ÅìµþÅÔ'=>'D', + '¿ÀÆàÀ'=>'D', + '¿·³ã¸©'=>'E', + 'ÉÙ»³¸©'=>'G', + 'ÀÐÀ'=>'G', + 'Ê¡°æ¸©'=>'G', + '»³Íü¸©'=>'D', + 'ĹÌ'=>'E', + '´ôÉ츩'=>'F', + 'ÀŲ¬¸©'=>'F', + '°¦Ãθ©'=>'F', + '»°½Å¸©'=>'F', + '¼¢²ì¸©'=>'H', + 'µþÅÔÉÜ'=>'H', + 'ÂçºåÉÜ'=>'H', + 'ʼ¸Ë¸©'=>'H', + 'ÆàÎɸ©'=>'H', + 'Ï²λ³¸©'=>'H', + 'Ä»¼è¸©'=>'I', + 'Å纬¸©'=>'I', + '²¬»³¸©'=>'I', + '¹­Å縩'=>'I', + '»³¸ý¸©'=>'I', + 'ÆÁÅ縩'=>'J', + '¹áÀ'=>'J', + '°¦É²¸©'=>'J', + '¹âÃθ©'=>'J', + 'Ê¡²¬¸©'=>'K', + 'º´²ì¸©'=>'K', + 'Ĺºê¸©'=>'K', + '·§Ëܸ©'=>'K', + 'Âçʬ¸©'=>'K', + 'µÜºê¸©'=>'K', + '¼¯»ùÅ縩'=>'K', + '²­Æ츩'=>'L' + ); + return $a_zonemap[$zone]; + } + + function GetQuote() { + // µ÷Î¥Ê̤βÁ³Ê¥é¥ó¥¯: ¥é¥ó¥¯¥³¡¼¥É => ²Á³Ê(60,80,100,120,140,160) + $a_pricerank = array( + 'N01'=>array( 740, 950,1160,1370,1580,1790), // Ä̾ïÊØ(01) ¶áµ÷Î¥ + 'N02'=>array( 840,1050,1260,1470,1680,1890), // Ä̾ïÊØ(02) ¢¬ + 'N03'=>array( 950,1160,1370,1580,1790,2000), // Ä̾ïÊØ(03) + 'N04'=>array(1050,1260,1470,1680,1890,2100), // Ä̾ïÊØ(04) + 'N05'=>array(1160,1370,1580,1790,2000,2210), // Ä̾ïÊØ(05) + 'N06'=>array(1260,1470,1680,1890,2100,2310), // Ä̾ïÊØ(06) + 'N07'=>array(1370,1580,1790,2000,2210,2420), // Ä̾ïÊØ(07) + 'N08'=>array(1470,1680,1890,2100,2310,2520), // Ä̾ïÊØ(08) + 'N09'=>array(1580,1790,2000,2210,2420,2630), // Ä̾ïÊØ(09) + 'N10'=>array(1680,1890,2100,2310,2520,2730), // Ä̾ïÊØ(10) ¢­ + 'N11'=>array(1790,2000,2210,2420,2630,2840), // Ä̾ïÊØ(11) ±óµ÷Î¥ + 'X05'=>array(1160,1680,2210,2730,3260,3780),// + 'X06'=>array(1260,1790,2310,2840,3360,3890),// + 'X07'=>array(1370,1890,2420,2940,3470,3990),// + 'X08'=>array(1470,2000,2520,3050,3570,4100),// + 'X09'=>array(1580,2100,2630,3150,3680,4200),// + 'X12'=>array(1890,2420,2940,3470,3990,4520) // + ); + // ÃÏÂÓ - ÃÏÂӴ֤βÁ³Ê¥é¥ó¥¯ + // (»²¾È) http://partner.kuronekoyamato.co.jp/estimate/all_est.html + $a_dist_to_rank = array( + 'AA'=>'N01', + 'AB'=>'N03','BB'=>'N01', + 'AC'=>'N04','BC'=>'N01','CC'=>'N01', + 'AD'=>'N05','BD'=>'N02','CD'=>'N01','DD'=>'N01', + 'AE'=>'N05','BE'=>'N02','CE'=>'N01','DE'=>'N01','EE'=>'N01', + 'AF'=>'N06','BF'=>'N03','CF'=>'N02','DF'=>'N01','EF'=>'N01','FF'=>'N01', + 'AG'=>'N06','BG'=>'N03','CG'=>'N02','DG'=>'N01','EG'=>'N01','FG'=>'N01','GG'=>'N01', + 'AH'=>'N08','BH'=>'N04','CH'=>'N03','DH'=>'N02','EH'=>'N02','FH'=>'N01','GH'=>'N01','HH'=>'N01', + 'AI'=>'N09','BI'=>'N05','CI'=>'N05','DI'=>'N03','EI'=>'N03','FI'=>'N02','GI'=>'N02','HI'=>'N01','II'=>'N01', + 'AJ'=>'N10','BJ'=>'N06','CJ'=>'N06','DJ'=>'N04','EJ'=>'N04','FJ'=>'N03','GJ'=>'N03','HJ'=>'N02','IJ'=>'N02','JJ'=>'N01', + 'AK'=>'N11','BK'=>'N07','CK'=>'N07','DK'=>'N05','EK'=>'N05','FK'=>'N03','GK'=>'N03','HK'=>'N02','IK'=>'N01','JK'=>'N02','KK'=>'N01', + 'AL'=>'X12','BL'=>'X09','CL'=>'X08','DL'=>'X06','EL'=>'X07','FL'=>'X06','GL'=>'X07','HL'=>'X06','IL'=>'X06','JL'=>'X06','KL'=>'X05','LL'=>'N01' + ); + + $s_key = $this->GetDistKey(); + if ( $s_key ) { + $s_rank = $a_dist_to_rank[$s_key]; + if ( $s_rank ) { + $n_sizeclass = $this->GetSizeClass(); + if ($n_sizeclass < 0) { + $this->quote['error'] = MODULE_SHIPPING_YAMATO_TEXT_OVERSIZE; + } else { + $this->quote['cost'] = $a_pricerank[$s_rank][$n_sizeclass]; + } + //$this->quote['DEBUG'] = ' zone=' . $this->OriginZone . '=>' . $this->DestZone //DEBUG + // . ' cost=' . $a_pricerank[$s_rank][$n_sizeclass]; //DEBUG + } else { + $this->quote['error'] = MODULE_SHIPPING_YAMATO_TEXT_OUT_OF_AREA . '(' . $s_key .')'; + } + } else { + $this->quote['error'] = MODULE_SHIPPING_YAMATO_TEXT_ILLEGAL_ZONE . '(' . $this->OriginZone . '=>' . $this->DestZone . ')'; + } + return $this->quote; + } + } + ?> \ No newline at end of file diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/includes/classes/email.php zen-cart-v1.2.0-l10n-jp-2/includes/classes/email.php *** zen-cart-v1.2.0-l10n-jp-1/includes/classes/email.php Wed Jan 12 18:16:21 2005 --- zen-cart-v1.2.0-l10n-jp-2/includes/classes/email.php Fri Apr 22 07:10:11 2005 *************** *** 17,23 **** // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ ! // $Id: email.php,v 1.6 2005/01/12 09:16:21 shida Exp $ // /* mail.php - a class to assist in building mime-HTML eMails --- 17,23 ---- // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ ! // $Id: email.php,v 1.8 2005/04/21 22:10:11 shida Exp $ // /* mail.php - a class to assist in building mime-HTML eMails *************** *** 487,495 **** */ function send($to_name, $to_addr, $from_name, $from_addr, $subject = '', $headers = '') { ! $subject = mb_encode_mimeheader( mb_convert_kana($subject, 'KV'), 'ISO-2022-JP'); ! $to = (($to_name != '') ? '"' . mb_encode_mimeheader( mb_convert_kana($to_name, 'KV'), 'ISO-2022-JP') . '" <' . $to_addr . '>' : $to_addr); ! $from = (($from_name != '') ? '"' . mb_encode_mimeheader( mb_convert_kana($from_name, 'KV'), 'ISO-2022-JP') . '" <' . $from_addr . '>' : $from_addr); if (is_string($headers)) { $headers = explode($this->lf, trim($headers)); } --- 487,495 ---- */ function send($to_name, $to_addr, $from_name, $from_addr, $subject = '', $headers = '') { ! $subject = mb_encode_mimeheader( mb_convert_kana($subject, 'KV'), 'ISO-2022-JP', 'B', $this->lf); ! $to = (($to_name != '') ? '"' . mb_encode_mimeheader( mb_convert_kana($to_name, 'KV'), 'ISO-2022-JP', 'B', $this->lf) . '" <' . $to_addr . '>' : $to_addr); ! $from = (($from_name != '') ? '"' . mb_encode_mimeheader( mb_convert_kana($from_name, 'KV'), 'ISO-2022-JP', 'B', $this->lf) . '" <' . $from_addr . '>' : $from_addr); if (is_string($headers)) { $headers = explode($this->lf, trim($headers)); } *************** *** 513,519 **** } if (EMAIL_TRANSPORT == 'smtp') { ! return mail($to, $subject, $this->output, 'From: '.$from.$this->lf.implode($this->lf, $this->headers).$this->lf.implode($this->lf, $xtra_headers)); } else { return mail($to, $subject, $this->output, 'From: '.$from.$this->lf.implode($this->lf, $this->headers).$this->lf.implode($this->lf, $xtra_headers)); } --- 513,519 ---- } if (EMAIL_TRANSPORT == 'smtp') { ! return mail($to_addr, $subject, $this->output, 'From: '.$from.$this->lf.implode($this->lf, $this->headers).$this->lf.implode($this->lf, $xtra_headers)); } else { return mail($to, $subject, $this->output, 'From: '.$from.$this->lf.implode($this->lf, $this->headers).$this->lf.implode($this->lf, $xtra_headers)); } diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/includes/functions/functions_general.php zen-cart-v1.2.0-l10n-jp-2/includes/functions/functions_general.php *** zen-cart-v1.2.0-l10n-jp-1/includes/functions/functions_general.php Sat Feb 5 15:18:10 2005 --- zen-cart-v1.2.0-l10n-jp-2/includes/functions/functions_general.php Sat Apr 16 14:49:01 2005 *************** *** 17,23 **** // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ ! // $Id: functions_general.php,v 1.2 2005/02/05 06:18:10 shida Exp $ // /** * General Function Repository. --- 17,23 ---- // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ ! // $Id: functions_general.php,v 1.4 2005/04/16 05:49:01 shida Exp $ // /** * General Function Repository. *************** *** 118,125 **** function zen_break_string($string, $len, $break_char = '-') { $l = 0; $output = ''; ! for ($i=0, $n=strlen($string); $i<$n; $i++) { ! $char = substr($string, $i, 1); if ($char != ' ') { $l++; } else { --- 118,125 ---- function zen_break_string($string, $len, $break_char = '-') { $l = 0; $output = ''; ! for ($i=0, $n=mb_strlen($string); $i<$n; $i++) { ! $char = mb_substr($string, $i, 1); if ($char != ' ') { $l++; } else { *************** *** 249,255 **** //// // Parse search string into indivual objects function zen_parse_search_string($search_str = '', &$objects) { ! $search_str = trim(strtolower($search_str)); // Break up $search_str on whitespace; quoted string will be reconstructed later $pieces = split('[[:space:]]+', $search_str); --- 249,255 ---- //// // Parse search string into indivual objects function zen_parse_search_string($search_str = '', &$objects) { ! $search_str = trim($search_str); // Break up $search_str on whitespace; quoted string will be reconstructed later $pieces = split('[[:space:]]+', $search_str); diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/includes/languages/english/modules/payment/kuroneko_at_payment.php zen-cart-v1.2.0-l10n-jp-2/includes/languages/english/modules/payment/kuroneko_at_payment.php *** zen-cart-v1.2.0-l10n-jp-1/includes/languages/english/modules/payment/kuroneko_at_payment.php Thu Jan 1 09:00:00 1970 --- zen-cart-v1.2.0-l10n-jp-2/includes/languages/english/modules/payment/kuroneko_at_payment.php Sat Apr 16 15:01:00 2005 *************** *** 0 **** --- 1,33 ---- + If you want to know detail, please click banner.'); + define('MODULE_PAYMENT_KURONEKO_AT_PAYMENT_BUTTON_IMAGE', 'button_kuroneko_at_payment.gif'); + define('MODULE_PAYMENT_KURONEKO_AT_PAYMENT_BUTTON_ALT', 'Go to Kuroneko@Payment'); + define('MODULE_PAYMENT_KURONEKO_AT_PAYMENT_TEXT_CONFIRMATION', 'Please pay by clicking "' . MODULE_PAYMENT_KURONEKO_AT_PAYMENT_BUTTON_ALT . '" button shown after checkout.'); + define('MODULE_PAYMENT_KURONEKO_AT_PAYMENT_TEXT_DESCRIPTION', 'Kuroneko@Payment Credit Card Payment'); + define('MODULE_PAYMENT_KURONEKO_AT_PAYMENT_TEXT_URGE', 'If you pay by using Kuroneko@Payment(credit card payment),
please click button to start to pay.
'); + define('MODULE_PAYMENT_KURONEKO_AT_PAYMENT_LEADING_PRODUCT', '%s x %d(s)'); + define('MODULE_PAYMENT_KURONEKO_AT_PAYMENT_OTHER_PRODUCTS', ' %d others'); + + ?> \ No newline at end of file diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/includes/languages/english/modules/shipping/nittsu.php zen-cart-v1.2.0-l10n-jp-2/includes/languages/english/modules/shipping/nittsu.php *** zen-cart-v1.2.0-l10n-jp-1/includes/languages/english/modules/shipping/nittsu.php Thu Jan 1 09:00:00 1970 --- zen-cart-v1.2.0-l10n-jp-2/includes/languages/english/modules/shipping/nittsu.php Sat Apr 16 15:01:00 2005 *************** *** 0 **** --- 1,41 ---- + '´õ˾¤Ê¤·', 'text'=>'None'), + array('id'=>'08»þ¡Á12»þ','text'=>'Morning'), + array('id'=>'12»þ¡Á16»þ','text'=>'12 a.m. - 4 p.m.'), + array('id'=>'16»þ¡Á19»þ','text'=>'4 p.m. - 7 p.m.'), + array('id'=>'19»þ¡Á22»þ','text'=>'7 p.m. - 10 p.m.'), + ); + ?> \ No newline at end of file diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/includes/languages/english/modules/shipping/yamato.php zen-cart-v1.2.0-l10n-jp-2/includes/languages/english/modules/shipping/yamato.php *** zen-cart-v1.2.0-l10n-jp-1/includes/languages/english/modules/shipping/yamato.php Thu Jan 1 09:00:00 1970 --- zen-cart-v1.2.0-l10n-jp-2/includes/languages/english/modules/shipping/yamato.php Sat Apr 16 15:01:00 2005 *************** *** 0 **** --- 1,43 ---- + '´õ˾¤Ê¤·', 'text'=>'None'), + array('id'=>'¸áÁ°Ãæ', 'text'=>'Morning'), + array('id'=>'12»þ¡Á15»þ','text'=>'12 a.m. - 2 p.m.'), + array('id'=>'15»þ¡Á18»þ','text'=>'2 p.m. - 4 p.m.'), + array('id'=>'18»þ¡Á21»þ','text'=>'4 p.m. - 6 p.m.'), + array('id'=>'12»þ¡Á15»þ','text'=>'6 p.m. - 8 p.m.'), + array('id'=>'18»þ¡Á21»þ','text'=>'8 p.m. - 10 p.m.'), + ); + ?> \ No newline at end of file diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/includes/languages/japanese/modules/payment/kuroneko_at_payment.php zen-cart-v1.2.0-l10n-jp-2/includes/languages/japanese/modules/payment/kuroneko_at_payment.php *** zen-cart-v1.2.0-l10n-jp-1/includes/languages/japanese/modules/payment/kuroneko_at_payment.php Thu Jan 1 09:00:00 1970 --- zen-cart-v1.2.0-l10n-jp-2/includes/languages/japanese/modules/payment/kuroneko_at_payment.php Sat Apr 16 15:01:01 2005 *************** *** 0 **** --- 1,33 ---- + ¾Ü¤·¤¯¤Ï¡¢±¦¤Î¥Ð¥Ê¡¼¤ò¥¯¥ê¥Ã¥¯¤·¤Æ¤¯¤À¤µ¤¤¡£'); + define('MODULE_PAYMENT_KURONEKO_AT_PAYMENT_BUTTON_IMAGE', 'button_kuroneko_at_payment.gif'); + define('MODULE_PAYMENT_KURONEKO_AT_PAYMENT_BUTTON_ALT', '¥¯¥í¥Í¥³¡÷¥Ú¥¤¥á¥ó¥È¤Î¤ª»Ùʧ¼ê³¤­¤Ø'); + define('MODULE_PAYMENT_KURONEKO_AT_PAYMENT_TEXT_CONFIRMATION', 'Ãíʸ³Îǧ¸å¤Ëɽ¼¨¤µ¤ì¤ë¡Ö' . MODULE_PAYMENT_KURONEKO_AT_PAYMENT_BUTTON_ALT . '¡×¤Î¥Ü¥¿¥ó¤ò²¡¤·¤Æ¤ª»Ùʧ¤¤¤Î¼ê³¤­¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡£'); + define('MODULE_PAYMENT_KURONEKO_AT_PAYMENT_TEXT_DESCRIPTION', '¥¯¥í¥Í¥³¡÷¥Ú¥¤¥á¥ó¥È¥¯¥ì¥¸¥Ã¥È¥«¡¼¥É·èºÑ'); + define('MODULE_PAYMENT_KURONEKO_AT_PAYMENT_TEXT_URGE', '¥¯¥í¥Í¥³¡÷¥Ú¥¤¥á¥ó¥È¡Ê¥¯¥ì¥¸¥Ã¥È¥«¡¼¥É¡Ë¤Ç¤ª»Ùʧ¤¤¤µ¤ì¤ë¤ªµÒÍͤÏ
¥Ü¥¿¥ó¤ò²¡¤·¤Æ¼ê³¤­¤ò¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡£
'); + define('MODULE_PAYMENT_KURONEKO_AT_PAYMENT_LEADING_PRODUCT', '%s x %dÅÀ'); + define('MODULE_PAYMENT_KURONEKO_AT_PAYMENT_OTHER_PRODUCTS', ' ¾%dÅÀ'); + + ?> \ No newline at end of file diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/includes/languages/japanese/modules/shipping/nittsu.php zen-cart-v1.2.0-l10n-jp-2/includes/languages/japanese/modules/shipping/nittsu.php *** zen-cart-v1.2.0-l10n-jp-1/includes/languages/japanese/modules/shipping/nittsu.php Thu Jan 1 09:00:00 1970 --- zen-cart-v1.2.0-l10n-jp-2/includes/languages/japanese/modules/shipping/nittsu.php Sat Apr 16 15:01:01 2005 *************** *** 0 **** --- 1,41 ---- + '´õ˾¤Ê¤·', 'text'=>'´õ˾¤Ê¤·'), + array('id'=>'08»þ¡Á12»þ','text'=>'Ä« 8»þ¡Á12»þ'), + array('id'=>'12»þ¡Á16»þ','text'=>'Ãë 12»þ¡Á16»þ'), + array('id'=>'16»þ¡Á19»þ','text'=>'ͼ 16»þ¡Á19»þ'), + array('id'=>'19»þ¡Á22»þ','text'=>'Ìë 19»þ¡Á22»þ'), + ); + ?> \ No newline at end of file diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/includes/languages/japanese/modules/shipping/yamato.php zen-cart-v1.2.0-l10n-jp-2/includes/languages/japanese/modules/shipping/yamato.php *** zen-cart-v1.2.0-l10n-jp-1/includes/languages/japanese/modules/shipping/yamato.php Thu Jan 1 09:00:00 1970 --- zen-cart-v1.2.0-l10n-jp-2/includes/languages/japanese/modules/shipping/yamato.php Sat Apr 16 15:01:01 2005 *************** *** 0 **** --- 1,43 ---- + '´õ˾¤Ê¤·', 'text'=>'´õ˾¤Ê¤·'), + array('id'=>'¸áÁ°Ãæ', 'text'=>'¸áÁ°Ãæ'), + array('id'=>'12»þ¡Á15»þ','text'=>'12»þ¡Á14»þ'), + array('id'=>'15»þ¡Á18»þ','text'=>'14»þ¡Á16»þ'), + array('id'=>'18»þ¡Á21»þ','text'=>'16»þ¡Á18»þ'), + array('id'=>'12»þ¡Á15»þ','text'=>'18»þ¡Á20»þ'), + array('id'=>'18»þ¡Á21»þ','text'=>'20»þ¡Á21»þ'), + ); + ?> \ No newline at end of file diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/includes/languages/japanese.php zen-cart-v1.2.0-l10n-jp-2/includes/languages/japanese.php *** zen-cart-v1.2.0-l10n-jp-1/includes/languages/japanese.php Mon Feb 7 18:34:36 2005 --- zen-cart-v1.2.0-l10n-jp-2/includes/languages/japanese.php Sat Apr 16 15:01:00 2005 *************** *** 17,23 **** // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ ! // $Id: japanese.php,v 1.11 2005/02/07 09:34:36 shida Exp $ // mb_language('Japanese'); --- 17,23 ---- // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ ! // $Id: japanese.php,v 1.12 2005/04/16 06:01:00 shida Exp $ // mb_language('Japanese'); *************** *** 318,324 **** define('TEXT_REQUIRED', 'ɬ¿Ü'); ! define('TEXT_TIME_SPECIFY','¤ªÕü¤±»þ´ÖÂÓ'); define('ERROR_zen_MAIL', 'ZEN ERROR: »ØÄꤵ¤ì¤¿SMTP¥µ¡¼¥Ð¡¼¤«¤é¥á¡¼¥ë¤òÁ÷¿®½ÐÍè¤Þ¤»¤ó¡£php.ini¤ÎÀßÄê¤ò³Îǧ¤·¡¢É¬Íפ˱þ¤¸¤ÆSMTP¥µ¡¼¥Ð¡¼¤òÄûÀµ¤·¤Æ¤¯¤À¤µ¤¤¡£'); define('WARNING_INSTALL_DIRECTORY_EXISTS', '·Ù¹ð: ±¦µ­¤Î¥¤¥ó¥¹¥È¡¼¥ë¥Ç¥£¥ì¥¯¥È¥ê¤¬¤½¤Î¤Þ¤Þ»Ä¤Ã¤Æ¤¤¤Þ¤¹: ' . dirname($_SERVER['SCRIPT_FILENAME']) . '/zc_install. ¥»¥­¥å¥ê¥Æ¥£¾å´í¸±¤Ç¤¹¤Î¤Ç¡¢¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£'); --- 318,324 ---- define('TEXT_REQUIRED', 'ɬ¿Ü'); ! define('TEXT_TIME_SPECIFY','¤ªÆϤ±»þ´ÖÂÓ'); define('ERROR_zen_MAIL', 'ZEN ERROR: »ØÄꤵ¤ì¤¿SMTP¥µ¡¼¥Ð¡¼¤«¤é¥á¡¼¥ë¤òÁ÷¿®½ÐÍè¤Þ¤»¤ó¡£php.ini¤ÎÀßÄê¤ò³Îǧ¤·¡¢É¬Íפ˱þ¤¸¤ÆSMTP¥µ¡¼¥Ð¡¼¤òÄûÀµ¤·¤Æ¤¯¤À¤µ¤¤¡£'); define('WARNING_INSTALL_DIRECTORY_EXISTS', '·Ù¹ð: ±¦µ­¤Î¥¤¥ó¥¹¥È¡¼¥ë¥Ç¥£¥ì¥¯¥È¥ê¤¬¤½¤Î¤Þ¤Þ»Ä¤Ã¤Æ¤¤¤Þ¤¹: ' . dirname($_SERVER['SCRIPT_FILENAME']) . '/zc_install. ¥»¥­¥å¥ê¥Æ¥£¾å´í¸±¤Ç¤¹¤Î¤Ç¡¢¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£'); diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/includes/modules/order_total/ot_cod_fee.php zen-cart-v1.2.0-l10n-jp-2/includes/modules/order_total/ot_cod_fee.php *** zen-cart-v1.2.0-l10n-jp-1/includes/modules/order_total/ot_cod_fee.php Wed Sep 1 13:47:45 2004 --- zen-cart-v1.2.0-l10n-jp-2/includes/modules/order_total/ot_cod_fee.php Fri Apr 22 06:54:57 2005 *************** *** 8,14 **** // | http://www.zen-cart.com/index.php | // | | // | Portions Copyright (c) 2003 osCommerce | ! // | Portions Copyright (c) 2002 Thomas Plänkers | // | http://www.oscommerce.at | // +----------------------------------------------------------------------+ // | This source file is subject to version 2.0 of the GPL license, | --- 8,14 ---- // | http://www.zen-cart.com/index.php | // | | // | Portions Copyright (c) 2003 osCommerce | ! // | Portions Copyright (c) 2002 Thomas PlçÏkers | // | http://www.oscommerce.at | // +----------------------------------------------------------------------+ // | This source file is subject to version 2.0 of the GPL license, | *************** *** 19,25 **** // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ ! // $Id: ot_cod_fee.php,v 1.1.1.1 2004/09/01 04:47:45 shidairiki Exp $ // class ot_cod_fee { --- 19,25 ---- // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ ! // $Id: ot_cod_fee.php,v 1.4 2005/04/21 21:54:57 shida Exp $ // class ot_cod_fee { *************** *** 61,66 **** --- 61,69 ---- if (substr_count($_SESSION['shipping']['id'], 'dp') !=0) $cod_zones = split("[:,]", MODULE_ORDER_TOTAL_COD_FEE_DP); //satt inn av Pompel if (substr_count($_SESSION['shipping']['id'], 'servicepakke') !=0) $cod_zones = split("[:,]", MODULE_ORDER_TOTAL_COD_FEE_SERVICEPAKKE); + if (substr_count($_SESSION['shipping']['id'], 'sagawa') !=0) $cod_zones = split("[:,]", MODULE_ORDER_TOTAL_COD_FEE_SAGAWA); + if (substr_count($_SESSION['shipping']['id'], 'yamato') !=0) $cod_zones = split("[:,]", MODULE_ORDER_TOTAL_COD_FEE_YAMATO); + if (substr_count($_SESSION['shipping']['id'], 'nittsu') !=0) $cod_zones = split("[:,]", MODULE_ORDER_TOTAL_COD_FEE_NITTSU); for ($i = 0; $i < count($cod_zones); $i++) { if ($cod_zones[$i] == $order->delivery['country']['iso_code_2']) { *************** *** 111,117 **** } //lagt tilk servicepakke her!!!! function keys() { ! return array('MODULE_ORDER_TOTAL_COD_STATUS', 'MODULE_ORDER_TOTAL_COD_SORT_ORDER', 'MODULE_ORDER_TOTAL_COD_FEE_FLAT', 'MODULE_ORDER_TOTAL_COD_FEE_FREE', 'MODULE_ORDER_TOTAL_COD_FEE_FREESHIPPER', 'MODULE_ORDER_TOTAL_COD_FEE_ITEM', 'MODULE_ORDER_TOTAL_COD_FEE_TABLE', 'MODULE_ORDER_TOTAL_COD_FEE_UPS', 'MODULE_ORDER_TOTAL_COD_FEE_USPS', 'MODULE_ORDER_TOTAL_COD_FEE_ZONES', 'MODULE_ORDER_TOTAL_COD_FEE_AP', 'MODULE_ORDER_TOTAL_COD_FEE_DP', 'MODULE_ORDER_TOTAL_COD_FEE_SERVICEPAKKE', 'MODULE_ORDER_TOTAL_COD_FEE_FEDEX', 'MODULE_ORDER_TOTAL_COD_TAX_CLASS'); } function install() { --- 114,120 ---- } //lagt tilk servicepakke her!!!! function keys() { ! return array('MODULE_ORDER_TOTAL_COD_STATUS', 'MODULE_ORDER_TOTAL_COD_SORT_ORDER', 'MODULE_ORDER_TOTAL_COD_FEE_FLAT', 'MODULE_ORDER_TOTAL_COD_FEE_FREE', 'MODULE_ORDER_TOTAL_COD_FEE_FREESHIPPER', 'MODULE_ORDER_TOTAL_COD_FEE_ITEM', 'MODULE_ORDER_TOTAL_COD_FEE_TABLE', 'MODULE_ORDER_TOTAL_COD_FEE_UPS', 'MODULE_ORDER_TOTAL_COD_FEE_USPS', 'MODULE_ORDER_TOTAL_COD_FEE_ZONES', 'MODULE_ORDER_TOTAL_COD_FEE_AP', 'MODULE_ORDER_TOTAL_COD_FEE_DP', 'MODULE_ORDER_TOTAL_COD_FEE_SERVICEPAKKE', 'MODULE_ORDER_TOTAL_COD_FEE_FEDEX', 'MODULE_ORDER_TOTAL_COD_FEE_SAGAWA', 'MODULE_ORDER_TOTAL_COD_FEE_YAMATO', 'MODULE_ORDER_TOTAL_COD_FEE_NITTSU', 'MODULE_ORDER_TOTAL_COD_TAX_CLASS'); } function install() { *************** *** 130,135 **** --- 133,141 ---- $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('COD Fee for German Post', 'MODULE_ORDER_TOTAL_COD_FEE_DP', 'DE:3.58,00:9.99', 'German Post: <Country code>:<COD price>, .... 00 as country code applies for all countries. If country code is 00, it must be the last statement. If no 00:9.99 appears, COD shipping in foreign countries is not calculated (not possible)', '6', '10', now())"); $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('COD Fee for Servicepakke', 'MODULE_ORDER_TOTAL_COD_FEE_SERVICEPAKKE', 'NO:69', 'Servicepakke: <Country code>:<COD price>, .... 00 as country code applies for all countries. If country code is 00, it must be the last statement. If no 00:9.99 appears, COD shipping in foreign countries is not calculated (not possible)', '6', '11', now())"); $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('COD Fee for FedEx', 'MODULE_ORDER_TOTAL_COD_FEE_FEDEX', 'US:3.00', 'FedEx: <Country code>:<COD price>, .... 00 as country code applies for all countries. If country code is 00, it must be the last statement. If no 00:9.99 appears, COD shipping in foreign countries is not calculated (not possible)', '6', '12', now())"); + $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('º´ÀîµÞÊؤÎÂå¶â°ú´¹(e-¥³¥ì¥¯¥È)ÍѤÎÂå°ú¤­¼ê¿ôÎÁ', 'MODULE_ORDER_TOTAL_COD_FEE_SAGAWA', '00:400', 'e-¥³¥ì¥¯¥È¤Î¼ê¿ôÎÁ¤ò¡Ö¹ñ¥³¡¼¥É:¼ê¿ôÎÁ,¹ñ¥³¡¼¥É:¼ê¿ôÎÁ,...¡×¤È¤¤¤¦½ñ¼°¤ÇÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£¹ñ¥³¡¼¥É¤¬¤ï¤«¤Ê¤é¤¤¾ì¹ç¡¢¤Þ¤¿¤Ï¤¹¤Ù¤ÆÅý°ì¤¹¤ë¾ì¹ç¤Ï00¡§¼ê¿ôÎÁ¤Çµ­¤·¤Æ¤¯¤À¤µ¤¤', '6', '13', now())"); + $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('¥ä¥Þ¥È±¿Í¢¤ÎÂå¶â°ú´¹(¥ä¥Þ¥È¥³¥ì¥¯¥È)ÍѤÎÂå°ú¤­¼ê¿ôÎÁ', 'MODULE_ORDER_TOTAL_COD_FEE_YAMATO', '00:400', '¥ä¥Þ¥È¥³¥ì¥¯¥È¤Î¼ê¿ôÎÁ¤ò¡Ö¹ñ¥³¡¼¥É:¼ê¿ôÎÁ,¹ñ¥³¡¼¥É:¼ê¿ôÎÁ,...¡×¤È¤¤¤¦½ñ¼°¤ÇÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£¹ñ¥³¡¼¥É¤¬¤ï¤«¤Ê¤é¤¤¾ì¹ç¡¢¤Þ¤¿¤Ï¤¹¤Ù¤ÆÅý°ì¤¹¤ë¾ì¹ç¤Ï00¡§¼ê¿ôÎÁ¤Çµ­¤·¤Æ¤¯¤À¤µ¤¤', '6', '14', now())"); + $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('ÆüËÜÄ̱¿¤ÎÂå¶â°ú´¹(¥Ú¥ê¥«¥ó½¸¶â¥µ¡¼¥Ó¥¹)ÍѤÎÂå°ú¤­¼ê¿ôÎÁ', 'MODULE_ORDER_TOTAL_COD_FEE_NITTSU', '00:400', '¥ä¥Þ¥È¥³¥ì¥¯¥È¤Î¼ê¿ôÎÁ¤ò¡Ö¹ñ¥³¡¼¥É:¼ê¿ôÎÁ,¹ñ¥³¡¼¥É:¼ê¿ôÎÁ,...¡×¤È¤¤¤¦½ñ¼°¤ÇÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£¹ñ¥³¡¼¥É¤¬¤ï¤«¤Ê¤é¤¤¾ì¹ç¡¢¤Þ¤¿¤Ï¤¹¤Ù¤ÆÅý°ì¤¹¤ë¾ì¹ç¤Ï00¡§¼ê¿ôÎÁ¤Çµ­¤·¤Æ¤¯¤À¤µ¤¤', '6', '15', now())"); $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('Tax Class', 'MODULE_ORDER_TOTAL_COD_TAX_CLASS', '0', 'Use the following tax class on the COD fee.', '6', '25', 'zen_get_tax_class_title', 'zen_cfg_pull_down_tax_classes(', now())"); } diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/includes/modules/pages/download/header_php.php zen-cart-v1.2.0-l10n-jp-2/includes/modules/pages/download/header_php.php *** zen-cart-v1.2.0-l10n-jp-1/includes/modules/pages/download/header_php.php Wed Sep 1 13:47:41 2004 --- zen-cart-v1.2.0-l10n-jp-2/includes/modules/pages/download/header_php.php Sat Apr 16 14:46:32 2005 *************** *** 17,23 **** // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ ! // $Id: header_php.php,v 1.1.1.1 2004/09/01 04:47:41 shidairiki Exp $ // require(DIR_WS_MODULES . 'require_languages.php'); --- 17,23 ---- // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ ! // $Id: header_php.php,v 1.4 2005/04/16 05:46:32 shida Exp $ // require(DIR_WS_MODULES . 'require_languages.php'); *************** *** 113,117 **** --- 113,118 ---- // We could also loop with fread($fp, 4096) to save memory header("Content-Length: " . $zv_filesize); readfile(DIR_FS_DOWNLOAD . $downloads->fields['orders_products_filename']); + exit(); } ?> diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/includes/modules/payment/kuroneko_at_payment.php zen-cart-v1.2.0-l10n-jp-2/includes/modules/payment/kuroneko_at_payment.php *** zen-cart-v1.2.0-l10n-jp-1/includes/modules/payment/kuroneko_at_payment.php Thu Jan 1 09:00:00 1970 --- zen-cart-v1.2.0-l10n-jp-2/includes/modules/payment/kuroneko_at_payment.php Sat Apr 16 15:01:01 2005 *************** *** 0 **** --- 1,314 ---- + ¡¡¤òÁÞÆþ + // + // ---------------------------------------------------------------------- + // + // + // Ãíʸ³Îǧ¸å¡¢$_SESSION['kuroneko_at_payment']¡¡¤Ë¥ê¥ó¥¯¥Ü¥¿¥ó¤ÎHTML¥½¡¼¥¹¤¬ + // ÇÛÎó¤ÇÂåÆþ¤µ¤ì¤Þ¤¹¡£ + // + // ÇÛÎó¤ÎÆâÍÆ + // $_SESSION['kuroneko_at_payment']['link_button'] ¡¡¥ê¥ó¥¯¥Ü¥¿¥ó¤Î¤ß¤Îhtml¥½¡¼¥¹ + // $_SESSION['kuroneko_at_payment']['text_urge']¡¡·èºÑ¼ê³¤­¤ØÂ¥¤¹Ê¸¾Ï¤Îhtml¥½¡¼¥¹ + // $_SESSION['kuroneko_at_payment']['box']¡¡¾åµ­£²¤Ä¤ò´Þ¤àplainBox¤Îhtml¥½¡¼¥¹ + // + // includes/templates/template_default/templates/tpl_checkout_success_default.php¡¡Æâ¤Ç + // ɬÍפʥ½¡¼¥¹¤òecho¤¹¤ë + // + // Îã¡Ë¥¯¥í¥Í¥³¡÷¥Ú¥¤¥á¥ó¥È·èºÑ¤Ø¤Î¥Ü¥Ã¥¯¥¹¤Îɽ¼¨ + // < ?php if (isset($_SESSION['kuroneko_at_payment'])) echo $_SESSION['kuroneko_at_payment']['box']; ? > + // + // ---------------------------------------------------------------------- + // + // + // + // ¥â¥¸¥å¡¼¥ëÀßÄê ------------------------------------------------------- + // + // ¡¦¥¯¥í¥Í¥³¡÷¥Ú¥¤¥á¥ó¥È¥â¥¸¥å¡¼¥ë¤òÍ­¸ú¤Ë¤¹¤ë + // ¡¡¡¡True¡¡¡¦¡¦¡¦ Í­¸ú + // ¡¡¡¡False ¡¦¡¦¡¦ ̵¸ú + // ¡¡¡¡¥Ç¥Õ¥©¥ë¥ÈÃÍ¡¡True + // + // ¡¦ËÜÈÖ¥Ú¡¼¥¸¤Ø¤ÎÀÚÂؤ¨ + // ¡¡¡¡True¡¡¡¦¡¦¡¦ ËÜÅö¤Î·èºÑ¥Ú¡¼¥¸¤Ø¤Ä¤Ê¤¬¤ê¤Þ¤¹¡£ + // ¡¡¡¡False ¡¦¡¦¡¦ Æ°ºî¥Æ¥¹¥ÈÍѤΥڡ¼¥¸¤Ë¤Ä¤Ê¤¬¤ê¤Þ¤¹¡£ + // ¡¡¡¡¢¨ ËÜÈÖ²ÔÆ°¤ÎÁ°¤ËÆ°ºî¥Æ¥¹¥ÈÍѤΥڡ¼¥¸¤Ç½½Ê¬¥Æ¥¹¥È¤·¤Æ¤¯¤À¤µ¤¤¡£ + // ¡¡¡¡¥Ç¥Õ¥©¥ë¥ÈÃÍ¡¡False + // + // ¡¦²ÃÌÁŹ¥³¡¼¥É + // ¡¡¡¡²ÃÌÁŹ¥³¡¼¥É¤òȾ³Ñ¿ô»ú¤ÇÆþÎϤ·¤Þ¤¹¡£ + // ¡¡¡¡¥Ç¥Õ¥©¥ë¥ÈÃÍ¡¡¶õÍó + // + // ¡¦ºÇÄã¶â³Û + // ¡¡¡¡¥¯¥í¥Í¥³¡÷¥Ú¥¤¥á¥ó¥È¤òŬÍѤ¹¤ëºÇÄã¶â³Û¤òÆþÎϤ·¤Þ¤¹¡£ + // ¡¡¡¡ÆâÀdz°ÀǤη׻»¤Ë´Ø·¸¤Ê¤¯¥«¡¼¥È¤Î¾®·×¤¬ÆþÎϤ·¤¿¶â³Û°Ê¾å¤Ç + // ¡¡¡¡É½¼¨¤µ¤ì¤Þ¤¹¡£ + // ¡¡¡¡¥Ç¥Õ¥©¥ë¥ÈÃÍ¡¡0 + // + // ¡¦Á÷¿®ÀèURL + // ¡¡¡¡¥ê¥ó¥¯¥Ü¥¿¥ó¡Ê¥Õ¥©¡¼¥à¡Ë¤ÎÁ÷¿®Àè¤ÎURL¤òÆþÎϤ·¤Þ¤¹¡£ + // ¡¡¡¡¥Ç¥Õ¥©¥ë¥ÈÃÍ¡¡https://payment.kuronekoyamato.co.jp/kuroneko/servlet/YCS_ServletC + // + // ¡¦¥¯¥í¥Í¥³¡÷¥Ú¥¤¥á¥ó¥È¥ê¥ó¥¯¥Ð¥Ê¡¼ + // ¡¡¡¡¤ª»Ùʧ¤¤ÊýË¡ÁªÂò¥Ú¡¼¥¸¤Ç¥¯¥í¥Í¥³¡÷¥Ú¥¤¥á¥ó¥È¤ÎÀâÌÀ¥Ú¡¼¥¸¤Ø¤Î¥ê¥ó¥¯¥Ð¥Ê¡¼¤Î¥½¡¼¥¹¤ò + // ¡¡¡¡ÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£¥ê¥ó¥¯¥Ð¥Ê¡¼¤Î¥½¡¼¥¹¤Ï¥¯¥í¥Í¥³¡÷¥Ú¥¤¥á¥ó¥È¤ÎWEB¥µ¥¤¥È¤«¤éÆþ¼ê + // ¡¡¡¡½ÐÍè¤Þ¤¹¡£ + // ¡¡¡¡¥Ç¥Õ¥©¥ë¥ÈÃÍ¡¡¥¯¥í¥Í¥³¡÷¥Ú¥¤¥á¥ó¥È + // + // ¡¦Å¬ÍÑÃÏ°è + // ¡¡¡¡ÆüËܰʳ°¤ÎÃϰ褬ÁªÂò²Äǽ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¤¬É¬¤ºÆüËܤòÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£ + // ¡¡¡¡¥Ç¥Õ¥©¥ë¥ÈÃÍ¡¡ÆüËÜ + // + // ¡¦½é´üÃíʸ¥¹¥Æ¡¼¥¿¥¹ + // ¡¡¡¡Ãíʸ³Îǧ´°Î»¸å¤ÎÃíʸ¥¹¥Æ¡¼¥¿¥¹¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£ + // ¡¡¡¡¥Ç¥Õ¥©¥ë¥ÈÃÍ¡¡¥Ç¥Õ¥©¥ë¥È + // + // ¡¦É½¼¨¤ÎÀ°Îó½ç + // ¡¡¡¡¤ª»Ùʧ¤¤ÊýË¡ÁªÂò¥Ú¡¼¥¸¤Ç¤Îɽ¼¨¤ÎÀ°Îó½ç¤òÀßÄê¤Ç¤­¤Þ¤¹¡£¿ô»ú¤¬¾®¤µ¤¤¤Û¤É¾å°Ì¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£ + // ¡¡¡¡¥Ç¥Õ¥©¥ë¥ÈÃÍ¡¡0 + // + // ---------------------------------------------------------------------- + // + // [»²¾È] + // http://www.zen-cart.jp/bbs/7/tree.php?all=126 + // http://www.zen-cart.jp/bbs/7/tree.php?all=166 + // http://www.zen-cart.jp/bbs/7/tree.php?all=230 + + class kuroneko_at_payment { + var $code, $title, $description, $enabled; + + // class constructor + function kuroneko_at_payment() { + global $order; + if (isset($_SESSION['kuroneko_at_payment'])) { + unset($_SESSION['kuroneko_at_payment']); + } + $this->code = 'kuroneko_at_payment'; + $this->title = MODULE_PAYMENT_KURONEKO_AT_PAYMENT_TEXT_TITLE; + $this->description = MODULE_PAYMENT_KURONEKO_AT_PAYMENT_TEXT_DESCRIPTION; + $this->sort_order = MODULE_PAYMENT_KURONEKO_AT_PAYMENT_SORT_ORDER; + $this->enabled = ((MODULE_PAYMENT_KURONEKO_AT_PAYMENT_STATUS == 'True') ? true : false); + + if ((int)MODULE_PAYMENT_KURONEKO_AT_PAYMENT_ORDER_STATUS_ID > 0) { + $this->order_status = MODULE_PAYMENT_KURONEKO_AT_PAYMENT_ORDER_STATUS_ID; + } + + if (is_object($order)) $this->update_status(); + + } + + // class methods + function update_status() { + global $order, $db; + + if ( ($this->enabled == true) && ((int)MODULE_PAYMENT_KURONEKO_AT_PAYMENT_ZONE > 0) ) { + $check_flag = false; + $check = $db->Execute("select zone_id from " . TABLE_ZONES_TO_GEO_ZONES . " where geo_zone_id = '" . MODULE_PAYMENT_KURONEKO_AT_PAYMENT_ZONE . "' and zone_country_id = '" . $order->delivery['country']['id'] . "' order by zone_id"); + while (!$check->EOF) { + if ($check->fields['zone_id'] < 1) { + $check_flag = true; + break; + } elseif ($check->fields['zone_id'] == $order->delivery['zone_id']) { + $check_flag = true; + break; + } + $check->MoveNext(); + } + + $total_price = $_SESSION['cart']->show_total(); + if ($total_price < MODULE_PAYMENT_KURONEKO_AT_PAYMENT_MINIMUM_TOTAL_PRICE) { + $check_flag = false; + } + + if ($check_flag == false) { + $this->enabled = false; + } + } + + // disable the module if the order only contains virtual products + if ($this->enabled == true) { + if ($order->content_type != 'physical') { + $this->enabled = false; + } + } + } + + function javascript_validation() { + return false; + } + + function selection() { + return array('id' => $this->code, + 'module' => $this->title, + 'fields' => array(array('title' => MODULE_PAYMENT_KURONEKO_AT_PAYMENT_TEXT_ABOUT, + 'field' => MODULE_PAYMENT_KURONEKO_AT_PAYMENT_LINK_BANNER))); + } + + function pre_confirmation_check() { + return false; + } + + function confirmation() { + return array('title' => MODULE_PAYMENT_KURONEKO_AT_PAYMENT_TEXT_CONFIRMATION); + } + + function process_button() { + return false; + } + + function before_process() { + return false; + } + + function after_process() { + global $db; + $orders_query = "select orders_id, billing_name, order_total, billing_telephone, customers_email_address from " . TABLE_ORDERS . " + where customers_id = '" . (int)$_SESSION['customer_id'] . "' + order by date_purchased desc limit 1"; + + $orders = $db->Execute($orders_query); + + $products_array = array(); + + $products_query = "select products_id, products_name, products_quantity from " . TABLE_ORDERS_PRODUCTS . " + where orders_id = '" . (int)$orders->fields['orders_id'] . "' + order by products_name"; + + $products = $db->Execute($products_query); + $leading_product_name = sprintf(MODULE_PAYMENT_KURONEKO_AT_PAYMENT_LEADING_PRODUCT, $products->fields['products_name'], (int)$products->fields['products_quantity']); + $products_count = $products->RecordCount(); + $total_products_quantity = 0; + $products->MoveNext(); + while (!$products->EOF) { + $other_products_quantity = $other_products_quantity + (int)$products->fields['products_quantity']; + $products->MoveNext(); + } + + $action = MODULE_PAYMENT_KURONEKO_AT_PAYMENT_ACTION_URL; + if (MODULE_PAYMENT_KURONEKO_AT_PAYMENT_NO_TEST == 'True') { + $trs_map = 'V_W02'; + } else { + $trs_map = 'L_TEST'; + } + $trader_code = MODULE_PAYMENT_KURONEKO_AT_PAYMENT_TRADER_CODE; + $order_no = (int)$orders->fields['orders_id']; + $goods_name = $leading_product_name; + if ($other_products_quantity > 0) { + $goods_name .= sprintf(MODULE_PAYMENT_KURONEKO_AT_PAYMENT_OTHER_PRODUCTS, $other_products_quantity); + } + $settle_price = (int)$orders->fields['order_total']; + $buyer_name_kanji = $orders->fields['billing_name']; + $buyer_tel = $orders->fields['billing_telephone']; + $buyer_email = $orders->fields['customers_email_address']; + $button_image = MODULE_PAYMENT_KURONEKO_AT_PAYMENT_BUTTON_IMAGE; + $button_alt = MODULE_PAYMENT_KURONEKO_AT_PAYMENT_BUTTON_ALT; + + $link_button .= zen_draw_form('UserForm', $action, 'post', 'target="_blank"') . "\n"; + $link_button .= zen_draw_hidden_field('TRS_MAP', $trs_map) . "\n"; + $link_button .= zen_draw_hidden_field('trader_code', $trader_code) . "\n"; + $link_button .= zen_draw_hidden_field('order_no', $order_no) . "\n"; + $link_button .= zen_draw_hidden_field('goods_name', $goods_name) . "\n"; + $link_button .= zen_draw_hidden_field('settle_price', $settle_price) . "\n"; + $link_button .= zen_draw_hidden_field('buyer_name_kanji', $buyer_name_kanji) . "\n"; + $link_button .= zen_draw_hidden_field('buyer_tel', $buyer_tel) . "\n"; + $link_button .= zen_draw_hidden_field('buyer_email', $buyer_email) . "\n"; + $link_button .= zen_image_submit($button_image, $button_alt) . "\n"; + $link_button .= "\n"; + + $text_urge = MODULE_PAYMENT_KURONEKO_AT_PAYMENT_TEXT_URGE; + + $box = "\n"; + $box .= " \n"; + $box .= " \n"; + $box .= " \n"; + $box .= "
" . MODULE_PAYMENT_KURONEKO_AT_PAYMENT_TEXT_URGE . "
\n"; + $box .= $link_button; + $box .= "
\n"; + + $kuroneko_at_payment = array('link_button' => $link_button,'text_urge' => $text_urge,'box' => $box); + $_SESSION['kuroneko_at_payment'] = $kuroneko_at_payment; + } + + function get_error() { + return false; + } + + function check() { + global $db; + if (!isset($this->_check)) { + $check_query = $db->Execute("select configuration_value from " . TABLE_CONFIGURATION . " where configuration_key = 'MODULE_PAYMENT_KURONEKO_AT_PAYMENT_STATUS'"); + $this->_check = $check_query->RecordCount(); + } + return $this->_check; + } + + function install() { + global $db; + $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, date_added) values ('¥¯¥í¥Í¥³¡÷¥Ú¥¤¥á¥ó¥È¥â¥¸¥å¡¼¥ë¤òÍ­¸ú¤Ë¤¹¤ë', 'MODULE_PAYMENT_KURONEKO_AT_PAYMENT_STATUS', 'True', '¥¯¥í¥Í¥³¡÷¥Ú¥¤¥á¥ó¥È¤ò¼õ¤±ÉÕ¤±¤Þ¤¹¤«¡©', '6', '1', 'zen_cfg_select_option(array(\'True\', \'False\'), ', now())"); + $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, date_added) values ('ËÜÈÖ¥Ú¡¼¥¸¤Ø¤ÎÀÚÂؤ¨', 'MODULE_PAYMENT_KURONEKO_AT_PAYMENT_NO_TEST', 'False', 'ËÜÈÖ¥Ú¡¼¥¸¤ØÀÚ¤êÂؤ¨¤Þ¤¹¤«¡©
¢¨ËÜÈÖ¥Ú¡¼¥¸¤ØÀÚ¤êÂؤ¨¤Ï¡¢½½Ê¬¤Ë¥Æ¥¹¥È¤ò¤·¤Æ¤«¤é¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡£', '6', '2', 'zen_cfg_select_option(array(\'True\', \'False\'), ', now())"); + $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('²ÃÌÁŹ¥³¡¼¥É', 'MODULE_PAYMENT_KURONEKO_AT_PAYMENT_TRADER_CODE', '', '²ÃÌÁŹ¥³¡¼¥É', '6', '3', now())"); + $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('ºÇÄã¶â³Û', 'MODULE_PAYMENT_KURONEKO_AT_PAYMENT_MINIMUM_TOTAL_PRICE', '0', '¥¯¥í¥Í¥³¡÷¥Ú¥¤¥á¥ó¥È¤òŬÍѤ¹¤ëºÇÄã¶â³Û¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£', '6', '4', now())"); + $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('Á÷¿®ÀèURL', 'MODULE_PAYMENT_KURONEKO_AT_PAYMENT_ACTION_URL', 'https://payment.kuronekoyamato.co.jp/kuroneko/servlet/YCS_ServletC', '¥ê¥ó¥¯¥Ü¥¿¥ó¤ÎÁ÷¿®Àè¤ÎURL¤ò»ØÄꤷ¤Þ¤¹¡£', '6', '5', now())"); + $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('¥¯¥í¥Í¥³¡÷¥Ú¥¤¥á¥ó¥È¥ê¥ó¥¯¥Ð¥Ê¡¼', 'MODULE_PAYMENT_KURONEKO_AT_PAYMENT_LINK_BANNER', '\"¥¯¥í¥Í¥³¡÷¥Ú¥¤¥á¥ó¥È\"', '¥¯¥í¥Í¥³¡÷¥Ú¥¤¥á¥ó¥È¥ê¥ó¥¯¥Ð¡¼¥Ê¡¼¤ÎHTML¥½¡¼¥¹¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£', '6', '6', now())"); + $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('ŬÍÑÃÏ°è', 'MODULE_PAYMENT_KURONEKO_AT_PAYMENT_ZONE', '2', 'ɬ¤ºÆüËܤòÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£
¥¯¥í¥Í¥³¡÷¥Ú¥¤¥á¥ó¥È¤ÏÆüËܹñ³°¤Ç¤ÏÍøÍѤǤ­¤Þ¤»¤ó¡£', '6', '7', 'zen_get_zone_class_title', 'zen_cfg_pull_down_zone_classes(', now())"); + $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('ɽ¼¨¤ÎÀ°Îó½ç', 'MODULE_PAYMENT_KURONEKO_AT_PAYMENT_SORT_ORDER', '0', 'ɽ¼¨¤ÎÀ°Îó½ç¤òÀßÄê¤Ç¤­¤Þ¤¹¡£¿ô»ú¤¬¾®¤µ¤¤¤Û¤É¾å°Ì¤Ëɽ¼¨¤µ¤ì¤Þ¤¹¡£', '6', '8', now())"); + $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, use_function, date_added) values ('½é´üÃíʸ¥¹¥Æ¡¼¥¿¥¹', 'MODULE_PAYMENT_KURONEKO_AT_PAYMENT_ORDER_STATUS_ID', '0', 'ÀßÄꤷ¤¿¥¹¥Æ¡¼¥¿¥¹¤¬¼õÃí»þ¤ËŬÍѤµ¤ì¤Þ¤¹¡£', '6', '9', 'zen_cfg_pull_down_order_statuses(', 'zen_get_order_status_name', now())"); + } + + function remove() { + global $db; + $db->Execute("delete from " . TABLE_CONFIGURATION . " where configuration_key in ('" . implode("', '", $this->keys()) . "')"); + } + + function keys() { + return array('MODULE_PAYMENT_KURONEKO_AT_PAYMENT_STATUS', 'MODULE_PAYMENT_KURONEKO_AT_PAYMENT_NO_TEST', 'MODULE_PAYMENT_KURONEKO_AT_PAYMENT_TRADER_CODE', 'MODULE_PAYMENT_KURONEKO_AT_PAYMENT_MINIMUM_TOTAL_PRICE', 'MODULE_PAYMENT_KURONEKO_AT_PAYMENT_ACTION_URL', 'MODULE_PAYMENT_KURONEKO_AT_PAYMENT_LINK_BANNER', 'MODULE_PAYMENT_KURONEKO_AT_PAYMENT_ZONE', 'MODULE_PAYMENT_KURONEKO_AT_PAYMENT_ORDER_STATUS_ID', 'MODULE_PAYMENT_KURONEKO_AT_PAYMENT_SORT_ORDER'); + } + } + + ?> \ No newline at end of file diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/includes/modules/shipping/nittsu.php zen-cart-v1.2.0-l10n-jp-2/includes/modules/shipping/nittsu.php *** zen-cart-v1.2.0-l10n-jp-1/includes/modules/shipping/nittsu.php Thu Jan 1 09:00:00 1970 --- zen-cart-v1.2.0-l10n-jp-2/includes/modules/shipping/nittsu.php Sat Apr 16 15:01:02 2005 *************** *** 0 **** --- 1,211 ---- + code = 'nittsu'; + $this->title = MODULE_SHIPPING_NITTSU_TEXT_TITLE; + $this->description = MODULE_SHIPPING_NITTSU_TEXT_DESCRIPTION; + $this->sort_order = MODULE_SHIPPING_NITTSU_SORT_ORDER; + // $this->icon = DIR_WS_ICONS . 'shipping_nittsu.gif'; + $this->tax_class = in_array('MODULE_SHIPPING_NITTSU_TAX_CLASS',$this->keys()) ? MODULE_SHIPPING_NITTSU_TAX_CLASS : 0; + + if( zen_get_shipping_enabled( $this->code ) ){ + $this->enabled = ((MODULE_SHIPPING_NITTSU_STATUS == 'True') ? true : false); + } + // only these three are needed since Nittsu only ships to them + // convert TEP country id to ISO 3166 id + $this->nittsu_countries = array(107 => 'JP'); + $this->nittsu_countries_nbr = array(107); + + if ( ($this->enabled == true) && ((int)MODULE_SHIPPING_NITTSU_ZONE > 0) ) { + $check_flag = false; + $check = $db->Execute("select zone_id from " . TABLE_ZONES_TO_GEO_ZONES . " where geo_zone_id = '" . MODULE_SHIPPING_NITTSU_ZONE . "' and zone_country_id = '" . $order->delivery['country']['id'] . "' order by zone_id"); + while (!$check->EOF) { + if ($check->fields['zone_id'] < 1) { + $check_flag = true; + break; + } elseif ($check->fields['zone_id'] == $order->delivery['zone_id']) { + $check_flag = true; + break; + } + $check->MoveNext(); + } + + if ($check_flag == false) { + $this->enabled = false; + } + } + } + + // class methods + function quote() { + global $shipping_weight, $shipping_num_boxes; + global $order; + global $a_nittsu_time; + global $cart; + global $db; + + $this->quotes = array('id' => $this->code, + 'module' => $this->title); + if (zen_not_null($this->icon)) $this->quotes['icon'] = zen_image($this->icon, $this->title); + $country_id = $order->delivery['country']['id']; + $zone_id = $order->delivery['zone_id']; + + if (in_array($country_id, $this->nittsu_countries_nbr)) { + $zoneinfo = $db->Execute("SELECT zone_code FROM zones WHERE zone_id = '".$zone_id."'"); + $a_zonevalues = $zoneinfo->fields; + $s_zone_code = $a_zonevalues['zone_code']; + + if ( (MODULE_SHIPPING_NITTSU_FREE_SHIPPING != 'True') || ((int)$order->info['total'] < (int)MODULE_SHIPPING_NITTSU_OVER) ) { + include(DIR_WS_CLASSES . '_nittsu.php'); + $rate = new _Nittsu($this->code, MODULE_SHIPPING_NITTSU_TEXT_WAY_NORMAL, + zen_get_zone_code( STORE_COUNTRY,STORE_ZONE,0), STORE_COUNTRY); + //STORE_ORIGIN_ZONE, STORE_ORIGIN_COUNTRY); + $rate->SetDest($s_zone_code, $this->nittsu_countries[$country_id]); + $rate->SetWeight($shipping_weight); + $tmpQuote = $rate->GetQuote(); // id, title, cost | error + + if (isset($tmpQuote['error'])) { + $this->quotes['error'] = $tmpQuote['error']; + } else { + $this->quotes['module'] = $this->title + . ' (' . $shipping_num_boxes . ' x ' . $shipping_weight . 'kg)'; + + $tmpQuote['cost'] *= $shipping_num_boxes; + // Á÷ÎÁ¥Ç¥£¥¹¥«¥¦¥ó¥È + if (defined('MODULE_SHIPPING_NITTSU_DISCOUNT') && 0 < (int)MODULE_SHIPPING_NITTSU_DISCOUNT) { + $tmpQuote['cost'] -= (int)($tmpQuote['cost'] * MODULE_SHIPPING_NITTSU_DISCOUNT / 100); + } + // ¼ê¿ôÎÁ + $tmpQuote['cost'] += MODULE_SHIPPING_NITTSU_HANDLING; + } + } else { + $tmpQuote = array('id' => $this->code, 'title' => MODULE_SHIPPING_NITTSU_TEXT_WAY_NORMAL, 'cost' => 0); + } + + if (!isset($tmpQuote['error'])) { + // ÇÛÁ÷»þ¹ï»ØÄê + $timespec = $this->get_timespec(); + $tmpQuote['option'] = TEXT_TIME_SPECIFY + . zen_draw_pull_down_menu('nittsu_timespec', $a_nittsu_time, $timespec); + $tmpQuote['timespec'] = $timespec; + } + + $this->quotes['methods'][] = $tmpQuote; + + if ($this->tax_class > 0) { + $this->quotes['tax'] = zen_get_tax_rate($this->tax_class, $country_id, $zone_id); + } + } else { + $this->quotes['error'] = MODULE_SHIPPING_NITTSU_TEXT_NOTAVAILABLE; + } + return $this->quotes; + } + + // »þ¹ï¤ò»ØÄꤹ¤ë¥×¥ë¥À¥¦¥ó¥á¥Ë¥å¡¼¤Î'value'¤òÊÖ¤¹ + function get_timespec() { + global $a_nittsu_time; + global $shipping; + global $HTTP_POST_VARS; + + $selected = $a_nittsu_time[0]['id']; + if ( isset($HTTP_POST_VARS['nittsu_timespec']) ) { + $selected = $HTTP_POST_VARS['nittsu_timespec']; + } elseif ( is_array($shipping) ) { // see checkout_shipping.php + list($module, $method) = explode('_', $shipping['id']); + if ($module == $this->code) { + $selected = $shipping['timespec']; + } + } + return $selected; + } + + function check() { + global $db; + if (!isset($this->_check)) { + $check_query = $db->Execute("select configuration_value from " + . TABLE_CONFIGURATION . " where configuration_key = 'MODULE_SHIPPING_NITTSU_STATUS'"); + $this->_check = $check_query->RecordCount(); + } + return $this->_check; + } + + function install() { + global $db; + $db->Execute("insert into " . TABLE_CONFIGURATION . + " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, date_added) values ('ÆüËÜÄ̱¿¥Ú¥ê¥«¥óÊؤÎÇÛÁ÷¤òÍ­¸ú¤Ë¤¹¤ë', 'MODULE_SHIPPING_NITTSU_STATUS', 'True', 'ÆüËÜÄ̱¿¥Ú¥ê¥«¥óÊؤÎÇÛÁ÷¤òÄ󶡤·¤Þ¤¹¤«?', '6', '0', 'zen_cfg_select_option(array(\'True\', \'False\'), ', now())"); + + $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('¼è°·¤¤¼ê¿ôÎÁ', 'MODULE_SHIPPING_NITTSU_HANDLING', '0', 'Á÷ÎÁ¤ËŬÍѤ¹¤ë¼è°·¼ê¿ôÎÁ¤òÀßÄê¤Ç¤­¤Þ¤¹.', '6', '1', now())"); + + $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, date_added) values ('Á÷ÎÁ̵ÎÁÀßÄê', 'MODULE_SHIPPING_NITTSU_FREE_SHIPPING', 'False', 'Á÷ÎÁ̵ÎÁÀßÄê¤òÍ­¸ú¤Ë¤·¤Þ¤¹¤«? [¹ç·×¥â¥¸¥å¡¼¥ë]-[Á÷ÎÁ]-[Á÷ÎÁ̵ÎÁÀßÄê]¤òÍ¥À褹¤ë¾ì¹ç¤Ï False ¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤.', '6', '2', 'zen_cfg_select_option(array(\'True\', \'False\'), ', now())"); + + $db->Execute("INSERT INTO " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) VALUES ('Á÷ÎÁ¤ò̵ÎÁ¤Ë¤¹¤ë¹ØÆþ¶â³ÛÀßÄê', 'MODULE_SHIPPING_NITTSU_OVER', '5000', 'ÀßÄê¶â³Û°Ê¾å¤ò¤´¹ØÆþ¤Î¾ì¹ç¤ÏÁ÷ÎÁ¤ò̵ÎÁ¤Ë¤·¤Þ¤¹.', '6', '3', now())"); + + $db->Execute("INSERT INTO " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) VALUES ('Á÷ÎÁ¤ÎÃÍ°úΨ', 'MODULE_SHIPPING_NITTSU_DISCOUNT', '0', 'Á÷ÎÁ¤ÎÃÍ°úΨ¤ò»ØÄꤷ¤Þ¤¹.(¡ó)', '6', '4', now())"); + + // $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('ÀǼïÊÌ', 'MODULE_SHIPPING_NITTSU_TAX_CLASS', '0', 'ÇÛÁ÷ÎÁ¶â¤ËŬÍѤµ¤ì¤ëÀǼïÊ̤òÁª¤ó¤Ç¤¯¤À¤µ¤¤.', '6', '3', 'zen_get_tax_class_title', 'zen_cfg_pull_down_tax_classes(', now())"); + + $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('ÇÛÁ÷ÃÏ°è', 'MODULE_SHIPPING_NITTSU_ZONE', '0', 'ÇÛÁ÷ÃÏ°è¤òÁªÂò¤¹¤ë¤ÈÁªÂò¤µ¤ì¤¿ÃÏ°è¤Î¤ß¤ÇÍøÍѲÄǽ¤È¤Ê¤ê¤Þ¤¹.', '6', '5', 'zen_get_zone_class_title', 'zen_cfg_pull_down_zone_classes(', now())"); + + $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('ɽ¼¨¤ÎÀ°Îó½ç', 'MODULE_SHIPPING_NITTSU_SORT_ORDER', '0', 'ɽ¼¨¤ÎÀ°Îó½ç¤òÀßÄê¤Ç¤­¤Þ¤¹. ¿ô»ú¤¬¾®¤µ¤¤¤Û¤É¾å°Ì¤Ëɽ¼¨¤µ¤ì¤Þ¤¹.', '6', '6', now())"); + } + + function remove() { + global $db; + $db->Execute("delete from " . TABLE_CONFIGURATION . " where configuration_key in ('" . implode("', '", $this->keys()) . "')"); + } + + function keys() { + return array( + 'MODULE_SHIPPING_NITTSU_STATUS', + 'MODULE_SHIPPING_NITTSU_HANDLING', + 'MODULE_SHIPPING_NITTSU_FREE_SHIPPING', + 'MODULE_SHIPPING_NITTSU_OVER', + 'MODULE_SHIPPING_NITTSU_DISCOUNT', + // 'MODULE_SHIPPING_NITTSU_TAX_CLASS', + 'MODULE_SHIPPING_NITTSU_ZONE', + 'MODULE_SHIPPING_NITTSU_SORT_ORDER', + ); + } + } + ?> \ No newline at end of file diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/includes/modules/shipping/sagawaex.php zen-cart-v1.2.0-l10n-jp-2/includes/modules/shipping/sagawaex.php *** zen-cart-v1.2.0-l10n-jp-1/includes/modules/shipping/sagawaex.php Sat Dec 4 13:24:21 2004 --- zen-cart-v1.2.0-l10n-jp-2/includes/modules/shipping/sagawaex.php Sat Apr 16 15:01:02 2005 *************** *** 110,115 **** --- 110,116 ---- $this->quotes['module'] = $this->title . ' (' . $shipping_num_boxes . ' x ' . $shipping_weight . 'kg)'; + $tmpQuote['cost'] *= $shipping_num_boxes; // Á÷ÎÁ¥Ç¥£¥¹¥«¥¦¥ó¥È if (defined('MODULE_SHIPPING_SAGAWAEX_DISCOUNT') && 0 < (int)MODULE_SHIPPING_SAGAWAEX_DISCOUNT) { $tmpQuote['cost'] -= (int)($tmpQuote['cost'] * MODULE_SHIPPING_SAGAWAEX_DISCOUNT / 100); diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/includes/modules/shipping/yamato.php zen-cart-v1.2.0-l10n-jp-2/includes/modules/shipping/yamato.php *** zen-cart-v1.2.0-l10n-jp-1/includes/modules/shipping/yamato.php Thu Jan 1 09:00:00 1970 --- zen-cart-v1.2.0-l10n-jp-2/includes/modules/shipping/yamato.php Sat Apr 16 15:01:02 2005 *************** *** 0 **** --- 1,211 ---- + code = 'yamato'; + $this->title = MODULE_SHIPPING_YAMATO_TEXT_TITLE; + $this->description = MODULE_SHIPPING_YAMATO_TEXT_DESCRIPTION; + $this->sort_order = MODULE_SHIPPING_YAMATO_SORT_ORDER; + // $this->icon = DIR_WS_ICONS . 'shipping_yamato.gif'; + $this->tax_class = in_array('MODULE_SHIPPING_YAMATO_TAX_CLASS',$this->keys()) ? MODULE_SHIPPING_YAMATO_TAX_CLASS : 0; + + if( zen_get_shipping_enabled( $this->code ) ){ + $this->enabled = ((MODULE_SHIPPING_YAMATO_STATUS == 'True') ? true : false); + } + // only these three are needed since Yamato only ships to them + // convert TEP country id to ISO 3166 id + $this->yamato_countries = array(107 => 'JP'); + $this->yamato_countries_nbr = array(107); + + if ( ($this->enabled == true) && ((int)MODULE_SHIPPING_YAMATO_ZONE > 0) ) { + $check_flag = false; + $check = $db->Execute("select zone_id from " . TABLE_ZONES_TO_GEO_ZONES . " where geo_zone_id = '" . MODULE_SHIPPING_YAMATO_ZONE . "' and zone_country_id = '" . $order->delivery['country']['id'] . "' order by zone_id"); + while (!$check->EOF) { + if ($check->fields['zone_id'] < 1) { + $check_flag = true; + break; + } elseif ($check->fields['zone_id'] == $order->delivery['zone_id']) { + $check_flag = true; + break; + } + $check->MoveNext(); + } + + if ($check_flag == false) { + $this->enabled = false; + } + } + } + + // class methods + function quote() { + global $shipping_weight, $shipping_num_boxes; + global $order; + global $a_yamato_time; + global $cart; + global $db; + + $this->quotes = array('id' => $this->code, + 'module' => $this->title); + if (zen_not_null($this->icon)) $this->quotes['icon'] = zen_image($this->icon, $this->title); + $country_id = $order->delivery['country']['id']; + $zone_id = $order->delivery['zone_id']; + + if (in_array($country_id, $this->yamato_countries_nbr)) { + $zoneinfo = $db->Execute("SELECT zone_code FROM ".TABLE_ZONES." WHERE zone_id = '".$zone_id."'"); + $a_zonevalues = $zoneinfo->fields; + $s_zone_code = $a_zonevalues['zone_code']; + + if ( (MODULE_SHIPPING_YAMATO_FREE_SHIPPING != 'True') || ((int)$order->info['total'] < (int)MODULE_SHIPPING_YAMATO_OVER) ) { + include(DIR_WS_CLASSES . '_yamato.php'); + $rate = new _Yamato($this->code, MODULE_SHIPPING_YAMATO_TEXT_WAY_NORMAL, + zen_get_zone_code( STORE_COUNTRY,STORE_ZONE,0), STORE_COUNTRY); + //STORE_ORIGIN_ZONE, STORE_ORIGIN_COUNTRY); + $rate->SetDest($s_zone_code, $this->yamato_countries[$country_id]); + $rate->SetWeight($shipping_weight); + $tmpQuote = $rate->GetQuote(); // id, title, cost | error + + if (isset($tmpQuote['error'])) { + $this->quotes['error'] = $tmpQuote['error']; + } else { + $this->quotes['module'] = $this->title + . ' (' . $shipping_num_boxes . ' x ' . $shipping_weight . 'kg)'; + + $tmpQuote['cost'] *= $shipping_num_boxes; + // Á÷ÎÁ¥Ç¥£¥¹¥«¥¦¥ó¥È + if (defined('MODULE_SHIPPING_YAMATO_DISCOUNT') && 0 < (int)MODULE_SHIPPING_YAMATO_DISCOUNT) { + $tmpQuote['cost'] -= (int)($tmpQuote['cost'] * MODULE_SHIPPING_YAMATO_DISCOUNT / 100); + } + // ¼ê¿ôÎÁ + $tmpQuote['cost'] += MODULE_SHIPPING_YAMATO_HANDLING; + } + } else { + $tmpQuote = array('id' => $this->code, 'title' => MODULE_SHIPPING_YAMATO_TEXT_WAY_NORMAL, 'cost' => 0); + } + + if (!isset($tmpQuote['error'])) { + // ÇÛÁ÷»þ¹ï»ØÄê + $timespec = $this->get_timespec(); + $tmpQuote['option'] = TEXT_TIME_SPECIFY + . zen_draw_pull_down_menu('yamato_timespec', $a_yamato_time, $timespec); + $tmpQuote['timespec'] = $timespec; + } + + $this->quotes['methods'][] = $tmpQuote; + + if ($this->tax_class > 0) { + $this->quotes['tax'] = zen_get_tax_rate($this->tax_class, $country_id, $zone_id); + } + } else { + $this->quotes['error'] = MODULE_SHIPPING_YAMATO_TEXT_NOTAVAILABLE; + } + return $this->quotes; + } + + // »þ¹ï¤ò»ØÄꤹ¤ë¥×¥ë¥À¥¦¥ó¥á¥Ë¥å¡¼¤Î'value'¤òÊÖ¤¹ + function get_timespec() { + global $a_yamato_time; + global $shipping; + global $HTTP_POST_VARS; + + $selected = $a_yamato_time[0]['id']; + if ( isset($HTTP_POST_VARS['yamato_timespec']) ) { + $selected = $HTTP_POST_VARS['yamato_timespec']; + } elseif ( is_array($shipping) ) { // see checkout_shipping.php + list($module, $method) = explode('_', $shipping['id']); + if ($module == $this->code) { + $selected = $shipping['timespec']; + } + } + return $selected; + } + + function check() { + global $db; + if (!isset($this->_check)) { + $check_query = $db->Execute("select configuration_value from " + . TABLE_CONFIGURATION . " where configuration_key = 'MODULE_SHIPPING_YAMATO_STATUS'"); + $this->_check = $check_query->RecordCount(); + } + return $this->_check; + } + + function install() { + global $db; + $db->Execute("insert into " . TABLE_CONFIGURATION . + " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, date_added) values ('º´ÀîµÞÊؤÎÇÛÁ÷¤òÍ­¸ú¤Ë¤¹¤ë', 'MODULE_SHIPPING_YAMATO_STATUS', 'True', '¥ä¥Þ¥È±¿Í¢(ÂðµÞÊØ)¤ÎÇÛÁ÷¤òÄ󶡤·¤Þ¤¹¤«?', '6', '0', 'zen_cfg_select_option(array(\'True\', \'False\'), ', now())"); + + $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('¼è°·¤¤¼ê¿ôÎÁ', 'MODULE_SHIPPING_YAMATO_HANDLING', '0', 'Á÷ÎÁ¤ËŬÍѤ¹¤ë¼è°·¼ê¿ôÎÁ¤òÀßÄê¤Ç¤­¤Þ¤¹.', '6', '1', now())"); + + $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, set_function, date_added) values ('Á÷ÎÁ̵ÎÁÀßÄê', 'MODULE_SHIPPING_YAMATO_FREE_SHIPPING', 'False', 'Á÷ÎÁ̵ÎÁÀßÄê¤òÍ­¸ú¤Ë¤·¤Þ¤¹¤«? [¹ç·×¥â¥¸¥å¡¼¥ë]-[Á÷ÎÁ]-[Á÷ÎÁ̵ÎÁÀßÄê]¤òÍ¥À褹¤ë¾ì¹ç¤Ï False ¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤.', '6', '2', 'zen_cfg_select_option(array(\'True\', \'False\'), ', now())"); + + $db->Execute("INSERT INTO " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) VALUES ('Á÷ÎÁ¤ò̵ÎÁ¤Ë¤¹¤ë¹ØÆþ¶â³ÛÀßÄê', 'MODULE_SHIPPING_YAMATO_OVER', '5000', 'ÀßÄê¶â³Û°Ê¾å¤ò¤´¹ØÆþ¤Î¾ì¹ç¤ÏÁ÷ÎÁ¤ò̵ÎÁ¤Ë¤·¤Þ¤¹.', '6', '3', now())"); + + $db->Execute("INSERT INTO " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) VALUES ('Á÷ÎÁ¤ÎÃÍ°úΨ', 'MODULE_SHIPPING_YAMATO_DISCOUNT', '0', 'Á÷ÎÁ¤ÎÃÍ°úΨ¤ò»ØÄꤷ¤Þ¤¹.(¡ó)', '6', '4', now())"); + + // $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('ÀǼïÊÌ', 'MODULE_SHIPPING_YAMATO_TAX_CLASS', '0', 'ÇÛÁ÷ÎÁ¶â¤ËŬÍѤµ¤ì¤ëÀǼïÊ̤òÁª¤ó¤Ç¤¯¤À¤µ¤¤.', '6', '3', 'zen_get_tax_class_title', 'zen_cfg_pull_down_tax_classes(', now())"); + + $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, use_function, set_function, date_added) values ('ÇÛÁ÷ÃÏ°è', 'MODULE_SHIPPING_YAMATO_ZONE', '0', 'ÇÛÁ÷ÃÏ°è¤òÁªÂò¤¹¤ë¤ÈÁªÂò¤µ¤ì¤¿ÃÏ°è¤Î¤ß¤ÇÍøÍѲÄǽ¤È¤Ê¤ê¤Þ¤¹.', '6', '5', 'zen_get_zone_class_title', 'zen_cfg_pull_down_zone_classes(', now())"); + + $db->Execute("insert into " . TABLE_CONFIGURATION . " (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) values ('ɽ¼¨¤ÎÀ°Îó½ç', 'MODULE_SHIPPING_YAMATO_SORT_ORDER', '0', 'ɽ¼¨¤ÎÀ°Îó½ç¤òÀßÄê¤Ç¤­¤Þ¤¹. ¿ô»ú¤¬¾®¤µ¤¤¤Û¤É¾å°Ì¤Ëɽ¼¨¤µ¤ì¤Þ¤¹.', '6', '6', now())"); + } + + function remove() { + global $db; + $db->Execute("delete from " . TABLE_CONFIGURATION . " where configuration_key in ('" . implode("', '", $this->keys()) . "')"); + } + + function keys() { + return array( + 'MODULE_SHIPPING_YAMATO_STATUS', + 'MODULE_SHIPPING_YAMATO_HANDLING', + 'MODULE_SHIPPING_YAMATO_FREE_SHIPPING', + 'MODULE_SHIPPING_YAMATO_OVER', + 'MODULE_SHIPPING_YAMATO_DISCOUNT', + // 'MODULE_SHIPPING_YAMATO_TAX_CLASS', + 'MODULE_SHIPPING_YAMATO_ZONE', + 'MODULE_SHIPPING_YAMATO_SORT_ORDER', + ); + } + } + ?> \ No newline at end of file Binary files zen-cart-v1.2.0-l10n-jp-1/includes/templates/template_default/buttons/english/button_kuroneko_at_payment.gif and zen-cart-v1.2.0-l10n-jp-2/includes/templates/template_default/buttons/english/button_kuroneko_at_payment.gif differ Binary files zen-cart-v1.2.0-l10n-jp-1/includes/templates/template_default/buttons/japanese/button_kuroneko_at_payment.gif and zen-cart-v1.2.0-l10n-jp-2/includes/templates/template_default/buttons/japanese/button_kuroneko_at_payment.gif differ diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/includes/templates/template_default/templates/tpl_checkout_success_default.php zen-cart-v1.2.0-l10n-jp-2/includes/templates/template_default/templates/tpl_checkout_success_default.php *** zen-cart-v1.2.0-l10n-jp-1/includes/templates/template_default/templates/tpl_checkout_success_default.php Wed Sep 1 13:47:55 2004 --- zen-cart-v1.2.0-l10n-jp-2/includes/templates/template_default/templates/tpl_checkout_success_default.php Sat Apr 16 15:01:02 2005 *************** *** 17,25 **** // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ ! // $Id: tpl_checkout_success_default.php,v 1.1.1.1 2004/09/01 04:47:55 shidairiki Exp $ // ?> --- 17,26 ---- // | to obtain it through the world-wide-web, please send a note to | // | license@zen-cart.com so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ ! // $Id: tpl_checkout_success_default.php,v 1.2 2005/04/16 06:01:02 shida Exp $ // ?> +
diff -c -r -N zen-cart-v1.2.0-l10n-jp-1/zc_install/mysql_zencart.sql zen-cart-v1.2.0-l10n-jp-2/zc_install/mysql_zencart.sql *** zen-cart-v1.2.0-l10n-jp-1/zc_install/mysql_zencart.sql Sat Feb 5 15:27:33 2005 --- zen-cart-v1.2.0-l10n-jp-2/zc_install/mysql_zencart.sql Fri Apr 22 18:16:46 2005 *************** *** 2387,2392 **** --- 2387,2393 ---- INSERT INTO products_options_types (products_options_types_id, products_options_types_name) VALUES (5, 'Read Only'); INSERT INTO products_options_values (products_options_values_id, language_id, products_options_values_name) VALUES (0, 1, 'TEXT'); + INSERT INTO products_options_values (products_options_values_id, language_id, products_options_values_name) VALUES (0, 2, 'TEXT'); # USA/Florida INSERT INTO tax_rates VALUES (1, 1, 1, 1, 7.0, 'FL TAX 7.0%', now(), now());