almost finish print receipt
almost finish print receipt

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Author:    Shengyong Jiang <jiangshengyong@gmail.com>
#
# On branch dev
# Changes to be committed:
#   (use "git reset HEAD^1 <file>..." to unstage)
#
#	modified:   .gitignore
#	deleted:    .travis.yml
#	modified:   application/config/config.php
#	modified:   application/config/database.php
#	modified:   application/controllers/order.php
#	modified:   application/models/ordermodel.php
#	modified:   application/views/order/details/content_outer_frame.php
#	modified:   application/views/order/details/content_receipt.php
#	modified:   application/views/reserve/client_info/content.php
#	modified:   application/views/reserve/client_info/js_bottom.php
#	modified:   application/views/reserve/tour_fees/js_bottom.php
#	modified:   application/views/travelroute/list/content.php
#	renamed:    sql/product.sql -> documentation/sql/product.sql
#	renamed:    sql/t_dm_option.txt -> documentation/sql/t_dm_option.txt
#	deleted:    license.txt
#	deleted:    nbproject/private/config.properties
#	deleted:    nbproject/private/private.properties
#	deleted:    nbproject/private/private.xml
#	deleted:    nbproject/project.properties
#	deleted:    nbproject/project.xml
#	new file:   public_files/assets_more/js/form-validation-client-info.js
#	deleted:    user_guide/changelog.html
#	deleted:    user_guide/database/active_record.html
#	deleted:    user_guide/database/caching.html
#	deleted:    user_guide/database/call_function.html
#	deleted:    user_guide/database/configuration.html
#	deleted:    user_guide/database/connecting.html
#	deleted:    user_guide/database/examples.html
#	deleted:    user_guide/database/fields.html
#	deleted:    user_guide/database/forge.html
#	deleted:    user_guide/database/helpers.html
#	deleted:    user_guide/database/index.html
#	deleted:    user_guide/database/queries.html
#	deleted:    user_guide/database/results.html
#	deleted:    user_guide/database/table_data.html
#	deleted:    user_guide/database/transactions.html
#	deleted:    user_guide/database/utilities.html
#	deleted:    user_guide/doc_style/index.html
#	deleted:    user_guide/doc_style/template.html
#	deleted:    user_guide/general/alternative_php.html
#	deleted:    user_guide/general/ancillary_classes.html
#	deleted:    user_guide/general/autoloader.html
#	deleted:    user_guide/general/caching.html
#	deleted:    user_guide/general/cli.html
#	deleted:    user_guide/general/common_functions.html
#	deleted:    user_guide/general/controllers.html
#	deleted:    user_guide/general/core_classes.html
#	deleted:    user_guide/general/creating_drivers.html
#	deleted:    user_guide/general/creating_libraries.html
#	deleted:    user_guide/general/credits.html
#	deleted:    user_guide/general/drivers.html
#	deleted:    user_guide/general/environments.html
#	deleted:    user_guide/general/errors.html
#	deleted:    user_guide/general/helpers.html
#	deleted:    user_guide/general/hooks.html
#	deleted:    user_guide/general/libraries.html
#	deleted:    user_guide/general/managing_apps.html
#	deleted:    user_guide/general/models.html
#	deleted:    user_guide/general/profiling.html
#	deleted:    user_guide/general/quick_reference.html
#	deleted:    user_guide/general/requirements.html
#	deleted:    user_guide/general/reserved_names.html
#	deleted:    user_guide/general/routing.html
#	deleted:    user_guide/general/security.html
#	deleted:    user_guide/general/styleguide.html
#	deleted:    user_guide/general/urls.html
#	deleted:    user_guide/general/views.html
#	deleted:    user_guide/helpers/array_helper.html
#	deleted:    user_guide/helpers/captcha_helper.html
#	deleted:    user_guide/helpers/cookie_helper.html
#	deleted:    user_guide/helpers/date_helper.html
#	deleted:    user_guide/helpers/directory_helper.html
#	deleted:    user_guide/helpers/download_helper.html
#	deleted:    user_guide/helpers/email_helper.html
#	deleted:    user_guide/helpers/file_helper.html
#	deleted:    user_guide/helpers/form_helper.html
#	deleted:    user_guide/helpers/html_helper.html
#	deleted:    user_guide/helpers/inflector_helper.html
#	deleted:    user_guide/helpers/language_helper.html
#	deleted:    user_guide/helpers/number_helper.html
#	deleted:    user_guide/helpers/path_helper.html
#	deleted:    user_guide/helpers/security_helper.html
#	deleted:    user_guide/helpers/smiley_helper.html
#	deleted:    user_guide/helpers/string_helper.html
#	deleted:    user_guide/helpers/text_helper.html
#	deleted:    user_guide/helpers/typography_helper.html
#	deleted:    user_guide/helpers/url_helper.html
#	deleted:    user_guide/helpers/xml_helper.html
#	deleted:    user_guide/images/appflowchart.gif
#	deleted:    user_guide/images/arrow.gif
#	deleted:    user_guide/images/ci_logo.jpg
#	deleted:    user_guide/images/ci_logo_flame.jpg
#	deleted:    user_guide/images/ci_quick_ref.png
#	deleted:    user_guide/images/codeigniter_1.7.1_helper_reference.pdf
#	deleted:    user_guide/images/codeigniter_1.7.1_helper_reference.png
#	deleted:    user_guide/images/codeigniter_1.7.1_library_reference.pdf
#	deleted:    user_guide/images/codeigniter_1.7.1_library_reference.png
#	deleted:    user_guide/images/file.gif
#	deleted:    user_guide/images/folder.gif
#	deleted:    user_guide/images/nav_bg_darker.jpg
#	deleted:    user_guide/images/nav_separator_darker.jpg
#	deleted:    user_guide/images/nav_toggle_darker.jpg
#	deleted:    user_guide/images/reactor-bullet.png
#	deleted:    user_guide/images/smile.gif
#	deleted:    user_guide/images/transparent.gif
#	deleted:    user_guide/index.html
#	deleted:    user_guide/installation/downloads.html
#	deleted:    user_guide/installation/index.html
#	deleted:    user_guide/installation/troubleshooting.html
#	deleted:    user_guide/installation/upgrade_120.html
#	deleted:    user_guide/installation/upgrade_130.html
#	deleted:    user_guide/installation/upgrade_131.html
#	deleted:    user_guide/installation/upgrade_132.html
#	deleted:    user_guide/installation/upgrade_133.html
#	deleted:    user_guide/installation/upgrade_140.html
#	deleted:    user_guide/installation/upgrade_141.html
#	deleted:    user_guide/installation/upgrade_150.html
#	deleted:    user_guide/installation/upgrade_152.html
#	deleted:    user_guide/installation/upgrade_153.html
#	deleted:    user_guide/installation/upgrade_154.html
#	deleted:    user_guide/installation/upgrade_160.html
#	deleted:    user_guide/installation/upgrade_161.html
#	deleted:    user_guide/installation/upgrade_162.html
#	deleted:    user_guide/installation/upgrade_163.html
#	deleted:    user_guide/installation/upgrade_170.html
#	deleted:    user_guide/installation/upgrade_171.html
#	deleted:    user_guide/installation/upgrade_172.html
#	deleted:    user_guide/installation/upgrade_200.html
#	deleted:    user_guide/installation/upgrade_201.html
#	deleted:    user_guide/installation/upgrade_202.html
#	deleted:    user_guide/installation/upgrade_203.html
#	deleted:    user_guide/installation/upgrade_210.html
#	deleted:    user_guide/installation/upgrade_211.html
#	deleted:    user_guide/installation/upgrade_212.html
#	deleted:    user_guide/installation/upgrade_213.html
#	deleted:    user_guide/installation/upgrade_214.html
#	deleted:    user_guide/installation/upgrade_b11.html
#	deleted:    user_guide/installation/upgrading.html
#	deleted:    user_guide/libraries/benchmark.html
#	deleted:    user_guide/libraries/caching.html
#	deleted:    user_guide/libraries/calendar.html
#	deleted:    user_guide/libraries/cart.html
#	deleted:    user_guide/libraries/config.html
#	deleted:    user_guide/libraries/email.html
#	deleted:    user_guide/libraries/encryption.html
#	deleted:    user_guide/libraries/file_uploading.html
#	deleted:    user_guide/libraries/form_validation.html
#	deleted:    user_guide/libraries/ftp.html
#	deleted:    user_guide/libraries/image_lib.html
#	deleted:    user_guide/libraries/input.html
#	deleted:    user_guide/libraries/javascript.html
#	deleted:    user_guide/libraries/language.html
#	deleted:    user_guide/libraries/loader.html
#	deleted:    user_guide/libraries/migration.html
#	deleted:    user_guide/libraries/output.html
#	deleted:    user_guide/libraries/pagination.html
#	deleted:    user_guide/libraries/parser.html
#	deleted:    user_guide/libraries/security.html
#	deleted:    user_guide/libraries/sessions.html
#	deleted:    user_guide/libraries/table.html
#	deleted:    user_guide/libraries/trackback.html
#	deleted:    user_guide/libraries/typography.html
#	deleted:    user_guide/libraries/unit_testing.html
#	deleted:    user_guide/libraries/uri.html
#	deleted:    user_guide/libraries/user_agent.html
#	deleted:    user_guide/libraries/xmlrpc.html
#	deleted:    user_guide/libraries/zip.html
#	deleted:    user_guide/license.html
#	deleted:    user_guide/nav/hacks.txt
#	deleted:    user_guide/nav/moo.fx.js
#	deleted:    user_guide/nav/nav.js
#	deleted:    user_guide/nav/prototype.lite.js
#	deleted:    user_guide/nav/user_guide_menu.js
#	deleted:    user_guide/overview/appflow.html
#	deleted:    user_guide/overview/at_a_glance.html
#	deleted:    user_guide/overview/cheatsheets.html
#	deleted:    user_guide/overview/features.html
#	deleted:    user_guide/overview/getting_started.html
#	deleted:    user_guide/overview/goals.html
#	deleted:    user_guide/overview/index.html
#	deleted:    user_guide/overview/mvc.html
#	deleted:    user_guide/toc.html
#	deleted:    user_guide/tutorial/conclusion.html
#	deleted:    user_guide/tutorial/create_news_items.html
#	deleted:    user_guide/tutorial/hard_coded_pages.html
#	deleted:    user_guide/tutorial/index.html
#	deleted:    user_guide/tutorial/news_section.html
#	deleted:    user_guide/tutorial/static_pages.html
#	deleted:    user_guide/userguide.css
#
daily change
finish valid part
fixed merg conflict
Merge pull request #1 from shengyongjiang/dev

Dev