From 052f48a635fdf22f2ef0b741622a0aa04379baf0 Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 18 Oct 2016 16:13:27 +0200 Subject: [PATCH] 3.0.0 RC3 --- config.xml | 292 ++++++++++-- controller.php | 4 +- controllers/phocacartcart.php | 2 +- controllers/phocacartcategory.php | 12 +- controllers/phocacarteditstatus.php | 2 +- controllers/phocacartformfields.php | 31 +- controllers/phocacartitem.php | 8 +- controllers/phocacartitems.php | 23 +- controllers/phocacartquestion.php | 12 + controllers/phocacartquestions.php | 18 + controllers/phocacartupload.php | 24 +- controllers/phocacartuser.json.php | 2 +- controllers/phocacartwishlist.php | 12 + controllers/phocacartwishlists.php | 18 + help/en-GB/screen.phocacart.html | 2 +- help/screen.phocacart.html | 2 +- helpers/phocacartquestions.php | 15 + helpers/phocacartwishlists.php | 15 + install/script.php | 24 +- install/sql/mysql/install.utf8.sql | 126 ++++- install/sql/mysql/uninstall.utf8.sql | 5 +- language/en-GB/en-GB.com_phocacart.ini | 176 ++++++- language/en-GB/en-GB.com_phocacart.sys.ini | 30 +- libraries/loader.php | 8 +- libraries/phocacart/attribute/attribute.php | 26 +- libraries/phocacart/captcha/index.html | 1 + libraries/phocacart/captcha/recaptcha.php | 58 +++ libraries/phocacart/cart/cart.php | 48 +- libraries/phocacart/cart/cartdb.php | 2 +- libraries/phocacart/cart/rendercart.php | 2 +- libraries/phocacart/cart/rendercheckout.php | 10 +- libraries/phocacart/category/category.php | 2 +- libraries/phocacart/compare/compare.php | 2 +- libraries/phocacart/currency/currency.php | 2 +- libraries/phocacart/email/email.php | 276 ++++++++++- libraries/phocacart/file/file.php | 5 +- libraries/phocacart/file/filethumbnail.php | 16 +- libraries/phocacart/file/fileupload.php | 45 +- .../phocacart/file/fileuploadmultiple.php | 2 - libraries/phocacart/filter/filter.php | 32 +- libraries/phocacart/form/formuser.php | 2 +- libraries/phocacart/html/batch.php | 2 +- libraries/phocacart/html/grid.php | 2 +- libraries/phocacart/html/jgrid.php | 2 +- libraries/phocacart/order/order.php | 20 +- libraries/phocacart/order/orderrender.php | 146 ++++-- libraries/phocacart/order/orderstatus.php | 107 ++++- libraries/phocacart/path/path.php | 13 +- libraries/phocacart/path/route.php | 323 +++++-------- libraries/phocacart/price/price.php | 26 +- libraries/phocacart/product/product.php | 106 +++-- .../phocacart/render/renderadminview.php | 306 ++++++++++-- .../phocacart/render/renderadminviews.php | 4 +- libraries/phocacart/render/renderfront.php | 61 ++- libraries/phocacart/render/renderjs.php | 437 +++++++++++++++-- libraries/phocacart/render/rendermedia.php | 31 +- libraries/phocacart/security/index.html | 1 + libraries/phocacart/security/security.php | 53 +++ .../phocacart/specification/specification.php | 4 + libraries/phocacart/statistics/statistics.php | 125 +++-- libraries/phocacart/stock/stock.php | 7 +- libraries/phocacart/utils/extension.php | 71 +++ libraries/phocacart/utils/log.php | 4 + libraries/phocacart/utils/utils.php | 66 ++- libraries/phocacart/wishlist/index.html | 1 + libraries/phocacart/wishlist/wishlist.php | 295 ++++++++++++ .../fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes media/css/administrator/phocacart.css | 219 ++++++++- media/css/icomoon/fonts/icomoon.eot | Bin 2912 -> 0 bytes media/css/icomoon/fonts/icomoon.svg | 16 - media/css/icomoon/fonts/icomoon.ttf | Bin 2748 -> 0 bytes media/css/icomoon/fonts/icomoon.woff | Bin 2240 -> 0 bytes media/css/icomoon/fonts/index.html | 1 - media/css/icomoon/icomoon-license.txt | 2 - media/css/icomoon/icomoon.css | 58 --- media/css/icomoon/index.html | 1 - media/css/main-product-hover.css | 120 +++++ media/css/main-product-image-move.css | 33 ++ media/css/main.css | 177 ++++++- media/js/chartjs/Chart.min.js | 46 +- media/js/jquery.equalminheights.min.js | 11 + media/js/phoca/index.html | 1 + media/js/phoca/jquery.phocaattribute.js | 106 +++++ media/js/phoca/jquery.phocaswapimage.js | 79 ++++ media/js/windowpopup.js | 19 + models/fields/phocacartcategory.php | 10 +- models/fields/phocacartfeed.php | 2 +- models/fields/phocapaymentmethod.php | 2 +- models/fields/phocaselectfilename.php | 82 +++- models/fields/phocaselectfilenameimage.php | 51 +- models/fields/phocaselectitem.php | 1 + models/forms/phocacartcountry.xml | 2 + models/forms/phocacartcurrency.xml | 2 + models/forms/phocacartitem.xml | 1 + models/forms/phocacartquestion.xml | 47 ++ models/forms/phocacartregion.xml | 2 + models/forms/phocacartwishlist.xml | 38 ++ models/phocacartcategories.php | 2 +- models/phocacartcategory.php | 19 +- models/phocacartcountries.php | 2 +- models/phocacartcountry.php | 3 +- models/phocacartcoupon.php | 7 + models/phocacartcoupons.php | 4 +- models/phocacartcurrencies.php | 2 +- models/phocacartdownloads.php | 2 +- models/phocacarteditstatus.php | 2 + models/phocacartfeeds.php | 2 +- models/phocacartformfield.php | 2 +- models/phocacartformfields.php | 2 +- models/phocacartitem.php | 33 +- models/phocacartitems.php | 2 +- models/phocacartlogs.php | 2 +- models/phocacartmanager.php | 23 +- models/phocacartmanufacturers.php | 2 +- models/phocacartorder.php | 2 +- models/phocacartorders.php | 4 +- models/phocacartparama.php | 6 +- models/phocacartpayments.php | 2 +- models/phocacartquestion.php | 105 +++++ models/phocacartquestions.php | 151 ++++++ models/phocacartregion.php | 2 +- models/phocacartregions.php | 2 +- models/phocacartreviews.php | 2 +- models/phocacartshippings.php | 2 +- models/phocacartspecifications.php | 2 +- models/phocacartstatistics.php | 2 +- models/phocacartstatuses.php | 2 +- models/phocacartstockstatuses.php | 2 +- models/phocacarttags.php | 4 +- models/phocacarttax.php | 7 + models/phocacartusers.php | 2 +- models/phocacartwishlist.php | 105 +++++ models/phocacartwishlists.php | 148 ++++++ other/index.html | 1 + other/install_xml.php | 111 +++++ phocacart.php | 5 +- phocacart.xml | 6 +- site/controller.php | 2 +- site/controllers/account.php | 4 +- site/controllers/checkout.json.php | 8 +- site/controllers/checkout.php | 28 +- site/controllers/comparison.json.php | 5 +- site/controllers/comparison.php | 6 +- site/controllers/download.php | 2 +- site/controllers/item.php | 4 +- site/controllers/question.php | 314 +++++++++++++ site/controllers/response.php | 4 +- site/controllers/wishlist.json.php | 160 +++++++ site/controllers/wishlist.php | 54 +++ site/helpers/route.php | 2 +- site/layouts/button_add_to_cart_item.php | 10 +- site/layouts/button_add_to_cart_list.php | 16 +- site/layouts/button_ask_question.php | 24 + site/layouts/button_buy_now_paddle.php | 2 +- site/layouts/button_category_view.php | 24 + site/layouts/button_product_view.php | 11 +- site/layouts/button_quickview.php | 24 + site/layouts/button_wishlist.php | 29 ++ site/layouts/form_filter_checkbox.php | 2 +- site/layouts/form_filter_color.php | 54 +++ site/layouts/form_filter_image.php | 59 +++ site/layouts/form_filter_text.php | 1 - site/layouts/form_question.php | 34 ++ site/layouts/list_compare.php | 6 +- site/layouts/list_wishlist.php | 46 ++ site/layouts/popup_add_to_wishlist.php | 44 ++ site/layouts/popup_quickview.php | 25 + site/layouts/popup_remove_from_wishlist.php | 45 ++ site/models/category.php | 18 +- site/models/fields/phocacaptcha.php | 37 ++ site/models/forms/question.xml | 61 +++ site/models/item.php | 2 +- site/models/items.php | 17 +- site/models/orders.php | 4 +- site/models/question.php | 144 ++++++ site/models/rules/phocacartcaptcha.php | 39 ++ site/models/rules/phocacartemail.php | 39 ++ site/models/rules/phocacarthidden.php | 28 ++ site/models/wishlist.php | 19 + site/phocacart.php | 18 +- site/router.php | 158 ++++--- site/views/account/tmpl/default.php | 11 +- site/views/account/tmpl/default_profile.php | 4 +- site/views/account/view.html.php | 4 +- site/views/categories/tmpl/default.php | 32 +- site/views/categories/tmpl/default.xml | 8 +- site/views/categories/view.html.php | 5 +- site/views/category/tmpl/default.php | 155 +++++-- site/views/category/tmpl/default.xml | 8 +- .../category/tmpl/default_pagination.php | 1 - site/views/category/view.html.php | 44 +- site/views/checkout/tmpl/default.php | 9 +- site/views/checkout/tmpl/default_address.php | 4 +- site/views/checkout/tmpl/default_confirm.php | 26 +- site/views/checkout/tmpl/default_payment.php | 4 +- .../checkout/tmpl/default_proceedpayment.php | 4 +- site/views/checkout/tmpl/default_shipping.php | 4 +- site/views/checkout/view.html.php | 10 +- site/views/comparison/tmpl/default.php | 24 +- site/views/comparison/view.html.php | 8 +- site/views/download/tmpl/default.php | 11 +- site/views/download/view.html.php | 2 +- site/views/feed/view.xml.php | 8 +- site/views/info/tmpl/default.php | 9 +- site/views/info/view.html.php | 2 +- site/views/item/tmpl/default.php | 157 +++++-- site/views/item/view.html.php | 31 +- site/views/item/view.json.php | 438 ++++++++++++++++++ site/views/items/tmpl/default.php | 165 +++++-- site/views/items/tmpl/default_pagination.php | 1 + site/views/items/view.html.php | 34 ++ site/views/order/view.html.php | 4 +- site/views/order/view.pdf.php | 60 +++ site/views/orders/tmpl/default.php | 31 +- site/views/orders/view.html.php | 7 +- site/views/payment/tmpl/default.php | 11 +- site/views/payment/view.html.php | 2 +- site/views/question/index.html | 1 + site/views/question/metadata.xml | 7 + site/views/question/tmpl/default.php | 114 +++++ site/views/question/tmpl/default.xml | 19 + site/views/question/tmpl/index.html | 1 + site/views/question/view.html.php | 126 +++++ site/views/response/tmpl/default.php | 11 +- site/views/terms/metadata.xml | 4 +- site/views/terms/tmpl/default.php | 10 + site/views/terms/view.html.php | 7 +- site/views/wishlist/index.html | 1 + site/views/wishlist/metadata.xml | 6 + site/views/wishlist/tmpl/default.php | 137 ++++++ site/views/wishlist/tmpl/default.xml | 20 + site/views/wishlist/tmpl/index.html | 1 + site/views/wishlist/view.html.php | 92 ++++ tables/phocacartcart.php | 2 +- tables/phocacartcategory.php | 2 +- tables/phocacartcountry.php | 2 +- tables/phocacartcoupon.php | 2 +- tables/phocacartcurrency.php | 2 +- tables/phocacartfeed.php | 2 +- tables/phocacartformfield.php | 3 +- tables/phocacartitem.php | 2 +- tables/phocacartlog.php | 2 +- tables/phocacartmanufacturer.php | 2 +- tables/phocacartorder.php | 2 +- tables/phocacartorderattributes.php | 2 +- tables/phocacartordercoupons.php | 2 +- tables/phocacartorderdownloads.php | 2 +- tables/phocacartorderhistory.php | 2 +- tables/phocacartorderproducts.php | 2 +- tables/phocacartpayment.php | 2 +- tables/phocacartproductcategories.php | 2 +- tables/phocacartquestion.php | 27 ++ tables/phocacartregion.php | 2 +- tables/phocacartreview.php | 2 +- tables/phocacartshipping.php | 2 +- tables/phocacartspecification.php | 2 +- tables/phocacartstatus.php | 2 +- tables/phocacartstockstatus.php | 2 +- tables/phocacarttag.php | 2 +- tables/phocacarttax.php | 2 +- tables/phocacartuser.php | 2 +- tables/phocacartwishlist.php | 27 ++ views/phocacartcart/tmpl/default.php | 2 +- views/phocacartcategories/tmpl/default.php | 14 +- views/phocacartcategory/tmpl/edit.php | 2 +- views/phocacartcategory/view.html.php | 2 +- views/phocacartcountries/tmpl/default.php | 12 +- views/phocacartcountries/view.html.php | 2 +- views/phocacartcountry/tmpl/edit.php | 4 +- views/phocacartcountry/view.html.php | 2 +- views/phocacartcoupon/tmpl/edit.php | 2 +- views/phocacartcoupon/view.html.php | 2 +- views/phocacartcoupons/tmpl/default.php | 18 +- views/phocacartcoupons/view.html.php | 2 +- views/phocacartcp/tmpl/default.php | 33 +- views/phocacartcp/view.html.php | 6 +- views/phocacartcurrencies/tmpl/default.php | 14 +- views/phocacartcurrencies/view.html.php | 2 +- views/phocacartcurrency/tmpl/edit.php | 4 +- views/phocacartcurrency/view.html.php | 2 +- views/phocacartdownload/tmpl/edit.php | 2 +- views/phocacartdownload/view.html.php | 2 +- views/phocacartdownloads/tmpl/default.php | 22 +- views/phocacartdownloads/view.html.php | 2 +- views/phocacarteditstatus/tmpl/default.php | 12 +- views/phocacartfeed/tmpl/edit.php | 4 +- views/phocacartfeed/view.html.php | 2 +- views/phocacartfeeds/tmpl/default.php | 8 +- views/phocacartfeeds/view.html.php | 2 +- views/phocacartformfield/tmpl/edit.php | 2 +- views/phocacartformfield/view.html.php | 2 +- views/phocacartformfields/tmpl/default.php | 18 +- views/phocacartformfields/view.html.php | 2 +- views/phocacartitem/tmpl/edit.php | 53 ++- views/phocacartitem/tmpl/edit_metadata.php | 2 +- views/phocacartitem/view.html.php | 2 +- views/phocacartitema/view.json.php | 2 +- views/phocacartitems/tmpl/default.php | 20 +- views/phocacartlogs/tmpl/default.php | 16 +- views/phocacartlogs/view.html.php | 2 +- views/phocacartmanager/tmpl/default.php | 2 +- views/phocacartmanager/tmpl/default_file.php | 3 +- views/phocacartmanager/view.html.php | 14 +- views/phocacartmanufacturer/tmpl/edit.php | 2 +- views/phocacartmanufacturer/view.html.php | 2 +- views/phocacartmanufacturers/tmpl/default.php | 8 +- views/phocacartmanufacturers/view.html.php | 2 +- views/phocacartorder/tmpl/edit.php | 16 +- views/phocacartorder/view.html.php | 2 +- views/phocacartorders/tmpl/default.php | 61 ++- views/phocacartorders/view.html.php | 5 +- views/phocacartorderview/view.html.php | 2 +- views/phocacartorderview/view.pdf.php | 58 +++ views/phocacartparama/view.json.php | 2 +- views/phocacartpayment/tmpl/edit.php | 5 +- views/phocacartpayment/view.html.php | 2 +- views/phocacartpayments/tmpl/default.php | 12 +- views/phocacartpayments/view.html.php | 2 +- views/phocacartquestion/index.html | 1 + views/phocacartquestion/tmpl/edit.php | 62 +++ views/phocacartquestion/tmpl/index.html | 1 + views/phocacartquestion/view.html.php | 63 +++ views/phocacartquestions/index.html | 1 + views/phocacartquestions/tmpl/default.php | 153 ++++++ views/phocacartquestions/tmpl/index.html | 1 + views/phocacartquestions/view.html.php | 87 ++++ views/phocacartregion/tmpl/edit.php | 4 +- views/phocacartregion/view.html.php | 2 +- views/phocacartregions/tmpl/default.php | 12 +- views/phocacartregions/view.html.php | 2 +- views/phocacartreview/tmpl/edit.php | 2 +- views/phocacartreview/view.html.php | 2 +- views/phocacartreviews/tmpl/default.php | 14 +- views/phocacartreviews/view.html.php | 2 +- views/phocacartshipping/tmpl/edit.php | 2 +- views/phocacartshipping/view.html.php | 2 +- views/phocacartshippings/tmpl/default.php | 10 +- views/phocacartshippings/view.html.php | 2 +- views/phocacartspecification/tmpl/edit.php | 2 +- views/phocacartspecification/view.html.php | 2 +- .../phocacartspecifications/tmpl/default.php | 8 +- views/phocacartspecifications/view.html.php | 2 +- views/phocacartstatistics/tmpl/default.php | 92 +++- views/phocacartstatistics/view.html.php | 57 +-- views/phocacartstatus/tmpl/edit.php | 2 +- views/phocacartstatus/view.html.php | 2 +- views/phocacartstatuses/tmpl/default.php | 16 +- views/phocacartstatuses/view.html.php | 2 +- views/phocacartstockstatus/tmpl/edit.php | 2 +- views/phocacartstockstatus/view.html.php | 2 +- views/phocacartstockstatuses/tmpl/default.php | 8 +- views/phocacartstockstatuses/view.html.php | 2 +- views/phocacarttag/tmpl/edit.php | 2 +- views/phocacarttag/view.html.php | 2 +- views/phocacarttags/tmpl/default.php | 8 +- views/phocacarttags/view.html.php | 2 +- views/phocacarttax/tmpl/edit.php | 2 +- views/phocacarttax/view.html.php | 2 +- views/phocacarttaxes/tmpl/default.php | 12 +- views/phocacarttaxes/view.html.php | 2 +- views/phocacartthumba/view.json.php | 7 +- views/phocacartuser/tmpl/edit.php | 2 +- views/phocacartuser/view.html.php | 2 +- views/phocacartusers/tmpl/default.php | 24 +- views/phocacartusers/view.html.php | 2 +- views/phocacartwishlist/index.html | 1 + views/phocacartwishlist/tmpl/edit.php | 62 +++ views/phocacartwishlist/tmpl/index.html | 1 + views/phocacartwishlist/view.html.php | 63 +++ views/phocacartwishlists/index.html | 1 + views/phocacartwishlists/tmpl/default.php | 149 ++++++ views/phocacartwishlists/tmpl/index.html | 1 + views/phocacartwishlists/view.html.php | 86 ++++ 373 files changed, 9200 insertions(+), 1518 deletions(-) create mode 100644 controllers/phocacartquestion.php create mode 100644 controllers/phocacartquestions.php create mode 100644 controllers/phocacartwishlist.php create mode 100644 controllers/phocacartwishlists.php create mode 100644 helpers/phocacartquestions.php create mode 100644 helpers/phocacartwishlists.php create mode 100644 libraries/phocacart/captcha/index.html create mode 100644 libraries/phocacart/captcha/recaptcha.php create mode 100644 libraries/phocacart/security/index.html create mode 100644 libraries/phocacart/security/security.php create mode 100644 libraries/phocacart/utils/extension.php create mode 100644 libraries/phocacart/wishlist/index.html create mode 100644 libraries/phocacart/wishlist/wishlist.php create mode 100644 media/bootstrap/fonts/glyphicons-halflings-regular.woff2 delete mode 100644 media/css/icomoon/fonts/icomoon.eot delete mode 100644 media/css/icomoon/fonts/icomoon.svg delete mode 100644 media/css/icomoon/fonts/icomoon.ttf delete mode 100644 media/css/icomoon/fonts/icomoon.woff delete mode 100644 media/css/icomoon/fonts/index.html delete mode 100644 media/css/icomoon/icomoon-license.txt delete mode 100644 media/css/icomoon/icomoon.css delete mode 100644 media/css/icomoon/index.html create mode 100644 media/css/main-product-hover.css create mode 100644 media/css/main-product-image-move.css create mode 100644 media/js/jquery.equalminheights.min.js create mode 100644 media/js/phoca/index.html create mode 100644 media/js/phoca/jquery.phocaattribute.js create mode 100644 media/js/phoca/jquery.phocaswapimage.js create mode 100644 media/js/windowpopup.js create mode 100644 models/forms/phocacartquestion.xml create mode 100644 models/forms/phocacartwishlist.xml create mode 100644 models/phocacartquestion.php create mode 100644 models/phocacartquestions.php create mode 100644 models/phocacartwishlist.php create mode 100644 models/phocacartwishlists.php create mode 100644 other/index.html create mode 100644 other/install_xml.php create mode 100644 site/controllers/question.php create mode 100644 site/controllers/wishlist.json.php create mode 100644 site/controllers/wishlist.php create mode 100644 site/layouts/button_ask_question.php create mode 100644 site/layouts/button_category_view.php create mode 100644 site/layouts/button_quickview.php create mode 100644 site/layouts/button_wishlist.php create mode 100644 site/layouts/form_filter_color.php create mode 100644 site/layouts/form_filter_image.php create mode 100644 site/layouts/form_question.php create mode 100644 site/layouts/list_wishlist.php create mode 100644 site/layouts/popup_add_to_wishlist.php create mode 100644 site/layouts/popup_quickview.php create mode 100644 site/layouts/popup_remove_from_wishlist.php create mode 100644 site/models/fields/phocacaptcha.php create mode 100644 site/models/forms/question.xml create mode 100644 site/models/question.php create mode 100644 site/models/rules/phocacartcaptcha.php create mode 100644 site/models/rules/phocacartemail.php create mode 100644 site/models/rules/phocacarthidden.php create mode 100644 site/models/wishlist.php create mode 100644 site/views/item/view.json.php create mode 100644 site/views/order/view.pdf.php create mode 100644 site/views/question/index.html create mode 100644 site/views/question/metadata.xml create mode 100644 site/views/question/tmpl/default.php create mode 100644 site/views/question/tmpl/default.xml create mode 100644 site/views/question/tmpl/index.html create mode 100644 site/views/question/view.html.php create mode 100644 site/views/wishlist/index.html create mode 100644 site/views/wishlist/metadata.xml create mode 100644 site/views/wishlist/tmpl/default.php create mode 100644 site/views/wishlist/tmpl/default.xml create mode 100644 site/views/wishlist/tmpl/index.html create mode 100644 site/views/wishlist/view.html.php create mode 100644 tables/phocacartquestion.php create mode 100644 tables/phocacartwishlist.php create mode 100644 views/phocacartorderview/view.pdf.php create mode 100644 views/phocacartquestion/index.html create mode 100644 views/phocacartquestion/tmpl/edit.php create mode 100644 views/phocacartquestion/tmpl/index.html create mode 100644 views/phocacartquestion/view.html.php create mode 100644 views/phocacartquestions/index.html create mode 100644 views/phocacartquestions/tmpl/default.php create mode 100644 views/phocacartquestions/tmpl/index.html create mode 100644 views/phocacartquestions/view.html.php create mode 100644 views/phocacartwishlist/index.html create mode 100644 views/phocacartwishlist/tmpl/edit.php create mode 100644 views/phocacartwishlist/tmpl/index.html create mode 100644 views/phocacartwishlist/view.html.php create mode 100644 views/phocacartwishlists/index.html create mode 100644 views/phocacartwishlists/tmpl/default.php create mode 100644 views/phocacartwishlists/tmpl/index.html create mode 100644 views/phocacartwishlists/view.html.php diff --git a/config.xml b/config.xml index 6125eac3..07e12c58 100644 --- a/config.xml +++ b/config.xml @@ -9,7 +9,9 @@ - + + + @@ -23,7 +25,6 @@ - @@ -33,15 +34,26 @@ + + + + + + + + + + + - + @@ -84,35 +96,59 @@ - - - - - - - + + + - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -139,7 +175,21 @@ - + + + + + + + + + + + + + + + @@ -155,11 +205,28 @@ + + + + + + + + + + + + + + + + + @@ -171,6 +238,10 @@ + + + + @@ -192,7 +263,6 @@ - @@ -212,7 +282,10 @@ - + + + + @@ -226,15 +299,19 @@ - - + + + + + - +
+ - + @@ -246,7 +323,7 @@ - + @@ -258,7 +335,7 @@ - + @@ -271,39 +348,39 @@ + - - - + + - - + + - - + + - - + + - - + + - + @@ -337,38 +414,40 @@
+ - + - - + + - + - + - + - + - + + @@ -379,38 +458,156 @@
- - + + - - + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ - + @@ -418,6 +615,7 @@
+
diff --git a/controller.php b/controller.php index cb363673..cf1f6f0b 100644 --- a/controller.php +++ b/controller.php @@ -6,7 +6,7 @@ * @copyright Copyright (C) Jan Pavelka www.phoca.cz * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL */ -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die; jimport('joomla.application.component.controller'); $app = JFactory::getApplication(); @@ -34,6 +34,8 @@ $l['do'] = array('COM_PHOCACART_DOWNLOADS', 'phocacartdownloads'); $l['tg'] = array('COM_PHOCACART_TAGS', 'phocacarttags'); $l['fd'] = array('COM_PHOCACART_XML_FEEDS', 'phocacartfeeds'); +$l['wl'] = array('COM_PHOCACART_WISH_LISTS', 'phocacartwishlists'); +$l['qu'] = array('COM_PHOCACART_QUESTIONS', 'phocacartquestions'); $l['sc'] = array('COM_PHOCACART_STATISTICS', 'phocacartstatistics'); $l['lo'] = array('COM_PHOCACART_SYSTEM_LOG', 'phocacartlogs'); $l['in'] = array('COM_PHOCACART_INFO', 'phocacartinfo'); diff --git a/controllers/phocacartcart.php b/controllers/phocacartcart.php index 19fdf6fc..ffb054d9 100644 --- a/controllers/phocacartcart.php +++ b/controllers/phocacartcart.php @@ -16,7 +16,7 @@ public function &getModel($name = 'PhocaCartCart', $prefix = 'PhocaCartCpModel', } function emptycart() { - if (!JRequest::checkToken('request')) { + if (!JSession::checkToken('request')) { $app->enqueueMessage('Invalid Token', 'message'); return false; } diff --git a/controllers/phocacartcategory.php b/controllers/phocacartcategory.php index 22f2cdd0..2a2a51dc 100644 --- a/controllers/phocacartcategory.php +++ b/controllers/phocacartcategory.php @@ -11,7 +11,7 @@ class PhocaCartCpControllerPhocaCartCategory extends PhocaCartCpControllerPhocaCartCommon { public function batch($model = null) { - JRequest::checkToken() or jexit(JText::_('JINVALID_TOKEN')); + JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); $model = $this->getModel('phocacartcategory', '', array()); $this->setRedirect(JRoute::_('index.php?option=com_phocacart&view=phocacartcategories'.$this->getRedirectToListAppend(), false)); return parent::batch($model); @@ -19,13 +19,17 @@ public function batch($model = null) { function recreate() { $app = JFactory::getApplication(); - $cid = JRequest::getVar( 'cid', array(), '', 'array' ); + $cid = JFactory::getApplication()->input->get( 'cid', array(), '', 'array' ); JArrayHelper::toInteger($cid); + $message = ''; + if (count( $cid ) < 1) { - JError::raiseError(500, JText::_( 'COM_PHOCACART_SELECT_ITEM_RECREATE' ) ); + $message = JText::_( 'COM_PHOCACART_SELECT_ITEM_RECREATE' ); + $app->enqueueMessage($message, 'error'); + $app->redirect('index.php?option=com_phocacart&view=phocacartcategories'); } - $message = ''; + $model = $this->getModel( 'phocacartcategory' ); if(!$model->recreate($cid, $message)) { $message = PhocaCartUtils::setMessage($message, JText::_( 'COM_PHOCACART_ERROR_THUMBS_REGENERATING' )); diff --git a/controllers/phocacarteditstatus.php b/controllers/phocacarteditstatus.php index d453ba85..9614baba 100644 --- a/controllers/phocacarteditstatus.php +++ b/controllers/phocacarteditstatus.php @@ -17,7 +17,7 @@ public function &getModel($name = 'PhocaCartEditStatus', $prefix = 'PhocaCartCpM function editstatus() { - if (!JRequest::checkToken('request')) { + if (!JSession::checkToken('request')) { $app->enqueueMessage('Invalid Token', 'message'); return false; } diff --git a/controllers/phocacartformfields.php b/controllers/phocacartformfields.php index a8489fc2..9b91875b 100644 --- a/controllers/phocacartformfields.php +++ b/controllers/phocacartformfields.php @@ -26,20 +26,23 @@ public function &getModel($name = 'PhocaCartFormfield', $prefix = 'PhocaCartCpMo } function displaybilling() { - JRequest::checkToken() or die(JText::_('JINVALID_TOKEN')); - - $cid = JRequest::getVar('cid', array(), '', 'array'); + JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); + + $app = JFactory::getApplication(); + $cid = $app->input->get('cid', array(), '', 'array'); $data = array('displaybilling' => 1, 'hidebilling' => 0); $task = $this->getTask(); $value = JArrayHelper::getValue($data, $task, 0, 'int'); + + if (empty($cid)) { - JError::raiseWarning(500, JText::_($this->text_prefix.'_NO_ITEM_SELECTED')); + $app->enqueueMessage(JText::_($this->text_prefix.'_NO_ITEM_SELECTED'), 'error'); } else { $model = $this->getModel(); JArrayHelper::toInteger($cid); if (!$model->displayItem($cid, $value, 'display_billing')) { - JError::raiseWarning(500, $model->getError()); + $app->enqueueMessage($model->getError(), 'error'); } else { if ($value == 1) { $ntext = $this->text_prefix.'_N_ITEMS_DISPLAYED'; @@ -53,20 +56,21 @@ function displaybilling() { } function displayshipping() { - JRequest::checkToken() or die(JText::_('JINVALID_TOKEN')); + JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - $cid = JRequest::getVar('cid', array(), '', 'array'); + $app = JFactory::getApplication(); + $cid = $app->input->get('cid', array(), '', 'array'); $data = array('displayshipping' => 1, 'hideshipping' => 0); $task = $this->getTask(); $value = JArrayHelper::getValue($data, $task, 0, 'int'); if (empty($cid)) { - JError::raiseWarning(500, JText::_($this->text_prefix.'_NO_ITEM_SELECTED')); + $app->enqueueMessage(JText::_($this->text_prefix.'_NO_ITEM_SELECTED'), 'error'); } else { $model = $this->getModel(); JArrayHelper::toInteger($cid); if (!$model->displayItem($cid, $value, 'display_shipping')) { - JError::raiseWarning(500, $model->getError()); + $app->enqueueMessage($model->getError(), 'error'); } else { if ($value == 1) { $ntext = $this->text_prefix.'_N_ITEMS_DISPLAYED'; @@ -80,20 +84,21 @@ function displayshipping() { } function displayaccount() { - JRequest::checkToken() or die(JText::_('JINVALID_TOKEN')); + JSession::checkToken() or die(JText::_('JINVALID_TOKEN')); - $cid = JRequest::getVar('cid', array(), '', 'array'); + $app = JFactory::getApplication(); + $cid = $app->input->get('cid', array(), '', 'array'); $data = array('displayaccount' => 1, 'hideaccount' => 0); $task = $this->getTask(); $value = JArrayHelper::getValue($data, $task, 0, 'int'); if (empty($cid)) { - JError::raiseWarning(500, JText::_($this->text_prefix.'_NO_ITEM_SELECTED')); + $app->enqueueMessage(JText::_($this->text_prefix.'_NO_ITEM_SELECTED'), 'error'); } else { $model = $this->getModel(); JArrayHelper::toInteger($cid); if (!$model->displayItem($cid, $value, 'display_account')) { - JError::raiseWarning(500, $model->getError()); + $app->enqueueMessage($model->getError(), 'error'); } else { if ($value == 1) { $ntext = $this->text_prefix.'_N_ITEMS_DISPLAYED'; diff --git a/controllers/phocacartitem.php b/controllers/phocacartitem.php index 1c6814f0..f97c16c5 100644 --- a/controllers/phocacartitem.php +++ b/controllers/phocacartitem.php @@ -11,7 +11,7 @@ class PhocaCartCpControllerPhocaCartItem extends PhocaCartCpControllerPhocaCartCommon { public function batch($model = null) { - JRequest::checkToken() or jexit(JText::_('JINVALID_TOKEN')); + JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); $model = $this->getModel('phocacartitem', '', array()); $this->setRedirect(JRoute::_('index.php?option=com_phocacart&view=phocacartitems'.$this->getRedirectToListAppend(), false)); @@ -21,11 +21,13 @@ public function batch($model = null) { function recreate() { $app = JFactory::getApplication(); - $cid = JRequest::getVar( 'cid', array(), '', 'array' ); + $cid = JFactory::getApplication()->input->get( 'cid', array(), '', 'array' ); JArrayHelper::toInteger($cid); if (count( $cid ) < 1) { - JError::raiseError(500, JText::_( 'COM_PHOCACART_SELECT_ITEM_RECREATE' ) ); + $message = JText::_( 'COM_PHOCACART_SELECT_ITEM_RECREATE' ); + $app->enqueueMessage($message, 'error'); + $app->redirect('index.php?option=com_phocacart&view=phocacartcategories'); } $message = ''; $model = $this->getModel( 'phocacartitem' ); diff --git a/controllers/phocacartitems.php b/controllers/phocacartitems.php index 4416c5bb..d54cd9c6 100644 --- a/controllers/phocacartitems.php +++ b/controllers/phocacartitems.php @@ -25,6 +25,7 @@ public function featured() // Check for request forgeries JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); + $app = JFactory::getApplication(); $user = JFactory::getUser(); $ids = $this->input->get('cid', array(), 'array'); $values = array('featured' => 1, 'unfeatured' => 0); @@ -38,26 +39,20 @@ public function featured() { // Prune items that you can't change. unset($ids[$i]); - JError::raiseNotice(403, JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED')); + $this->setError(JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED')); + $this->setMessage($this->getError(), 'error'); } } - if (empty($ids)) - { - JError::raiseWarning(500, JText::_('JERROR_NO_ITEMS_SELECTED')); - } - else - { - // Get the model. - $model = $this->getModel(); + if (empty($ids)) { + $app->enqueueMessage(JText::_('COM_PHOCACART_ERROR_NO_ITEMS_SELECTED'), 'error'); + } else { - // Publish the items. - if (!$model->featured($ids, $value)) - { - JError::raiseWarning(500, $model->getError()); + $model = $this->getModel(); + if (!$model->featured($ids, $value)) { + $app->enqueueMessage($model->getError(), 'error'); } } - $this->setRedirect('index.php?option=com_phocacart&view=phocacartitems'); } } diff --git a/controllers/phocacartquestion.php b/controllers/phocacartquestion.php new file mode 100644 index 00000000..81c13e9c --- /dev/null +++ b/controllers/phocacartquestion.php @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/controllers/phocacartquestions.php b/controllers/phocacartquestions.php new file mode 100644 index 00000000..3eaab36a --- /dev/null +++ b/controllers/phocacartquestions.php @@ -0,0 +1,18 @@ + true)); + return $model; + } +} +?> \ No newline at end of file diff --git a/controllers/phocacartupload.php b/controllers/phocacartupload.php index 2c502fbe..e8899842 100644 --- a/controllers/phocacartupload.php +++ b/controllers/phocacartupload.php @@ -18,7 +18,7 @@ function __construct() { } function createfolder() { - JRequest::checkToken() or jexit( 'COM_PHOCADOWNLOAD_INVALID_TOKEN' ); + JSession::checkToken() or jexit( 'COM_PHOCADOWNLOAD_INVALID_TOKEN' ); $app = JFactory::getApplication(); // Set FTP credentials, if given @@ -29,13 +29,13 @@ function createfolder() { $folder_permissions = $paramsC->get( 'folder_permissions', 0755 ); //$folder_permissions = octdec((int)$folder_permissions); - $folderNew = JRequest::getCmd( 'foldername', ''); - $folderCheck = JRequest::getVar( 'foldername', null, '', 'string', JREQUEST_ALLOWRAW); - $parent = JRequest::getVar( 'folderbase', '', '', 'path' ); - $tab = JRequest::getVar( 'tab', 0, '', 'string' ); - $field = JRequest::getVar( 'field'); - $viewBack = JRequest::getVar( 'viewback', '', '', 'phocacartmanager' ); - $manager = JRequest::getVar( 'manager', 'file', '', 'string' ); + $folderNew = $app->input->get( 'foldername', ''); + $folderCheck = $app->input->get( 'foldername', null, 'raw'); + $parent = $app->input->get( 'folderbase', '', 'path' ); + $tab = $app->input->get( 'tab', 0, 'string' ); + $field = $app->input->get( 'field'); + $viewBack = $app->input->get( 'viewback', 'phocacartmanager' ); + $manager = $app->input->get( 'manager', 'file', 'string' ); $link = ''; @@ -49,14 +49,14 @@ function createfolder() { exit; } - JRequest::setVar('folder', $parent); + JFactory::getApplication()->input->set('folder', $parent); if (($folderCheck !== null) && ($folderNew !== $folderCheck)) { $app->redirect($link, JText::_('COM_PHOCACART_WARNING_DIRNAME')); } if (strlen($folderNew) > 0) { - $folder = JPath::clean($path['orig_abs_ds'].$parent.DS.$folderNew); + $folder = JPath::clean($path['orig_abs_ds'].$parent.'/'.$folderNew); if (!JFolder::exists($folder) && !JFile::exists($folder)) { //JFolder::create($path, $folder_permissions ); @@ -81,7 +81,7 @@ function createfolder() { } if (isset($folder)) { $data = "\n\n\n"; - JFile::write($folder.DS."index.html", $data); + JFile::write($folder."/index.html", $data); } else { $app->redirect($link, JText::_('COM_PHOCACART_ERROR_FOLDER_CREATING')); } @@ -90,7 +90,7 @@ function createfolder() { } else { $app->redirect($link, JText::_('COM_PHOCACART_ERROR_FOLDER_CREATING_EXISTS')); } - //JRequest::setVar('folder', ($parent) ? $parent.'/'.$folder : $folder); + //JFactory::getApplication()->input->set('folder', ($parent) ? $parent.'/'.$folder : $folder); } $app->redirect($link); } diff --git a/controllers/phocacartuser.json.php b/controllers/phocacartuser.json.php index 21d78e38..23162fbb 100644 --- a/controllers/phocacartuser.json.php +++ b/controllers/phocacartuser.json.php @@ -12,7 +12,7 @@ class PhocaCartCpControllerPhocaCartUser extends JControllerForm { public function setregion() { - if (!JRequest::checkToken('request')) { + if (!JSession::checkToken('request')) { $response = array( 'status' => '0', 'error' => '
' . JText::_('JINVALID_TOKEN') . '
'); diff --git a/controllers/phocacartwishlist.php b/controllers/phocacartwishlist.php new file mode 100644 index 00000000..f912778c --- /dev/null +++ b/controllers/phocacartwishlist.php @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/controllers/phocacartwishlists.php b/controllers/phocacartwishlists.php new file mode 100644 index 00000000..da92f853 --- /dev/null +++ b/controllers/phocacartwishlists.php @@ -0,0 +1,18 @@ + true)); + return $model; + } +} +?> \ No newline at end of file diff --git a/help/en-GB/screen.phocacart.html b/help/en-GB/screen.phocacart.html index 3ad8b748..be5b381f 100644 --- a/help/en-GB/screen.phocacart.html +++ b/help/en-GB/screen.phocacart.html @@ -1,4 +1,4 @@ - + diff --git a/help/screen.phocacart.html b/help/screen.phocacart.html index 3ad8b748..be5b381f 100644 --- a/help/screen.phocacart.html +++ b/help/screen.phocacart.html @@ -1,4 +1,4 @@ - + diff --git a/helpers/phocacartquestions.php b/helpers/phocacartquestions.php new file mode 100644 index 00000000..b0a24658 --- /dev/null +++ b/helpers/phocacartquestions.php @@ -0,0 +1,15 @@ + \ No newline at end of file diff --git a/helpers/phocacartwishlists.php b/helpers/phocacartwishlists.php new file mode 100644 index 00000000..10bfd6d5 --- /dev/null +++ b/helpers/phocacartwishlists.php @@ -0,0 +1,15 @@ + \ No newline at end of file diff --git a/install/script.php b/install/script.php index bec6f56f..8f2442f7 100644 --- a/install/script.php +++ b/install/script.php @@ -18,14 +18,14 @@ function install($parent) { //echo '

' . JText::_('COM_PHOCAGALLLERY_INSTALL_TEXT') . '

'; - $folder[0][0] = 'images' . DS . 'phocacartcategories' ; - $folder[0][1] = JPATH_ROOT . DS . $folder[0][0]; + $folder[0][0] = 'images' . '/phocacartcategories' ; + $folder[0][1] = JPATH_ROOT . '/' . $folder[0][0]; - $folder[1][0] = 'images' . DS . 'phocacartproducts' ; - $folder[1][1] = JPATH_ROOT . DS . $folder[1][0]; + $folder[1][0] = 'images' . '/phocacartproducts' ; + $folder[1][1] = JPATH_ROOT . '/' . $folder[1][0]; $folder[2][0] = 'phocacartdownload' ; - $folder[2][1] = JPATH_ROOT . DS . $folder[2][0]; + $folder[2][1] = JPATH_ROOT . '/' . $folder[2][0]; $message = ''; @@ -38,7 +38,7 @@ function install($parent) { { $data = "\n\n\n"; - JFile::write($value[1].DS."index.html", $data); + JFile::write($value[1]."/index.html", $data); $message .= '
Folder ' . $value[0] .' created!
'; $error[] = 0; @@ -85,14 +85,14 @@ function uninstall($parent) { function update($parent) { //echo '

' . JText::sprintf('COM_PHOCACART_UPDATE_TEXT', $parent->get('manifest')->version) . '

'; - $folder[0][0] = 'images' . DS . 'phocacartcategories' ; - $folder[0][1] = JPATH_ROOT . DS . $folder[0][0]; + $folder[0][0] = 'images/phocacartcategories' ; + $folder[0][1] = JPATH_ROOT . '/' . $folder[0][0]; - $folder[1][0] = 'images' . DS . 'phocacartproducts' ; - $folder[1][1] = JPATH_ROOT . DS . $folder[1][0]; + $folder[1][0] = 'images/phocacartproducts' ; + $folder[1][1] = JPATH_ROOT . '/' . $folder[1][0]; $folder[2][0] = 'phocacartdownload' ; - $folder[2][1] = JPATH_ROOT . DS . $folder[2][0]; + $folder[2][1] = JPATH_ROOT . '/' . $folder[2][0]; $message = ''; $error = array(); @@ -104,7 +104,7 @@ function update($parent) { { $data = "\n\n\n"; - JFile::write($value[1].DS."index.html", $data); + JFile::write($value[1]."/index.html", $data); $message .= '
Folder ' . $value[0] .' created!
'; $error[] = 0; diff --git a/install/sql/mysql/install.utf8.sql b/install/sql/mysql/install.utf8.sql index bc6fa6f6..09be80ff 100644 --- a/install/sql/mysql/install.utf8.sql +++ b/install/sql/mysql/install.utf8.sql @@ -63,6 +63,7 @@ CREATE TABLE IF NOT EXISTS `#__phocacart_products` ( `unit_amount` DECIMAL( 15, 4 ) NOT NULL DEFAULT '0', `unit_unit` varchar(64) NOT NULL DEFAULT '', `min_quantity` int(11) NOT NULL DEFAULT '0', + `min_multiple_quantity` int(11) NOT NULL DEFAULT '0', `stockstatus_a_id` int(11) NOT NULL DEFAULT '0', `stockstatus_n_id` int(11) NOT NULL DEFAULT '0', `availability` text, @@ -168,8 +169,13 @@ CREATE TABLE IF NOT EXISTS `#__phocacart_attribute_values` ( `volume` DECIMAL( 10, 4 ) NOT NULL DEFAULT '0', `operator_volume` char(1) NOT NULL DEFAULT '0', `image` varchar(255) NOT NULL DEFAULT '', + `image_small` varchar(255) NOT NULL DEFAULT '', + `image_medium` varchar(255) NOT NULL DEFAULT '', `ordering` int(11) NOT NULL DEFAULT '0', `language` char(7) NOT NULL DEFAULT '', + `color` varchar(50) NOT NULL DEFAULT '', + `type` tinyint(1) NOT NULL DEFAULT '0', + `params` text, PRIMARY KEY (`id`), KEY `idx_attribute` (`attribute_id`) , KEY `idx_alias` (`alias`), @@ -269,6 +275,7 @@ CREATE TABLE IF NOT EXISTS `#__phocacart_countries` ( `type` int(11) NOT NULL DEFAULT '0', `code2` varchar(20) NOT NULL DEFAULT '', `code3` varchar(20) NOT NULL DEFAULT '', + `image` varchar(255) NOT NULL DEFAULT '', `published` tinyint(1) NOT NULL DEFAULT '0', `checked_out` int(11) unsigned NOT NULL DEFAULT '0', `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', @@ -286,6 +293,7 @@ CREATE TABLE IF NOT EXISTS `#__phocacart_regions` ( `type` int(11) NOT NULL DEFAULT '0', `code2` varchar(20) NOT NULL DEFAULT '', `code3` varchar(20) NOT NULL DEFAULT '', + `image` varchar(255) NOT NULL DEFAULT '', `published` tinyint(1) NOT NULL DEFAULT '0', `checked_out` int(11) unsigned NOT NULL DEFAULT '0', `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', @@ -348,6 +356,7 @@ CREATE TABLE IF NOT EXISTS `#__phocacart_tags` ( `id` int(11) NOT NULL auto_increment, `title` varchar(255) NOT NULL DEFAULT '', `alias` varchar(255) NOT NULL DEFAULT '', + `image` varchar(255) NOT NULL DEFAULT '', `link_ext` varchar(255) NOT NULL DEFAULT '', `link_cat` int(11) unsigned NOT NULL DEFAULT '0', `description` text, @@ -372,6 +381,7 @@ CREATE TABLE IF NOT EXISTS `#__phocacart_taxes` ( `id` int(11) NOT NULL auto_increment, `title` varchar(255) NOT NULL DEFAULT '', `alias` varchar(255) NOT NULL DEFAULT '', + `image` varchar(255) NOT NULL DEFAULT '', `tax_rate` DECIMAL( 10, 4 ) NOT NULL DEFAULT '0', `calculation_type` tinyint(1) NOT NULL DEFAULT '0', `published` tinyint(1) NOT NULL DEFAULT '0', @@ -388,6 +398,7 @@ CREATE TABLE IF NOT EXISTS `#__phocacart_currencies` ( `title` varchar(255) NOT NULL DEFAULT '', `alias` varchar(255) NOT NULL DEFAULT '', `code` varchar(5) NOT NULL DEFAULT '', + `image` varchar(255) NOT NULL DEFAULT '', `exchange_rate` DECIMAL( 10, 4 ) NOT NULL DEFAULT '0', `price_format` tinyint(1) NOT NULL DEFAULT '0', `price_currency_symbol` varchar(10) NOT NULL DEFAULT '', @@ -562,6 +573,7 @@ CREATE TABLE IF NOT EXISTS `#__phocacart_users` ( `newsletter` tinyint(1) NOT NULL DEFAULT '0', `title` varchar(255) NOT NULL DEFAULT '', `alias` varchar(255) NOT NULL DEFAULT '', + `image` varchar(255) NOT NULL DEFAULT '', `name_first` varchar(100) NOT NULL DEFAULT '', `name_middle` varchar(100) NOT NULL DEFAULT '', @@ -606,6 +618,7 @@ CREATE TABLE IF NOT EXISTS `#__phocacart_order_statuses` ( `id` int(11) NOT NULL AUTO_INCREMENT, `title` varchar(255) NOT NULL DEFAULT '', `alias` varchar(255) NOT NULL DEFAULT '', + `image` varchar(255) NOT NULL DEFAULT '', `description` text, `stock_movements` char(1) NOT NULL DEFAULT '', `email_customer` tinyint(1) NOT NULL DEFAULT '0', @@ -815,6 +828,7 @@ CREATE TABLE IF NOT EXISTS `#__phocacart_feeds` ( `id` int(11) NOT NULL AUTO_INCREMENT, `title` varchar(255) NOT NULL DEFAULT '', `alias` varchar(255) NOT NULL DEFAULT '', + `image` varchar(255) NOT NULL DEFAULT '', `description` text, `header` text, `footer` text, @@ -834,6 +848,52 @@ CREATE TABLE IF NOT EXISTS `#__phocacart_feeds` ( KEY (`type`) ) DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS `#__phocacart_wishlists` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `product_id` int(11) NOT NULL DEFAULT '0', + `category_id` int(11) NOT NULL DEFAULT '0', + `user_id` int(11) NOT NULL DEFAULT '0', + `title` varchar(255) NOT NULL DEFAULT '', + `alias` varchar(255) NOT NULL DEFAULT '', + `ip` varchar(40) NOT NULL DEFAULT '', + `user_agent` varchar(255) NOT NULL DEFAULT '', + `quantity` int(11) NOT NULL DEFAULT '0', + `type` tinyint(1) NOT NULL DEFAULT '0', + `priority` tinyint(1) NOT NULL DEFAULT '0', + `published` tinyint(1) NOT NULL DEFAULT '0', + `checked_out` int(11) unsigned NOT NULL DEFAULT '0', + `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `ordering` int(11) NOT NULL DEFAULT '0', + `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `params` text, + PRIMARY KEY (`id`) +) DEFAULT CHARSET=utf8; + +CREATE TABLE IF NOT EXISTS `#__phocacart_questions` ( + `id` int(11) unsigned NOT NULL auto_increment, + `product_id` int(11) NOT NULL default '0', + `category_id` int(11) NOT NULL default '0', + `user_id` int(11) NOT NULL default '0', + `question_id` int(11) NOT NULL default '0', + `name` varchar(100) NOT NULL default '', + `email` varchar(50) NOT NULL default '', + `phone` varchar(20) NOT NULL default '', + `phone_mobile` varchar(20) NOT NULL default '', + `ip` varchar(20) NOT NULL default '', + `title` varchar(200) NOT NULL default '', + `alias` varchar(255) NOT NULL default '', + `message` text NOT NULL, + `date` datetime NOT NULL default '0000-00-00 00:00:00', + `published` tinyint(1) NOT NULL default '0', + `checked_out` int(11) NOT NULL default '0', + `checked_out_time` datetime NOT NULL default '0000-00-00 00:00:00', + `ordering` int(11) NOT NULL DEFAULT '0', + `params` text NOT NULL, + `language` char(7) NOT NULL default '', + PRIMARY KEY (`id`), + KEY `published` (`published`) +) DEFAULT CHARSET=utf8; + -- Data @@ -1055,10 +1115,72 @@ INSERT INTO `#__phocacart_form_fields` ( `title`, `label`, `description`, `type` -- ALTER TABLE `#__phocacart_order_total` CHANGE `amount` `amount` DECIMAL( 15, 4 ) NOT NULL DEFAULT '0'; +-- --------- +-- RC2 -> RC3 +-- --------- +-- ALTER TABLE `#__phocacart_countries` ADD `image` varchar(255) NOT NULL DEFAULT ''; +-- ALTER TABLE `#__phocacart_regions` ADD `image` varchar(255) NOT NULL DEFAULT ''; +-- ALTER TABLE `#__phocacart_currencies` ADD `image` varchar(255) NOT NULL DEFAULT ''; +-- ALTER TABLE `#__phocacart_users` ADD `image` varchar(255) NOT NULL DEFAULT ''; +-- ALTER TABLE `#__phocacart_order_statuses` ADD `image` varchar(255) NOT NULL DEFAULT ''; +-- ALTER TABLE `#__phocacart_taxes` ADD `image` varchar(255) NOT NULL DEFAULT ''; +-- ALTER TABLE `#__phocacart_feeds` ADD `image` varchar(255) NOT NULL DEFAULT ''; +-- ALTER TABLE `#__phocacart_tags` ADD `image` varchar(255) NOT NULL DEFAULT ''; +-- ALTER TABLE `#__phocacart_products` ADD `min_multiple_quantity` int(11) NOT NULL DEFAULT '0'; +-- ALTER TABLE `#__phocacart_attribute_values` ADD `color` varchar(50) NOT NULL DEFAULT ''; +-- ALTER TABLE `#__phocacart_attribute_values` ADD `type` tinyint(1) NOT NULL DEFAULT '0'; +-- ALTER TABLE `#__phocacart_attribute_values` ADD `params` text; +-- ALTER TABLE `#__phocacart_attribute_values` ADD `image_small` varchar(255) NOT NULL DEFAULT ''; +-- ALTER TABLE `#__phocacart_attribute_values` ADD `image_medium` varchar(255) NOT NULL DEFAULT ''; - - +-- New table added +-- --------------- +--CREATE TABLE IF NOT EXISTS `#__phocacart_wishlists` ( +-- `id` int(11) NOT NULL AUTO_INCREMENT, +-- `product_id` int(11) NOT NULL DEFAULT '0', +-- `category_id` int(11) NOT NULL DEFAULT '0', +-- `user_id` int(11) NOT NULL DEFAULT '0', +-- `title` varchar(255) NOT NULL DEFAULT '', +-- `alias` varchar(255) NOT NULL DEFAULT '', +-- `ip` varchar(40) NOT NULL DEFAULT '', +-- `user_agent` varchar(255) NOT NULL DEFAULT '', +-- `quantity` int(11) NOT NULL DEFAULT '0', +-- `type` tinyint(1) NOT NULL DEFAULT '0', +-- `priority` tinyint(1) NOT NULL DEFAULT '0', +-- `published` tinyint(1) NOT NULL DEFAULT '0', +-- `checked_out` int(11) unsigned NOT NULL DEFAULT '0', +-- `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', +-- `ordering` int(11) NOT NULL DEFAULT '0', +-- `date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', +-- `params` text, +-- PRIMARY KEY (`id`) +--) DEFAULT CHARSET=utf8; + +--CREATE TABLE IF NOT EXISTS `#__phocacart_questions` ( +-- `id` int(11) unsigned NOT NULL auto_increment, +-- `product_id` int(11) NOT NULL default '0', +-- `category_id` int(11) NOT NULL default '0', +-- `user_id` int(11) NOT NULL default '0', +-- `question_id` int(11) NOT NULL default '0', +-- `name` varchar(100) NOT NULL default '', +-- `email` varchar(50) NOT NULL default '', +-- `phone` varchar(20) NOT NULL default '', +-- `phone_mobile` varchar(20) NOT NULL default '', +-- `ip` varchar(20) NOT NULL default '', +-- `title` varchar(200) NOT NULL default '', +-- `alias` varchar(255) NOT NULL default '', +-- `message` text NOT NULL, +-- `date` datetime NOT NULL default '0000-00-00 00:00:00', +-- `published` tinyint(1) NOT NULL default '0', +-- `checked_out` int(11) NOT NULL default '0', +-- `checked_out_time` datetime NOT NULL default '0000-00-00 00:00:00', +-- `ordering` int(11) NOT NULL DEFAULT '0', +-- `params` text NOT NULL, +-- `language` char(7) NOT NULL default '', +-- PRIMARY KEY (`id`), +-- KEY `published` (`published`) +--) DEFAULT CHARSET=utf8; diff --git a/install/sql/mysql/uninstall.utf8.sql b/install/sql/mysql/uninstall.utf8.sql index e54a508e..5c0ef57f 100644 --- a/install/sql/mysql/uninstall.utf8.sql +++ b/install/sql/mysql/uninstall.utf8.sql @@ -41,4 +41,7 @@ DROP TABLE IF EXISTS `#__phocacart_order_coupons`; DROP TABLE IF EXISTS `#__phocacart_order_total`; DROP TABLE IF EXISTS `#__phocacart_order_history`; DROP TABLE IF EXISTS `#__phocacart_order_downloads`; -DROP TABLE IF EXISTS `#__phocacart_logs`; \ No newline at end of file +DROP TABLE IF EXISTS `#__phocacart_logs`; +DROP TABLE IF EXISTS `#__phocacart_feeds`; +DROP TABLE IF EXISTS `#__phocacart_wishlists`; +DROP TABLE IF EXISTS `#__phocacart_questions`; \ No newline at end of file diff --git a/language/en-GB/en-GB.com_phocacart.ini b/language/en-GB/en-GB.com_phocacart.ini index de10eced..387a81fd 100644 --- a/language/en-GB/en-GB.com_phocacart.ini +++ b/language/en-GB/en-GB.com_phocacart.ini @@ -15,7 +15,179 @@ COM_PHOCACART_ORDER_PROCESSED_DOWNLOADABLE_ITEMS_ADDITIONAL_INFO="" COM_PHOCACART_ORDER_PAYMENT_PROCESSED_ADDITIONAL_INFO="" COM_PHOCACART_ORDER_PAYMENT_PROCESSED_DOWNLOADABLE_ITEMS_ADDITIONAL_INFO="" COM_PHOCACART_ORDER_PAYMENT_CANCELED_ADDITIONAL_INFO="" +COM_PHOCACART_FIELD_IP_BAN_DESC="Add the IP(s) you want to block, to the IP(s) Ban list. Separate each IP with a comma (,)" +COM_PHOCACART_FIELD_IP_BAN_LABEL="IP Ban" +;[3.0.0 RC3] +COM_PHOCACART_ITEMS="Items" +COM_PHOCACART_FIELD_FADE_IN_ACTION_ICONS_LABEL="Fade In Action Icons" +COM_PHOCACART_FIELD_FADE_IN_ACTION_ICONS_DESC="Display action icons with javascript effect (fade in)" +COM_PHOCACART_FIELD_DISPLAY_QUICK_VIEW_ICON_LABEL="Display Quick View Icon" +COM_PHOCACART_FIELD_DISPLAY_QUICK_VIEW_ICON_DESC="Display or hide Quick View icon" +COM_PHOCACART_QUICK_VIEW="Quick View" +COM_PHOCACART_PROCEED_TO_WISH_LIST="Proceed to wish list" +COM_PHOCACART_PRODUCT_REMOVED_FROM_WISH_LIST="Product removed from wish list" +COM_PHOCACART_PRODUCT_NOT_REMOVED_FROM_WISH_LIST="Product not removed from wishl list" +COM_PHOCACART_THERE_ARE_NO_PRODUCTS_IN_YOUR_WISH_LIST="There are no products in your wish list" +COM_PHOCACART_VIEW_WISH_LIST="View Wish list" +COM_PHOCACART_REMOVE_FROM_WISH_LIST="Remove from wish list" +COM_PHOCACART_REMOVE_FROM_COMPARISON_LIST="Remove from comparison list" +COM_PHOCACART_PRODUCT_NOT_ADDED_TO_WISH_LIST="Product not added to wish list" +COM_PHOCACART_PRODUCT_NOT_REMOVED_FROM_WISH_LIST="Product not removed from wish list" +COM_PHOCACART_PRODUCT_ADDED_TO_WISH_LIST="Product added to wish list" +COM_PHOCACART_PRODUCT_INCLUDED_IN_WISH_LIST="Product is included in wish list" +COM_PHOCACART_NOT_LOGGED_IN_PLEASE_LOGIN="You are not logged in. Please login." +COM_PHOCACART_COUNT_OF_PRODUCTS_IN_WISH_LIST_IS_LIMITED="Count of products in wish list is limited" +COM_PHOCACART_FIELD_DISPLAY_WISH_LIST_ICON_LABEL="Display Wish List Icon" +COM_PHOCACART_FIELD_DISPLAY_WISH_LIST_ICON_DESC="Display or hide Wish List icon" +COM_PHOCACART_ADD_TO_WISH_LIST="Add to Wish List" +COM_PHOCACART_FIELD_ADD_TO_WISH_LIST_METHOD_LABEL="Add To Wish List Method" +COM_PHOCACART_FIELD_ADD_TO_WISH_LIST_METHOD_DESC="Select method of how the products will be added to the wish list." +COM_PHOCACART_WISH_LISTS="Wish Lists" +COM_PHOCACART_WISH_LIST="Wish List" +COM_PHOCACART_FIELD_SWITCH_IMAGE_CATEGORY_ITEMS_VIEW_LABEL="Switch Image" +COM_PHOCACART_FIELD_SWITCH_IMAGE_CATEGORY_ITEMS_VIEW_DESC="Enable or disable switch image effect for Category or Items View. Products must include at least two images" +COM_PHOCACART_QUESTION="Question" +COM_PHOCACART_FIELD_CATEGORY_ID_LABEL="Category ID" +COM_PHOCACART_FIELD_CATEGORY_ID_DESC="Set category ID" +COM_PHOCACART_FIELD_EMAIL_LABEL="Email" +COM_PHOCACART_FIELD_EMAIL_LABEL="Set email" +COM_PHOCACART_FIELD_IP_LABEL="IP" +COM_PHOCACART_FIELD_IP_LABEL="Set IP" +COM_PHOCACART_FIELD_MESSAGE_LABEL="Message" +COM_PHOCACART_FIELD_MESSAGE_LABEL="Set message" +COM_PHOCACART_FIELD_ASK_A_QUESTON_BUTTON_ITEM_VIEW_LABEL="Ask A Question Button" +COM_PHOCACART_FIELD_ASK_A_QUESTON_BUTTON_ITEM_VIEW_DESC="Display or hide Ask A Question button in Product view. Ask A Question function needs to be enabled in Ask Question/Feedback/Report Options" +COM_PHOCACART_FIELD_ASK_A_QUESTON_POPUP_ITEM_VIEW_LABEL="Ask A Question Popup" +COM_PHOCACART_FIELD_ASK_A_QUESTON_POPUP_ITEM_VIEW_DESC="Display Ask A Question form in Popup window or on standard page" +COM_PHOCACART_ASK_A_QUESTION="Ask a Question" +COM_PHOCACART_FIELD_ENABLE_TIME_CHECK_QUESTION_LABEL="Enable Time Check" +COM_PHOCACART_FIELD_ENABLE_TIME_CHECK_QUESTION_DESC="If time check is enabled, user cannot post the message after a few seconds. Define time in seconds. If zero, this parameter will be disabled." +COM_PHOCACART_BAD_EMAIL="Please enter valid email address" +COM_PHOCACART_REGARDS="Regards" +COM_PHOCACART_CLICK_LINK_READ_FULL_POST="Click the link to read full post" +COM_PHOCACART_FIELD_DISPLAY_NAME_FORM_LABEL="Display Name In Form" +COM_PHOCACART_FIELD_DISPLAY_NAME_FORM_DESC="Display or hide name in Ask Question form" +COM_PHOCACART_FIELD_DISPLAY_EMAIL_FORM_LABEL="Display Email In Form" +COM_PHOCACART_FIELD_DISPLAY_EMAIL_FORM_DESC="Display or hide email in Ask Question form" +COM_PHOCACART_FIELD_DISPLAY_PHONE_FORM_LABEL="Display Phone In Form" +COM_PHOCACART_FIELD_DISPLAY_PHONE_FORM_DESC="Display or hide phone in Ask Question form" +COM_PHOCACART_FIELD_DISPLAY_MESSAGE_FORM_LABEL="Display Message In Form" +COM_PHOCACART_FIELD_DISPLAY_MESSAGE_FORM_DESC="Display or hide message in Ask Question form" +COM_PHOCACART_FIELD_ENABLE_CAPTCHA_FORM_LABEL="Enable Captcha In Form" +COM_PHOCACART_FIELD_ENABLE_CAPTCHA_FORM_DESC="Enable or disable captcha in Ask Question form" +COM_PHOCACART_YES_REQUIRED="Yes (Required)" +COM_PHOCACART_POSSIBLE_SPAM_DETECTED="Possible Spam Detected" +COM_PHOCACART_SESSION_INVALID="Invalid session" +COM_PHOCACART_SUBMIT_TOO_FAST="Possible spam detected. Form entered too fast." +COM_PHOCACART_THANK_YOU_FOR_LEAVING_INFORMATION_ASKING_QUESTION="Thank you for leaving your information and asking your question. We will contact you as soon as possible" +COM_PHOCACART_FIELD_MAXIMUM_CHARACTERS_MESSAGE_LABEL="Maximum Characters" +COM_PHOCACART_FIELD_MAXIMUM_CHARACTERS_MESSAGE_DESC="Set maximum number of characters in Message field, they can be saved in database" +COM_PHOCACART_FIELD_MAXIMUM_CHARACTERS_MESSAGE_EMAIL_LABEL="Maximum Characters (Email)" +COM_PHOCACART_FIELD_MAXIMUM_CHARACTERS_MESSAGE_EMAIL_DESC="Set maximum number of characters in Message field, they can be sent in email" +COM_PHOCACART_FIELD_SEND_EMAIL_QUESTION_DESC="Send Email to selected user" +COM_PHOCACART_FIELD_SEND_EMAIL_QUESTION_LABEL="Send Email" +COM_PHOCACART_NEW_QUESTION="New Question" +COM_PHOCACART_NEW_POST_ADDED="New Post Added" +COM_PHOCACART_FROM="From" +COM_PHOCACART_SUBJECT="Subject" +COM_PHOCACART_FIELD_ENABLE_HIDDEN_FIELD_QUESTION_LABEL="Enable Hidden Field" +COM_PHOCACART_FIELD_ENABLE_HIDDEN_FIELD_QUESTION_DESC="Enable or disable hidden field. Some spam bots try to fill all the fields on the site, if they fill this hidden field, which human does not see, the entry will be not added into the Ask Question form." +COM_PHOCACART_FIELD_FORBIDDEN_WHOLE_WORD_FILTER_QUESTION_LABEL="Forbidden Whole Word Filter" +COM_PHOCACART_FIELD_FORBIDDEN_WHOLE_WORD_FILTER_QUESTION_DESC="Set whole forbidden words. If some will be included in Ask Question form then form will be not stored and sent. Separate each word with a comma (,)" +COM_PHOCACART_FIELD_FORBIDDEN_WORD_FILTER_QUESTION_LABEL="Forbidden Word Filter" +COM_PHOCACART_FIELD_FORBIDDEN_WORD_FILTER_QUESTION_DESC="Set forbidden words. If some will be included in Ask Question form then form will be not stored and sent. Separate each word with a comma (,)" +COM_PHOCACART_FIELD_SESSION_SUFFIX_LABEL="Session Suffix" +COM_PHOCACART_FIELD_SESSION_SUFFIX_DESC="Set session suffix (It is a security feature to change the name of session, set unique suffix, for example: a100b20c3)" +COM_PHOCACART_FIELD_RECAPTCHA_SITEKEY_LABEL="reCAPTCHA Site Key" +COM_PHOCACART_FIELD_RECAPTCHA_SITEKEY_DESC="Set reCAPTCHA Site Key which is needed to display reCAPTCHA code" +COM_PHOCACART_FIELD_RECAPTCHA_PRIVATEKEY_LABEL="reCAPTCHA Private Key" +COM_PHOCACART_FIELD_RECAPTCHA_PRIVATEKEY_DESC="Set reCAPTCHA Private Key which is needed to communicate reCAPTCHA server" +COM_PHOCACART_SECURITY_OPTIONS_LABEL="Security Options" +COM_PHOCACART_WRONG_CAPTCHA="The Captcha code you have entered is wrong. Please, try it again" +COM_PHOCACART_FIELD_ENABLE_ASK_QUESTION_LABEL="Enable Ask Question" +COM_PHOCACART_FIELD_ENABLE_ASK_QUESTION_DESC="Enable or disable Ask Question/Feedback/Report function. If Ask Question/Feedback/Report is not used on your site, disable this parameter (because of possible spam attempts)" +COM_PHOCACART_ASK_QUESTION_DISABLED="Ask Question function is disabled" +COM_PHOCACART_YES_ONLY_IF_ADD_TO_CART_NOT_DISPLAYED="Yes (Only if Add To Cart button is not displayed)" +COM_PHOCACART_PLEASE_PROVE_THAT_YOU_ARE_HUMAN="Please prove that you are human" +COM_PHOCACART_SECURITY_CHECK="Security Check" +COM_PHOCACART_FIELD_F_NAME_LABEL="Name" +COM_PHOCACART_FIELD_F_NAME_DESC="Please fill in your name" +COM_PHOCACART_FIELD_F_EMAIL_LABEL="Email" +COM_PHOCACART_FIELD_F_EMAIL_DESC="Please fill in your email address" +COM_PHOCACART_FIELD_F_PHONE_LABEL="Phone" +COM_PHOCACART_FIELD_F_PHONE_DESC="Please fill in your phone" +COM_PHOCACART_FIELD_F_MOBILE_PHONE_LABEL="Mobile Phone" +COM_PHOCACART_FIELD_F_MOBILE_PHONE_DESC="Please fill in your mobile phone" +COM_PHOCACART_FIELD_F_MESSAGE_LABEL="Message" +COM_PHOCACART_FIELD_F_MESSAGE_DESC="Please fill in the message" +COM_PHOCACART_NO_ERROR="No (Error)" +COM_PHOCACART_CHART="Chart" +COM_PHOCACART_TOP_5="Top 5" +COM_PHOCACART_ALL_PRODUCTS="All products" +COM_PHOCACART_CATEGORY_VIEW="Category View" +COM_PHOCACART_FIELD_MIN_MULTIPLE_ORDER_QUANTITY_DESC="Set minimum multiple of ordered quantity of the current product. For example: If you set 6, then customers will be able to order 6 or 12 or 18, etc. products but not e.g. 15." +COM_PHOCACART_FIELD_MIN_MULTIPLE_ORDER_QUANTITY_LABEL="Minimum Multiple Order Quantity" +COM_PHOCACART_MINIMUM_MULTIPLE_ORDER_QUANTITY="Minumum multiple order quantity" +COM_PHOCACART_MINIMUM_MULTIPLE_ORDER_QUANTITY_FOR_PRODUCT="Minimum multiple of order quantity for product" +COM_PHOCACART_MINIMUM_MULTIPLE_ORDER_QUANTITY_OF_ONE_OR_MORE_PRODUCTS_NOT_MET_UPDATE_QUANTITY_BEFORE_ORDERING="Requirement of minimum multiple of ordered quantity of one or more products not met. Please update the quantity before finishing the order." +COM_PHOCACART_FIELD_ZERO_PRICE_TEXT_LABEL="Zero Price Text" +COM_PHOCACART_FIELD_ZERO_PRICE_TEXT_DESC="Set text which will be displayed instead of zero (0) in case the price is zero (0)" +COM_PHOCACART_FIELD_ZERO_PRICE_LABEL_LABEL="Zero Price Label" +COM_PHOCACART_FIELD_ZERO_PRICE_LABEL_DESC="Set text which will be displayed instead of price label in case the price is zero (0). If empty (no text set) then standard text 'Price' will be displayed. If '0' is set then no label will be displayed. If some text is set then this text will be displayed as price label. See documentation for examples." +COM_PHOCACART_ERROR_NO_ITEMS_SELECTED="Error - no items selected" +COM_PHOCACART_ERROR_LOADFILE_FAILED="Error loading form file" +COM_PHOCACART_ERROR_FILE_NOT_FOUND="File not found" +COM_PHOCACART_ERROR_ALERTNOAUTHOR="You are not authorised to view this resource." +COM_PHOCACART_PDF="PDF" +COM_PHOCACART_INVOICE_NR="Invoice Nr." +COM_PHOCACART_FIELD_EMAIL_ATTACHMENT_LABEL="Email Attachment" +COM_PHOCACART_FIELD_EMAIL_ATTACHMENT_TYPE_LABEL="Email Attachment Type" +COM_PHOCACART_FIELD_EMAIL_ATTACHMENT_TYPE_DESC="Set which type of document format will be sent as email attachment. in case document attachment ((Purchase Order, Invoice/Receipt, Delivery Note) is selected when sending email." +COM_PHOCACART_HTML="HTML" +COM_PHOCACART_PDF="PDF" +COM_PHOCACART_BOTH="Both" +COM_PHOCACART_CATALOG_OPTIONS_LABEL="Catalog Options" +COM_PHOCACART_FIELD_HIDE_PRICES_LABEL="Hide Product Prices" +COM_PHOCACART_FIELD_HIDE_PRICES_DESC="Display or hide product prices" +COM_PHOCACART_FIELD_HIDE_ADD_TO_CART_LABEL="Hide Add To Cart Button" +COM_PHOCACART_FIELD_HIDE_ADD_TO_CART_DESC="Display or hide Add To Cart button. With this parameter you can hide all the Add To Cart buttons in component. To hide the button for selected view only, see Display tab in Options." +COM_PHOCACART_FIELD_HIDE_ATTRIBUTES_LABEL="Hide Product Attributes" +COM_PHOCACART_FIELD_HIDE_ATTRIBUTES_DESC="Display or hide product attributes" +COM_PHOCACART_FIELD_DISPLAY_VIEW_CATEGORY_BUTTON_LABEL="Display View Category Button" +COM_PHOCACART_FIELD_DISPLAY_VIEW_CATEGORY_BUTTON_DESC="Display or hide View Category button" +COM_PHOCACART_CATEGORY_AND_ITEMS_VIEW_LABEL="Category and Items View (Products View)" +COM_PHOCACART_FIELD_CATEGORY_NAME_AS_LINK_LABEL="Category Name As Link" +COM_PHOCACART_FIELD_CATEGORY_NAME_AS_LINK_DESC="Display category name as link to category view" +COM_PHOCACART_FIELD_DISPLAY_VIEW_PRODUCT_BUTTON_LABEL="Display View Product Button" +COM_PHOCACART_FIELD_DISPLAY_VIEW_PRODUCT_BUTTON_DESC="Display or hide View Product button" +COM_PHOCACART_FIELD_PRODUCT_NAME_AS_LINK_LABEL="Product Name As Link" +COM_PHOCACART_FIELD_PRODUCT_NAME_AS_LINK_DESC="Display product name as link to product view" +COM_PHOCACART_YES_ICON_ONLY="Yes (Icon Only)" +COM_PHOCACART_YES_STANDARD_ICON_ONLY="Yes (Standard - Icon Only)" +COM_PHOCACART_FORM_SELECT_COLOR="Select Color" +COM_PHOCACART_COLOR="Color" +COM_PHOCACART_ATTR_TYPE_COLOR="Color" +COM_PHOCACART_IMAGES="Images" +COM_PHOCACART_LARGE_IMAGE="Large Image" +COM_PHOCACART_SMALL_IMAGE="Small Image" +COM_PHOCACART_LARGE="Large" +COM_PHOCACART_SMALL="Small" +COM_PHOCACART_ATTR_TYPE_IMAGE="Image" +COM_PHOCACART_FIELD_CROP_THUMBNAIL_DESC="Set which thumbnails should be cropped" +COM_PHOCACART_FIELD_CROP_THUMBNAIL_LABEL="Crop Thumbnails" +COM_PHOCACART_ONLY_LARGE_THUMBNAIL="Only large thumbnails" +COM_PHOCACART_ONLY_MEDIUM_THUMBNAIL="Only medium thumbnails" +COM_PHOCACART_ONLY_SMALL_THUMBNAIL="Only small thumbnails" +COM_PHOCACART_LARGE_AND_MEDIUM_THUMBNAIL="Large and medium thumbnails" +COM_PHOCACART_SMALL_AND_LARGE_THUMBNAIL="Small and large thumbnails" +COM_PHOCACART_MEDIUM_AND_SMALL_THUMBNAIL="Medium and small thumbnails" +COM_PHOCACART_NONE="None" +COM_PHOCACART_QUESTIONS="Questions" +COM_PHOCACART_EMAIL="Email" +COM_PHOCACART_ASK_QUESTION_FEEDBACK_REPORT_OPTIONS_LABEL="Ask Question/Feedback/Report Options" +COM_PHOCACART_FIELD_ASK_QUESTION_DESCRIPTION_LABEL="Ask Question Description" +COM_PHOCACART_FIELD_ASK_QUESTION_DESCRIPTION_DESC="Set description for Ask Question form" ;[3.0.0 RC2] COM_PHOCACART_FOR_THE_WHOLE_PERIOD="for the whole period" @@ -199,12 +371,12 @@ COM_PHOCACART_BUY_NOW="Buy Now" COM_PHOCACART_YES_BUY_NOW_PADDLE="Yes - Buy Now (Paddle)" COM_PHOCACART_YES_STANDARD="Yes (Standard)" COM_PHOCACART_FIELD_ADD_TO_CART_ITEMS_VIEW_LABEL="Add To Cart (Items View)" -COM_PHOCACART_FIELD_ADD_TO_CART_ITEMS_VIEW_DESC="Display or hide Add To Cart button in Items View. If displayed, set which type of button will be displayed." +COM_PHOCACART_FIELD_ADD_TO_CART_ITEMS_VIEW_DESC="Display or hide Add To Cart button in Items View (Products View). If displayed, set which type of button will be displayed." COM_PHOCACART_FIELD_ADD_TO_CART_ITEM_VIEW_LABEL="Add To Cart (Item View)" COM_PHOCACART_FIELD_ADD_TO_CART_ITEM_VIEW_DESC="Display or hide Add To Cart button in Item View. If displayed, set which type of button will be displayed." COM_PHOCACART_FIELD_ADD_TO_CART_CATEGORY_VIEW_LABEL="Add To Cart (Category View)" COM_PHOCACART_FIELD_ADD_TO_CART_CATEGORY_VIEW_DESC="Display or hide Add To Cart button in Category View. If displayed, set which type of button will be displayed." -COM_PHOCACART_ITEMS_VIEW_LABEL="Items View" +COM_PHOCACART_ITEMS_VIEW_LABEL="Items View (Products View)" COM_PHOCACART_SEARCH_ALL_PRODUCTS="All products" COM_PHOCACART_SEARCH_FILTERED_PRODUCTS="Filtered products" COM_PHOCACART_SEARCH="Search" diff --git a/language/en-GB/en-GB.com_phocacart.sys.ini b/language/en-GB/en-GB.com_phocacart.sys.ini index 364d7038..9b73fc3e 100644 --- a/language/en-GB/en-GB.com_phocacart.sys.ini +++ b/language/en-GB/en-GB.com_phocacart.sys.ini @@ -10,22 +10,30 @@ ; - +;[3.0.0 RC3] +COM_PHOCACART_ASK_QUESTION_LAYOUT="Ask Question (Feedback, Report) View" +COM_PHOCACART_ASK_QUESTION_LAYOUT_DESC="This view displays Ask Question (Feedback, Report) form" +COM_PHOCACART_TERMS_LAYOUT="Terms And Conditions View" +COM_PHOCACART_TERMS_LAYOUT_DESC="This view displays Terms And Conditions" +COM_PHOCACART_QUESTIONS="Questions" +COM_PHOCACART_WISH_LISTS="Wish Lists" +COM_PHOCACART_WISH_LIST_LAYOUT="Wish List View" +COM_PHOCACART_WISH_LIST_LAYOUT_DESC="This view displays Wish List View" ;[3.0.0 RC] COM_PHOCACART_XML_FEEDS="XML Feeds" -COM_PHOCACART_XML_FEED_LAYOUT="XML Feed Layout" +COM_PHOCACART_XML_FEED_LAYOUT="XML Feed View" COM_PHOCACART_XML_FEED_LAYOUT_DESC="This view displays XML feed" ;[3.0.0 Beta2] -COM_PHOCACART_ITEM_LIST_LAYOUT="Product List Layout" -COM_PHOCACART_ITEM_LIST_LAYOUT_DESC="This view displays list of products" +COM_PHOCACART_ITEM_LIST_LAYOUT="Products View (Product list layout)" +COM_PHOCACART_ITEM_LIST_LAYOUT_DESC="This view displays list of products (items) in Products View" ;[3.0.0 Beta1] COM_PHOCACART_STATISTICS="Statistics" COM_PHOCACART_SYSTEM_LOG="System Log" -COM_PHOCACART_CATEGORY_LIST_LAYOUT="Category List Layout" -COM_PHOCACART_CATEGORY_LIST_LAYOUT_DESC="This view displays list of products" -COM_PHOCACART_ITEM_LAYOUT="Product Layout" -COM_PHOCACART_ITEM_LAYOUT_DESC="This view displays product view" +COM_PHOCACART_CATEGORY_LAYOUT="Category View (Product list layout)" +COM_PHOCACART_CATEGORY_LAYOUT_DESC="This view displays list of products (items) in Category View" +COM_PHOCACART_ITEM_LAYOUT="Product View (Product layout)" +COM_PHOCACART_ITEM_LAYOUT_DESC="This view displays Product View - product details" ;[3.0.0 Alpha2] COM_PHOCACART_PAYMENT="Payment" @@ -34,7 +42,7 @@ COM_PHOCACART_UPDATE_TEXT="Phoca Cart Updated" COM_PHOCACART_VERSION="Version" PHOCACART="Phoca Cart" COM_PHOCACART="Phoca Cart" -COM_PHOCACART_XML_DESCRIPTION="Phoca Cart is a Joomla! component. Eshop for Joomla! CMS." +COM_PHOCACART_XML_DESCRIPTION="Phoca Cart is a Joomla! component. E-commerce solution for Joomla! CMS." COM_PHOCACART_UPGRADE="Upgrade" COM_PHOCACART_INSTALL="Install" COM_PHOCACART_CONTROLPANEL="Control Panel" @@ -58,8 +66,8 @@ COM_PHOCACART_DOWNLOADS="Downloads" COM_PHOCACART_TAGS="Tags" COM_PHOCACART_INFO="Info" -COM_PHOCACART_CATEGORIES_LIST_LAYOUT="Categories List Layout" -COM_PHOCACART_CATEGORIES_LIST_LAYOUT_DESC="This view displays list of categories" +COM_PHOCACART_CATEGORIES_LAYOUT="Categories View (Category list layout - default view)" +COM_PHOCACART_CATEGORIES_LAYOUT_DESC="This view displays list of categories" COM_PHOCACART_ORDERS_LAYOUT="Orders Layout" COM_PHOCACART_ORDERS_LAYOUT_DESC="This view displays list of user's orders" COM_PHOCACART_COMPARISON_LAYOUT="Comparison Layout" diff --git a/libraries/loader.php b/libraries/loader.php index 8a23fdba..dce805ad 100644 --- a/libraries/loader.php +++ b/libraries/loader.php @@ -22,7 +22,7 @@ public static function import($filePath, $base = null, $key = 'libraries.') { if (!isset($paths[$keyPath])) { if ( !$base ) { - $base = JPATH_ADMINISTRATOR.DS.'components'.DS.'com_phocacart'.DS.'libraries'; + $base = JPATH_ADMINISTRATOR.'/components/com_phocacart/libraries'; } $parts = explode( '.', $filePath ); @@ -40,18 +40,18 @@ public static function import($filePath, $base = null, $key = 'libraries.') { break; } - $path = str_replace( '.', DS, $filePath ); + $path = str_replace( '.', '/', $filePath ); if (strpos($filePath, 'phocacart') === 0) { $className = 'PhocaCart'.$className; - $classes = JLoader::register($className, $base.DS.$path.'.php'); + $classes = JLoader::register($className, $base.'/'.$path.'.php'); $rs = isset($classes[strtolower($className)]); } else { // If it is not in the joomla namespace then we have no idea if // it uses our pattern for class names/files so just include // if the file exists or set it to false if not - $filename = $base.DS.$path.'.php'; + $filename = $base.'/'.$path.'.php'; if (is_file($filename)) { $rs = (bool) include $filename; } else { diff --git a/libraries/phocacart/attribute/attribute.php b/libraries/phocacart/attribute/attribute.php index 34592963..af63d1d1 100644 --- a/libraries/phocacart/attribute/attribute.php +++ b/libraries/phocacart/attribute/attribute.php @@ -32,7 +32,7 @@ public static function getOptionsById($attributeId, $returnArray = 0) { $db =JFactory::getDBO(); - $query = 'SELECT a.id, a.title, a.alias, a.amount, a.operator, a.stock, a.operator_weight, a.weight, a.image'; + $query = 'SELECT a.id, a.title, a.alias, a.amount, a.operator, a.stock, a.operator_weight, a.weight, a.image, a.image_small, a.color'; $query .= ' FROM #__phocacart_attribute_values AS a' .' WHERE a.attribute_id = '.(int) $attributeId .' ORDER BY a.id'; @@ -47,7 +47,11 @@ public static function getOptionsById($attributeId, $returnArray = 0) { } public static function getTypeArray() { - $o = array('1' => JText::_('COM_PHOCACART_ATTR_TYPE_SELECT')); + $o = array( + '1' => JText::_('COM_PHOCACART_ATTR_TYPE_SELECT'), + '2' => JText::_('COM_PHOCACART_ATTR_TYPE_COLOR'), + '3' => JText::_('COM_PHOCACART_ATTR_TYPE_IMAGE'), + ); return $o; } @@ -123,12 +127,12 @@ public static function storeAttributesById($productId, $attributesArray) { } $v2['alias'] = PhocaCartUtils::getAliasName($v2['alias']); - $options[] = '('.(int)$newId.', '.$db->quote($v2['title']).', '.$db->quote($v2['alias']).', '.$db->quote($v2['operator']).', '.$db->quote($v2['amount']).', '.(int)$v2['stock'].', '.$db->quote($v2['operator_weight']).', '.$db->quote($v2['weight']).', '.$db->quote($v2['image']).')'; + $options[] = '('.(int)$newId.', '.$db->quote($v2['title']).', '.$db->quote($v2['alias']).', '.$db->quote($v2['operator']).', '.$db->quote($v2['amount']).', '.(int)$v2['stock'].', '.$db->quote($v2['operator_weight']).', '.$db->quote($v2['weight']).', '.$db->quote($v2['image']).', '.$db->quote($v2['image_small']).', '.$db->quote($v2['color']).')'; if (!empty($options)) { $valuesString2 = implode($options, ','); } } - $query = ' INSERT INTO #__phocacart_attribute_values (attribute_id, title, alias, operator, amount, stock, operator_weight, weight, image)' + $query = ' INSERT INTO #__phocacart_attribute_values (attribute_id, title, alias, operator, amount, stock, operator_weight, weight, image, image_small, color)' .' VALUES '.(string)$valuesString2; $db->setQuery($query); @@ -161,7 +165,7 @@ public static function getAllAttributesAndOptions() { $db = JFactory::getDBO(); - $query = 'SELECT v.id, v.title, v.alias, at.id AS attrid, at.title AS attrtitle, at.alias AS attralias' + $query = 'SELECT v.id, v.title, v.alias, v.image, v.image_small, v.color, at.id AS attrid, at.title AS attrtitle, at.alias AS attralias, at.type as attrtype' .' FROM #__phocacart_attribute_values AS v' .' LEFT JOIN #__phocacart_attributes AS at ON at.id = v.attribute_id' .' GROUP BY v.alias, attralias' @@ -178,13 +182,17 @@ public static function getAllAttributesAndOptions() { $a[$v->attralias]['title'] = $v->attrtitle; $a[$v->attralias]['id'] = $v->attrid; $a[$v->attralias]['alias'] = $v->attralias; + $a[$v->attralias]['type'] = $v->attrtype; if (isset($v->title) && $v->title != '' && isset($v->id) && $v->id != '' && isset($v->alias) && $v->alias != '') { $a[$v->attralias]['option'][$v->alias] = new stdClass(); - $a[$v->attralias]['option'][$v->alias]->title = $v->title; - $a[$v->attralias]['option'][$v->alias]->id = $v->id; - $a[$v->attralias]['option'][$v->alias]->alias = $v->alias; + $a[$v->attralias]['option'][$v->alias]->title = $v->title; + $a[$v->attralias]['option'][$v->alias]->id = $v->id; + $a[$v->attralias]['option'][$v->alias]->alias = $v->alias; + $a[$v->attralias]['option'][$v->alias]->image = $v->image; + $a[$v->attralias]['option'][$v->alias]->image_small = $v->image_small; + $a[$v->attralias]['option'][$v->alias]->color = $v->color; } else { $a[$v->attralias]['option'] = array(); } @@ -198,7 +206,7 @@ public static function getAllAttributesAndOptions() { public static function getAttributeValue($id, $attributeId) { $db =JFactory::getDBO(); - $query = ' SELECT a.id, a.title, a.alias, a.amount, a.operator, a.weight, a.operator_weight, a.stock, a.image,' + $query = ' SELECT a.id, a.title, a.alias, a.amount, a.operator, a.weight, a.operator_weight, a.stock, a.image, a.image_small, a.color,' .' aa.id as aid, aa.title as atitle' .' FROM #__phocacart_attribute_values AS a' .' LEFT JOIN #__phocacart_attributes AS aa ON a.attribute_id = aa.id' diff --git a/libraries/phocacart/captcha/index.html b/libraries/phocacart/captcha/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/libraries/phocacart/captcha/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/libraries/phocacart/captcha/recaptcha.php b/libraries/phocacart/captcha/recaptcha.php new file mode 100644 index 00000000..0907d06e --- /dev/null +++ b/libraries/phocacart/captcha/recaptcha.php @@ -0,0 +1,58 @@ +get( 'recaptcha_sitekey', '' ))); + + $document->addScript('https://www.google.com/recaptcha/api.js'); + return '
'; + } + public static function isValid() { + + $app = JFactory::getApplication(); + $pC = JComponentHelper::getParams('com_phocacart') ; + $secretKey = strip_tags(trim($pC->get( 'recaptcha_privatekey', '' ))); + //$response = $app->input->post->get('g-recaptcha-response', '', 'string'); + //$response = $_POST['g-recaptcha-response']; + $response = $app->input->post->get('g-recaptcha-response', '', 'string'); + $remoteIp = $_SERVER['REMOTE_ADDR']; + + try { + + $url = 'https://www.google.com/recaptcha/api/siteverify'; + $data = ['secret' => $secretKey, + 'response' => $response, + 'remoteip' => $remoteIp]; + + $options = [ + 'http' => [ + 'header' => "Content-type: application/x-www-form-urlencoded\r\n", + 'method' => 'POST', + 'content' => http_build_query($data) + ] + ]; + + $context = stream_context_create($options); + $result = file_get_contents($url, false, $context); + + //$resultString = print_r($result, true); + //PhocaCartLog::add(1, 'Ask a Question - Captcha Result', 0, $resultString); + return json_decode($result)->success; + } + catch (Exception $e) { + return null; + } + } +} +?> diff --git a/libraries/phocacart/cart/cart.php b/libraries/phocacart/cart/cart.php index 92ba4e80..68ddbc6d 100644 --- a/libraries/phocacart/cart/cart.php +++ b/libraries/phocacart/cart/cart.php @@ -32,6 +32,7 @@ class PhocaCartCart protected $couponvalid = 0;// is the coupon valid - all three tests - basic, advanced, total protected $stockvalid = 1;// check stock - products, attributes (no matter if stock checking is disabled or enabled) protected $minqtyvalid = 1;// check minimum order quantity + protected $minmltpqtyvalid = 1;// check minimum multiple order quantity public function __construct() { $session = JFactory::getSession(); @@ -322,14 +323,15 @@ public function setFullItems() { $this->fullitems[$k]['stock'] = 0; // database value set in product settings $this->fullitems[$k]['stockvalid'] = 1; // variable to inform if stock validity is ok $this->fullitems[$k]['minqty'] = 0; // database value set in product settings + $this->fullitems[$k]['minmltpqty'] = 0; $this->fullitems[$k]['minqtyvalid'] = 1; // varible to inform if minimum order is ok + $this->fullitems[$k]['minmltpqtyvalid'] = 1; // Group $this->fullitemsgroup[$itemId]['id'] = (int)$itemId; $this->fullitemsgroup[$itemId]['title'] = ''; - $attribs = array(); if (!empty($item[1])) { $attribs = unserialize(base64_decode($item[1])); @@ -363,10 +365,12 @@ public function setFullItems() { $this->fullitems[$k]['volume'] = $item2->volume; $this->fullitems[$k]['stock'] = $item2->stock; $this->fullitems[$k]['minqty'] = $item2->min_quantity; + $this->fullitems[$k]['minmltpqty'] = $item2->min_multiple_quantity; // Group - $this->fullitemsgroup[$itemId]['minqty'] = $item2->min_quantity; - $this->fullitemsgroup[$itemId]['title'] = $item2->title; + $this->fullitemsgroup[$itemId]['minqty'] = $item2->min_quantity; + $this->fullitemsgroup[$itemId]['minmltpqty'] = $item2->min_multiple_quantity; + $this->fullitemsgroup[$itemId]['title'] = $item2->title; //$this->fullitems[$k]['netto'] *= $fQ; $this->total['netto'] += ($this->fullitems[$k]['netto'] * $fQ); @@ -395,9 +399,10 @@ public function setFullItems() { $taxSuffix = ''; if ($item2->taxcalctype == 1) { - $taxSuffix = ' ('.$item2->taxrate.'%)'; + $taxSuffix = ' ('.($price->getTaxFormat($item2->taxrate, $item2->taxcalctype, 0)).')'; } - $this->total['tax'][$item2->taxid]['title'] = $item2->taxtitle . $taxSuffix ; + + $this->total['tax'][$item2->taxid]['title'] = $item2->taxtitle . $taxSuffix; $this->total['tax'][$item2->taxid]['type'] = $item2->taxcalctype; $this->total['tax'][$item2->taxid]['rate'] = $item2->taxrate; @@ -588,7 +593,7 @@ public function setFullItems() { } } - + // Last place to influence $k // STOCK VALID CHECK @@ -623,7 +628,15 @@ public function setFullItems() { $this->fullitemsgroup[$itemId]['minqtyvalid'] = 1; } - if (((int)$this->fullitemsgroup[$itemId]['quantity']) < (int)$this->fullitemsgroup[$itemId]['minqty']) { + if (!isset($this->fullitemsgroup[$itemId]['minmltpqtyvalid'])) { + $this->fullitemsgroup[$itemId]['minmltpqtyvalid'] = 1; + } + + if (empty($this->fullitemsgroup[$itemId]['minqty'])) { + $this->minqtyvalid = 1; + $this->fullitemsgroup[$itemId]['minqtyvalid'] = 1; + + } else if ((int)$this->fullitemsgroup[$itemId]['quantity'] < (int)$this->fullitemsgroup[$itemId]['minqty']) { $this->minqtyvalid = 0; $this->fullitemsgroup[$itemId]['minqtyvalid'] = 0; } else { @@ -632,6 +645,23 @@ public function setFullItems() { $this->fullitemsgroup[$itemId]['minqtyvalid'] = 1; } + if (empty($this->fullitemsgroup[$itemId]['minmltpqty'])) { + $this->minmltpqtyvalid = 1; + $this->fullitemsgroup[$itemId]['minmltpqtyvalid'] = 1; + } else if ($this->fullitemsgroup[$itemId]['minmltpqty'] == 0) { + // Do not modulo by zere + // Set it back because we are in foreach + $this->minmltpqtyvalid = 1; + $this->fullitemsgroup[$itemId]['minmltpqtyvalid'] = 1; + } else if (((int)$this->fullitemsgroup[$itemId]['quantity']) % (int)$this->fullitemsgroup[$itemId]['minmltpqty'] != 0) { + $this->minmltpqtyvalid = 0; + $this->fullitemsgroup[$itemId]['minmltpqtyvalid'] = 0; + } else { + // Set it back because we are in foreach + $this->minmltpqtyvalid = 1; + $this->fullitemsgroup[$itemId]['minmltpqtyvalid'] = 1; + } + } // COUPON total check @@ -815,6 +845,10 @@ public function getMinimumQuantityValid() { return $this->minqtyvalid; } + public function getMinimumMultipleQuantityValid() { + return $this->minmltpqtyvalid; + } + public function addShippingCosts($shippingId = 0) { if ($shippingId == 0) { diff --git a/libraries/phocacart/cart/cartdb.php b/libraries/phocacart/cart/cartdb.php index 6284d8c5..695a0681 100644 --- a/libraries/phocacart/cart/cartdb.php +++ b/libraries/phocacart/cart/cartdb.php @@ -60,7 +60,7 @@ public static function emptyCartDb($userId) { } public final function __clone() { - JError::raiseWarning(500, 'Function Error: Cannot clone instance of Singleton pattern');// No JText - for developers only + throw new Exception('Function Error: Cannot clone instance of Singleton pattern', 500); return false; } } diff --git a/libraries/phocacart/cart/rendercart.php b/libraries/phocacart/cart/rendercart.php index 01420aec..e7328393 100644 --- a/libraries/phocacart/cart/rendercart.php +++ b/libraries/phocacart/cart/rendercart.php @@ -28,7 +28,7 @@ public function render() { $this->fullitems = $this->getFullItems();// get them from parent } - + if (!empty($this->fullitems)) { $o[] = ''; /*echo ''; diff --git a/libraries/phocacart/cart/rendercheckout.php b/libraries/phocacart/cart/rendercheckout.php index 5daba61a..4fb161ff 100644 --- a/libraries/phocacart/cart/rendercheckout.php +++ b/libraries/phocacart/cart/rendercheckout.php @@ -45,6 +45,11 @@ public function render() { $o[] = '
'.JText::_('COM_PHOCACART_MINIMUM_ORDER_QUANTITY_FOR_PRODUCT'). ' '.$v['title']. ' '.JText::_('COM_PHOCACART_IS').': '.$v['minqty'].'
'; } + + if (isset($v['minmltpqtyvalid']) && $v['minmltpqtyvalid'] == 0) { + $o[] = '
'.JText::_('COM_PHOCACART_MINIMUM_MULTIPLE_ORDER_QUANTITY_FOR_PRODUCT'). ' '.$v['title']. ' '.JText::_('COM_PHOCACART_IS').': '.$v['minmltpqty'].'
'; + + } } } @@ -75,6 +80,7 @@ public function render() { $o[] = ''; + foreach($this->fullitems as $k => $v) { $link = PhocaCartRoute::getItemRoute((int)$v['id'], (int)$v['catid'], $v['alias']); @@ -120,9 +126,9 @@ public function render() { $o[] = ''; $o[] = ''; //UPDATE - $o[] = ' '; + $o[] = ' '; //DELETE - $o[] = ' '; + $o[] = ' '; $o[] = JHtml::_('form.token'); $o[] = ''; $o[] = ''; diff --git a/libraries/phocacart/category/category.php b/libraries/phocacart/category/category.php index 4029e334..7a011e48 100644 --- a/libraries/phocacart/category/category.php +++ b/libraries/phocacart/category/category.php @@ -341,7 +341,7 @@ public static function getActiveCategoryId() { public final function __clone() { - JError::raiseWarning(500, 'Function Error: Cannot clone instance of Singleton pattern');// No JText - for developers only + throw new Exception('Function Error: Cannot clone instance of Singleton pattern', 500); return false; } } diff --git a/libraries/phocacart/compare/compare.php b/libraries/phocacart/compare/compare.php index 8a09b88f..1c6fe68f 100644 --- a/libraries/phocacart/compare/compare.php +++ b/libraries/phocacart/compare/compare.php @@ -95,7 +95,7 @@ public function getQueryList($items, $full = 0){ ' SELECT a.id as id, a.title as title, a.alias as alias, a.description, a.price, a.image,' .' c.id as catid, c.alias as catalias, c.title as cattitle, count(pc.category_id) AS count_categories,' .' a.length, a.width, a.height, a.weight, a.volume,' - .' a.stock, a.min_quantity, a.stockstatus_a_id, a.stockstatus_n_id, a.availability,' + .' a.stock, a.min_quantity, a.min_multiple_quantity, a.stockstatus_a_id, a.stockstatus_n_id, a.availability,' .' m.title as manufacturer_title' .' FROM #__phocacart_products AS a' .' LEFT JOIN #__phocacart_product_categories AS pc ON pc.product_id = a.id' diff --git a/libraries/phocacart/currency/currency.php b/libraries/phocacart/currency/currency.php index 9ec7add6..063cc033 100644 --- a/libraries/phocacart/currency/currency.php +++ b/libraries/phocacart/currency/currency.php @@ -179,7 +179,7 @@ public static function getCurrenciesListBox() { public final function __clone() { - JError::raiseWarning(500, 'Function Error: Cannot clone instance of Singleton pattern');// No JText - for developers only + throw new Exception('Function Error: Cannot clone instance of Singleton pattern', 500); return false; } } diff --git a/libraries/phocacart/email/email.php b/libraries/phocacart/email/email.php index a94c7172..b9c6a168 100644 --- a/libraries/phocacart/email/email.php +++ b/libraries/phocacart/email/email.php @@ -8,11 +8,180 @@ */ defined('_JEXEC') or die(); +class PhocaCartEmailMail extends JMail{ + + + public static function getInstance($id = 'Joomla', $exceptions = true) + { + if (empty(self::$instances[$id])) + { + self::$instances[$id] = new PhocaCartEmailMail($exceptions); + } + + return self::$instances[$id]; + } + + // PHOCAEDIT + //public function sendMail($from, $fromName, $recipient, $subject, $body, $mode = false, $cc = null, $bcc = null, $attachment = null, + // $replyTo = null, $replyToName = null) + public function sendMailA($from, $fromName, $recipient, $subject, $body, $mode = false, $cc = null, $bcc = null, $attachmentString = '', $attachmentFileName = '', $replyTo = null, $replyToName = null) + { + + + $this->setSubject($subject); + $this->setBody($body); + + // Are we sending the email as HTML? + $this->isHtml($mode); + + /* + * Do not send the message if adding any of the below items fails + */ + + if ($this->addRecipient($recipient) === false) + { + return false; + } + + if ($this->addCc($cc) === false) + { + return false; + } + + if ($this->addBcc($bcc) === false) + { + return false; + } + + // PHOCAEDIT + if ($attachmentString != '' && $attachmentFileName != '') { + if ($this->addStringAttachment($attachmentString, $attachmentFileName) === false) + { + return false; + } + } + + // Take care of reply email addresses + if (is_array($replyTo)) + { + $numReplyTo = count($replyTo); + + for ($i = 0; $i < $numReplyTo; $i++) + { + if ($this->addReplyTo($replyTo[$i], $replyToName[$i]) === false) + { + return false; + } + } + } + elseif (isset($replyTo)) + { + if ($this->addReplyTo($replyTo, $replyToName) === false) + { + return false; + } + } + + // Add sender to replyTo only if no replyTo received + $autoReplyTo = (empty($this->ReplyTo)) ? true : false; + + if ($this->setSender(array($from, $fromName, $autoReplyTo)) === false) + { + return false; + } + + return $this->Send(); + } + +} + + + +class PhocaCartEmailFactory extends JFactory{ + + public static $mailer = null; + + public static function getMailer() + { + if (!self::$mailer) + { + self::$mailer = self::createMailer(); + } + + $copy = clone self::$mailer; + + return $copy; + } + + protected static function createMailer() + { + $conf = self::getConfig(); + + $smtpauth = ($conf->get('smtpauth') == 0) ? null : 1; + $smtpuser = $conf->get('smtpuser'); + $smtppass = $conf->get('smtppass'); + $smtphost = $conf->get('smtphost'); + $smtpsecure = $conf->get('smtpsecure'); + $smtpport = $conf->get('smtpport'); + $mailfrom = $conf->get('mailfrom'); + $fromname = $conf->get('fromname'); + $mailer = $conf->get('mailer'); + + // Create a JMail object + $mail = PhocaCartEmailMail::getInstance(); + + // Clean the email address + $mailfrom = JMailHelper::cleanLine($mailfrom); + + // Set default sender without Reply-to if the mailfrom is a valid address + if (JMailHelper::isEmailAddress($mailfrom)) + { + // Wrap in try/catch to catch phpmailerExceptions if it is throwing them + try + { + // Check for a false return value if exception throwing is disabled + if ($mail->setFrom($mailfrom, JMailHelper::cleanLine($fromname), false) === false) + { + PhocaCartLog::add(1, 'Error sending email', 0, __METHOD__ . '() could not set the sender data. Warning: ' . JLog::WARNING, 'Mail From: '.$mailfrom ); + JLog::add(__METHOD__ . '() could not set the sender data.', JLog::WARNING, 'mail'); + } + } + catch (phpmailerException $e) + { + PhocaCartLog::add(1, 'Error sending email', 0, __METHOD__ . '() could not set the sender data. Warning: ' . JLog::WARNING, 'Mail From: '.$mailfrom ); + JLog::add(__METHOD__ . '() could not set the sender data.', JLog::WARNING, 'mail'); + } + } + + // Default mailer is to use PHP's mail function + switch ($mailer) + { + case 'smtp': + $mail->useSmtp($smtpauth, $smtphost, $smtpuser, $smtppass, $smtpsecure, $smtpport); + break; + + case 'sendmail': + $mail->isSendmail(); + break; + + default: + $mail->isMail(); + break; + } + + return $mail; + } +} + + + class PhocaCartEmail { - public static function sendEmail($from = '', $fromName = '', $recipient, $subject, $body, $mode = false, $cc = null, $bcc = null, $attachment = null, $replyTo = null, $replyToName = null) { + public static function sendEmail($from = '', $fromName = '', $recipient, $subject, $body, $mode = false, $cc = array(), $bcc = array(), $attachmentString = '', $attachmentFilename = '', $replyTo = null, $replyToName = null) { + + //public static function sendEmail($from = '', $fromName = '', $recipient, $subject, $body, $mode = false, $cc = array(), $bcc = array(), $attachment = null, $replyTo = null, $replyToName = null) { $config = JFactory::getConfig(); @@ -23,7 +192,19 @@ public static function sendEmail($from = '', $fromName = '', $recipient, $subjec $fromName = $config->get('fromname'); } + if ($replyTo == '') { + $replyTo = $from; + } + if ($replyToName == '') { + $replyToName = $fromName; + } + if ($cc == '') { + $cc = array(); + } + if ($bcc == '') { + $bcc = array(); + } // Attachment /*if (!empty($tmpl['attachment'])) { $i = 0; @@ -38,13 +219,27 @@ public static function sendEmail($from = '', $fromName = '', $recipient, $subjec $i++; } }*/ + $subject = html_entity_decode($subject, ENT_QUOTES); + $body = html_entity_decode($body, ENT_QUOTES); - $subject = html_entity_decode($subject, ENT_QUOTES); - $body = html_entity_decode($body, ENT_QUOTES); + $mail = PhocaCartEmailFactory::getMailer(); + + + $body = $body . PhocaCartUtils::getInfo($mode); + + $sendMail = $mail->sendMailA($from, $fromName, $recipient, $subject, $body, $mode, $cc, $bcc, $attachmentString, $attachmentFilename, $replyTo, $replyToName); + + + if (isset($sendMail->message)) { + PhocaCartLog::add(1, 'Error sending email', 0, $sendMail->message . ', Mail From: '.$mailfrom ); + return false; + } else if ($sendMail == 1) { + return true; + } else { + PhocaCartLog::add(1, 'Error sending email', 0, 'No error data set, Mail From: '.$mailfrom ); + return false; + } - $mail = JFactory::getMailer(); - return $mail->sendMail($from, $fromName, $recipient, $subject, $body, $mode, $cc, $bcc, $attachment, - $replyTo, $replyToName); } public static function completeMail($body, $replace) { @@ -66,5 +261,74 @@ public static function completeMail($body, $replace) { return $body; } + + public static function sendQuestionMail ($id, $data, $url, $tmpl) { + + $app = JFactory::getApplication(); + $db = JFactory::getDBO(); + $sitename = $app->getCfg( 'sitename' ); + $paramsC = JComponentHelper::getParams('com_phocacart') ; + $numCharEmail = $paramsC->get( 'max_char_question_email', 1000 ); + + //get all selected users + $query = 'SELECT name, email, sendEmail' . + ' FROM #__users' . + ' WHERE id = '.(int)$id; + $db->setQuery( $query ); + $rows = $db->loadObjectList(); + + $subject = $sitename .' - '.JText::_( 'COM_PHOCACART_NEW_QUESTION' ); + if (isset($data['product']->title) && $data['product']->title != '') { + $subject .= ', '.JText::_('COM_PHOCACART_PRODUCT'). ': '. $data['product']->title; + } + if (isset($data['category']->title) && $data['category']->title != '') { + $subject .= ', '.JText::_('COM_PHOCACART_CATEGORY'). ': '. $data['category']->title; + } + + + + if (isset($data['name']) && $data['name'] != '') { + $fromname = $data['name']; + } else { + $fromname = 'Unknown'; + } + + if (isset($data['email']) && $data['email'] != '') { + $mailfrom = $data['email']; + } else { + $mailfrom = $rows[0]->email; + } + + if (isset($data['message']) && $data['message'] != '') { + $message = $data['message']; + } else { + $message = "..."; + } + + $email = $rows[0]->email; + + $message = str_replace("

", "\n", $message ); + $message = strip_tags($message); + + $message = JText::_( 'COM_PHOCACART_NEW_POST_ADDED' ) . "\n\n" + . JText::_( 'COM_PHOCACART_FROM' ) . ': '. $fromname . "\n" + . JText::_( 'COM_PHOCACART_DATE' ) . ': '. JHTML::_('date', gmdate('Y-m-d H:i:s'), JText::_( 'DATE_FORMAT_LC2' )) . "\n\n" + . JText::_( 'COM_PHOCACART_SUBJECT' ) . ': '.$subject."\n" + . JText::_( 'COM_PHOCACART_MESSAGE' ) . ': '."\n" + . "\n\n" + .PhocaCartUtils::wordDelete($message, $numCharEmail, '...')."\n\n" + . "\n\n" + //. JText::_( 'COM_PHOCACART_CLICK_LINK_READ_FULL_POST' ) ."\n" + . $url."\n\n" + . JText::_( 'COM_PHOCACART_REGARDS' ) .", \n" + . $sitename ."\n"; + + $subject = html_entity_decode($subject, ENT_QUOTES); + $message = html_entity_decode($message, ENT_QUOTES); + + $notify = PhocaCartEmail::sendEmail($mailfrom, $fromname, $email, $subject, $message, false, null, null, '', '', $mailfrom, $fromname); + + return $notify; + } } ?> \ No newline at end of file diff --git a/libraries/phocacart/file/file.php b/libraries/phocacart/file/file.php index 7d52c254..1d48830f 100644 --- a/libraries/phocacart/file/file.php +++ b/libraries/phocacart/file/file.php @@ -40,7 +40,7 @@ public static function getFileSizeReadable ($size, $retstring = null, $onlyMB = public static function getFileSize($manager, $filename, $readable = 1) { $path = PhocaCartPath::getPath($manager); - $fileNameAbs = JPath::clean($path['orig_abs'] . DS . $filename); + $fileNameAbs = JPath::clean($path['orig_abs'] . '/' . $filename); if ($readable == 1) { return self::getFileSizeReadable(filesize($fileNameAbs)); @@ -52,7 +52,7 @@ public static function getFileSize($manager, $filename, $readable = 1) { public static function getFileTime($manager, $filename, $function, $format = "d. M Y") { $path = PhocaDownloadPath::getPath($manager); - $fileNameAbs = JPath::clean($path['orig_abs'] . DS . $filename); + $fileNameAbs = JPath::clean($path['orig_abs'] . '/' . $filename); if (JFile::exists($fileNameAbs)) { switch($function) { case 2: @@ -99,7 +99,6 @@ public static function getMimeType($extension, $params) { preg_match($regex_one,$phocaDownload,$phocaDownloadParts); $values_replace = array ("/^'/", "/'$/", "/^'/", "/'$/", "/
/"); $values = explode("=", $phocaDownloadParts[2], 2); - foreach ($values_replace as $key2 => $values2) { $values = preg_replace($values2, '', $values); } diff --git a/libraries/phocacart/file/filethumbnail.php b/libraries/phocacart/file/filethumbnail.php index c501948a..c2c6640b 100644 --- a/libraries/phocacart/file/filethumbnail.php +++ b/libraries/phocacart/file/filethumbnail.php @@ -27,20 +27,20 @@ public static function getThumbnailName($filename, $size, $manager) { switch ($size) { case 'large': $fileNameThumb = 'phoca_thumb_l_'. $title; - $thumbName->abs = JPath::clean(str_replace($title, 'thumbs'. DS . $fileNameThumb, $path['orig_abs_ds'] . $filename)); + $thumbName->abs = JPath::clean(str_replace($title, 'thumbs/' . $fileNameThumb, $path['orig_abs_ds'] . $filename)); $thumbName->rel = str_replace ($title, 'thumbs/' . $fileNameThumb, $path['orig_rel_ds'] . $filename); break; case 'medium': $fileNameThumb = 'phoca_thumb_m_'. $title; - $thumbName->abs = JPath::clean(str_replace($title, 'thumbs'. DS . $fileNameThumb, $path['orig_abs_ds'] . $filename)); + $thumbName->abs = JPath::clean(str_replace($title, 'thumbs/' . $fileNameThumb, $path['orig_abs_ds'] . $filename)); $thumbName->rel = str_replace ($title, 'thumbs/' . $fileNameThumb, $path['orig_rel_ds'] . $filename); break; default: case 'small': $fileNameThumb = 'phoca_thumb_s_'. $title; - $thumbName->abs = JPath::clean(str_replace($title, 'thumbs' . DS . $fileNameThumb, $path['orig_abs_ds'] . $filename)); + $thumbName->abs = JPath::clean(str_replace($title, 'thumbs/' . $fileNameThumb, $path['orig_abs_ds'] . $filename)); $thumbName->rel = str_replace ($title, 'thumbs/' . $fileNameThumb, $path['orig_rel_ds'] . $filename); break; } @@ -98,20 +98,20 @@ public static function getOrCreateThumbnail($fileNo, $refreshUrl, $small = 0, $m //$additional_thumbnails = $paramsC->get( 'additional_thumbnails',0 ); $path = PhocaCartPath::getPath($manager); - $origPathServer = str_replace(DS, '/', $path['orig_abs_ds']); + $origPathServer = str_replace('\\', '/', $path['orig_abs_ds']); $file['name'] = PhocaCartFile::getTitleFromFilenameWithExt($fileNo); $file['name_no'] = ltrim($fileNo, '/'); $file['name_original_abs'] = PhocaCartFile::getFileOriginal($fileNo, 0, $manager); $file['name_original_rel'] = PhocaCartFile::getFileOriginal($fileNo, 1, $manager); $file['path_without_file_name_original']= str_replace($file['name'], '', $file['name_original_abs']); - $file['path_without_file_name_thumb'] = str_replace($file['name'], '', $file['name_original_abs'] . 'thumbs' . DS); - //$file['path_without_name'] = str_replace(DS, '/', JPath::clean($origPathServer)); + $file['path_without_file_name_thumb'] = str_replace($file['name'], '', $file['name_original_abs'] . 'thumbs' . '/'); + //$file['path_without_name'] = str_replace('\\', '/', JPath::clean($origPathServer)); //$file['path_with_name_relative_no'] = str_replace($origPathServer, '', $file['name_original']); /* $file['path_with_name_relative'] = $path['orig_rel_ds'] . str_replace($origPathServer, '', $file['name_original']); $file['path_with_name_relative_no'] = str_replace($origPathServer, '', $file['name_original']); - $file['path_without_name'] = str_replace(DS, '/', JPath::clean($origPath.DS)); + $file['path_without_name'] = str_replace('\\', '/', JPath::clean($origPath.'/')); $file['path_without_name_relative'] = $path['orig_rel_ds'] . str_replace($origPathServer, '', $file['path_without_name']); $file['path_without_name_relative_no'] = str_replace($origPathServer, '', $file['path_without_name']); $file['path_without_name_thumbs'] = $file['path_without_name'] .'thumbs'; @@ -301,7 +301,7 @@ public static function createThumbnailFolder($folderOriginal, $folderThumbnail, //JFolder::create($folderThumbnail, $folder_permissions ); if (isset($folderThumbnail)) { $data = "\n\n\n"; - JFile::write($folderThumbnail.DS."index.html", $data); + JFile::write($folderThumbnail."/index.html", $data); } // folder was not created if (!JFolder::exists($folderThumbnail)) { diff --git a/libraries/phocacart/file/fileupload.php b/libraries/phocacart/file/fileupload.php index bfde1e1c..e46d3bf4 100644 --- a/libraries/phocacart/file/fileupload.php +++ b/libraries/phocacart/file/fileupload.php @@ -32,7 +32,7 @@ public static function realMultipleUpload( $frontEnd = 0) { header("Pragma: no-cache"); // Invalid Token - JRequest::checkToken( 'request' ) or jexit(json_encode(array( 'jsonrpc' => '2.0', 'result' => 'error', 'code' => 100, + JSession::checkToken('request') or jexit(json_encode(array( 'jsonrpc' => '2.0', 'result' => 'error', 'code' => 100, 'message' => JText::_('COM_PHOCACART_ERROR').': ', 'details' => JTEXT::_('COM_PHOCACART_INVALID_TOKEN')))); @@ -40,11 +40,12 @@ public static function realMultipleUpload( $frontEnd = 0) { $ftp = JClientHelper::setCredentialsFromRequest('ftp'); - $file = JRequest::getVar( 'file', '', 'files', 'array' ); - $chunk = JRequest::getVar( 'chunk', 0, '', 'int' ); - $chunks = JRequest::getVar( 'chunks', 0, '', 'int' ); - $folder = JRequest::getVar( 'folder', '', '', 'path' ); - $manager = JRequest::getVar( 'manager', 'file', '', 'string' ); + //$file = JFactory::getApplication()->input->get( 'file', '', 'files', 'array' ); + $file = JFactory::getApplication()->input->files->get( 'file', null, 'raw'); + $chunk = JFactory::getApplication()->input->get( 'chunk', 0, '', 'int' ); + $chunks = JFactory::getApplication()->input->get( 'chunks', 0, '', 'int' ); + $folder = JFactory::getApplication()->input->get( 'folder', '', '', 'path' ); + $manager = JFactory::getApplication()->input->get( 'manager', 'file', '', 'string' ); $path = PhocaCartPath::getPath($manager);// we use viewback to get right path @@ -56,7 +57,7 @@ public static function realMultipleUpload( $frontEnd = 0) { $file['name'] = JFile::makeSafe($file['name']); } if (isset($folder) && $folder != '') { - $folder = $folder . DS; + $folder = $folder . '/'; } $chunkEnabled = 0; @@ -93,7 +94,7 @@ public static function realMultipleUpload( $frontEnd = 0) { // and we recognize there is one - ok don't upload it BUT the file will be damaged by // parts uploaded by the new file - so this is why we are using temp file in Chunk method $stream = JFactory::getStream();// Chunk Files - $tempFolder = 'pcpluploadtmpfolder'.DS; + $tempFolder = 'pcpluploadtmpfolder'.'/'; $filepathImgFinal = JPath::clean($path['orig_abs_ds'].$folder.strtolower($file['name'])); $filepathImgTemp = JPath::clean($path['orig_abs_ds'].$folder.$tempFolder.strtolower($file['name'])); $filepathFolderFinal = JPath::clean($path['orig_abs_ds'].$folder); @@ -301,6 +302,7 @@ public static function realMultipleUpload( $frontEnd = 0) { if(!JFile::upload($file['tmp_name'], $filepathImgFinal, false, true)) { + PhocaCartLog::add(1, 'Error uploading file - JFile upload Ajax', 0, 'File: '.$file['name'].', File Path: '.$filepathImgFinal ); jexit(json_encode(array( 'jsonrpc' => '2.0', 'result' => 'error', 'code' => 109, 'message' => JText::_('COM_PHOCACART_ERROR').': ', 'details' => JTEXT::_('COM_PHOCACART_ERROR_UNABLE_TO_UPLOAD_FILE') .'
' @@ -319,6 +321,7 @@ public static function realMultipleUpload( $frontEnd = 0) { } } else { // No isset $file['name'] + PhocaCartLog::add(1, 'Error uploading file - Filename does not exist', 0, 'File: File does not exist - Multiple Upload ' ); jexit(json_encode(array( 'jsonrpc' => '2.0', 'result' => 'error', 'code' => 104, 'message' => JText::_('COM_PHOCACART_ERROR').': ', @@ -337,22 +340,23 @@ public static function realSingleUpload( $frontEnd = 0 ) { $overwriteExistingFiles = $paramsC->get( 'overwrite_existing_files', 0 ); $app = JFactory::getApplication(); - JRequest::checkToken( 'request' ) or jexit( 'ERROR: '. JTEXT::_('COM_PHOCACART_INVALID_TOKEN')); + JSession::checkToken('request') or jexit( 'ERROR: '. JTEXT::_('COM_PHOCACART_INVALID_TOKEN')); JResponse::allowCache(false); - $file = JRequest::getVar( 'Filedata', '', 'files', 'array' ); - $folder = JRequest::getVar( 'folder', '', '', 'path' ); - $format = JRequest::getVar( 'format', 'html', '', 'cmd'); - $return = JRequest::getVar( 'return-url', null, 'post', 'base64' );//includes field - $viewBack = JRequest::getVar( 'viewback', '', '', '' ); - $manager = JRequest::getVar( 'manager', 'file', '', 'string' ); - $tab = JRequest::getVar( 'tab', '', '', 'string' ); - $field = JRequest::getVar( 'field' ); + $file = JFactory::getApplication()->input->files->get( 'Filedata', null, 'raw'); + //$file = JRequest::getVar( 'Filedata', '', 'files', 'array' ); + $folder = JFactory::getApplication()->input->get( 'folder', '', '', 'path' ); + $format = JFactory::getApplication()->input->get( 'format', 'html', '', 'cmd'); + $return = JFactory::getApplication()->input->get( 'return-url', null, 'post', 'base64' );//includes field + $viewBack = JFactory::getApplication()->input->get( 'viewback', '', '', '' ); + $manager = JFactory::getApplication()->input->get( 'manager', 'file', '', 'string' ); + $tab = JFactory::getApplication()->input->get( 'tab', '', '', 'string' ); + $field = JFactory::getApplication()->input->get( 'field' ); $errUploadMsg = ''; $folderUrl = $folder; $tabUrl = ''; - $component = JRequest::getVar( 'option', '', '', 'string' ); + $component = JFactory::getApplication()->input->get( 'option', '', '', 'string' ); $path = PhocaCartPath::getPath($manager);// we use viewback to get right path @@ -376,7 +380,7 @@ public static function realSingleUpload( $frontEnd = 0 ) { if (isset($folder) && $folder != '') { - $folder = $folder . DS; + $folder = $folder . '/'; } @@ -420,6 +424,8 @@ public static function realSingleUpload( $frontEnd = 0 ) { } if (!JFile::upload($file['tmp_name'], $filepath, false, true)) { + + PhocaCartLog::add(1, 'Error uploading file - JFile upload', 0, 'File: '.$file['name'].', File Path: '.$filepath ); if ($return) { $app->enqueueMessage( JText::_('COM_PHOCACART_ERROR_UNABLE_TO_UPLOAD_FILE'), 'error'); $app->redirect(base64_decode($return).'&manager='.(string)$manager.'&folder='.$folderUrl); @@ -448,6 +454,7 @@ public static function realSingleUpload( $frontEnd = 0 ) { } } } else { + PhocaCartLog::add(1, 'Error uploading file - Filename does not exist', 0, 'File: File does not exist (Single Upload)' ); $msg = JText::_('COM_PHOCACART_ERROR_UNABLE_TO_UPLOAD_FILE'); if ($return) { $app->enqueueMessage($msg); diff --git a/libraries/phocacart/file/fileuploadmultiple.php b/libraries/phocacart/file/fileuploadmultiple.php index d20c9d57..abc67581 100644 --- a/libraries/phocacart/file/fileuploadmultiple.php +++ b/libraries/phocacart/file/fileuploadmultiple.php @@ -73,9 +73,7 @@ static public function renderMultipleUploadLibraries() { static public function getMultipleUploadSizeFormat($size) { $readableSize = PhocaCartFile::getFileSizeReadable($size, '%01.0f %s', 1); - $readableSize = str_replace(' ', '', $readableSize); - $readableSize = strtolower($readableSize); return $readableSize; } diff --git a/libraries/phocacart/filter/filter.php b/libraries/phocacart/filter/filter.php index 31fed793..d8b8cd5f 100644 --- a/libraries/phocacart/filter/filter.php +++ b/libraries/phocacart/filter/filter.php @@ -11,9 +11,15 @@ class PhocaCartFilter { public $taglist = false; + public $tag = false; public $manufacturer = false; public $price = false; public $attributes = false; + public $specifications = false; + + public $enable_color_filter = false; + public $enable_image_filter = false; + public $image_style_image_filter = false; public function __construct() {} @@ -26,6 +32,11 @@ public function renderList() { $layout = new JLayoutFile('form_filter_checkbox', $basePath = JPATH_ROOT .'/components/com_phocacart/layouts'); $layout2 = new JLayoutFile('form_filter_text', $basePath = JPATH_ROOT .'/components/com_phocacart/layouts'); $layout3 = new JLayoutFile('form_filter_checkbox_categories', $basePath = JPATH_ROOT .'/components/com_phocacart/layouts'); + $layout4 = new JLayoutFile('form_filter_color', $basePath = JPATH_ROOT .'/components/com_phocacart/layouts'); + $layout5 = new JLayoutFile('form_filter_image', $basePath = JPATH_ROOT .'/components/com_phocacart/layouts'); + + + $pathProductImage = PhocaCartPath::getPath('productimage'); // =FILTER= $data['getparams'] = array(); @@ -69,8 +80,6 @@ public function renderList() { } } - - // -PRICE- $data['param'] = 'price_from'; $data['param2'] = 'price_to'; @@ -127,6 +136,7 @@ public function renderList() { if ($this->attributes) { phocacartimport('phocacart.attribute.attribute'); $attributes = PhocaCartAttribute::getAllAttributesAndOptions(); + if (!empty($attributes)) { foreach($attributes as $k => $v) { $data = array(); @@ -134,11 +144,25 @@ public function renderList() { $data['title'] = $v['title']; $data['items'] = $v['option']; $data['getparams'] = $this->getArrayParamValues($data['param'], 'array'); - $data['formtype'] = 'checked'; $data['uniquevalue']= 0; + $data['pathitem'] = $pathProductImage; if (!empty($data['items'])) { - $o[] = $layout->render($data); + + if ($this->enable_color_filter && isset($v['type']) && ($v['type'] == 2)) { + // Color + $data['formtype'] = 'text'; + $o[] = $layout4->render($data); + } else if ($this->enable_image_filter && isset($v['type']) && ($v['type'] == 3)) { + // Image + $data['formtype'] = 'text'; + $data['style'] = strip_tags($this->image_style_image_filter); + $o[] = $layout5->render($data); + } else { + // Select + $data['formtype'] = 'checked'; + $o[] = $layout->render($data); + } } } } diff --git a/libraries/phocacart/form/formuser.php b/libraries/phocacart/form/formuser.php index db60ebb7..dc57f35f 100644 --- a/libraries/phocacart/form/formuser.php +++ b/libraries/phocacart/form/formuser.php @@ -148,7 +148,7 @@ public static function getFormXml($billingSuffix = '', $shippingSuffix = '_phs', } public final function __clone() { - JError::raiseWarning(500, 'Function Error: Cannot clone instance of Singleton pattern');// No JText - for developers only + throw new Exception('Function Error: Cannot clone instance of Singleton pattern', 500); return false; } } diff --git a/libraries/phocacart/html/batch.php b/libraries/phocacart/html/batch.php index 2d3ac679..92602485 100644 --- a/libraries/phocacart/html/batch.php +++ b/libraries/phocacart/html/batch.php @@ -24,7 +24,7 @@ public static function item($published, $category = 0) //build the list of categories $query = 'SELECT a.title AS text, a.id AS value, a.parent_id as parentid' . ' FROM #__phocacart_categories AS a' - // TODO. ' WHERE a.published = '.(int)$published + // TO DO. ' WHERE a.published = '.(int)$published . ' ORDER BY a.ordering'; $db->setQuery( $query ); $data = $db->loadObjectList(); diff --git a/libraries/phocacart/html/grid.php b/libraries/phocacart/html/grid.php index 95f7fe7d..a2704863 100644 --- a/libraries/phocacart/html/grid.php +++ b/libraries/phocacart/html/grid.php @@ -8,7 +8,7 @@ */ defined('_JEXEC') or die(); if (! class_exists('JHtmlGrid')) { - require_once( JPATH_SITE.DS.'libraries'.DS.'joomla'.DS.'html'.DS.'html'.DS.'grid.php' ); + require_once( JPATH_SITE.'/libraries/joomla/html/html/grid.php' ); } //jimport('joomla.html.html.jgrid'); class PhocaCartGrid extends JHtmlJGrid diff --git a/libraries/phocacart/html/jgrid.php b/libraries/phocacart/html/jgrid.php index 58cf5d27..f515fb46 100644 --- a/libraries/phocacart/html/jgrid.php +++ b/libraries/phocacart/html/jgrid.php @@ -14,7 +14,7 @@ */ if (! class_exists('JHtmlJGrid')) { - require_once( JPATH_SITE.DS.'libraries'.DS.'joomla'.DS.'html'.DS.'html'.DS.'jgrid.php' ); + require_once( JPATH_SITE.'/libraries/joomla/html/html/jgrid.php' ); } class PhocaCartJGrid extends JHtmlJGrid diff --git a/libraries/phocacart/order/order.php b/libraries/phocacart/order/order.php index 3f669caa..966ae98e 100644 --- a/libraries/phocacart/order/order.php +++ b/libraries/phocacart/order/order.php @@ -110,6 +110,17 @@ public function saveOrder($comment) { exit; } + // -------------------- + // CHECK MIN MULTIPLE QUANTITY + // -------------------- + $minMultipleQuantityValid = $cart->getMinimumMultipleQuantityValid(); + if($minMultipleQuantityValid == 0) { + $msg = JText::_('COM_PHOCACART_MINIMUM_MULTIPLE_ORDER_QUANTITY_OF_ONE_OR_MORE_PRODUCTS_NOT_MET_UPDATE_QUANTITY_BEFORE_ORDERING'); + $app->enqueueMessage($msg.$msgSuffix, 'error'); + $app->redirect($action); + exit; + } + $db = JFactory::getDBO(); @@ -538,12 +549,14 @@ public function saveOrderProducts($d, $orderId) { - if ($row->id > 0 && !empty($d['attributes'])) { + if ((int)$row->id > 0 && !empty($d['attributes'])) { //$this->cleanTable('phocacart_order_attributes', $orderId); NOT HERE, we are in foreach foreach ($d['attributes'] as $k => $v) { $checkA = PhocaCartAttribute::checkIfRequired($v['aid'], $v['oid']); + + if (!$checkA) { return false; } @@ -576,8 +589,9 @@ public function saveOrderProducts($d, $orderId) { throw new Exception($row2->getError()); return false; } + } - } else if ($row->id > 0){ + } else if ((int)$row->id > 0){ // Empty attributes - check if product include some required attribute $checkA = PhocaCartAttribute::checkIfExistsAndRequired($d['product_id']); if (!$checkA) { @@ -808,7 +822,7 @@ public static function getOrderNumber($orderId) { return str_pad($orderId, '10', '0', STR_PAD_LEFT); } - public static function getInvoiceNumber($orderId, $invoicePrefix) { + public static function getInvoiceNumber($orderId, $invoicePrefix = '') { $l = strlen($invoicePrefix); $n = 10 - $l; if ($n < 0) {$n = 0;} diff --git a/libraries/phocacart/order/orderrender.php b/libraries/phocacart/order/orderrender.php index e34cff64..ae0f2991 100644 --- a/libraries/phocacart/order/orderrender.php +++ b/libraries/phocacart/order/orderrender.php @@ -12,7 +12,7 @@ class PhocaCartOrderRender { public function __construct() {} - public function render($id, $type = 1, $format = 1, $token = '') { + public function render($id, $type = 1, $format = 'html', $token = '') { if ($id < 1) { @@ -35,7 +35,7 @@ public function render($id, $type = 1, $format = 1, $token = '') { $order = new PhocaCartOrderView(); $common = $order->getItemCommon($id); - + $app = JFactory::getApplication(); // Not for admin @@ -66,21 +66,21 @@ public function render($id, $type = 1, $format = 1, $token = '') { // FORMAT - HTML $box = 'class="ph-idnr-box"'; $table = 'class="ph-idnr-box-in"'; - $pho1 = 'class="pho1"'; - $pho2 = 'class="pho2"'; - $pho3 = 'class="pho3"'; - $pho4 = 'class="pho4"'; - $pho5 = 'class="pho5"'; - $pho6 = 'class="pho6"'; - $pho7 = 'class="pho7"'; - $pho6Sep = 'class="pho6 ph-idnr-sep"'; - $pho7Sep = 'class="pho7 ph-idnr-sep"'; - $pho8 = 'class="pho8"'; - $pho9 = 'class="pho9"'; - $pho10 = 'class="pho10"'; - $pho11 = 'class="pho11"'; - $pho12 = 'class="pho12"'; - $sep = 'class="ph-idnr-sep"'; + $pho1 = $pho12 = 'class="pho1"'; + $pho2 = $pho22 = 'class="pho2"'; + $pho3 = $pho32 = 'class="pho3"'; + $pho4 = $pho42 = 'class="pho4"'; + $pho5 = $pho52 = 'class="pho5"'; + $pho6 = $pho62 = 'class="pho6"'; + $pho7 = $pho72 = 'class="pho7"'; + $pho6Sep = $pho6Sep2 = 'class="pho6 ph-idnr-sep"'; + $pho7Sep = $pho7Sep2 = 'class="pho7 ph-idnr-sep"'; + $pho8 = $pho82 = 'class="pho8"'; + $pho9 = $pho92 = 'class="pho9"'; + $pho10 = $pho102 = 'class="pho10"'; + $pho11 = $pho112 = 'class="pho11"'; + $pho12 = $pho122 = 'class="pho12"'; + $sep = $sep2 = 'class="ph-idnr-sep"'; $bBox = 'class="ph-idnr-billing-box"'; $bBoxIn = 'class="ph-idnr-billing-box-in"'; $sBox = 'class="ph-idnr-shipping-box"'; @@ -90,9 +90,61 @@ public function render($id, $type = 1, $format = 1, $token = '') { $bProduct = 'class="ph-idnr-body-product"'; $sepH = 'class="ph-idnr-sep-horizontal"'; $totalF = 'class="ph-idnr-total"'; - $toPay = 'class="ph-idnr-to-pay"'; + $toPayS = 'class="ph-idnr-to-pay"'; + $toPaySV = 'class="ph-idnr-to-pay-value"'; + $firstRow = ''; + + if ($format == 'pdf') { + $box = ''; + $table = 'style="width: 100%; font-family: sans-serif, arial; font-size: 80%;padding:3px;margin-top:-200px"'; + $pho1 = 'style="width: 8.3333%;"'; + $pho2 = 'style="width: 8.3333%;"'; + $pho3 = 'style="width: 8.3333%;"'; + $pho4 = 'style="width: 8.3333%;"'; + $pho5 = 'style="width: 8.3333%;"'; + $pho6 = 'style="width: 8.3333%;"'; + $pho7 = 'style="width: 8.3333%;"'; + $pho6Sep = 'style="width: 3%;"'; + $pho7Sep = 'style="width: 3%;"'; + $pho8 = 'style="width: 8.3333%;"'; + $pho9 = 'style="width: 8.3333%;"'; + $pho10 = 'style="width: 8.3333%;"'; + $pho11 = 'style="width: 8.3333%;"'; + $pho12 = 'style="width: 8.3333%;"'; + $sep = 'style="width: 3%;"'; + + $pho12 = 'style="width: 9%;"'; + $pho22 = 'style="width: 9%;"'; + $pho32 = 'style="width: 9%;"'; + $pho42 = 'style="width: 9%;"'; + $pho52 = 'style="width: 9%;"'; + $pho62 = 'style="width: 9%;"'; + $pho72 = 'style="width: 9%;"'; + $pho6Sep2 = 'style="width: 5%;"'; + $pho7Sep2 = 'style="width: 5%;"'; + $pho82 = 'style="width: 9%;"'; + $pho92 = 'style="width: 9%;"'; + $pho102 = 'style="width: 9%;"'; + $pho112 = 'style="width: 9%;"'; + $pho122 = 'style="width: 9%;"'; + $seps2 = 'style="width: 10%;"'; + + + $bBox = 'style="border: 1pt solid #dddddd;"'; + $bBoxIn = 'style=""'; + $sBox = 'style="border: 1pt solid #dddddd;"'; + $sBoxIn = 'style=""'; + $boxIn = 'style="width: 100%; font-family: sans-serif, arial; font-size: 60%;padding:3px 1px;"'; + $hProduct = 'style="white-space:nowrap;font-weight: bold;background-color: #dddddd;"'; + $bProduct = 'style="white-space:nowrap;"'; + $sepH = 'style="border-top: 1pt solid #dddddd;"'; + $totalF = 'style=""'; + $toPayS = 'style="background-color: #eeeeee;padding: 20px;"'; + $toPaySV = 'style="background-color: #eeeeee;padding: 20px;text-align:right;"'; + $firstRow = 'style="font-size:0pt;"'; - if ($format == 2) { + } else if ($format == 'mail') { + $box = ''; $table = 'style="width: 100%; font-family: sans-serif, arial; font-size: 90%;"'; $pho1 = 'style="width: 8.3333%;"'; @@ -110,6 +162,23 @@ public function render($id, $type = 1, $format = 1, $token = '') { $pho11 = 'style="width: 8.3333%;"'; $pho12 = 'style="width: 8.3333%;"'; $sep = 'style="width: 3%;"'; + + $pho12 = 'style="width: 9%;"'; + $pho22 = 'style="width: 9%;"'; + $pho32 = 'style="width: 9%;"'; + $pho42 = 'style="width: 9%;"'; + $pho52 = 'style="width: 9%;"'; + $pho62 = 'style="width: 9%;"'; + $pho72 = 'style="width: 9%;"'; + $pho6Sep2 = 'style="width: 5%;"'; + $pho7Sep2 = 'style="width: 5%;"'; + $pho82 = 'style="width: 9%;"'; + $pho92 = 'style="width: 9%;"'; + $pho102 = 'style="width: 9%;"'; + $pho112 = 'style="width: 9%;"'; + $pho122 = 'style="width: 9%;"'; + $seps2 = 'style="width: 10%;"'; + $bBox = 'style="border: 1px solid #ddd;padding: 10px;"'; $bBoxIn = 'style=""'; $sBox = 'style="border: 1px solid #ddd;padding: 10px;"'; @@ -119,8 +188,10 @@ public function render($id, $type = 1, $format = 1, $token = '') { $bProduct = 'style="white-space:nowrap;padding: 5px;"'; $sepH = 'style="border-top: 1px solid #ddd;"'; $totalF = 'style=""'; - $toPay = 'style="background: #ddd;padding: 20px;"'; - + $toPayS = 'style="background-color: #eeeeee;padding: 20px;"'; + $toPaySV = 'style="background-color: #eeeeee;padding: 20px;text-align:right;"'; + $firstRow = ''; + } @@ -128,10 +199,10 @@ public function render($id, $type = 1, $format = 1, $token = '') { $o[] = '
'; $o[] = '
'; - $o[] = ''; - $o[] = ''; - $o[] = ''; - $o[] = ''; + $o[] = ''; + $o[] = ''; + $o[] = ''; + $o[] = ''; $o[] = ''; // -------- @@ -148,27 +219,27 @@ public function render($id, $type = 1, $format = 1, $token = '') { } $o[] = ''; - $o[] = ''; + $o[] = ''; // -------- // HEADER RIGHT $o[] = ''; + $t = array(); $toPay = 0; if (!empty($total)) { foreach($total as $k => $v) { @@ -414,13 +486,13 @@ public function render($id, $type = 1, $format = 1, $token = '') { if ($toPay > 0) { $o[] = ''; $o[] = ''; - $o[] = ''; - $o[] = ''; + $o[] = ''; + $o[] = ''; $o[] = ''; } - $o[] = '
            
            
'; if ($type == 1) { $o[] = '

'.JText::_('COM_PHOCACART_ORDER').'

'; - $o[] = '
'.JText::_('COM_PHOCACART_ORDER_NUMBER').': '.PhocaCartOrder::getOrderNumber($common->id).'
'; + $o[] = '
'.JText::_('COM_PHOCACART_ORDER_NR').': '.PhocaCartOrder::getOrderNumber($common->id).'
'; $o[] = '
'.JText::_('COM_PHOCACART_ORDER_DATE').': '.JHtml::date($common->date, 'd. m. Y').'
'; } else if ($type == 2) { $o[] = '

'.JText::_('COM_PHOCACART_INVOICE').'

'; - $o[] = '
'.JText::_('COM_PHOCACART_INVOICE_NUMBER').': '.PhocaCartOrder::getInvoiceNumber($common->id, $invoice_prefix).'
'; + $o[] = '
'.JText::_('COM_PHOCACART_INVOICE_NR').': '.PhocaCartOrder::getInvoiceNumber($common->id, $invoice_prefix).'
'; $o[] = '
'.JText::_('COM_PHOCACART_ORDER_DATE').': '.JHtml::date($common->date, 'd. m. Y').'
'; } else if ($type == 3) { $o[] = '

'.JText::_('COM_PHOCACART_DELIVERY_NOTE').'

'; - $o[] = '
'.JText::_('COM_PHOCACART_ORDER_NUMBER').': '.PhocaCartOrder::getOrderNumber($common->id).'
'; - $o[] = '
'.JText::_('COM_PHOCACART_ORDER_DATE').': '.JHtml::date($common->date, 'd. m. Y').'
'; + $o[] = '
'.JText::_('COM_PHOCACART_ORDER_NR').': '.PhocaCartOrder::getOrderNumber($common->id).'
'; + $o[] = '
'.JText::_('COM_PHOCACART_ORDER_DATE').': '.JHtml::date($common->date, 'd. m. Y').'
'; } $o[] = '
 
'; @@ -214,10 +285,10 @@ public function render($id, $type = 1, $format = 1, $token = '') { if ($v['zip'] != '') { $city[] = $v['zip'];} if ($v['city'] != '') { $city[] = $v['city'];} if (!empty($city)) {$o[] = implode("\n", $city).'
';} - echo '
'; + //echo '
'; if (!empty($v['regiontitle'])) {$o[] = $v['regiontitle'].'
';} if (!empty($v['countrytitle'])) {$o[] = $v['countrytitle'].'
';} - echo '
'; + //echo '
'; if ($v['vat_1'] != '') { $o[] = '
'.JText::_('COM_PHOCACART_VAT1').': '. $v['vat_1'].'
';} if ($v['vat_2'] != '') { $o[] = JText::_('COM_PHOCACART_VAT2').': '.$v['vat_2'].'
';} } @@ -245,10 +316,10 @@ public function render($id, $type = 1, $format = 1, $token = '') { if ($v['zip'] != '') { $city[] = $v['zip'];} if ($v['city'] != '') { $city[] = $v['city'];} if (!empty($city)) {$o[] = implode("\n", $city).'
';} - echo '
'; + //echo '
'; if (!empty($v['regiontitle'])) {$o[] = $v['regiontitle'].'
';} if (!empty($v['countrytitle'])) {$o[] = $v['countrytitle'].'
';} - echo '
'; + //echo '
'; if ($v['vat_1'] != '') { $o[] = '
'.JText::_('COM_PHOCACART_VAT1').': '. $v['vat_1'].'
';} if ($v['vat_2'] != '') { $o[] = JText::_('COM_PHOCACART_VAT2').': '.$v['vat_2'].'
';} } @@ -374,6 +445,7 @@ public function render($id, $type = 1, $format = 1, $token = '') { $o[] = '
 
 '.JText::_('COM_PHOCACART_TO_PAY').''.$price->getPriceFormat($toPay).''.JText::_('COM_PHOCACART_TO_PAY').''.$price->getPriceFormat($toPay).'
';// End box in + $o[] = '
';// End box in $o[] = '';// End box diff --git a/libraries/phocacart/order/orderstatus.php b/libraries/phocacart/order/orderstatus.php index dc29a5d9..2ddbfce2 100644 --- a/libraries/phocacart/order/orderstatus.php +++ b/libraries/phocacart/order/orderstatus.php @@ -61,7 +61,7 @@ public static function getStatus( $id = 0) { } public final function __clone() { - JError::raiseWarning(500, 'Function Error: Cannot clone instance of Singleton pattern');// No JText - for developers only + throw new Exception('Function Error: Cannot clone instance of Singleton pattern', 500); return false; } @@ -86,6 +86,10 @@ public static function changeStatus( $orderId, $statusId, $orderToken = '', $not $config = JFactory::getConfig(); + $paramsC = JComponentHelper::getParams('com_phocacart'); + $invoice_prefix = $paramsC->get('invoice_prefix', ''); + $attachment_format = $paramsC->get('attachment_format', 0 ); + // FIND THE RIGHT VALUES FOR VARIBALES - different if we are in frontend or backend $notifyUserV = false; $notifyOthersV = false; @@ -103,6 +107,7 @@ public static function changeStatus( $orderId, $statusId, $orderToken = '', $not } } + // 2) NOTIFY OTHERS if ($notifyOthers == 0) { $notifyOthersV = false; @@ -212,6 +217,7 @@ public static function changeStatus( $orderId, $statusId, $orderToken = '', $not // Status ID will be ignored as we know the Stock Movement PhocaCartStock::handleStockProduct((int)$v->product_id, $statusId, (int)$v->quantity, $stockMovementsV); } + if (!empty($v->attributes)) { foreach($v->attributes as $k2 => $v2) { if ((int)$v2->option_id > 0 && (int)$v2->productquantity > 0) { @@ -295,23 +301,95 @@ public static function changeStatus( $orderId, $statusId, $orderToken = '', $not $body = PhocaCartEmail::completeMail($body, $r); + + // PDF + $pdfV = array(); + $attachmentContent = ''; + $attachmentName = ''; + $pdfV['plugin-pdf'] = PhocaCartExtension::getExtensionInfo('phocacart', 'plugin', 'phocapdf'); + $pdfV['component-pdf'] = PhocaCartExtension::getExtensionInfo('com_phocapdf'); + $pdfV['pdf'] = 0; + + if ($pdfV['plugin-pdf'] == 1 && $pdfV['component-pdf'] == 1) { + if (JFile::exists(JPATH_ADMINISTRATOR.'/components/com_phocapdf/helpers/phocapdfrender.php')) { + require_once(JPATH_ADMINISTRATOR.'/components/com_phocapdf/helpers/phocapdfrender.php'); + } else { + throw new Exception('Error - Phoca PDF Helper - Render PDF file could not be found in system', 500); + return false; + } + $pdfV['pdf'] = 1; + } switch ($emailSendV) { case 1: $orderRender = new PhocaCartOrderRender(); - $body .= "

"; - $body .= $orderRender->render($orderId, 1, 2, $orderToken); + + if ($attachment_format == 0 || $attachment_format == 2) { + $body .= "

"; + $body .= $orderRender->render($orderId, 1, 'mail', $orderToken); + } + + if ($pdfV['pdf'] == 1 && ($attachment_format == 1 || $attachment_format == 2)) { + $staticData = array(); + $orderNumber = PhocaCartOrder::getOrderNumber($orderId); + $staticData['option'] = 'com_phocacart'; + $staticData['title'] = JText::_('COM_PHOCACART_ORDER_NR'). ': '. $orderNumber; + $staticData['file'] = '';// Must be empty to not save the pdf to server + $staticData['filename'] = strip_tags(JText::_('COM_PHOCACART_ORDER'). '_'. $orderNumber).'.pdf'; + $staticData['subject'] = ''; + $staticData['keywords'] = ''; + $staticData['output'] = $orderRender->render($orderId, 1, 'pdf', $orderToken); + $attachmentContent = PhocaPDFRender::renderPDF('', $staticData); + $attachmentName = $staticData['filename']; + } + break; case 2: $orderRender = new PhocaCartOrderRender(); - $body .= "

"; - $body .= $orderRender->render($orderId, 2, 2, $orderToken); + + if ($attachment_format == 0 || $attachment_format == 2) { + $body .= "

"; + $body .= $orderRender->render($orderId, 2, 'mail', $orderToken); + } + + if ($pdfV['pdf'] == 1 && ($attachment_format == 1 || $attachment_format == 2)) { + $staticData = array(); + $invoiceNumber = PhocaCartOrder::getInvoiceNumber($orderId, $invoice_prefix); + $staticData['option'] = 'com_phocacart'; + $staticData['title'] = JText::_('COM_PHOCACART_INVOICE_NR'). ': '. $invoiceNumber; + $staticData['file'] = '';// Must be empty to not save the pdf to server + $staticData['filename'] = strip_tags(JText::_('COM_PHOCACART_INVOICE'). '_'. $invoiceNumber).'.pdf'; + $staticData['subject'] = ''; + $staticData['keywords'] = ''; + $staticData['output'] = $orderRender->render($orderId, 2, 'pdf', $orderToken); + $attachmentContent = PhocaPDFRender::renderPDF('', $staticData); + $attachmentName = $staticData['filename']; + } + break; case 3: $orderRender = new PhocaCartOrderRender(); - $body .= "

"; - $body .= $orderRender->render($orderId, 3, 2, $orderToken); + + if ($attachment_format == 0 || $attachment_format == 2) { + $body .= "

"; + $body .= $orderRender->render($orderId, 3, 'mail', $orderToken); + } + + if ($pdfV['pdf'] == 1 && ($attachment_format == 1 || $attachment_format == 2)) { + $staticData = array(); + $orderNumber = PhocaCartOrder::getOrderNumber($orderId); + $staticData['option'] = 'com_phocacart'; + $staticData['title'] = JText::_('COM_PHOCACART_ORDER_NR'). ': '. $orderNumber; + $staticData['file'] = '';// Must be empty to not save the pdf to server + $staticData['filename'] = strip_tags(JText::_('COM_PHOCACART_ORDER'). '_'. $orderNumber).'.pdf'; + $staticData['subject'] = ''; + $staticData['keywords'] = ''; + $staticData['output'] = $orderRender->render($orderId, 3, 'pdf', $orderToken); + $attachmentContent = PhocaPDFRender::renderPDF('', $staticData); + $attachmentName = $staticData['filename']; + } + break; } @@ -337,16 +415,23 @@ public static function changeStatus( $orderId, $statusId, $orderToken = '', $not } - - $notify = PhocaCartEmail::sendEmail('', '', $recipient, $subject, $body, true, null, $bcc); + + // Notify + // 1 ... sent + // 0 ... not sent + // -1 ... not sent (error) + $notify = PhocaCartEmail::sendEmail('', '', $recipient, $subject, $body, true, null, $bcc, $attachmentContent, $attachmentName); if ($notify) { if ($app->isAdmin()){ $app->enqueueMessage(JText::_('COM_PHOCACART_EMAIL_IF_NO_ERROR_EMAIL_SENT')); } + return $notify;// 1 + } else { + return -1; } - return $notify; + } - return false; + return false;// 0 } /* Usually diff --git a/libraries/phocacart/path/path.php b/libraries/phocacart/path/path.php index d11da70f..bd780ff0 100644 --- a/libraries/phocacart/path/path.php +++ b/libraries/phocacart/path/path.php @@ -23,8 +23,8 @@ public static function getPath( $manager = '') { // Path of preview and play //$downloadFolderPap = JPath::clean($downloadFolderPap); - //$path['orig_abs_pap'] = JPATH_ROOT . DS . $downloadFolderPap; - //$path['orig_abs_pap_ds'] = $path['orig_abs_pap'] . DS ; + //$path['orig_abs_pap'] = JPATH_ROOT . '/' . $downloadFolderPap; + //$path['orig_abs_pap_ds'] = $path['orig_abs_pap'] . '/' ; $path['media_abs_front_ds'] = JPATH_ROOT . '/media/com_phocacart/images/' ; @@ -64,13 +64,13 @@ public static function getPath( $manager = '') { public static function getPathMedia() { - //TODO create a singleton + // TO DO - create a singleton $option = 'com_phocacart'; $instance = new StdClass(); $baseFront = JURI::root(true); - $instance->media_css_abs = JPATH_ROOT . DS . 'media'. DS . $option . DS . 'css' . DS; - $instance->media_img_abs = JPATH_ROOT . DS . 'media'. DS . $option . DS . 'images' . DS; - $instance->media_js_abs = JPATH_ROOT . DS . 'media'. DS . $option . DS . 'js' . DS; + $instance->media_css_abs = JPATH_ROOT . '/' . 'media'. '/' . $option . '/' . 'css' . '/'; + $instance->media_img_abs = JPATH_ROOT . '/' . 'media'. '/' . $option . '/' . 'images' . '/'; + $instance->media_js_abs = JPATH_ROOT . '/' . 'media'. '/' . $option . '/' . 'js' . '/'; $instance->media_css_rel = 'media/'. $option .'/css/'; $instance->media_img_rel = 'media/'. $option .'/images/'; $instance->media_js_rel = 'components/'. $option .'/assets/'; @@ -90,7 +90,6 @@ public static function getRightPathLink($link) { $pos = strpos($uriS, 'administrator'); if ($pos === false) { - $uriL = str_replace(JURI::root(true), '', $uriS); $uriL = ltrim($uriL, '/'); $formatLink = JURI::root(false). $uriL; diff --git a/libraries/phocacart/path/route.php b/libraries/phocacart/path/route.php index 9d4cfdab..e9bafa7b 100644 --- a/libraries/phocacart/path/route.php +++ b/libraries/phocacart/path/route.php @@ -11,19 +11,19 @@ * source software licenses. See COPYRIGHT.php for copyright notices and * details. */ -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die; jimport('joomla.application.component.helper'); class PhocaCartRoute { - public static function getCategoriesRoute() - { - // TEST SOLUTION + public static function getCategoriesRoute() { + $app = JFactory::getApplication(); $menu = $app->getMenu(); $active = $menu->getActive(); - + $option = $app->input->get( 'option', '', 'string' ); + $view = $app->input->get( 'view', '', 'string' ); $activeId = 0; if (isset($active->id)){ @@ -31,14 +31,9 @@ public static function getCategoriesRoute() } $itemId = 0; - - $option = $app->input->get( 'option', '', 'string' ); - $view = $app->input->get( 'view', '', 'string' ); - if ($option == 'com_phocacart' && $view == 'category') { - if ((int)$activeId > 0) { - // 2) if there are two menu links, try to select the one active - $itemId = $activeId; - } + if ((int)$activeId > 0 &&$option == 'com_phocacart' && $view == 'category') { + // 2) if there are two menu links, try to select the one active + $itemId = $activeId; } $needles = array( @@ -52,7 +47,6 @@ public static function getCategoriesRoute() if(isset($item->query['layout'])) { $link .= '&layout='.$item->query['layout']; } - // $item->id should be a "categories view" and it should have preference to category view // so first we check item->id then itemId if (isset($item->id) && ((int)$item->id > 0)) { @@ -64,9 +58,8 @@ public static function getCategoriesRoute() return $link; } - public static function getCategoryRoute($catid, $catidAlias = '') - { - // TEST SOLUTION + public static function getCategoryRoute($catid, $catidAlias = '') { + $app = JFactory::getApplication(); $menu = $app->getMenu(); $active = $menu->getActive(); @@ -79,7 +72,6 @@ public static function getCategoryRoute($catid, $catidAlias = '') } if ((int)$activeId > 0 && $option == 'com_phocacart' && $view == 'category') { - $needles = array( 'category' => (int)$catid, 'categories' => (int)$activeId @@ -95,24 +87,13 @@ public static function getCategoryRoute($catid, $catidAlias = '') $catid = $catid . ':' . $catidAlias; } - //Create the link $link = 'index.php?option=com_phocacart&view=category&id='.$catid; - - if($item = PhocaCartRoute::_findItem($needles)) { - if(isset($item->query['layout'])) { - $link .= '&layout='.$item->query['layout']; - } - if (isset($item->id) && ((int)$item->id > 0)) { - $link .= '&Itemid='.$item->id; - } - }; - - return $link; + return self::_buildLink($link, $needles); } - public static function getCategoryRouteByTag($tagId) - { - // TEST SOLUTION + + public static function getCategoryRouteByTag($tagId) { + $app = JFactory::getApplication(); $menu = $app->getMenu(); $active = $menu->getActive(); @@ -123,7 +104,6 @@ public static function getCategoryRouteByTag($tagId) $activeId = $active->id; } if ((int)$activeId > 0 && $option == 'com_phocacart') { - $needles = array( 'category' => '', 'categories' => (int)$activeId @@ -135,8 +115,6 @@ public static function getCategoryRouteByTag($tagId) ); } - - $db = JFactory::getDBO(); $query = 'SELECT a.id, a.title, a.link_ext, a.link_cat' @@ -147,33 +125,20 @@ public static function getCategoryRouteByTag($tagId) $db->setQuery($query, 0, 1); $tag = $db->loadObject(); - - //Create the link if (isset($tag->id)) { $link = 'index.php?option=com_phocacart&view=category&id=tag&tagid='.(int)$tag->id; } else { $link = 'index.php?option=com_phocacart&view=category&id=tag&tagid=0'; } - - if($item = self::_findItem($needles)) { - if(isset($item->query['layout'])) { - $link .= '&layout='.$item->query['layout']; - } - if (isset($item->id) && ((int)$item->id > 0)) { - $link .= '&Itemid='.$item->id; - } - }; - - return $link; + return self::_buildLink($link, $needles); } /* Items route can be without id or with id, if id, then it is a category id */ - public static function getItemsRoute($catid = '', $catidAlias = '') - { - // TEST SOLUTION + public static function getItemsRoute($catid = '', $catidAlias = '') { + $app = JFactory::getApplication(); $menu = $app->getMenu(); $active = $menu->getActive(); @@ -217,36 +182,20 @@ public static function getItemsRoute($catid = '', $catidAlias = '') } } - - - if ($catidAlias != '') { $catid = $catid . ':' . $catidAlias; } - //Create the link if ($catid != '') { $link = 'index.php?option=com_phocacart&view=items&id='.$catid; } else { $link = 'index.php?option=com_phocacart&view=items'; } - - - if($item = self::_findItem($needles)) { - if(isset($item->query['layout'])) { - $link .= '&layout='.$item->query['layout']; - } - if (isset($item->id) && ((int)$item->id > 0)) { - $link .= '&Itemid='.$item->id; - } - } - - return $link; + return self::_buildLink($link, $needles); } - public static function getItemRoute($id, $catid = 0, $idAlias = '', $catidAlias = '') - { - // TEST SOLUTION + public static function getItemRoute($id, $catid = 0, $idAlias = '', $catidAlias = '') { + $app = JFactory::getApplication(); $menu = $app->getMenu(); $active = $menu->getActive(); @@ -264,15 +213,14 @@ public static function getItemRoute($id, $catid = 0, $idAlias = '', $catidAlias } if ((int)$activeId > 0 && $option == 'com_phocacart' && $view == 'item') { - $needles = array( - 'detail' => (int) $id, + 'item' => (int) $id, 'category' => (int) $catid, 'categories' => (int)$activeId ); } else { $needles = array( - 'detail' => (int) $id, + 'item' => (int) $id, 'category' => (int) $catid, 'categories' => '' ); @@ -286,183 +234,113 @@ public static function getItemRoute($id, $catid = 0, $idAlias = '', $catidAlias } $link = 'index.php?option=com_phocacart&view=item&id='. $id.'&catid='.$catid; - - - if($item = self::_findItem($needles)) { - if (isset($item->id)) { - $link .= '&Itemid='.$item->id; - } - } - - return $link; + return self::_buildLink($link, $needles); } - public static function getCheckoutRoute($id = 0, $catid = 0) - { + public static function getCheckoutRoute($id = 0, $catid = 0) { $needles = array( + 'checkout' => '', 'item' => (int) $id, 'category' => (int) $catid, - 'checkout' => '', 'categories' => '' ); - //Create the link $link = 'index.php?option=com_phocacart&view=checkout'; - - if($item = self::_findItem($needles)) { - if(isset($item->query['layout'])) { - $link .= '&layout='.$item->query['layout']; - } - if(isset($item->id)) { - $link .= '&Itemid='.$item->id; - } - }; - return $link; + return self::_buildLink($link, $needles); } - public static function getAccountRoute($id = 0, $catid = 0) - { + public static function getAccountRoute($id = 0, $catid = 0) { $needles = array( + 'account' => '', 'item' => (int) $id, 'category' => (int) $catid, - 'account' => '', 'categories' => '' ); - //Create the link $link = 'index.php?option=com_phocacart&view=account'; - - if($item = self::_findItem($needles)) { - if(isset($item->query['layout'])) { - $link .= '&layout='.$item->query['layout']; - } - if(isset($item->id)) { - $link .= '&Itemid='.$item->id; - } - }; - return $link; + return self::_buildLink($link, $needles); } - public static function getComparisonRoute($id = 0, $catid = 0) - { + public static function getComparisonRoute($id = 0, $catid = 0) { $needles = array( + 'comparison' => '', 'item' => (int) $id, 'category' => (int) $catid, - 'comparison' => '', 'categories' => '' ); - //Create the link $link = 'index.php?option=com_phocacart&view=comparison'; - - if($item = self::_findItem($needles)) { - if(isset($item->query['layout'])) { - $link .= '&layout='.$item->query['layout']; - } - if(isset($item->id)) { - $link .= '&Itemid='.$item->id; - } - }; - return $link; + return self::_buildLink($link, $needles); } - public static function getPaymentRoute($id = 0, $catid = 0) - { + public static function getWishListRoute($id = 0, $catid = 0) { $needles = array( + 'wishlist' => '', 'item' => (int) $id, 'category' => (int) $catid, + 'categories' => '' + ); + + $link = 'index.php?option=com_phocacart&view=wishlist'; + return self::_buildLink($link, $needles); + } + + public static function getPaymentRoute($id = 0, $catid = 0) { + $needles = array( //'payment' => '', + 'item' => (int) $id, + 'category' => (int) $catid, 'categories' => '' ); - //Create the link $link = 'index.php?option=com_phocacart&view=payment'; - - if($item = self::_findItem($needles)) { - if(isset($item->query['layout'])) { - $link .= '&layout='.$item->query['layout']; - } - if(isset($item->id)) { - $link .= '&Itemid='.$item->id; - } - }; - return $link; + return self::_buildLink($link, $needles); } - public static function getDownloadRoute($id = 0, $catid = 0) - { + public static function getDownloadRoute($id = 0, $catid = 0) { $needles = array( + 'download' => '', 'item' => (int) $id, 'category' => (int) $catid, - 'download' => '', 'categories' => '' ); - //Create the link $link = 'index.php?option=com_phocacart&view=download'; - - if($item = self::_findItem($needles)) { - if(isset($item->query['layout'])) { - $link .= '&layout='.$item->query['layout']; - } - if(isset($item->id)) { - $link .= '&Itemid='.$item->id; - } - }; - - return $link; + return self::_buildLink($link, $needles); } - public static function getOrdersRoute($id = 0, $catid = 0) - { + public static function getOrdersRoute($id = 0, $catid = 0) { $needles = array( + 'orders' => '', 'item' => (int) $id, 'category' => (int) $catid, - 'orders' => '', 'categories' => '' ); - //Create the link $link = 'index.php?option=com_phocacart&view=orders'; - - if($item = self::_findItem($needles)) { - if(isset($item->query['layout'])) { - $link .= '&layout='.$item->query['layout']; - } - if(isset($item->id)) { - $link .= '&Itemid='.$item->id; - } - }; - return $link; + return self::_buildLink($link, $needles); } - public static function getTermsRoute($id = 0, $catid = 0) - { + public static function getTermsRoute($id = 0, $catid = 0, $suffix = '') { $needles = array( + 'terms' => '', 'item' => (int) $id, 'category' => (int) $catid, 'categories' => '' ); - //Create the link $link = 'index.php?option=com_phocacart&view=terms'; + if ($suffix != '') { + $link .= '&'.$suffix; + } - if($item = self::_findItem($needles)) { - if(isset($item->query['layout'])) { - $link .= '&layout='.$item->query['layout']; - } - if(isset($item->id)) { - $link .= '&Itemid='.$item->id; - } - }; - return $link; + return self::_buildLink($link, $needles); } - public static function getInfoRoute($id = 0, $catid = 0) - { + public static function getInfoRoute($id = 0, $catid = 0) { $needles = array( //'info' => '', 'item' => (int) $id, @@ -470,23 +348,11 @@ public static function getInfoRoute($id = 0, $catid = 0) 'categories' => '' ); - //Create the link $link = 'index.php?option=com_phocacart&view=info'; - - if($item = self::_findItem($needles)) { - if(isset($item->query['layout'])) { - $link .= '&layout='.$item->query['layout']; - } - if (isset($item->id)) { - $link .= '&Itemid='.$item->id; - } - } - - return $link; + return self::_buildLink($link, $needles); } - public static function getFeedRoute($id = 0, $idAlias = '', $noSEF = 0) - { + public static function getFeedRoute($id = 0, $idAlias = '', $noSEF = 0) { $needles = array( 'feed' => (int) $id, 'categories' => '' @@ -500,20 +366,77 @@ public static function getFeedRoute($id = 0, $idAlias = '', $noSEF = 0) if ($noSEF == 1) { return $link; } + return self::_buildLink($link, $needles); + } + + + public static function getQuestionRoute($id = 0, $catid = 0, $idAlias = '', $catidAlias = '', $suffix = '') { + + $app = JFactory::getApplication(); + $menu = $app->getMenu(); + $active = $menu->getActive(); + $option = $app->input->get( 'option', '', 'string' ); + $view = $app->input->get( 'view', '', 'string' ); + + $activeId = 0; + if (isset($active->id)){ + $activeId = $active->id; + } + + if ((int)$activeId > 0 && $option == 'com_phocacart' && $view == 'question') { + + $needles = array( + 'question' => '', + 'item' => (int) $id, + 'category' => (int) $catid, + 'categories' => (int)$activeId + ); + } else { + $needles = array( + 'question' => '', + 'item' => (int) $id, + 'category' => (int) $catid, + 'categories' => '' + ); + } + + if ($idAlias != '') { + $id = (int)$id . ':' . $idAlias; + } + if ($catidAlias != '') { + $catid = (int)$catid . ':' . $catidAlias; + } + + $link = 'index.php?option=com_phocacart&view=question'; + if ($id != 0) { + $link .= '&id='. $id; + } + if ($catid != 0) { + $link .= '&catid='. $catid; + } + if ($suffix != '') { + $link .= '&'.$suffix; + } + + return self::_buildLink($link, $needles); + } + + + + protected static function _buildLink($link, $needles) { + if($item = self::_findItem($needles)) { if(isset($item->query['layout'])) { $link .= '&layout='.$item->query['layout']; } - if(isset($item->id)) { + if (isset($item->id) && ((int)$item->id > 0)) { $link .= '&Itemid='.$item->id; } - }; + } return $link; } - - protected static function _findItem($needles, $notCheckId = 0) { @@ -521,6 +444,7 @@ protected static function _findItem($needles, $notCheckId = 0) $menus = $app->getMenu('site', array()); $items = $menus->getItems('component', 'com_phocacart'); + if(!$items) { return $app->input->get('Itemid', 0, '', 'int'); //return null; @@ -607,6 +531,7 @@ public static function getJsItemsRoute($activeCategory = 0) { $urlItemsView = JRoute::_(PhocaCartRoute::getItemsRoute($a['id'], $a['alias'])); } + $urlItemsView = str_replace('&', '&', $urlItemsView); // Cause URL problems diff --git a/libraries/phocacart/price/price.php b/libraries/phocacart/price/price.php index 73fb5aa5..7402c1f2 100644 --- a/libraries/phocacart/price/price.php +++ b/libraries/phocacart/price/price.php @@ -103,9 +103,9 @@ public function getTaxFormat($tax, $taxCalculationType, $format = 1) { if ($format == 0) { // IS USED FOR PERCENTAGE IN VAT TITLE ... e.g. VAT(10%) if ($taxCalculationType == 2) { // FIX - $tax = $tax; + $tax = $tax + 0; } else { // Percentage - $tax = $tax.'%'; + $tax = ($tax + 0) .'%'; } } else { // IS USED FOR PERCENTAGE in CALCUTATION: ... VAT(10%) --> 10,00 % if ($taxCalculationType == 2) { // FIX @@ -123,12 +123,15 @@ public function getTaxFormat($tax, $taxCalculationType, $format = 1) { * param format - format the price or not (add currency symbol, price decimals thousands separator, ...) */ - public function getPriceItems($price, $tax, $taxCalculationType, $taxTitle = '', $baseAmount = 0, $baseUnit = '') { + public function getPriceItems($price, $tax, $taxCalculationType, $taxTitle = '', $baseAmount = 0, $baseUnit = '', $zeroPrice = 0) { $priceO = array(); $paramsC = JComponentHelper::getParams('com_phocacart'); $tax_calculation = $paramsC->get( 'tax_calculation', 0 ); $display_unit_price = $paramsC->get( 'display_unit_price', 1 ); + $zero_price_text = $paramsC->get( 'zero_price_text', '' ); + $zero_price_label = $paramsC->get( 'zero_price_label', '' ); + $priceO['taxtxt'] = $taxTitle; $priceO['taxcalc'] = $tax_calculation; @@ -154,6 +157,7 @@ public function getPriceItems($price, $tax, $taxCalculationType, $taxTitle = '', $priceO['taxtxt'] = $taxTitle . ' (' . $this->getTaxFormat($tax, $taxCalculationType, 0) . ')'; } + $priceO['bruttotxt'] = JText::_('COM_PHOCACART_PRICE_INCL_TAX'); $priceO['nettotxt'] = JText::_('COM_PHOCACART_PRICE_EXCL_TAX'); @@ -200,6 +204,19 @@ public function getPriceItems($price, $tax, $taxCalculationType, $taxTitle = '', $priceO['baseformat'] = $this->getPriceFormat($priceO['base']).'/'.$baseUnit; } + if ($price == 0 && $zeroPrice == 1) { + if ($zero_price_text != '') { + $priceO['nettoformat'] = $priceO['bruttoformat'] = $priceO['taxformat'] = JText::_($zero_price_text); + } + + if ($zero_price_label == '0') { + $priceO['nettotxt'] = $priceO['bruttotxt'] = $priceO['taxtxt'] = ''; + } else if ($zero_price_label != '') { + $priceO['nettotxt'] = $priceO['bruttotxt'] = $priceO['taxtxt'] = JText::_($zero_price_label); + } + + } + return $priceO; } @@ -405,4 +422,7 @@ public static function convertPriceCurrentToDefaultCurrency($price, $rate = 1) { $price /= $rate; return $price; } + public static function cleanPrice($price) { + return $price + 0; + } } \ No newline at end of file diff --git a/libraries/phocacart/product/product.php b/libraries/phocacart/product/product.php index e541b2aa..e9e5a238 100644 --- a/libraries/phocacart/product/product.php +++ b/libraries/phocacart/product/product.php @@ -16,7 +16,7 @@ public static function getProduct($productId, $prioritizeCatid = 0) { $db = JFactory::getDBO(); $query = ' SELECT a.id, c.id as catid, a.alias, a.title, a.sku, a.price, a.price_original, a.tax_id as taxid, a.image, a.weight, a.volume, a.unit_amount, a.unit_unit,' - .' a.download_token, a.download_folder, a.download_file, a.download_hits, a.stock, a.min_quantity,' + .' a.download_token, a.download_folder, a.download_file, a.download_hits, a.stock, a.min_quantity, a.min_multiple_quantity,' .' t.title as taxtitle, t.tax_rate as taxrate, t.calculation_type as taxcalctype' .' FROM #__phocacart_products AS a' .' LEFT JOIN #__phocacart_product_categories AS pc ON pc.product_id = a.id' @@ -38,7 +38,11 @@ public static function getProduct($productId, $prioritizeCatid = 0) { //$product->catid is $product->catid } else { // Recheck the category id of product - $checkCategory = PhocaCartProduct::checkIfAccessPossible((int)$product->id, (int)$prioritizeCatid); + $checkCategory = false; + if (isset($product->id)) { + $checkCategory = PhocaCartProduct::checkIfAccessPossible((int)$product->id, (int)$prioritizeCatid); + } + if ($checkCategory) { $product->catid = (int)$prioritizeCatid; } @@ -139,7 +143,7 @@ public static function getProductByProductId($id) { * checkPrice - check if the product has price or not ( > 0 ) */ - public static function getProducts($limit = 1, $orderingItem = 1, $orderingCat = 0, $checkPublished = false, $checkStock = false, $checkPrice = false, $categoriesList = 0) { + public static function getProducts($limit = 1, $orderingItem = 1, $orderingCat = 0, $checkPublished = false, $checkStock = false, $checkPrice = false, $categoriesList = 0, $categoryIds = array()) { phocacartimport('phocacart.ordering.ordering'); @@ -166,7 +170,13 @@ public static function getProducts($limit = 1, $orderingItem = 1, $orderingCat = $wheres[] = " a.price > 0"; } - $q = ' SELECT a.id, a.title, a.image, a.video, a.alias, a.description, a.description_long, a.sku, a.stockstatus_a_id, a.stockstatus_n_id, a.min_quantity, a.stock, a.unit_amount, a.unit_unit, c.id AS catid, c.title AS cattitle, c.alias AS catalias, c.title_feed AS cattitlefeed, a.price, a.price_original, t.tax_rate AS taxrate, t.calculation_type AS taxcalculationtype, t.title AS taxtitle, a.date, a.sales, a.featured, a.external_id, m.title AS manufacturertitle,' + if (!empty($categoryIds)) { + + $catIdsS = implode (',', $categoryIds); + $wheres[] = 'pc.category_id IN ('.$catIdsS.')'; + } + + $q = ' SELECT a.id, a.title, a.image, a.video, a.alias, a.description, a.description_long, a.sku, a.stockstatus_a_id, a.stockstatus_n_id, a.min_quantity, a.min_multiple_quantity, a.stock, a.unit_amount, a.unit_unit, c.id AS catid, c.title AS cattitle, c.alias AS catalias, c.title_feed AS cattitlefeed, a.price, a.price_original, t.tax_rate AS taxrate, t.calculation_type AS taxcalculationtype, t.title AS taxtitle, a.date, a.sales, a.featured, a.external_id, m.title AS manufacturertitle,' . ' AVG(r.rating) AS rating,' . ' at.required AS attribute_required'; @@ -211,13 +221,14 @@ public static function getCategoryByProductId($id) { . ' LIMIT 1'; $db->setQuery( $query ); $category = $db->loadRow(); + if (isset($category[0]) && $category[0] > 0) { return $category[0]; } return 0; } - public static function getMostViewedProducts($limit = 5, $checkPublished = false, $checkAccess = false) { + public static function getMostViewedProducts($limit = 5, $checkPublished = false, $checkAccess = false, $count = false) { $db = JFactory::getDBO(); $wheres = array(); @@ -234,26 +245,46 @@ public static function getMostViewedProducts($limit = 5, $checkPublished = false $wheres[] = " a.hits > 0"; $where = ( count( $wheres ) ? ' WHERE '. implode( ' AND ', $wheres ) : '' ); - $query = 'SELECT a.id, a.title, a.alias, a.hits, c.id as catid, c.alias as catalias, c.title as cattitle' - . ' FROM #__phocacart_products AS a' - . ' LEFT JOIN #__phocacart_product_categories AS pc ON pc.product_id = a.id' - . ' LEFT JOIN #__phocacart_categories AS c ON c.id = pc.category_id' - . $where - . ' GROUP BY a.id' - . ' ORDER BY a.hits DESC' - . ' LIMIT '.(int)$limit; - $db->setQuery( $query ); + if ($count) { + $q = 'SELECT SUM(a.hits)' + . ' FROM #__phocacart_products AS a' + . ' LEFT JOIN #__phocacart_product_categories AS pc ON pc.product_id = a.id' + . ' LEFT JOIN #__phocacart_categories AS c ON c.id = pc.category_id' + . $where; + if ((int)$limit > 0) { + $q .= ' LIMIT '.(int)$limit; + } + + $db->setQuery( $q ); + $products = $db->loadResult(); + + } else { + + $q = 'SELECT a.id, a.title, a.alias, a.hits, c.id as catid, c.alias as catalias, c.title as cattitle' + . ' FROM #__phocacart_products AS a' + . ' LEFT JOIN #__phocacart_product_categories AS pc ON pc.product_id = a.id' + . ' LEFT JOIN #__phocacart_categories AS c ON c.id = pc.category_id' + . $where + . ' GROUP BY a.id' + . ' ORDER BY a.hits DESC'; + if ((int)$limit > 0) { + $q .= ' LIMIT '.(int)$limit; + } + + $db->setQuery( $q ); + $products = $db->loadObjectList(); + } + - $products = $db->loadObjectList(); return $products; } - public static function getBestSellingProducts($limit = 5, $dateFrom = '', $dateTo = '') { + public static function getBestSellingProducts($limit = 5, $dateFrom = '', $dateTo = '', $count = false) { $db = JFactory::getDBO(); $wheres = array(); - $wheres[] = " a.id > 0"; + $wheres[] = " o.id > 0"; if ($dateTo != '' && $dateFrom != '') { $dateFrom = $db->Quote($dateFrom); @@ -263,26 +294,47 @@ public static function getBestSellingProducts($limit = 5, $dateFrom = '', $dateT $where = ( count( $wheres ) ? ' WHERE '. implode( ' AND ', $wheres ) : '' ); - - $q = ' SELECT a.id, a.title, a.alias, COUNT( o.id ) AS count_products' + if ($count) { + $q = ' SELECT count(o.id)' . ' FROM #__phocacart_order_products AS o' . ' LEFT JOIN #__phocacart_products AS a ON a.id = o.product_id'; - if ($dateTo != '' && $dateFrom != '') { - $q .= ' LEFT JOIN #__phocacart_orders AS od ON od.id = o.order_id'; - } + if ($dateTo != '' && $dateFrom != '') { + $q .= ' LEFT JOIN #__phocacart_orders AS od ON od.id = o.order_id'; + } + $q .= $where; + if ((int)$limit > 0) { + $q .= ' LIMIT '.(int)$limit; + } + + + $db->setQuery($q); + $products = $db->loadResult(); + + } else { + $q = ' SELECT o.product_id AS id, o.title, o.alias, COUNT( o.id ) AS count_products' + . ' FROM #__phocacart_order_products AS o'; + //. ' LEFT JOIN #__phocacart_products AS a ON a.id = o.product_id'; + if ($dateTo != '' && $dateFrom != '') { + $q .= ' LEFT JOIN #__phocacart_orders AS od ON od.id = o.order_id'; + } $q .= $where - . ' GROUP BY a.id' - . ' ORDER BY count_products DESC' - . ' LIMIT '.(int)$limit; + . ' GROUP BY o.id' + . ' ORDER BY count_products DESC'; + if ((int)$limit > 0) { + $q .= ' LIMIT '.(int)$limit; + } + + $db->setQuery($q); + $products = $db->loadObjectList(); + } - $db->setQuery($q); /* For now we don't need SEF url, if SEF url is needed, we need to get category alias and category id * This cannot be done in sql as then because of table jos_phocacart_product_categories will count count duplicities */ - $products = $db->loadObjectList(); + /* $productsA = array(); diff --git a/libraries/phocacart/render/renderadminview.php b/libraries/phocacart/render/renderadminview.php index c5237707..d83878b0 100644 --- a/libraries/phocacart/render/renderadminview.php +++ b/libraries/phocacart/render/renderadminview.php @@ -31,7 +31,7 @@ public function navigation($tabs) { $o = '
    '; $i = 0; foreach($tabs as $k => $v) { - $cA = 0; + $cA = ''; if ($i == 0) { $cA = 'class="active"'; } @@ -144,8 +144,7 @@ public function addRowButton($text, $type = 'image') { return $o; } - - + /* public function additionalImagesRow($id, $url, $value = '', $js = 0) { // Will be displayed inside Javascript @@ -172,6 +171,43 @@ public function additionalImagesRow($id, $url, $value = '', $js = 0) { .'
    ' . ''; + return $o; + }*/ + + + public function additionalImagesRow($id, $url, $value = '', $js = 0, $w = 700, $h = 400) { + + + $idA = 'phFileImageNameModalAT'; //phFileImageNameModal - standard image, phFileImageNameModalAT - additional images + $textButton = 'COM_PHOCACART_FORM_SELECT_IMAGE'; + + // Will be displayed inside Javascript + $o = '
    ' + .'
    '; + + $o .='' + .''; + //$o .= '' + + + + $o .= ' ' + . ' ' + . JText::_($textButton) . ''; + + + // Javascript rendered by modal windows $this->modalWindowDynamic() but in edit file to produce html code on right place + + + $o .= '' + .'
    ' + + .'
    '.JText::_('COM_PHOCACART_REMOVE_IMAGE').'
    ' + .'
    ' + . '
    '; + return $o; } @@ -182,7 +218,7 @@ public function additionalAttributesRow($id, $title, $alias, $required, $type, $ $o = ''; // Will be displayed inside Javascript - $o .= '
    '; + $o .= '
    '; if ($id == 0) { // Add Header @@ -194,7 +230,8 @@ public function additionalAttributesRow($id, $title, $alias, $required, $type, $ . '
     
    ' .'
    '."\n"; } - + + $o .= '
    ' .'
    ' @@ -214,7 +251,8 @@ public function additionalAttributesRow($id, $title, $alias, $required, $type, $ .'' .'
    ' - .'
    '.JText::_('COM_PHOCACART_REMOVE_ATTRIBUTE').'
    ' + .'
    ' + .'
    '.''.'
    ' .'
    ' . '
    '; @@ -241,7 +279,7 @@ public function addNewOptionButton($id, $js) { if ($js == 1) { $id = '\' + phRowOptionAttributeId + \'';// if no javascript, get real id, if javascript, get js variable } - $o .= '
    '; + $o .= '
    '; $o .= '
    '; $o .= '
    '.JText::_('COM_PHOCACART_ADD_OPTION').'
    '; @@ -250,14 +288,15 @@ public function addNewOptionButton($id, $js) { return $o; } - public function additionalOptionsRow($id, $attrId, $title, $alias, $operator, $amount, $stock, $operatorWeight, $weight, $image) { - + public function additionalOptionsRow($id, $attrId, $title, $alias, $operator, $amount, $stock, $operatorWeight, $weight, $image, $image_small, $color, $url, $url2, $w = 700, $h = 400) { + + $operatorArray = PhocaCartAttribute::getOperatorArray(); $o = ''; // Will be displayed inside Javascript - $o .= '
    '; + $o .= '
    '; $o .= '
    ' .'
    ' @@ -272,6 +311,7 @@ public function additionalOptionsRow($id, $attrId, $title, $alias, $operator, $a .'
    ' . JHtml::_('select.genericlist', $operatorArray, 'pformattr['.$attrId.'][option]['.$id.'][operator]', 'class="input-mini"', 'value', 'text', htmlspecialchars($operator), 'jform_optionoperator'.$attrId. $id) .'
    ' + .'
    ' .'' .'
    ' @@ -291,62 +331,175 @@ public function additionalOptionsRow($id, $attrId, $title, $alias, $operator, $a .'
    ' .'' - .'
    ' + .'
    '; - // Image - .'
    '; - if (is_numeric($attrId) && is_numeric($id)) { + // Images + // ----- + $o .= '
    '; + + /*if (is_numeric($attrId) && is_numeric($id)) { JHtml::_('behavior.modal', 'a.modal_jform_optionimage'.$attrId.$id); } else { // Don't render anything for items which will be added by javascript // it is set in javascript addnewrow function // administrator\components\com_phocacart\libraries\phocacart\render\renderjs.php line cca 171 - } + }*/ + + // IMAGE LARGE $group = PhocaCartSettings::getManagerGroup('productimage'); $managerOutput = '&manager=productimage'; $textButton = 'COM_PHOCACART_FORM_SELECT_'.strtoupper($group['t']); - $link = 'index.php?option=com_phocacart&view=phocacartmanager'.$group['c'].$managerOutput.'&field=jform_optionimage'.$attrId.$id; + $textButton2 = 'COM_PHOCACART_LARGE'; + //$link = 'index.php?option=com_phocacart&view=phocacartmanager'.$group['c'].$managerOutput.'&field=jform_optionimage'.$attrId.$id; $attr = ''; + $idA = 'phFileImageNameModalO'; - $html[] = '
    '; + $html = array(); + $html[] = ''; $html[] = ''; - $html[] = '' . JText::_($textButton).''; - $html[] = '
    '. "\n"; + + + $html[] = '' + . ' ' + . JText::_($textButton) . '';*/ + + $html[] = ' ' + . '' + . JText::_($textButton2). ''; + + $html[] = ''. "\n"; $o .= implode("\n", $html); - $o .= '
    ' - - //.'
    ' - .'
    '.JText::_('COM_PHOCACART_REMOVE_OPTION').'
    ' + $o .= '
    '; + + // IMAGE SMALL + + $attr = ''; + $idA = 'phFileImageNameModalO'; + $textButton2 = 'COM_PHOCACART_SMALL'; + + $html = array(); + $html[] = ''; + $html[] = ''; + $html[] = ' ' + . '' + . JText::_($textButton2). ''; + + $html[] = ''. "\n"; + + $o .= implode("\n", $html); + + + $o .= '
    '; + + + // Color + // ----- + $o .= '
    '; + + $format = 'hex'; + $keywords = ''; + $validate = ' data-validate="hex"'; + $class = ''; + $control = ''; + $readonly = ''; + $autocomplete = true; + $lang = JFactory::getLanguage(); + $position = ''; + $disabled = ''; + $required = ''; + $onchange = ''; + $autofocus = 'autofocus'; + + if (in_array($format, array('rgb', 'rgba')) && $validate != 'color') { + $alpha = ($format == 'rgba') ? true : false; + $placeholder = $alpha ? 'rgba(0, 0, 0, 0.5)' : 'rgb(0, 0, 0)'; + } else { + $placeholder = '#rrggbb'; + } + + $inputclass = ($keywords && ! in_array($format, array('rgb', 'rgba'))) ? ' keywords' : ' ' . $format; + $class = ' class="' . trim('minicolors ' . $class) . ($validate == 'color' ? '' : $inputclass) . '"'; + $control = $control ? ' data-control="' . $control . '"' : ''; + $format = $format ? ' data-format="' . $format . '"' : ''; + $keywords = $keywords ? ' data-keywords="' . $keywords . '"' : ''; + $readonly = $readonly ? ' readonly' : ''; + $hint = ' placeholder="' . $placeholder . '"'; + $autocomplete = ! $autocomplete ? ' autocomplete="off"' : ''; + $direction = $lang->isRTL() ? ' dir="ltr" style="text-align:right"' : ''; + + JHtml::_('jquery.framework'); + JHtml::_('script', 'system/html5fallback.js', false, true); + JHtml::_('behavior.colorpicker'); + + /*$jQ = "jQuery('INPUT[type=minicolors]').on('change', function() { + var hex = jQuery(this).val(), + opacity = jQuery(this).attr('data-opacity'); + jQuery('BODY').css('backgroundColor', hex); + + });"; + JFactory::getDocument()->addScriptDeclaration($jQ);*/ + + $html = array(); + $html[] = ''; + + + $o .= implode("\n", $html); + $o .= '
    '; + + + + //$o .= '
    '; + + + $o .= '
    '.''.'
    ' .'
    ' - . '
    ' + + . '
    ' .'
    '; return $o; } - public function headerOption() { + public function headerOption($id = 0) { - $o = '

    '.JText::_('COM_PHOCACART_OPTIONS').'

    '; + $o = ''; + + // we have two phrowboxoptions - phrowboxoption - loaded with php/mysql, phrowboxoptionjs - added by javascript + $o .= '
    '; + + $o .= '

    '.JText::_('COM_PHOCACART_OPTIONS').'

    '; $o .= '
    '."\n" . '
    '. JText::_('COM_PHOCACART_TITLE') . '
    ' . '
    '. JText::_('COM_PHOCACART_ALIAS') . '
    ' - . '
    '. JText::_('COM_PHOCACART_VALUE') . '
    ' + . '
     
    ' + . '
    '. JText::_('COM_PHOCACART_VALUE') . '
    ' . '
    '. JText::_('COM_PHOCACART_IN_STOCK') . '
    ' - . '
    '. JText::_('COM_PHOCACART_WEIGHT') . '
    ' - . '
    '. JText::_('COM_PHOCACART_IMAGE') . '
    ' - . '
     
    ' + . '
     
    ' + . '
    '. JText::_('COM_PHOCACART_WEIGHT') . '
    ' + + . '
    '. JText::_('COM_PHOCACART_IMAGES') . '
    ' + . '
    '. JText::_('COM_PHOCACART_COLOR') . '
    ' + //. '
     
    ' .'
    '."\n"; + + $o .= '
    '; return $o; } @@ -359,6 +512,17 @@ public function additionalSpecificationsRow($id, $title, $alias, $value, $alias_ // Will be displayed inside Javascript $o .= '
    '; + if ($id == 0) { + // Add Header + /*$o .= '
    '."\n" + . '
    '. JText::_('COM_PHOCACART_TITLE') . '
    ' + . '
    '. JText::_('COM_PHOCACART_ALIAS') . '
    ' + . '
    '. JText::_('COM_PHOCACART_REQUIRED') . '
    ' + . '
    '. JText::_('COM_PHOCACART_TYPE') . '
    ' + . '
     
    ' + .'
    '."\n";*/ + $o .= $this->headerSpecification(); + } $o .= '
    ' @@ -375,7 +539,8 @@ public function additionalSpecificationsRow($id, $title, $alias, $value, $alias_ .'
    ' - .'
    '.JText::_('COM_PHOCACART_REMOVE_PARAMETER').'
    ' + .'
    ' + .'
    '.''.'
    ' .'
    ' @@ -407,6 +572,7 @@ public function additionalSpecificationsRow($id, $title, $alias, $value, $alias_ } public function headerSpecification() { + //$o = '
    '."\n" $o = '
    '."\n" . '
    '. JText::_('COM_PHOCACART_PARAMETER') . '
    ' . '
    '. JText::_('COM_PHOCACART_VALUE') . '
    ' @@ -416,5 +582,83 @@ public function headerSpecification() { return $o; } + + public function modalWindow($id, $link, $textButton) { + + // Add javascript for additional images + // Specific case for additional images + // In case we have more than one "select image form input" and the additional form inputs are made by javascript + // we need to differentiate between them - the field id for each form input + // phRowImage is a variable set when clicking select button for additional images + //$link = 'index.php?option=com_phocacart&view=phocacartmanager'.$group['c'].$managerOutput.'&field='.$this->id . '\'+ (phRowImage) +\''; + $html = array(); + $html[] = JHtml::_( + 'bootstrap.renderModal', + $id, + array( + 'url' => $link, + 'title' => JText::_($textButton), + 'width' => '700px', + 'height' => '400px', + 'modalWidth' => '80', + 'bodyHeight' => '70', + 'footer' => '' + ) + ); + return implode("\n", $html); + } + + + public function modalWindowDynamic($id, $textButton, $w = 700, $h = 400, $reload = false) { + + + $s = array(); + $s[] = 'jQuery(document).ready(function() {'; + $s[] = ' jQuery(document.body).on(\'click\', \'a.'.$id.'ModalButton\' ,function(e) {'; + $s[] = ' var src = jQuery(this).attr(\'data-src\');'; + //$s[] = ' var height = jQuery(this).attr(\'data-height\') || '.$h.';'; + //$s[] = ' var width = jQuery(this).attr(\'data-width\') || '.$w.';'; + $s[] = ' jQuery("#'.$id.' iframe").attr({\'src\':src, \'height\': \'100%\', \'width\': \'auto\', \'max-height\': \'100%\'});'; + $s[] = ' });'; + + if ($reload) { + $s[] = ' jQuery("#'.$id.'").on("hidden", function () {'; + $s[] = ' var phOverlay = jQuery(\'
    \');'; + $s[] = ' phOverlay.appendTo(document.body);'; + $s[] = ' jQuery("#phOverlay").fadeIn().css("display","block");'; + $s[] = ' setTimeout(function(){'; + $s[] = ' window.parent.location.reload();'; + $s[] = ' },10);'; + $s[] = ' });'; + } + $s[] = '})'; + JFactory::getDocument()->addScriptDeclaration(implode("\n", $s)); + + $html = array(); + $html[] = JHtml::_( + 'bootstrap.renderModal', + $id, + array( + //'url' => $link, + 'title' => JText::_($textButton), + 'width' => $w.'px', + 'height' => $h.'px', + 'modalWidth' => '80', + 'bodyHeight' => '70', + 'footer' => '' + ), + '' + ); + return implode("\n", $html); + + /* Row + $o .= ' ' + . ' ' + . JText::_($textButton) . ''; + */ + } + } ?> \ No newline at end of file diff --git a/libraries/phocacart/render/renderadminviews.php b/libraries/phocacart/render/renderadminviews.php index e8c7f910..b3383268 100644 --- a/libraries/phocacart/render/renderadminviews.php +++ b/libraries/phocacart/render/renderadminviews.php @@ -278,9 +278,9 @@ public function td($value, $class = '') { } } - /* TODO: + /* TO DO: * CHANGE PATHS - * SET NEW PARAM IN PG: '/media/com_phocagallery/images/administrator/' + * SET NEW PARAM IN PG: '/media/com_phocacart/images/administrator/' */ public function tdImage($item, $button, $txtE, $class = '', $avatarAbs = '', $avatarRel = '') { $o = ''. "\n"; diff --git a/libraries/phocacart/render/renderfront.php b/libraries/phocacart/render/renderfront.php index da1ad782..b6cba74f 100644 --- a/libraries/phocacart/render/renderfront.php +++ b/libraries/phocacart/render/renderfront.php @@ -60,7 +60,7 @@ public static function renderFeaturedIcon($featured, $size = 1) { return $o; } - public static function prepareDocument($document, $params, $category = false, $item = false) { + public static function prepareDocument($document, $params, $category = false, $item = false, $header = '') { $app = JFactory::getApplication(); $menus = $app->getMenu(); @@ -69,7 +69,10 @@ public static function prepareDocument($document, $params, $category = false, $i $title = null; $metakey = $params->get( 'cart_metakey', '' ); $metadesc = $params->get( 'cart_metadesc', '' ); - $nameInTitle = 1;// TODO possible parameter Category or Title name + $nameInTitle = 1;// TO DO possible parameter Category or Title name + + $viewCurrent = $app->input->get('view'); + $viewLink = $menu->query['view']; $type = ''; $name = array(); @@ -80,7 +83,7 @@ public static function prepareDocument($document, $params, $category = false, $i $name = $category; $type = 'category'; } - + if ($menu) { $params->def('page_heading', $params->get('page_title', $menu->title)); } else { @@ -88,7 +91,10 @@ public static function prepareDocument($document, $params, $category = false, $i } $title = $params->get('page_title', ''); - if (empty($title)) { + + if ($viewLink != $viewCurrent && $header != '') { + $title = $header; + } else if (empty($title)) { $title = htmlspecialchars_decode($app->getCfg('sitename')); } else if ($app->getCfg('sitename_pagetitles', 0) == 1) { $title = JText::sprintf('JPAGETITLE', htmlspecialchars_decode($app->getCfg('sitename')), $title); @@ -101,6 +107,7 @@ public static function prepareDocument($document, $params, $category = false, $i } $title = JText::sprintf('JPAGETITLE', $title, htmlspecialchars_decode($app->getCfg('sitename'))); } + $document->setTitle($title); @@ -129,7 +136,7 @@ public static function prepareDocument($document, $params, $category = false, $i $document->setMetaData('title', $params->get('page_title', '')); } - // Breadcrumbs TODO (Add the whole tree) + // Breadcrumbs TO DO (Add the whole tree) if ($type == 'category') { $path = PhocaCartCategory::getPath(array(), (int)$category->id, (int)$category->parent_id, $category->title, $category->alias); @@ -162,7 +169,7 @@ public static function prepareDocument($document, $params, $category = false, $i $pathway->addItem($category->title); } }*/ - } else if ($type == 'item') { + } else if ($type == 'item' || $type == 'question') { $path = PhocaCartCategory::getPath(array(), (int)$category->id, (int)$category->parent_id, $category->title, $category->alias); $curpath = $pathway->getPathwayNames(); @@ -184,6 +191,18 @@ public static function prepareDocument($document, $params, $category = false, $i if (isset($item->title) && !empty($item->title)) { $pathway->addItem($item->title); } + } else { + + if ($viewCurrent == $viewLink) { + // Don't add anything to pathway as we display the title from menu link + // for example - comparision view has an menu link, use menu link title + } else { + // we are e.g. in comparison view but we use a menu link from categories + // so we need to add comparison header if exists + if ($header != '') { + $pathway->addItem($header); + } + } } } @@ -244,4 +263,34 @@ public static function displayVideo($url, $view = 0, $ywidth = 0, $yheight = 0) } return $o; } + + public static function renderHeader($headers = array(), $tag = 'h1') { + + $app = JFactory::getApplication(); + //$menus = $app->getMenu(); + //$menu = $menus->getActive(); + $p = $app->getParams(); + $showPageHeading= $p->get('show_page_heading'); + $pageHeading = $p->get('page_heading'); + + $h = array(); + if ($showPageHeading && $pageHeading != '') { + $h[] = htmlspecialchars($pageHeading); + } + + if (!empty($headers)) { + foreach ($headers as $k => $v) { + if ($v != '') { + $h[] = htmlspecialchars($v); + break; // in array there are stored OR items (if empty try next, if not empty use this and do not try next) + // PAGE HEADING AND NEXT ITEM OR NEXT NEXT ITEM + } + } + } + + if (!empty($h)) { + return '<' . strip_tags($tag) . '>' . implode(" - ", $h) . ''; + } + return false; + } } \ No newline at end of file diff --git a/libraries/phocacart/render/renderjs.php b/libraries/phocacart/render/renderjs.php index d1369e93..c1489385 100644 --- a/libraries/phocacart/render/renderjs.php +++ b/libraries/phocacart/render/renderjs.php @@ -14,8 +14,7 @@ private function __construct(){} public static function renderAjaxTopHtml($text = '') { $o = '
    '; if ($text != '') { - $o .= '
    '. JHtml::_( 'image', 'media/com_phocacart/images/administrator/icon-loading5.gif', '') - .'  '. htmlspecialchars($text) . '
    '; + $o .= '
    '. htmlspecialchars($text) . '
    '; } $o .= '
    '; return $o; @@ -25,7 +24,7 @@ public static function renderAjaxDoRequest($text) { $s = array(); $s[] = 'function phDoRequest(url, manager, value) {'; - $s[] = 'var phAjaxTop = \'
    '. JHtml::_( 'image', 'media/com_phocacart/images/administrator/icon-loading5.gif', ''). '   \' + \''. htmlspecialchars($text).'\' + \'
    \';'; + $s[] = 'var phAjaxTop = \'
    \' + \''. htmlspecialchars($text).'\' + \'
    \';'; $s[] = ' jQuery("#ph-ajaxtop").html(phAjaxTop);'; $s[] = ' jQuery("#ph-ajaxtop").show();'; $s[] = ' var dataPost = {};'; @@ -73,17 +72,41 @@ public static function renderAjaxDoRequestAfterChange($url, $manager = 'product' public static function renderAjaxDoRequestAfterPaste($url, $manager = 'product') { $s = array(); - $s[] = 'function phAddValue(id, title) {'; + $s[] = 'function phAddValue(id, title, titleModal) {'; $s[] = ' document.getElementById(id).value = title;'; - $s[] = ' SqueezeBox.close();'; + //$s[] = ' SqueezeBox.close();';// close + $s[] = ' jQuery(\'.modal\').modal(\'hide\');'; $s[] = ' phDoRequest(\''.$url.'\', \''.$manager.'\', title );'; $s[] = '}'; + + //jQuery('.modal').on('hidden', function () { + // // Do something after close + //}); + JFactory::getDocument()->addScriptDeclaration(implode("\n", $s)); } - public static function renderJsManageRowImage($i, $newRow, $poPup) { + public static function renderJsManageRowImage($i, $newRow) { $s = array(); $s[] = 'var phRowCountImage = '.$i.';'; + + // We have only two modal box - 1. for image, 2. for additinal images (all) + // So we need to get info, which additional images we have clicked + // For example, if there are 3 additional images and we click on second, in modal box, we need to get this value to set right value + // phRowImage variable is a part of iframe url (the iframe url is build dynamically) + // administrator\components\com_phocacart\models\fields\phocaselectfilenameimage.php + // $link = 'index.php?option=com_phocacart&view=phocacartmanager'.$group['c'].$managerOutput.'&field='.$this->id . '\'+ (phRowImage) +\''; + // Here + // administrator\components\com_phocacart\views\phocacartmanager\tmpl\default_file.php + // we get is as $this->field + // Here + // administrator\components\com_phocacart\libraries\phocacart\render\renderadminview.php + // in function additionalImagesRow we call this function + //$s[] = 'var phRowImage = 0;'; + //$s[] = 'function setPhRowImageId(rowImgId) {'; + //$s[] = ' phRowImage = rowImgId;'; + //$s[] = '}'; + $s[] = 'function phAddRowImage() {'; $s[] = ' var phNewRow = \'
    '. $newRow .'\';'; $s[] = ' jQuery(\'#phrowboximage\').append(phNewRow);'; @@ -92,11 +115,11 @@ public static function renderJsManageRowImage($i, $newRow, $poPup) { $s[] = ' jQuery(\'select\').chosen({disable_search_threshold : 10,allow_single_deselect : true});';//Reload Chosen Admin //$s[] = ' jQuery(\'select\').trigger("chosen:updated");';//Reload Chosen $s[] = ' '; - $s[] = ' /* Initialize the modal button again - FOR IMAGES */'; - $s[] = ' /* SqueezeBox.initialize({}); */'; - $s[] = ' SqueezeBox.assign($$(\''.$poPup.'\'), {'; - $s[] = ' parse: \'rel\''; - $s[] = ' });'; + //$s[] = ' /* Initialize the modal button again - FOR IMAGES */'; + //$s[] = ' /* SqueezeBox.initialize({}); */'; + //$s[] = ' SqueezeBox.assign($$(\''.$poPup.'\'), {'; + //$s[] = ' parse: \'rel\''; + //$s[] = ' });'; $s[] = '}'; $s[] = ' '; @@ -159,23 +182,40 @@ public static function renderJsManageRowOption($j, $newRow, $newHeader) { function jModalClose() {SqueezeBox.close();}' ;*/ $s[] = 'var phRowCountOption = '.$j.';'; + + + //$s[] = 'var phRowImgOption = \'00\';'; + //$s[] = 'function setPhRowImgOptionId(attrId, id) {'; + //$s[] = ' phRowImgOption = attrId.toString() + id.toString();'; + //$s[] = '}'; + + $s[] = 'function phAddRowOption(attrid) {'; $s[] = ' var phNewRow = \'
    '. $newRow .'\';'; $s[] = ' var phNewHeader = \'
    '. $newHeader .'\';'; $s[] = ' var phCountRowOption = jQuery(\'.ph-row-option-attrid\' + attrid).length;'; $s[] = ' if(phCountRowOption == 0) {'; - $s[] = ' jQuery(\'#phrowboxoption\' + attrid).append(phNewHeader);'; + $s[] = ' jQuery(\'#phrowboxoptionjs\' + attrid).append(phNewHeader);'; $s[] = ' }'; - $s[] = ' jQuery(\'#phrowboxoption\' + attrid).append(phNewRow);'; + $s[] = ' jQuery(\'#phrowboxoptionjs\' + attrid).append(phNewRow);'; // Modal Box Popup wee need to initialize it for every newly added item - $s[] = ' /* Initialize the modal button again - FOR IMAGES IN ATTRIBUTE OPTIONS */'; - $s[] = ' SqueezeBox.initialize({});'; - $s[] = ' var phModalFormOption = \'a.modal_jform_optionimage\' + attrid + phRowCountOption;'; - $s[] = ' SqueezeBox.assign(jQuery(phModalFormOption).get(), {parse: \'rel\'});'; - $s[] = ' function jModalClose() {SqueezeBox.close();}'; + //$s[] = ' /* Initialize the modal button again - FOR IMAGES IN ATTRIBUTE OPTIONS */'; + //$s[] = ' SqueezeBox.initialize({});'; + //$s[] = ' var phModalFormOption = \'a.modal_jform_optionimage\' + attrid + phRowCountOption;'; + //$s[] = ' SqueezeBox.assign(jQuery(phModalFormOption).get(), {parse: \'rel\'});'; + //$s[] = ' function jModalClose() {SqueezeBox.close();}'; // End Modal Box + $s[] = ' '; + $s[] = ' var phMiniColorsId = \'#jform_optioncolor\' + attrid + phRowCountOption;';// Reload minicolors + $s[] = ' jQuery(phMiniColorsId).minicolors({ + control: \'hex\', + format: \'hex\', + position: \'default\', + theme: \'bootstrap\' + });'; + $s[] = ' '; $s[] = ' phRowCountOption++;'; $s[] = ' jQuery(\'select\').chosen({disable_search_threshold : 10,allow_single_deselect : true});';//Reload Chosen Admin //$s[] = ' jQuery(\'select\').trigger("chosen:updated");';//Reload Chosen @@ -188,12 +228,17 @@ function jModalClose() {SqueezeBox.close();}' ;*/ $s[] = ' jQuery(\'#phOptionBox\' + attrid + id).remove();'; $s[] = ' var phCountRowOption = jQuery(\'.ph-row-option-attrid\' + attrid).length;'; $s[] = ' if (phCountRowOption == 0) {'; - $s[] = ' jQuery(\'#phrowboxoption\' + attrid).empty();'; + $s[] = ' jQuery(\'#phrowboxoptionjs\' + attrid).empty();';// clean header of option added by js + $s[] = ' jQuery(\'#phrowboxoption\' + attrid).empty();';// clean header of option loaded by php $s[] = ' }'; //$s[] = ' phRowCountOption--;';// DON'T SUBTRACT, it is not COUNT, but ID, every row should be unique ID //$s[] = ' jQuery(\'select\').chosen({disable_search_threshold : 10,allow_single_deselect : true});';//Reload Chosen $s[] = '}'; JFactory::getDocument()->addScriptDeclaration(implode("\n", $s)); + + // #phrowboxoptionjs - header created by javascript + // #phrowboxoption - header created by php/mysql + } public static function renderJsManageRowSpecification($i, $newRow, $newHeader) { @@ -217,23 +262,16 @@ public static function renderJsManageRowSpecification($i, $newRow, $newHeader) { //$s[] = ' jQuery(\'#phrowSpecification\' + id).remove();'; $s[] = ' jQuery(\'#phSpecificationBox\' + id).remove();'; $s[] = ' var phCountRowSpecification = jQuery(\'.ph-row-specification\').length;'; - $s[] = ' if (phCountSpecification == 0) {'; + $s[] = ' if (phCountRowSpecification == 0) {'; $s[] = ' jQuery(\'#phrowboxspecification\').empty();'; + $s[] = ' jQuery(\'#phrowboxspecificationheader\').empty();'; $s[] = ' }'; $s[] = '}'; JFactory::getDocument()->addScriptDeclaration(implode("\n", $s)); - } - - - public static function renderJsAppendValueToUrl() { - $s = array(); - $s[] = 'jQuery(document).ready(function() {'; - $s[] = ' var phDownloadFolder = jQuery(\'#jform_download_folder\').val();'; - $s[] = ' var stringToSend = "&folder=" + phDownloadFolder + "&downloadfolder=" + phDownloadFolder;'; - $s[] = ' var newUri = jQuery(\'.modal_jform_download_file\').attr(\'href\') + stringToSend;'; - $s[] = ' jQuery(\'.modal_jform_download_file\').attr("href", newUri);'; - $s[] = '})'; - JFactory::getDocument()->addScriptDeclaration(implode("\n", $s)); + + // #phrowboxspecification - header created by javascript + // #phrowboxspecificationheader - header created by php/mysql + } public static function renderBillingAndShippingSame() { @@ -311,14 +349,17 @@ public static function renderAjaxChangeProductPriceByOptions($id = 0, $class = ' return false; } if ($id == 0) { - return false; + // Quick View Popup + $id = 'jQuery(\'#phItemPriceBoxForm\').data(\'id\')'; + } else { + $id = (int)$id; } $urlAjax = JURI::base(true).'/index.php?option=com_phocacart&task=checkout.changepricebox&format=json&'. JSession::getFormToken().'=1'; $s[] = 'jQuery(document).ready(function(){'; - $s[] = ' jQuery("#phItemPriceBoxForm select.ph-item-input-select-attributes").change(function(){'; + $s[] = ' jQuery(document).on(\'change\', \'#phItemPriceBoxForm select.ph-item-input-select-attributes\', function(){'; $s[] = ' var phUrl = "'. $urlAjax.'";'; - $s[] = ' var phId = '.(int)$id.';'; + $s[] = ' var phId = '.$id.';'; $s[] = ' var phClass = "'.$class.'";'; $s[] = ' var phDataA = jQuery("#phItemPriceBoxForm select").serialize();'; $s[] = ' var phData = \'id=\'+phId+\'&\'+phDataA+\'&\'+\'class=\'+phClass;'; @@ -338,6 +379,8 @@ public static function renderAjaxChangeProductPriceByOptions($id = 0, $class = ' $s[] = ' }'; $s[] = ' }'; $s[] = ' })'; + + //$s[] = ' jQuery(this).off("change");'; $s[] = ' })'; $s[] = '})'; JFactory::getDocument()->addScriptDeclaration(implode("\n", $s)); @@ -462,6 +505,7 @@ public static function renderAjaxAddToCompare() { // If no popup is displayed we can relaod the page when we are in comparison page // If popup, this will be done when clicking continue or comparison list $s[] = ' if (phComparisonView == 1) {'; + $s[] = self::renderOverlay(); $s[] = ' setTimeout(function() {location.reload();}, 0001);'; $s[] = ' }'; } @@ -530,6 +574,7 @@ public static function renderAjaxRemoveFromCompare() { // If no popup is displayed we can relaod the page when we are in comparison page // If popup, this will be done when clicking continue or comparison list $s[] = ' if (phComparisonView == 1) {'; + $s[] = self::renderOverlay(); $s[] = ' setTimeout(function() {location.reload();}, 0001);'; $s[] = ' }'; } @@ -545,6 +590,299 @@ public static function renderAjaxRemoveFromCompare() { JFactory::getDocument()->addScriptDeclaration(implode("\n", $s)); } } + + + + public static function renderAjaxAddToWishList() { + + $paramsC = JComponentHelper::getParams('com_phocacart') ; + $add_wishlist_method = $paramsC->get( 'add_wishlist_method', 0 ); + + // We need to refresh wishlist site when AJAX used for removing or adding products to wishlist list + $app = JFactory::getApplication(); + $view = $app->input->get('view', ''); + $option = $app->input->get('option', ''); + if ($option == 'com_phocacart' && $view == 'wishlist') { + $wView = 1; + } else { + $wView = 0; + } + + if ($add_wishlist_method == 0) { + return false; + } + if ($add_wishlist_method == 2) { + JHTML::stylesheet( 'media/com_phocacart/bootstrap/css/bs_modal_transition.css'); + } + + if ($add_wishlist_method > 0) { + $urlAjax = JURI::base(true).'/index.php?option=com_phocacart&task=wishlist.add&format=json&'. JSession::getFormToken().'=1&wishlistview='.(int)$wView; + //$s[] = 'jQuery(document).ready(function(){'; + //$s[] = ' jQuery(".phItemWishListBoxForm").on(\'submit\', function (e) {'; + $s[] = ' function phItemWishListBoxFormAjax(phItemId) {'; + $s[] = ' var phUrl = "'. $urlAjax.'";'; + $s[] = ' var phItem = \'#\' + phItemId;'; + $s[] = ' var phWishListView = '.(int)$wView.''; + $s[] = ' var phData = jQuery(phItem).serialize();'; + $s[] = ' '; + $s[] = ' phRequest = jQuery.ajax({'; + $s[] = ' type: "POST",'; + $s[] = ' url: phUrl,'; + $s[] = ' async: "false",'; + $s[] = ' cache: "false",'; + $s[] = ' data: phData,'; + $s[] = ' dataType:"JSON",'; + $s[] = ' success: function(data){'; + $s[] = ' if (data.status == 1){'; + $s[] = ' jQuery("#phItemWishListBox").html(data.item);'; + if ($add_wishlist_method == 2) { + $s[] = ' jQuery("#phContainer").html(data.popup);'; + $s[] = ' jQuery("#phAddToWishListPopup").modal();'; + } + if ($add_wishlist_method == 1) { + // If no popup is displayed we can relaod the page when we are in wishlist page + // If popup, this will be done when clicking continue or wishlist list + $s[] = ' if (phWishListView == 1) {'; + $s[] = self::renderOverlay(); + $s[] = ' setTimeout(function() {location.reload();}, 0001);'; + $s[] = ' }'; + } + $s[] = ' } else {'; + //$s[] = ' // Don\'t change the price box'; + $s[] = ' }'; + $s[] = ' }'; + $s[] = ' })'; + //$s[] = ' e.preventDefault();'; + //$s[] = ' return false;'; + $s[] = ' }'; + //$s[] = '})'; + JFactory::getDocument()->addScriptDeclaration(implode("\n", $s)); + } + } + + public static function renderAjaxRemoveFromWishList() { + + $paramsC = JComponentHelper::getParams('com_phocacart') ; + $add_wishlist_method = $paramsC->get( 'add_wishlist_method', 0 ); + + // We need to refresh wishlist site when AJAX used for removing or adding products to wishlist list + $app = JFactory::getApplication(); + $view = $app->input->get('view', ''); + $option = $app->input->get('option', ''); + if ($option == 'com_phocacart' && $view == 'wishlist') { + $wView = 1; + } else { + $wView = 0; + } + + + if ($add_wishlist_method == 0) { + return false; + } + if ($add_wishlist_method == 2) { + JHTML::stylesheet( 'media/com_phocacart/bootstrap/css/bs_modal_transition.css'); + } + + if ($add_wishlist_method > 0) { + + $urlAjax = JURI::base(true).'/index.php?option=com_phocacart&task=wishlist.remove&format=json&'. JSession::getFormToken().'=1&wishlistview='.(int)$wView; + //$s[] = 'jQuery(document).ready(function(){'; + //$s[] = ' jQuery(".phItemWishListBoxForm").on(\'submit\', function (e) {'; + $s[] = ' function phItemRemoveWishListFormAjax(phItemId) {'; + $s[] = ' var phUrl = "'. $urlAjax.'";'; + $s[] = ' var phItem = \'#\' + phItemId;'; + $s[] = ' var phWishListView = '.(int)$wView.''; + $s[] = ' var phData = jQuery(phItem).serialize();'; + $s[] = ' '; + $s[] = ' phRequest = jQuery.ajax({'; + $s[] = ' type: "POST",'; + $s[] = ' url: phUrl,'; + $s[] = ' async: "false",'; + $s[] = ' cache: "false",'; + $s[] = ' data: phData,'; + $s[] = ' dataType:"JSON",'; + $s[] = ' success: function(data){'; + $s[] = ' if (data.status == 1){'; + $s[] = ' jQuery("#phItemWishListBox").html(data.item);'; + if ($add_wishlist_method == 2) { + // Display the popup + $s[] = ' jQuery("#phContainerModuleWishList").html(data.popup);'; + $s[] = ' jQuery("#phRemoveFromWishListPopup").modal();'; + } + if ($add_wishlist_method == 1) { + // If no popup is displayed we can relaod the page when we are in wishlist page + // If popup, this will be done when clicking continue or wishlist list + $s[] = ' if (phWishListView == 1) {'; + $s[] = self::renderOverlay(); + $s[] = ' setTimeout(function() {location.reload();}, 0001);'; + $s[] = ' }'; + } + $s[] = ' } else {'; + //$s[] = ' // Don\'t change the price box'; + $s[] = ' }'; + $s[] = ' }'; + $s[] = ' })'; + //$s[] = ' e.preventDefault();'; + //$s[] = ' return false;'; + $s[] = ' }'; + //$s[] = '})'; + JFactory::getDocument()->addScriptDeclaration(implode("\n", $s)); + } + } + + + + + + + public static function renderAjaxQuickViewBox() { + + + $paramsC = JComponentHelper::getParams('com_phocacart') ; + //$add_compare_method = $paramsC->get( 'add_compare_method', 0 ); + + // We need to refresh comparison site when AJAX used for removing or adding products to comparison list + $app = JFactory::getApplication(); + $view = $app->input->get('view', ''); + $option = $app->input->get('option', ''); + /*if ($option == 'com_phocacart' && $view == 'comparison') { + $cView = 1; + } else { + $cView = 0; + }*/ + + + JHTML::stylesheet( 'media/com_phocacart/bootstrap/css/bs_modal_transition.css'); + + + + $urlAjax = JURI::base(true).'/index.php?option=com_phocacart&view=item&format=json&tmpl=component&'. JSession::getFormToken().'=1'; + //$s[] = 'jQuery(document).ready(function(){'; + //$s[] = ' jQuery(".phItemCompareBoxForm").on(\'submit\', function (e) {'; + $s[] = ' function phItemQuickViewBoxFormAjax(phItemId) {'; + $s[] = ' var phUrl = "'. $urlAjax.'";'; + $s[] = ' var phItem = \'#\' + phItemId;'; + //$s[] = ' var phComparisonView = '.(int)$cView.''; + $s[] = ' var phData = jQuery(phItem).serialize();'; + $s[] = ' '; + $s[] = ' phRequest = jQuery.ajax({'; + $s[] = ' type: "POST",'; + $s[] = ' url: phUrl,'; + $s[] = ' async: "false",'; + $s[] = ' cache: "false",'; + $s[] = ' data: phData,'; + $s[] = ' dataType:"JSON",'; + $s[] = ' success: function(data){'; + $s[] = ' if (data.status == 1){'; + //$s[] = ' jQuery("#phItemCompareBox").html(data.item);'; + + //$s[] = ' jQuery("#phQuickViewPopupBody").html(data.popup);'; added in ajax + $s[] = ' jQuery("#phContainer").html(data.popup);'; + $s[] = ' jQuery("#phQuickViewPopup").modal();'; + $s[] = ' jQuery(\'select\').chosen({disable_search_threshold : 10,allow_single_deselect : true});';//Reload Chosen + + $s[] = ' } else {'; + //$s[] = ' // Don\'t change the price box'; + $s[] = ' }'; + $s[] = ' }'; + $s[] = ' })'; + //$s[] = ' e.preventDefault();'; + //$s[] = ' return false;'; + $s[] = ' }'; + //$s[] = '})'; + JFactory::getDocument()->addScriptDeclaration(implode("\n", $s)); + + + + + + + + + + /* + + + + $paramsC = JComponentHelper::getParams('com_phocacart') ; + $app = JFactory::getApplication(); + + JHTML::stylesheet( 'media/com_phocacart/bootstrap/css/bs_modal_transition.css'); + + + + $urlAjax = JURI::base(true).'/index.php?option=com_phocacart&view=item'; + +$s[] = 'jQuery(document).ready(function(){'; + $s[] = ' + + + +jQuery(\'.test\').on(\'click\', function(e) { + + + + + var src = jQuery(this).attr(\'data-src\'); + + + var height = jQuery(this).attr(\'data-height\') || \'100%\'; + var width = jQuery(this).attr(\'data-width\') || \'100%\'; + + + + jQuery("#phQuickViewPopup iframe").attr({\'src\':src, + \'height\': height, + \'width\': width}); + jQuery("#phQuickViewPopup").modal(); + + });'; +$s[] = '})'; + + + // function phItemQuickViewBoxFormAjax(phItemId) {'; + + // $s[] = 'jQuery(\'.modal\').on(\'shown.bs.modal\',function(){ + //jQuery(this).find(\'iframe\').attr(\'src\',\'http:\/\/phoca.cz\') +//})'; + /*$s[] = ' var phUrl = "'. $urlAjax.'";'; + $s[] = ' var phItem = \'#\' + phItemId;'; + $s[] = ' var phData = jQuery(phItem).serialize();'; + $s[] = ' '; + $s[] = ' phRequest = jQuery.ajax({'; + $s[] = ' type: "POST",'; + $s[] = ' url: phUrl,'; + $s[] = ' async: "false",'; + $s[] = ' cache: "false",'; + $s[] = ' data: phData,'; + $s[] = ' dataType:"HTML",'; + $s[] = ' success: function(data){'; + $s[] = ' if (1 == 1){'; + // $s[] = ' jQuery("#phItemWishListBox").html(data.item);'; + + $s[] = ' jQuery("#phQuickViewPopupBody").html(data);'; + $s[] = ' jQuery("#phQuickViewPopup").modal();'; + + + $s[] = ' } else {'; + //$s[] = ' // Don\'t change the price box'; + $s[] = ' }'; + $s[] = ' }'; + $s[] = ' })'; + //$s[] = ' e.preventDefault();'; + //$s[] = ' return false;'; *//* + //$s[] = ' }'; + //$s[] = '})'; + JFactory::getDocument()->addScriptDeclaration(implode("\n", $s));*/ + + } + + + + + + + // Singleton - do not load items more times from database @@ -633,18 +971,33 @@ public static function renderPrettyPhoto() { JHTML::stylesheet( 'media/com_phocacart/js/prettyphoto/css/prettyPhoto.css' ); $document->addScript(JURI::root(true).'/media/com_phocacart/js/prettyphoto/js/jquery.prettyPhoto.js'); - $js = "\n". 'jQuery(document).ready(function(){ - jQuery("a[rel^=\'prettyPhoto\']").prettyPhoto({'."\n"; - $js .= ' social_tools: 0'."\n"; - $js .= ' }); - });'."\n"; + $s[] = 'jQuery(document).ready(function(){'; + $s[] = ' jQuery("a[rel^=\'prettyPhoto\']").prettyPhoto({'; + $s[] = ' social_tools: 0'; + $s[] = ' });'; + $s[] = '})'; + + $document->addScriptDeclaration(implode("\n", $s)); + } + + public static function renderOverlay(){ + + $s = array(); + $s[] = ' var phOverlay = jQuery(\'
    \');'; + $s[] = ' phOverlay.appendTo(document.body);'; + $s[] = ' jQuery("#phOverlay").fadeIn().css("display","block");'; + return implode("\n", $s); + } - $document->addScriptDeclaration($js); + + public static function renderPhocaAttribute() { + $document = JFactory::getDocument(); + $document->addScript(JURI::root(true).'/media/com_phocacart/js/phoca/jquery.phocaattribute.js'); } public final function __clone() { - JError::raiseWarning(500, 'Function Error: Cannot clone instance of Singleton pattern');// No JText - for developers only + throw new Exception('Function Error: Cannot clone instance of Singleton pattern', 500); return false; } } diff --git a/libraries/phocacart/render/rendermedia.php b/libraries/phocacart/render/rendermedia.php index d99b73d1..22d0d6ae 100644 --- a/libraries/phocacart/render/rendermedia.php +++ b/libraries/phocacart/render/rendermedia.php @@ -12,6 +12,7 @@ class PhocaCartRenderMedia { public $jquery = 0; protected $document = false; + public function __construct() { JHTML::stylesheet('media/com_phocacart/css/main.css' ); @@ -19,8 +20,21 @@ public function __construct() { $this->document = JFactory::getDocument(); } + public function loadProductHover($load = 0) { + if ($load == 1) { + JHTML::stylesheet('media/com_phocacart/css/main-product-hover.css' ); + } + } + + public function loadPhocaMoveImage($load = 0) { + if ($load == 1) { + JHTML::stylesheet('media/com_phocacart/css/main-product-image-move.css' ); + } + } + public function loadBootstrap($load = 0) { if ($load == 1) { + JHTML::stylesheet('media/com_phocacart/bootstrap/css/bootstrap.min.css' ); $this->document->addScript(JURI::root(true).'/media/com_phocacart/bootstrap/js/bootstrap.min.js'); } @@ -43,16 +57,25 @@ public function loadChosen($load = 0) { public function loadEqualHeights($load = 0) { if ($load == 1) { $this->document->addScript(JURI::root(true).'/media/com_phocacart/js/jquery.equalheights.min.js'); + //$this->document->addScript(JURI::root(true).'/media/com_phocacart/js/jquery.equalminheights.min.js'); $this->document->addScriptDeclaration( 'jQuery(window).load(function(){ - jQuery(\'.ph-thumbnail\').equalHeights(); + jQuery(\'.ph-thumbnail-c\').equalHeights(); });'); + // not ph-thumbnail but only ph-thumbnail-c (in component area so module will not influence it) + } + } + + public function loadPhocaSwapImage($load = 0) { + if ($load == 1) { + $this->document->addScript(JURI::root(true).'/media/com_phocacart/js/phoca/jquery.phocaswapimage.js'); } } + - public function loadSwapImage($load = 0) { - if ($load = 0 == 1) { - $this->document->addScript(JURI::root(true).'/media/com_phocacart/js/swap.image.js'); + public function loadPhocaAttribute($load = 0) { + if ($load == 1) { + $this->document->addScript(JURI::root(true).'/media/com_phocacart/js/phoca/jquery.phocaattribute.js'); } } diff --git a/libraries/phocacart/security/index.html b/libraries/phocacart/security/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/libraries/phocacart/security/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/libraries/phocacart/security/security.php b/libraries/phocacart/security/security.php new file mode 100644 index 00000000..4fedc161 --- /dev/null +++ b/libraries/phocacart/security/security.php @@ -0,0 +1,53 @@ + 0) { + $form[] = 1; + } + if ((int)$email > 0) { + $form[] = 2; + } + if ((int)$phone > 0) { + $form[] = 3; + } + if ((int)$message > 0) { + $form[] = 4; + } + $value = mt_rand(0,count($form) - 1); + + return $form[$value]; + } + +} \ No newline at end of file diff --git a/libraries/phocacart/specification/specification.php b/libraries/phocacart/specification/specification.php index 6d965d32..d3186657 100644 --- a/libraries/phocacart/specification/specification.php +++ b/libraries/phocacart/specification/specification.php @@ -81,6 +81,10 @@ public static function storeSpecificationsById($productId, $specsArray) { $v['alias_value'] = PhocaCartUtils::getAliasName($v['alias_value']); } + if(empty($v['group_id'])) { + $v['group_id'] = 0; + } + $values[] = '('.(int)$productId.', '.$db->quote($v['title']).', '.$db->quote($v['alias']).', '.$db->quote($v['value']).', '.$db->quote($v['alias_value']).', '.(int)$v['group_id'].')'; } diff --git a/libraries/phocacart/statistics/statistics.php b/libraries/phocacart/statistics/statistics.php index 2b6fd1e9..8dd7758f 100644 --- a/libraries/phocacart/statistics/statistics.php +++ b/libraries/phocacart/statistics/statistics.php @@ -9,16 +9,18 @@ defined('_JEXEC') or die(); final class PhocaCartStatistics { - private function __construct(){} - - public static function renderChartJs($dataA, $dataALabel, $dataB, $dataBLabel, $dataX) { - + protected $fn = array(); + + public function __construct() { $document = JFactory::getDocument(); JHtml::_('jquery.framework', false); $document->addScript(JURI::root(true).'/media/com_phocacart/js/chartjs/Chart.min.js'); - - + //$document->addScript('https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.2.1/Chart.bundle.js'); + } + + public function renderChartJsLine($id, $dataA, $dataALabel, $dataB, $dataBLabel, $dataX) { + $bC = 'rgba(151,187,205,1)'; $baC = 'rgba(151,187,205,0.1)'; $pbC = 'rgba(255,255,255,1)'; @@ -29,10 +31,8 @@ public static function renderChartJs($dataA, $dataALabel, $dataB, $dataBLabel, $ $pbC2 = 'rgba(255,255,255,1)'; $pbaC2 = 'rgba(220,220,220,1)'; - $o = " - -var config = { +var config".$id." = { type: 'line', data: { datasets: [{ @@ -47,7 +47,6 @@ public static function renderChartJs($dataA, $dataALabel, $dataB, $dataBLabel, $ radius: 4, pointHoverRadius: 5, - label: '".htmlspecialchars($dataALabel)."', /*fillColor: '#fff', strokeColor: '#fff', @@ -55,8 +54,7 @@ public static function renderChartJs($dataA, $dataALabel, $dataB, $dataBLabel, $ pointStrokeColor: '#fff', pointHighlightFill: '#000', pointHighlightStroke: '#fff'*/ - - + }, { data: [".$dataB."], yAxisID: 'y-axis-1', @@ -69,21 +67,13 @@ public static function renderChartJs($dataA, $dataALabel, $dataB, $dataBLabel, $ pointHoverRadius: 5, label: '".htmlspecialchars($dataBLabel)."', - - - + }], labels: [".htmlspecialchars($dataX)." ], - }, - - - - scaleIntegersOnly: true, - +scaleIntegersOnly: true, options: { - responsive: true, hoverMode: 'label', stacked: false, @@ -147,21 +137,73 @@ public static function renderChartJs($dataA, $dataALabel, $dataB, $dataBLabel, $ }], }, } -}; - -window.onload = function() { -var ctx = document.getElementById('ph-chart-area').getContext('2d'); -window.myLine = new Chart(ctx, config); };"; + JFactory::getDocument()->addScriptDeclaration($o); + } + + + public function renderChartJsPie($id, $data) { + $colors = array('#FFCC33', '#FF6633', '#FF3366', '#FF33CC', '#CC33FF'); + $dS = $lS = $bS = ''; + if (!empty($data)) { + + foreach($data as $k => $v) { + $d[$k] = '\''. $v['items']. '\''; + $l[$k] = '\''. $v['title']. '\''; + $c = $k%5; + + $b[$k] = '\''. $colors[$k]. '\''; + } + + $dS = implode(',', $d); + $lS = implode(',', $l); + $bS = implode(',', $b); + } + + $o = " +var config".$id." = { + type: 'pie', + data: { + datasets: [{ + data: [".htmlspecialchars($dS)."], + backgroundColor : [".htmlspecialchars($bS)."], + }], + labels: [".htmlspecialchars($lS)."] + }, + options: { + responsive: true, + } +};"; JFactory::getDocument()->addScriptDeclaration($o); } - public static function getDataChart($numberOfDate = '', $dateFrom = '', $dateTo = '') { + public function setFunction($id, $type) { + $this->fn[$id]['id'] = $id; + $this->fn[$id]['type'] = $type; + $this->fn[$id]['area'] = $id; + } + + public function renderFunctions() { + $s = array(); + $s[] = 'window.onload = function() {'; - $db = JFactory::getDbo(); + if (!empty($this->fn)) { + foreach($this->fn as $k => $v) { + $s[] = 'var ctx'.$v['id'].' = document.getElementById(\''.$v['area'].'\').getContext(\'2d\');'; + $s[] = 'window.'.$v['type'].' = new Chart(ctx'.$v['id'].', config'.$v['id'].');'; + } + } + $s[] = '};'; + JFactory::getDocument()->addScriptDeclaration(implode( "\n", $s )); + } + + public function getDataChart($numberOfDate = '', $dateFrom = '', $dateTo = '') { + + + $db = JFactory::getDbo(); $q = $db->getQuery(true); $q->select('a.id, DATE(a.date) AS date_only, COUNT(DATE(a.date)) AS count_orders'); @@ -241,12 +283,15 @@ public static function getDataChart($numberOfDate = '', $dateFrom = '', $dateTo $i++; } + $rData = array(); + $rData['amount'] = $dataAmount; + $rData['orders'] = $dataOrders; + $rData['ticks'] = $dataTicks; - JHtml::_('jquery.framework', false); - PhocaCartStatistics::RenderChartJs($dataAmount, JText::_('COM_PHOCACART_TOTAL_AMOUNT'), $dataOrders, JText::_('COM_PHOCACART_TOTAL_ORDERS'), $dataTicks); + return $rData; } - public static function getNumberOfOrders($numberOfDate = '', $dateFrom = '', $dateTo = '') { + public function getNumberOfOrders($numberOfDate = '', $dateFrom = '', $dateTo = '') { if ($numberOfDate == '') { $numberOfDate = 7; @@ -270,7 +315,7 @@ public static function getNumberOfOrders($numberOfDate = '', $dateFrom = '', $da return 0; } - public static function getNumberOfUsers($numberOfDate = '', $dateFrom = '', $dateTo = '') { + public function getNumberOfUsers($numberOfDate = '', $dateFrom = '', $dateTo = '') { if ($numberOfDate == '') { $numberOfDate = 7; @@ -296,7 +341,7 @@ public static function getNumberOfUsers($numberOfDate = '', $dateFrom = '', $dat return 0; } - public static function getAmountOfOrders($numberOfDate = '', $dateFrom = '', $dateTo = '') { + public function getAmountOfOrders($numberOfDate = '', $dateFrom = '', $dateTo = '') { if ($numberOfDate == '') { $numberOfDate = 7; @@ -318,7 +363,7 @@ public static function getAmountOfOrders($numberOfDate = '', $dateFrom = '', $da $db->setQuery($q); $count = $db->loadRow(); if (isset($count[0]) && (int)$count[0] != 0) { - return PhocaCartStatistics::abreviateNumbers($count[0]); + return $this->abreviateNumbers($count[0]); } return 0; } @@ -327,7 +372,7 @@ public static function getAmountOfOrders($numberOfDate = '', $dateFrom = '', $da * http://stackoverflow.com/questions/13049851/php-number-abbreviator */ - public static function abreviateNumbers($value) { + public function abreviateNumbers($value) { $abbreviations = array(12 => 'T', 9 => 'B', 6 => 'M', 3 => 'K', 0 => ''); foreach($abbreviations as $exponent => $abbreviation) { @@ -337,13 +382,5 @@ public static function abreviateNumbers($value) { } } } - - - - - public final function __clone() { - JError::raiseWarning(500, 'Function Error: Cannot clone instance of Singleton pattern');// No JText - for developers only - return false; - } } ?> \ No newline at end of file diff --git a/libraries/phocacart/stock/stock.php b/libraries/phocacart/stock/stock.php index 93a02f10..82642c82 100644 --- a/libraries/phocacart/stock/stock.php +++ b/libraries/phocacart/stock/stock.php @@ -31,7 +31,7 @@ public static function getStockStatusData($stockStatusId, $available = 1) { return $data; } - public static function getStockStatus($stockCount, $minQuantity, $stockStatusIdA, $stockStatusIdN) { + public static function getStockStatus($stockCount, $minQuantity, $minMultipleQuantity, $stockStatusIdA, $stockStatusIdN) { // A > 0 OR Not checking // N = 0 @@ -104,6 +104,11 @@ public static function getStockStatus($stockCount, $minQuantity, $stockStatusIdA $stock['min_quantity'] = $minQuantity; } + $stock['min_multiple_quantity'] = false; + if ($minMultipleQuantity > 0) { + $stock['min_multiple_quantity'] = $minMultipleQuantity; + } + return $stock; } diff --git a/libraries/phocacart/utils/extension.php b/libraries/phocacart/utils/extension.php new file mode 100644 index 00000000..c1ec4b94 --- /dev/null +++ b/libraries/phocacart/utils/extension.php @@ -0,0 +1,71 @@ +getQuery(true); + if ($type == 'component'){ + $query->select('extension_id AS id, element AS "option", params, enabled'); + } else { + $query->select('extension_id AS "id", element AS "element", params, enabled'); + } + $query->from('#__extensions'); + $query->where('`type` = '.$db->quote($type)); + if ($folder != '') { + $query->where('`folder` = '.$db->quote($folder)); + } + $query->where('`element` = '.$db->quote($element)); + $db->setQuery($query); + + $cache = JFactory::getCache('_system','callback'); + $extensionData = $cache->get(array($db, 'loadObject'), null, $element, false); + if (isset($extensionData->enabled) && $extensionData->enabled == 1) { + self::$extension[$element] = 1; + } else if(isset($extensionData->enabled) && $extensionData->enabled == 0) { + self::$extension[$element] = 2; + } else { + self::$extension[$element] = 0; + } + } + + return self::$extension[$element]; + + } + public final function __clone() { + throw new Exception('Function Error: Cannot clone instance of Singleton pattern', 500); + return false; + } +} +?> \ No newline at end of file diff --git a/libraries/phocacart/utils/log.php b/libraries/phocacart/utils/log.php index 0f663016..424cf148 100644 --- a/libraries/phocacart/utils/log.php +++ b/libraries/phocacart/utils/log.php @@ -9,6 +9,10 @@ defined( '_JEXEC' ) or die( 'Restricted access' ); class PhocaCartLog { + /* type - type : e.g warning, error, etc. + * typeid - for example order id, category id, product id + */ + public static function add( $type = 0, $title = '', $typeid = 0, $description = '') { $paramsC = JComponentHelper::getParams('com_phocacart'); diff --git a/libraries/phocacart/utils/utils.php b/libraries/phocacart/utils/utils.php index 2566b6be..2f85cfbd 100644 --- a/libraries/phocacart/utils/utils.php +++ b/libraries/phocacart/utils/utils.php @@ -44,12 +44,12 @@ public static function setVars( $task = '') { public static function getPhocaVersion($component = 'com_phocacart') { $component = 'com_phocacart'; - $folder = JPATH_ADMINISTRATOR .DS. 'components'.DS.$component; + $folder = JPATH_ADMINISTRATOR .'/components'.'/'.$component; if (JFolder::exists($folder)) { $xmlFilesInDir = JFolder::files($folder, '.xml$'); } else { - $folder = JPATH_SITE .DS. 'components'.DS.$component; + $folder = JPATH_SITE . '/components'.'/'.$component; if (JFolder::exists($folder)) { $xmlFilesInDir = JFolder::files($folder, '.xml$'); } else { @@ -62,7 +62,7 @@ public static function getPhocaVersion($component = 'com_phocacart') { { foreach ($xmlFilesInDir as $xmlfile) { - if ($data = JApplicationHelper::parseXMLInstallFile($folder.DS.$xmlfile)) { + if ($data = JApplicationHelper::parseXMLInstallFile($folder.'/'.$xmlfile)) { foreach($data as $key => $value) { $xml_items[$key] = $value; } @@ -97,8 +97,13 @@ public static function setMessage($new = '', $current = '') { return $message; } - public static function getInfo() { - return '
    Powered by Phoca Cart
    '; + public static function getInfo($mode = 1) { + + if ($mode == 0) { + return "\n\n" . 'Powered by Phoca Cart' . "\n" . 'http://www.phoca.cz/phocacart'; + } else { + return '
    Powered by Phoca Cart
    '; + } } public static function getToken($type = 'token') { @@ -108,19 +113,23 @@ public static function getToken($type = 'token') { $secretPartA= substr($secret, mt_rand(4,15), mt_rand(0,10)); $secretPartB= substr($secret, mt_rand(4,15), mt_rand(0,10)); - $saltArray = array('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y'); + $saltArray = array('a', '0', 'c', '1', 'e', '2', 'h', '3', 'i', '4', 'k', '5', 'm', '6', 'o', '7', 'q', '8', 'r', '0', 'u', '1', 'w', '2', 'y'); $randA = mt_rand(0,9999); $randB = mt_rand(0, $randA); $randC = mt_rand(0, $randB); $randD = mt_rand(0,24); + $randD2 = mt_rand(0,24); $salt = md5('string '. $secretPartA . date('s'). $randA . str_replace($randC, $randD, date('r')). $secretPartB . 'end string'); - $salt = str_replace($saltArray[$randD], $saltArray[$randD], $salt); + $salt = str_replace($saltArray[$randD], $saltArray[$randD2], $salt); if ($type > 100) { $salt = md5($salt); } - $salt = crypt($salt); + + + // use password_hash since php 5.5.0 + $salt = crypt($salt, $salt); $rT = $randC + $randA; if ($rT < 1) {$rT = 1;} $time = (int)time() * $randB / $rT; @@ -141,5 +150,46 @@ public static function round($value, $precision = 2) { return round($value, $precision); } + + public static function getRandomString($length = '') { + $code = md5(uniqid(rand(), true)); + if ($length != '' && (int)$length > 0) { + $length = $length - 1; + return chr(rand(97,122)) . substr($code, 0, $length); + } else { + return chr(rand(97,122)) . $code; + } + } + + public static function wordDelete($string,$length,$end) { + if (strlen($string) < $length || strlen($string) == $length) { + return $string; + } else { + return substr($string, 0, $length) . $end; + } + } + + public static function wordDeleteWhole($string,$length,$end = '...') { + if (strlen($string) < $length || strlen($string) == $length) { + return $string; + } else { + preg_match('/(.{' . $length . '}.*?)\b/', $string, $matches); + return rtrim($matches[1]) . $end; + } + } + + + public static function strTrimAll($input) { + $output = ''; + $input = trim($input); + for($i=0;$i \ No newline at end of file diff --git a/libraries/phocacart/wishlist/index.html b/libraries/phocacart/wishlist/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/libraries/phocacart/wishlist/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/libraries/phocacart/wishlist/wishlist.php b/libraries/phocacart/wishlist/wishlist.php new file mode 100644 index 00000000..ef7e505d --- /dev/null +++ b/libraries/phocacart/wishlist/wishlist.php @@ -0,0 +1,295 @@ +user = JFactory::getUser(); + $app = JFactory::getApplication(); + + + if((int)$this->user->id > 0) { + // DATABASE - logged in user - Singleton because of not load data from database every time wishlist instance is loaded + // 1. Not found in DATABASE - maybe user logged in now, so: + // 2. We try to find the data in SESSION, if they are still in SESSION - load them to our wishlist class and then + // 3. Store them to DATABASE as all loged in users have wishlist in database and: + // 4. Remove them from SESSION as they are stored in DATABASE + $wLDb = $this->getWishListItemdDb();// user logged in - try to get wishlist from db + $this->items = $wLDb; + + if(empty($this->items)) { + $this->items = $session->get('wishlist', array(), 'phocaCart'); + if(!empty($this->items)) { + $this->updateWishListItems(); + $session->set('wishlist', array(), 'phocaCart'); + } + } + } else { + $this->items = $session->get('wishlist', array(), 'phocaCart'); + + } + } + + public function getWishListItemdDb() { + if ($this->user->id > 0) { + $db = JFactory::getDBO(); + + $query = 'SELECT a.product_id, a.category_id, a.user_id' + .' FROM #__phocacart_wishlists AS a' + .' WHERE a.user_id = '.(int)$this->user->id + .' ORDER BY a.id'; + $db->setQuery($query); + $items = $db->loadAssocList(); + $itemsSorted = array(); + if (!empty($items)) { + + foreach($items as $k => $v) { + $itemsSorted[$v['product_id']]['product_id'] = $v['product_id']; + $itemsSorted[$v['product_id']]['category_id'] = $v['category_id']; + $itemsSorted[$v['product_id']]['user_id'] = $v['user_id']; + } + + if (!empty($itemsSorted)) { + return $itemsSorted; + } + return false; + } + } + return false; + } + + public function updateWishListItems() { + if ($this->user->id > 0) { + $db = JFactory::getDBO(); + //$items = serialize($this->items); + $date = JFactory::getDate(); + $now = $date->toSql(); + + + if (!empty($this->items)) { + + $q = ''; + // Unfortunately we need to run SQL query more times in foreach as + // ON DUPLICATE KEY UPDATE can work with one SQL uqery INSERT INTO ... VALUES (a,b,c), (a2,b2,c2) + // but it does not work with multiple columns product_id x category_id x user_id in combination + foreach($this->items as $k => $v) { + if (isset($v['product_id']) && isset($v['category_id']) && (int)$v['product_id'] > 0 && (int)$v['category_id'] > 0) { + $q = ' INSERT INTO #__phocacart_wishlists (product_id, category_id, user_id, date)'; + $q .= ' VALUES ('.(int)$v['product_id'].', '.(int)$v['category_id'].', '.(int)$this->user->id.', '.$db->quote($now).')';; + $q .= ' ON DUPLICATE KEY UPDATE product_id = VALUES(product_id), category_id = VALUES(category_id), user_id = VALUES(user_id), date = VALUES(date);'; + } + } + if ($q != '') { + $db->setQuery($q); + $db->execute(); + } + return true; + } + return false; + } else { + + $session = JFactory::getSession(); + $session->set('wishlist', $this->items, 'phocaCart'); + } + return false; + } + + public function addItem($id = 0, $catid = 0) { + if ($id > 0) { + $app = JFactory::getApplication(); + + $count = count($this->items); + + if ($count > 100) { + $message = JText::_('COM_PHOCACART_COUNT_OF_PRODUCTS_IN_WISH_LIST_IS_LIMITED'); + $app->enqueueMessage($message, 'error'); + return false; + } + + if(isset($this->items[$id]) && (int)$this->items[$id] > 0) { + + $message = JText::_('COM_PHOCACART_PRODUCT_INCLUDED_IN_WISH_LIST'); + $app->enqueueMessage($message, 'error'); + return false; + } else { + + $this->items[$id]['product_id'] = $id; + $this->items[$id]['category_id'] = $catid; + if ($this->user->id > 0) { + $this->items[$id]['user_id'] = $this->user->id; + } + $this->updateWishListItems(); + return true; + } + } + return false; + } + + public function removeItem($id = 0) { + if ($id > 0) { + if(isset($this->items[$id]) && (int)$this->items[$id] > 0) { + if ($this->user->id > 0) { + if (isset($this->items[$id]['product_id']) && isset($this->items[$id]['category_id'])) { + + $db = JFactory::getDBO(); + $query = ' DELETE ' + .' FROM #__phocacart_wishlists' + .' WHERE product_id = '.(int)$this->items[$id]['product_id'] + .' AND category_id = '.(int)$this->items[$id]['category_id'] + .' AND user_id = '.(int)$this->user->id; + + unset($this->items[$id]);// Because of ajax + + $db->setQuery($query); + $db->execute(); + return true; + } else { + return false; + } + + } else { + unset($this->items[$id]); + $session = JFactory::getSession(); + $session->set('wishlist', $this->items, 'phocaCart'); + return true; + } + + } else { + return false; + } + return false; + } + return false; + } + + public function emptyWishList() { + $session = JFactory::getSession(); + $session->set('wishlist', array(), 'phocaCart'); + } + + public function getItems() { + return $this->items; + } + + + public function getQueryList($items, $full = 0){ + + $user = JFactory::getUser(); + $userLevels = implode (',', $user->getAuthorisedViewLevels()); + + $itemsS = $this->getItemsIdString($items); + + + + if ($itemsS == '') { + return false; + } + + $wheres[] = 'a.id IN ('.(string)$itemsS.')'; + $wheres[] = " c.access IN (".$userLevels.")"; + $wheres[] = " a.access IN (".$userLevels.")"; + $wheres[] = " c.published = 1"; + $wheres[] = " a.published = 1"; + + $where = ( count( $wheres ) ? ' WHERE '. implode( ' AND ', $wheres ) : '' ); + + if ($full == 1) { + $query = + ' SELECT a.id as id, a.title as title, a.alias as alias, a.description, a.price, a.image,' + .' c.id as catid, c.alias as catalias, c.title as cattitle, count(pc.category_id) AS count_categories,' + //.' a.length, a.width, a.height, a.weight, a.volume,' + .' a.stock, a.min_quantity, a.min_multiple_quantity, a.stockstatus_a_id, a.stockstatus_n_id, a.availability' + //.' m.title as manufacturer_title' + .' FROM #__phocacart_products AS a' + .' LEFT JOIN #__phocacart_product_categories AS pc ON pc.product_id = a.id' + .' LEFT JOIN #__phocacart_categories AS c ON c.id = pc.category_id' + //.' LEFT JOIN #__phocacart_manufacturers AS m ON a.manufacturer_id = m.id' + . $where + . ' GROUP BY a.id' + . ' ORDER BY a.id'; + } else { + $query = + ' SELECT a.id as id, a.title as title, a.alias as alias,' + .' c.id as catid, c.alias as catalias, c.title as cattitle, count(pc.category_id) AS count_categories' + .' FROM #__phocacart_products AS a' + .' LEFT JOIN #__phocacart_product_categories AS pc ON pc.product_id = a.id' + .' LEFT JOIN #__phocacart_categories AS c ON c.id = pc.category_id' + . $where + . ' GROUP BY a.id' + . ' ORDER BY a.id'; + } + return $query; + } + + public function getItemsIdString($items) { + + $itemsR = ''; + if (!empty($items)) { + $itemsA = array(); + foreach($items as $k => $v) { + if (isset($v['product_id']) && (int)$v['product_id'] > 0) { + $itemsA[] = $v['product_id']; + } + } + $itemsR = implode (',', $itemsA); + } + + if ($itemsR == '') { + return false; + } + + return $itemsR; + } + + public function renderList() { + + $db = JFactory::getDBO(); + $uri = JFactory::getURI(); + $action = $uri->toString(); + $paramsC = JComponentHelper::getParams('com_phocacart') ; + $add_wishlist_method = $paramsC->get( 'add_wishlist_method', 0 ); + $query = $this->getQueryList($this->items); + + $d = array(); + + if ($query) { + //echo nl2br(str_replace('#__', 'jos_', $query)); + $db->setQuery($query); + $d['wishlist'] = $db->loadObjectList(); + PhocaCartCategoryMultiple::setBestMatchCategory($d['wishtlist'], $this->items, 1);// returned by reference + } + $d['actionbase64'] = base64_encode($action); + $d['linkwishlist'] = JRoute::_(PhocaCartRoute::getWishListRoute()); + $d['method'] = $add_wishlist_method; + + $layoutW = new JLayoutFile('list_wishlist', $basePath = JPATH_ROOT .'/components/com_phocacart/layouts'); + echo $layoutW->render($d); + } + + public function getFullItems() { + + $db = JFactory::getDBO(); + $query = $this->getQueryList($this->items, 1); + + $products = array(); + if ($query) { + $db->setQuery($query); + $products = $db->loadAssocList(); + PhocaCartCategoryMultiple::setBestMatchCategory($products, $this->items);// returned by reference + } + return $products; + + } +} +?> \ No newline at end of file diff --git a/media/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/media/bootstrap/fonts/glyphicons-halflings-regular.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..64539b54c3751a6d9adb44c8e3a45ba5a73b77f0 GIT binary patch literal 18028 zcmV(~K+nH-Pew8T0RR9107h&84*&oF0I^&E07eM_0Rl|`00000000000000000000 z0000#Mn+Uk92y`7U;vDA2m}!b3WBL5f#qcZHUcCAhI9*rFaQJ~1&1OBl~F%;WnyLq z8)b|&?3j;$^FW}&KmNW53flIFARDZ7_Wz%hpoWaWlgHTHEHf()GI0&dMi#DFPaEt6 zCO)z0v0~C~q&0zBj^;=tv8q{$8JxX)>_`b}WQGgXi46R*CHJ}6r+;}OrvwA{_SY+o zK)H-vy{l!P`+NG*`*x6^PGgHH4!dsolgU4RKj@I8Xz~F6o?quCX&=VQ$Q{w01;M0? zKe|5r<_7CD z=eO3*x!r$aX2iFh3;}xNfx0v;SwBfGG+@Z;->HhvqfF4r__4$mU>Dl_1w;-9`~5rF~@!3;r~xP-hZvOfOx)A z#>8O3N{L{naf215f>m=bzbp7_(ssu&cx)Qo-{)!)Yz3A@Z0uZaM2yJ8#OGlzm?JO5gbrj~@)NB4@?>KE(K-$w}{};@dKY#K3+Vi64S<@!Z{(I{7l=!p9 z&kjG^P~0f46i13(w!hEDJga;*Eb z`!n|++@H8VaKG<9>VDh(y89J#=;Z$ei=GnD5TesW#|Wf)^D+9NKN4J3H5PF_t=V+Z zdeo8*h9+8&Zfc?>>1|E4B7MAx)^uy$L>szyXre7W|81fjy+RZ1>Gd}@@${~PCOXo) z$#HZd3)V3@lNGG%(3PyIbvyJTOJAWcN@Uh!FqUkx^&BuAvc)G}0~SKI`8ZZXw$*xP zum-ZdtPciTAUn$XWb6vrS=JX~f5?M%9S(=QsdYP?K%Odn0S0-Ad<-tBtS3W06I^FK z8}d2eR_n!(uK~APZ-#tl@SycxkRJ@5wmypdWV{MFtYBUY#g-Vv?5AEBj1 z`$T^tRKca*sn7gt%s@XUD-t>bij-4q-ilku9^;QJ3Mpc`HJ_EX4TGGQ-Og)`c~qm51<|gp7D@ zp#>Grssv^#A)&M8>ulnDM_5t#Al`#jaFpZ<#YJ@>!a$w@kEZ1<@PGs#L~kxOSz7jj zEhb?;W)eS}0IQQuk4~JT30>4rFJ3!b+77}>$_>v#2FFEnN^%(ls*o80pv0Q>#t#%H z@`Yy-FXQ9ULKh{Up&oA_A4B!(x^9&>i`+T|eD!&QOLVd(_avv-bFX~4^>o{%mzzrg_i~SBnr%DeE|i+^}|8?kaV(Z32{`vA^l!sp15>Z72z52FgXf z^8ZITvJ9eXBT1~iQjW|Q`Fac^ak$^N-vI^*geh5|*CdMz;n16gV_zk|Z7q8tFfCvU zJK^Pptnn0Rc~egGIAK}uv99VZm2WLPezQQ5K<`f zg{8Ll|GioPYfNheMj-7-S87=w4N0WxHP`1V6Y)0M&SkYzVrwp>yfsEF7wj&T0!}dB z)R~gGfP9pOR;GY_e0~K^^oJ-3AT+m~?Al!{>>5gNe17?OWz)$)sMH*xuQiB>FT2{i zQ>6U_8}Ay~r4li;jzG+$&?S12{)+<*k9 z<^SX#xY|jvlvTxt(m~C7{y{3g>7TX#o2q$xQO|fc<%8rE@A3=UW(o?gVg?gDV!0q6O!{MlX$6-Bu_m&0ms66 znWS&zr{O_4O&{2uCLQvA?xC5vGZ}KV1v6)#oTewgIMSnBur0PtM0&{R5t#UEy3I9) z`LVP?3f;o}sz*7g5qdTxJl^gk3>;8%SOPH@B)rmFOJ)m6?PlYa$y=RX%;}KId{m9R#2=LNwosF@OTivgMqxpRGe}5=LtAn?VVl6VWCFLD z7l#^^H8jY~42hR)OoVF#YDW(md!g(&pJ;yMj|UBAQa}UH?ED@%ci=*(q~Opn>kE2Q z_4Kgf|0kEA6ary41A;)^Ku(*nirvP!Y>{FZYBLXLP6QL~vRL+uMlZ?jWukMV*(dsn zL~~KA@jU)(UeoOz^4Gkw{fJsYQ%|UA7i79qO5=DOPBcWlv%pK!A+)*F`3WJ}t9FU3 zXhC4xMV7Z%5RjDs0=&vC4WdvD?Zi5tg4@xg8-GLUI>N$N&3aS4bHrp%3_1u9wqL)i z)XQLsI&{Hd&bQE!3m&D0vd!4D`l1$rt_{3NS?~lj#|$GN5RmvP(j3hzJOk=+0B*2v z)Bw133RMUM%wu_+$vbzOy?yk#kvR?xGsg-ipX4wKyXqd zROKp5))>tNy$HByaEHK%$mqd>-{Yoj`oSBK;w>+eZ&TVcj^DyXjo{DDbZ>vS2cCWB z(6&~GZ}kUdN(*2-nI!hvbnVy@z2E#F394OZD&Jb04}`Tgaj?MoY?1`{ejE2iud51% zQ~J0sijw(hqr_Ckbj@pm$FAVASKY(D4BS0GYPkSMqSDONRaFH+O2+jL{hIltJSJT~e)TNDr(}=Xt7|UhcU9eoXl&QZRR<9WomW%&m)FT~j zTgGd3-j}Uk%CRD;$@X)NNV9+RJbifYu>yr{FkO;p>_&njI> zyBHh_72bW;8}oGeY0gpHOxiV597j7mY<#?WMmkf5x~Kfk*re(&tG_mX<3&2cON*2u%V29tsXUv{#-ijs2>EuNH-x3) zPBpi+V6gI=wn}u164_j8xi-y(B?Au2o;UO=r6&)i5S3Mx*)*{_;u}~i4dh$`VgUS- zMG6t*?DXDYX0D2Oj31MI!HF>|aG8rjrOPnxHu4wZl;!=NGjjDoBpXf?ntrwt^dqxm zs(lE@*QB3NH)!`rH)5kks-D89g@UX&@DU9jvrsY)aI=9b4nPy3bfdX_U;#?zsan{G>DKob2LnhCJv8o}duQK)qP{7iaaf2=K`a-VNcfC582d4a z>sBJA*%S|NEazDxXcGPW_uZ&d7xG`~JB!U>U(}acUSn=FqOA~(pn^!aMXRnqiL0;? zebEZYouRv}-0r;Dq&z9>s#Rt1HL`0p4bB)A&sMyn|rE_9nh z?NO*RrjET8D4s(-`nS{MrdYtv*kyCnJKbsftG2D#ia@;42!8xd?a3P(&Y?vCf9na< zQ&Ni*1Qel&Xq{Z?=%f0SRqQt5m|Myg+8T=GDc)@^};=tM>9IDr7hdvE9-M@@<0pqv45xZTeNecbL- zWFQt4t`9>j8~X%lz}%We>Kzh_=`XO}!;4!OWH?=p*DOs#Nt({k^IvtBEL~Qafn)I^ zm*k{y7_bIs9YE}0B6%r`EIUH8US+MGY!KQA1fi-jCx9*}oz2k1nBsXp;4K<_&SN}}w<)!EylI_)v7}3&c)V;Cfuj*eJ2yc8LK=vugqTL><#65r6%#2e| zdYzZ)9Uq7)A$ol&ynM!|RDHc_7?FlWqjW>8TIHc`jExt)f5W|;D%GC#$u!%B*S%Z0 zsj&;bIU2jrt_7%$=!h4Q29n*A^^AI8R|stsW%O@?i+pN0YOU`z;TVuPy!N#~F8Z29 zzZh1`FU(q31wa>kmw{$q=MY>XBprL<1)Py~5TW4mgY%rg$S=4C^0qr+*A^T)Q)Q-U zGgRb9%MdE-&i#X3xW=I`%xDzAG95!RG9)s?v_5+qx`7NdkQ)If5}BoEp~h}XoeK>kweAMxJ8tehagx~;Nr_WP?jXa zJ&j7%Ef3w*XWf?V*nR)|IOMrX;$*$e23m?QN` zk>sC^GE=h6?*Cr~596s_QE@>Nnr?{EU+_^G=LZr#V&0fEXQ3IWtrM{=t^qJ62Sp=e zrrc>bzX^6yFV!^v7;>J9>j;`qHDQ4uc92eVe6nO@c>H=ouLQot``E~KLNqMqJ7(G+?GWO9Ol+q$w z!^kMv!n{vF?RqLnxVk{a_Ar;^sw0@=+~6!4&;SCh^utT=I zo&$CwvhNOjQpenw2`5*a6Gos6cs~*TD`8H9P4=#jOU_`%L!W;$57NjN%4 z39(61ZC#s7^tv`_4j}wMRT9rgDo*XtZwN-L;Qc$6v8kKkhmRrxSDkUAzGPgJ?}~_t zkwoGS4=6lsD`=RL|8L3O9L()N)lmEn-M15fRC{dhZ}7eYV%O-R^gsAp{q4 z!C1}_T8gy^v@SZ5R&Li5JMJy+K8iZw3LOGA0pN1~y@w7RRl#F()ii6Y5mr~Mdy@Kz z@FT4cm^I&#Fu_9IX(HAFP{XLbRALqm&)>m_we>a`hfv?eE|t z?YdDp2yAhj-~vuw^wzVDuj%w?exOcOT(ls(F*ceCe(C5HlN{lcQ;}|mRPqFDqLEzw zR7ldY+M6xe$$qLwekmk{Z&5cME$gpC?-8)f0m$rqaS|mj9ATNJvvyCgs(f2{r;2E!oy$k5{jik#(;S>do<#m0wVcU<}>)VtYmF9O0%(C>GDzPgh6X z9OkQLMR~y7=|MtaU!LDPPY7O)L{X#SC+M|v^X2CZ?$GS>U_|aC(VA(mIvCNk+biD| zSpj>gd(v>_Cbq>~-x^Y3o|?eHmuC?E&z>;Ij`%{$Pm$hI}bl0Kd`9KD~AchY+goL1?igDxf$qxL9< z4sW@sD)nwWr`T>e2B8MQN|p*DVTT8)3(%AZ&D|@Zh6`cJFT4G^y6`(UdPLY-&bJYJ z*L06f2~BX9qX}u)nrpmHPG#La#tiZ23<>`R@u8k;ueM6 znuSTY7>XEc+I-(VvL?Y>)adHo(cZ;1I7QP^q%hu#M{BEd8&mG_!EWR7ZV_&EGO;d(hGGJzX|tqyYEg2-m0zLT}a{COi$9!?9yK zGN7&yP$a|0gL`dPUt=4d^}?zrLN?HfKP0_gdRvb}1D73Hx!tXq>7{DWPV;^X{-)cm zFa^H5oBDL3uLkaFDWgFF@HL6Bt+_^g~*o*t`Hgy3M?nHhWvTp^|AQDc9_H< zg>IaSMzd7c(Sey;1SespO=8YUUArZaCc~}}tZZX80w%)fNpMExki-qB+;8xVX@dr; z#L52S6*aM-_$P9xFuIui;dN#qZ_MYy^C^hrY;YAMg;K`!ZpKKFc z9feHsool)`tFSS}Su|cL0%F;h!lpR+ym|P>kE-O`3QnHbJ%gJ$dQ_HPTT~>6WNX41 zoDEUpX-g&Hh&GP3koF4##?q*MX1K`@=W6(Gxm1=2Tb{hn8{sJyhQBoq}S>bZT zisRz-xDBYoYxt6--g2M1yh{#QWFCISux}4==r|7+fYdS$%DZ zXVQu{yPO<)Hn=TK`E@;l!09aY{!TMbT)H-l!(l{0j=SEj@JwW0a_h-2F0MZNpyucb zPPb+4&j?a!6ZnPTB>$t`(XSf-}`&+#rI#`GB> zl=$3HORwccTnA2%>$Nmz)u7j%_ywoGri1UXVNRxSf(<@vDLKKxFo;5pTI$R~a|-sQ zd5Rfwj+$k1t0{J`qOL^q>vZUHc7a^`cKKVa{66z?wMuQAfdZBaVVv@-wamPmes$d! z>gv^xx<0jXOz;7HIQS z4RBIFD?7{o^IQ=sNQ-k!ao*+V*|-^I2=UF?{d>bE9avsWbAs{sRE-y`7r zxVAKA9amvo4T}ZAHSF-{y1GqUHlDp4DO9I3mz5h8n|}P-9nKD|$r9AS3gbF1AX=2B zyaK3TbKYqv%~JHKQH8v+%zQ8UVEGDZY|mb>Oe3JD_Z{+Pq%HB+J1s*y6JOlk`6~H) zKt)YMZ*RkbU!GPHzJltmW-=6zqO=5;S)jz{ zFSx?ryqSMxgx|Nhv3z#kFBTuTBHsViaOHs5e&vXZ@l@mVI37<+^KvTE51!pB4Tggq zz!NlRY2ZLno0&6bA|KHPYOMY;;LZG&_lzuLy{@i$&B(}_*~Zk2 z>bkQ7u&Ww%CFh{aqkT{HCbPbRX&EvPRp=}WKmyHc>S_-qbwAr0<20vEoJ(!?-ucjE zKQ+nSlRL^VnOX0h+WcjGb6WI(8;7bsMaHXDb6ynPoOXMlf9nLKre;w*#E_whR#5!! z!^%_+X3eJVKc$fMZP;+xP$~e(CIP1R&{2m+iTQhDoC8Yl@kLM=Wily_cu>7C1wjVU z-^~I0P06ZSNVaN~A`#cSBH2L&tk6R%dU1(u1XdAx;g+5S^Hn9-L$v@p7CCF&PqV{Z?R$}4EJi36+u2JP7l(@fYfP!=e#76LGy^f>~vs0%s*x@X8`|5 zGd6JOHsQ=feES4Vo8%1P_7F5qjiIm#oRT0kO1(?Z_Dk6oX&j=Xd8Klk(;gk3S(ZFnc^8Gc=d;8O-R9tlGyp=2I@1teAZpGWUi;}`n zbJOS_Z2L16nVtDnPpMn{+wR9&yU9~C<-ncppPee`>@1k7hTl5Fn_3_KzQ)u{iJPp3 z)df?Xo%9ta%(dp@DhKuQj4D8=_!*ra#Ib&OXKrsYvAG%H7Kq|43WbayvsbeeimSa= z8~{7ya9ZUAIgLLPeuNmSB&#-`Je0Lja)M$}I41KHb7dQq$wgwX+EElNxBgyyLbA2* z=c1VJR%EPJEw(7!UE?4w@94{pI3E%(acEYd8*Wmr^R7|IM2RZ-RVXSkXy-8$!(iB* zQA`qh2Ze!EY6}Zs7vRz&nr|L60NlIgnO3L*Yz2k2Ivfen?drnVzzu3)1V&-t5S~S? zw#=Sdh>K@2vA25su*@>npw&7A%|Uh9T1jR$mV*H@)pU0&2#Se`7iJlOr$mp79`DKM z5vr*XLrg7w6lc4&S{So1KGKBqcuJ!E|HVFB?vTOjQHi)g+FwJqX@Y3q(qa#6T@3{q zhc@2T-W}XD9x4u+LCdce$*}x!Sc#+rH-sCz6j}0EE`Tk*irUq)y^za`}^1gFnF)C!yf_l_}I<6qfbT$Gc&Eyr?!QwJR~RE4!gKVmqjbI+I^*^ z&hz^7r-dgm@Mbfc#{JTH&^6sJCZt-NTpChB^fzQ}?etydyf~+)!d%V$0faN(f`rJb zm_YaJZ@>Fg>Ay2&bzTx3w^u-lsulc{mX4-nH*A(32O&b^EWmSuk{#HJk}_ULC}SB(L7`YAs>opp9o5UcnB^kVB*rmW6{s0&~_>J!_#+cEWib@v-Ms`?!&=3fDot`oH9v&$f<52>{n2l* z1FRzJ#yQbTHO}}wt0!y8Eh-0*|Um3vjX-nWH>`JN5tWB_gnW%; zUJ0V?_a#+!=>ahhrbGvmvObe8=v1uI8#gNHJ#>RwxL>E^pT05Br8+$@a9aDC1~$@* zicSQCbQcr=DCHM*?G7Hsovk|{$3oIwvymi#YoXeVfWj{Gd#XmnDgzQPRUKNAAI44y z{1WG&rhIR4ipmvBmq$BZ*5tmPIZmhhWgq|TcuR{6lA)+vhj(cH`0;+B^72{&a7ff* zkrIo|pd-Yxm+VVptC@QNCDk0=Re%Sz%ta7y{5Dn9(EapBS0r zLbDKeZepar5%cAcb<^;m>1{QhMzRmRem=+0I3ERot-)gb`i|sII^A#^Gz+x>TW5A& z3PQcpM$lDy`zb%1yf!e8&_>D02RN950KzW>GN6n@2so&Wu09x@PB=&IkIf|zZ1W}P zAKf*&Mo5@@G=w&290aG1@3=IMCB^|G4L7*xn;r3v&HBrD4D)Zg+)f~Ls$7*P-^i#B z4X7ac=0&58j^@2EBZCs}YPe3rqgLAA1L3Y}o?}$%u~)7Rk=LLFbAdSy@-Uw6lv?0K z&P@@M`o2Rll3GoYjotf@WNNjHbe|R?IKVn*?Rzf9v9QoFMq)ODF~>L}26@z`KA82t z43e!^z&WGqAk$Ww8j6bc3$I|;5^BHwt`?e)zf|&+l#!8uJV_Cwy-n1yS0^Q{W*a8B zTzTYL>tt&I&9vzGQUrO?YIm6C1r>eyh|qw~-&;7s7u1achP$K3VnXd8sV8J7ZTxTh z5+^*J5%_#X)XL2@>h(Gmv$@)fZ@ikR$v(2Rax89xscFEi!3_;ORI0dBxw)S{r50qf zg&_a*>2Xe{s@)7OX9O!C?^6fD8tc3bQTq9}fxhbx2@QeaO9Ej+2m!u~+u%Q6?Tgz{ zjYS}bleKcVhW~1$?t*AO^p!=Xkkgwx6OTik*R3~yg^L`wUU9Dq#$Z*iW%?s6pO_f8 zJ8w#u#Eaw7=8n{zJ}C>w{enA6XYHfUf7h)!Qaev)?V=yW{b@-z`hAz;I7^|DoFChP z1aYQnkGauh*ps6x*_S77@z1wwGmF8ky9fMbM$dr*`vsot4uvqWn)0vTRwJqH#&D%g zL3(0dP>%Oj&vm5Re%>*4x|h1J2X*mK5BH1?Nx_#7( zepgF`+n)rHXj!RiipusEq!X81;QQBXlTvLDj=Qub(ha&D=BDx3@-V*d!D9PeXUY?l zwZ0<4=iY!sUj4G>zTS+eYX7knN-8Oynl=NdwHS*nSz_5}*5LQ@=?Yr?uj$`C1m2OR zK`f5SD2|;=BhU#AmaTKe9QaSHQ_DUj1*cUPa*JICFt1<&S3P3zsrs^yUE;tx=x^cmW!Jq!+hohv_B> zPDMT0D&08dC4x@cTD$o1$x%So1Ir(G3_AVQMvQ13un~sP(cEWi$2%5q93E7t{3VJf%K? zuwSyDke~7KuB2?*#DV8YzJw z&}SCDexnUPD!%4|y~7}VzvJ4ch)WT4%sw@ItwoNt(C*RP)h?&~^g##vnhR0!HvIYx z0td2yz9=>t3JNySl*TszmfH6`Ir;ft@RdWs3}!J88UE|gj_GMQ6$ZYphUL2~4OY7} zB*33_bjkRf_@l;Y!7MIdb~bVe;-m78Pz|pdy=O*3kjak63UnLt!{^!!Ljg0rJD3a~ z1Q;y5Z^MF<=Hr}rdoz>yRczx+p3RxxgJE2GX&Si)14B@2t21j4hnnP#U?T3g#+{W+Zb z5s^@>->~-}4|_*!5pIzMCEp|3+i1XKcfUxW`8|ezAh>y{WiRcjSG*asw6;Ef(k#>V ztguN?EGkV_mGFdq!n#W)<7E}1#EZN8O$O|}qdoE|7K?F4zo1jL-v}E8v?9qz(d$&2 zMwyK&xlC9rXo_2xw7Qe0caC?o?Pc*-QAOE!+UvRuKjG+;dk|jQhDDBe?`XT7Y5lte zqSu0t5`;>Wv%|nhj|ZiE^IqA_lZu7OWh!2Y(627zb=r7Ends}wVk7Q5o09a@ojhH7 zU0m&h*8+j4e|OqWyJ&B`V`y=>MVO;K9=hk^6EsmVAGkLT{oUtR{JqSRY{Qi{kKw1k z6s;0SMPJOLp!som|A`*q3t0wIj-=bG8a#MC)MHcMSQU98Juv$?$CvYX)(n`P^!`5| zv3q@@|G@6wMqh;d;m4qvdibx2Yjml}vG9mDv&!0ne02M#D`Bo}xIB0VWh8>>WtNZQ z$&ISlJX;*ORQIO;k62qA{^6P%3!Z=Y1EbmY02{w^yB$`;%!{kur&XTGDiO2cjA)lr zsY^XZWy^DSAaz;kZ_VG?uWnJR7qdN18$~)>(kOoybY0~QYu9||K#|$Mby{3GduV~N zk9H7$7=RSo+?CUYF502`b76ytBy}sFak&|HIwRvB=0D|S`c#QCJPq zP)uOWI)#(n&{6|C4A^G~%B~BY21aOMoz9RuuM`Ip%oBz+NoAlb7?#`E^}7xXo!4S? zFg8I~G%!@nXi8&aJSGFcZAxQf;0m}942=i#p-&teLvE{AKm7Sl2f}Io?!IqbC|J;h z`=5LFOnU5?^w~SV@YwNZx$k_(kLNxZDE z3cf08^-rIT_>A$}B%IJBPcN^)4;90BQtiEi!gT#+EqyAUZ|}*b_}R>SGloq&6?opL zuT_+lwQMgg6!Cso$BwUA;k-1NcrzyE>(_X$B0HocjY~=Pk~Q08+N}(|%HjO_i+*=o z%G6C6A30Ch<0UlG;Zdj@ed!rfUY_i9mYwK8(aYuzcUzlTJ1yPz|Bb-9b33A9zRhGl>Ny-Q#JAq-+qtI@B@&w z$;PJbyiW=!py@g2hAi0)U1v=;avka`gd@8LC4=BEbNqL&K^UAQ5%r95#x%^qRB%KLaqMnG|6xKAm}sx!Qwo}J=2C;NROi$mfADui4)y(3wVA3k~{j^_5%H)C6K zlYAm1eY**HZOj($)xfKIQFtIVw$4&yvz9>(Crs>Gh{ zya6-FG7Dgi92#K)64=9Csj5?Zqe~_9TwSI!2quAwa1w-*uC5!}xY`?tltb0Hq740< zsq2QelPveZ4chr$=~U3!+c&>xyfvA1`)owOqj=i4wjY=A1577Gwg&Ko7;?il9r|_* z8P&IDV_g2D{in5OLFxsO!kx3AhO$5aKeoM|!q|VokqMlYM@HtsRuMtBY%I35#5$+G zpp|JOeoj^U=95HLemB04Yqv{a8X<^K9G2`&ShM_6&Bi1n?o?@MXsDj9Z*A3>#XK%J zRc*&SlFl>l)9DyRQ{*%Z+^e1XpH?0@vhpXrnPPU*d%vOhKkimm-u3c%Q^v3RKp9kx@A2dS?QfS=iigGr7m><)YkV=%LA5h@Uj@9=~ABPMJ z1UE;F&;Ttg5Kc^Qy!1SuvbNEqdgu3*l`=>s5_}dUv$B%BJbMiWrrMm7OXOdi=GOmh zZBvXXK7VqO&zojI2Om9};zCB5i|<210I{iwiGznGCx=FT89=Ef)5!lB1cZ6lbzgDn07*he}G&w7m!;|E(L-?+cz@0<9ZI~LqYQE7>HnPA436}oeN2Y(VfG6 zxNZuMK3Crm^Z_AFeHc~CVRrSl0W^?+Gbteu1g8NGYa3(8f*P{(ZT>%!jtSl6WbYVv zmE(37t0C8vJ6O-5+o*lL9XRcFbd~GSBGbGh3~R!67g&l)7n!kJlWd)~TUyXus#!&G6sR%(l(h1$xyrR5j_jM1zj#giA&@(Xl26@n<9>folx!92bQ z24h570+<)4!$!IQ(5yOU|4_E6aN@4v0+{Kx~Z z;q7fp%0cHziuI%!kB~w}g9@V+1wDz0wFlzX2UOvOy|&;e;t!lAR8tV2KQHgtfk8Uf zw;rs!(4JPODERk4ckd5I2Vq|0rd@@Mwd8MID%0^fITjYIQom^q;qhP8@|eJx{?5xX zc1@Fj*kDknlk{c-rnCloQ3hGh7OU+@efO3>fkRMcM>J?AeVP& zlfzX%cdp=N+4S#E*%^=BQ+N`A7C}|k%$|QUn0yI6S3$MS-NjO!4hm55uyju)Q6e!} z*OVO@A#-mfC9Pha6ng((Xl^V7{d+&u+yx)_B1{~t7d5e8L^i4J>;x<7@5;+l7-Gge zf#9diXJ$&v^rbN5V(ee%q0xBMEgS6%qZm7hNUP%G;^J44I!BmI@M*+FWz0!+s;+iQ zU4CuI+27bvNK8v>?7PZnVxB=heJ&_ymE0nN^W#-rqB%+JXkYGDuRw>JM_LdtLkiq* z6%%3&^BX$jnM@2bjiGc-DymKly)wVkA-pq;jSWL#7_*moZZ4I|-N}o8SK?sIv)p|c zu~9-B%tMc=!)YMFp*SiC0>kfnH8+X5>;+FFVN{~a9YVdIg1uGkZ~kegFy{^PU(4{( z`CbY`XmVA3esai686Yw8djCEyF7`bfB^F1)nwv+AqYLZ&Zy=eFhYT2uMd@{sP_qS4 zbJ&>PxajjZt?&c<1^!T|pLHfX=E^FJ>-l_XCZzvRV%x}@u(FtF(mS+Umw$e+IA74e>gCdTqi;6&=euAIpxd=Y3I5xWR zBhGoT+T`V1@91OlQ}2YO*~P4ukd*TBBdt?Plt)_ou6Y@Db`ss+Q~A-48s>?eaJYA2 zRGOa8^~Em}EFTmKIVVbMb|ob)hJJ7ITg>yHAn2i|{2ZJU!cwt9YNDT0=*WO7Bq#Xj zg@FjEaKoolrF8%c;49|`IT&25?O$dq8kp3#la9&6aH z6G|{>^C(>yP7#Dr$aeFyS0Ai_$ILhL43#*mgEl(c*4?Ae;tRL&S7Vc}Szl>B`mBuI zB9Y%xp%CZwlH!3V(`6W4-ZuETssvI&B~_O;CbULfl)X1V%(H7VSPf`_Ka9ak@8A=z z1l|B1QKT}NLI`WVTRd;2En5u{0CRqy9PTi$ja^inu){LJ&E&6W%JJPw#&PaTxpt?k zpC~gjN*22Q8tpGHR|tg~ye#9a8N<%odhZJnk7Oh=(PKfhYfzLAxdE36r<6a?A;rO&ELp_Y?8Pdw(PT^Fxn!eG_|LEbSYoBrsBA|6Fgr zt5LntyusI{Q2fdy=>ditS;}^B;I2MD4=(>7fWt0Jp~y=?VvfvzHvQhj6dyIef46J$ zl4Xu7U9v_NJV?uBBC0!kcTS0UcrV7+@~is?Fi+jrr@l3XwD|uG zr26jUWiv>Ju48Y^#qn7r9mwIH-Pv6Y|V|V-GZ&+&gQ?S?-`&ts{@5GXPqbmyZjUACC&oVXfNwUX0}ba(v978 zp8z!v9~8Zx8qB@7>oFPDm^iR@+yw`79YF)w^OHB_N;&&x7c3l^3!)IY#)}x)@D(iNaOm9 zC=^*!{`7={3*S=%iU=KsPXh=DDZcc``Ss>057i{pdW8M@4q+Ba@Tt%OytH!4>rbIbQw^-pR zGGYNPzw@n=PV@)b7yVbFr;glF*Qq3>F9oBN5PUXt!?2mdGcpv^o1?Thp`jP10G2Yi z(c93td3F3SW!Le5DUwdub!aDKoVLU6g!O?Ret21l$qOC;kdd@L#M&baVu&JZGt&<6 z!VCkvgRaav6QDW2x}tUy4~Y5(B+#Ej-8vM?DM-1?J_*&PntI3E96M!`WL#<&Z5n2u zo`P!~vBT$YOT~gU9#PB)%JZ zcd_u=m^LYzC!pH#W`yA1!(fA;D~b zG#73@l)NNd;n#XrKXZEfab;@kQRnOFU2Th-1m<4mJzlj9b3pv-GF$elX7ib9!uILM_$ke zHIGB*&=5=;ynQA{y7H93%i^d)T}y@(p>8vVhJ4L)M{0Q*@D^+SPp`EW+G6E%+`Z;u zS3goV@Dic7vc5`?!pCN44Ts@*{)zwy)9?B||AM{zKlN4T}qQRL2 zgv+{K8bv7w)#xge16;kI1fU87!W4pX)N&|cq8&i^1r`W|Hg4366r(?-ecEJ9u&Eaw zrhyikXQB>C9d>cpPGiu=VU3Z-u4|0V_iap!_J3o+K_R5EXk@sfu~zHwwYkpncVh!R zqNe7Cmf_|Wmeq4#(mIO&(wCK@b4(x0?W1Qtk(`$?+$uCJCGZm_%k?l32vuShgDFMa ztc`{$8DhB9)&?~(m&EUc=LzI1=qo#zjy#2{hLT_*aj<618qQ7mD#k2ZFGou&69;=2 z1j7=Su8k}{L*h&mfs7jg^PN&9C1Z@U!p6gXk&-7xM~{X`nqH#aGO`;Xy_zbz^rYacIq0AH%4!Oh93TzJ820%ur)8OyeS@K?sF1V(iFO z37Nnqj1z#1{|v7=_CX`lQA|$<1gtuNMHGNJYp1D_k;WQk-b+T6VmUK(x=bWviOZ~T z|4e%SpuaWLWD?qN2%`S*`P;BQBw(B__wTD6epvGdJ+>DBq2oVlf&F*lz+#avb4)3P1c^Mf#olQheVvZ|Z5 z>xXfgmv!5Z^SYn+_x}K5B%G^sRwiez&z9|f!E!#oJlT2kCOV0000$L_|bHBqAarB4TD{W@grX1CUr72@caw0faEd7-K|4L_|cawbojjHdpd6 zI6~Iv5J?-Q4*&oF000000FV;^004t70Z6Qk1Xl{X9oJ{sRC2(cs?- literal 0 HcmV?d00001 diff --git a/media/css/administrator/phocacart.css b/media/css/administrator/phocacart.css index 39d338a5..a5658cf5 100644 --- a/media/css/administrator/phocacart.css +++ b/media/css/administrator/phocacart.css @@ -401,6 +401,80 @@ input.pmreadonly:hover } */ +/* CSS Loading */ +/* Standard Message */ +.ph-loader { + margin: 1em auto; + font-size: 8px; + position: relative; + text-indent: -9999em; + border-top: 0.6em solid #C1E2F1; + border-right: 0.6em solid #C1E2F1; + border-bottom: 0.6em solid #C1E2F1; + border-left: 0.6em solid #0069cc; + -webkit-animation: load8 0.9s infinite linear; + animation: load8 0.9s infinite linear; +} +.ph-loader, +.ph-loader:after { + border-radius: 50%; + width: 2.5em; + height: 2.5em; +} + +.ph-ajax-message { + background: #E5F3FF; + text-align:center; + padding: 10px; + margin: 5px auto 10px auto; + color: #0069cc; + font-weight: bold; + border-radius: 3px; + border: 0px +} + +/* Top Message */ +.ph-loader-top { + margin: auto; + font-size: 8px; + position: relative; + text-indent: -9999em; + border-top: 0.6em solid #D3C650; + border-right: 0.6em solid #D3C650; + border-bottom: 0.6em solid #D3C650; + border-left: 0.6em solid #BFB130; + -webkit-animation: load8 0.9s infinite linear; + animation: load8 0.9s infinite linear; +} +.ph-loader-top, +.ph-loader-top:after { + border-radius: 50%; + width: 2.0em; + height: 2.0em; +} + + +@-webkit-keyframes load8 { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(360deg); + transform: rotate(360deg); + } +} +@keyframes load8 { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(360deg); + transform: rotate(360deg); + } +} + #ph-ajaxtop-message { position:fixed; top:0px; @@ -412,7 +486,7 @@ input.pmreadonly:hover border-top: 0px; -webkit-border-radius: 0px 0px 3px 3px; border-radius: 0px 0px 3px 3px; - padding:10px; + padding: 10px; margin: 0 auto; text-align:center; z-index: 9999; @@ -459,6 +533,7 @@ input.pmreadonly:hover } .ph-extended-params-inbox { background: #FFF6DB; + background: #f2f2f2; -webkit-border-radius: 3px; border-radius: 3px; padding: 10px; @@ -469,6 +544,7 @@ input.pmreadonly:hover .ph-specification-box, .ph-attribute-box { background: #FFF6DB; + background: #f2f2f2; -webkit-border-radius: 3px; border-radius: 3px; padding: 10px; @@ -478,6 +554,7 @@ input.pmreadonly:hover .ph-option-box { background: #FFE9A8; + background: #e0e0e0; padding: 10px; margin-left: -10px; @@ -609,7 +686,12 @@ table.ph-table-download-links tr th.link { padding:5px; } -.ph-chart-area { + +.ph-chart-box-line { + width: 92%; +} + +.ph-chart-area-line { width:100%; height:auto; } @@ -661,3 +743,136 @@ border-radius: 2px; background: #f5f5f5; padding: 7px; } + +.ph-float-icon { + float: right; +} +.ph-icon-remove { + color: #942A25; + font-size: 130%; +} + +.btn.btn-transparent { + background: transparent; + border: 1px solid transparent; + box-shadow: none; + padding: 3px; +} +.btn.btn-transparent:hover, +.btn.btn-transparent:focus, +.btn.btn-transparent:visited { + background: transparent; + border: 1px solid transparent; + box-shadow: none; +} +.ph-icon-success { + color: #378137; + font-size: 130%; +} +.ph-icon-success-txt { + color: #378137; + font-size: 70%; + margin-top: -7px; + display: block; +} + +.ph-icon-danger { + color: #942A25; + font-size: 130%; +} +.ph-icon-danger-txt { + color: #942A25; + font-size: 70%; + margin-top: -7px; + display: block; +} + +.ph-icon-warning { + color: #C67605; + font-size: 130%; +} +.ph-icon-warning-txt { + color: #C67605; + font-size: 70%; + margin-top: -7px; + display: block; +} + +.ph-stat-total { + margin-top: 5px; + border-top: 1px solid #fff; + padding: 5px; +} + +/* Full site overlay plus loader - used when reloading the page */ +#phLoaderFull { + margin: auto auto; + top: 50%; + font-size: 8px; + position: relative; + text-indent: -9999em; + border-top: 1.1em solid #C1E2F1; + border-right: 1.1em solid #C1E2F1; + border-bottom: 1.1em solid #C1E2F1; + border-left: 1.1em solid #45A7D4; + -webkit-animation: load8 1.3s infinite linear; + animation: load8 1.3s infinite linear; +} +#phLoaderFull, +#phLoaderFull:after { + border-radius: 50%; + width: 10em; + height: 10em; + margin-top: -10em; + +} +@-webkit-keyframes load8 { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(360deg); + transform: rotate(360deg); + } +} +@keyframes load8 { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(360deg); + transform: rotate(360deg); + } +} + +#phOverlay { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: #fff; + filter:alpha(opacity=70); + -moz-opacity:0.7; + -khtml-opacity: 0.7; + opacity: 0.7; + z-index: 10000; + display:none; +} + +.ph-br-small { + font-size: 3px; + height: 3px; +} +/* +.ph-option-box input{ + border: 1px solid #fff !important; +} +/* +.span1, .span2 { + border: 1px solid red; +} */ + + diff --git a/media/css/icomoon/fonts/icomoon.eot b/media/css/icomoon/fonts/icomoon.eot deleted file mode 100644 index eacb95ff8be35964c7389e2478aa26f62fc9306c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2912 zcmaJ@-EUk+6+dU@&YiiRd-wC&jbLbs_;FN4#dZ-VnO-Gi>xY0@IK>3ptxayFQD!GLy1()q7G_xO^T`S0(*c?-R_ zvDLpj@%-B_Kxq>6)y@9ByBHJDw=kN`+poR&y+8it0ch~`gGFew`F#SNTP7u8hV{X`Fs&^^P>gwvV?i(I<*`_weIgSc91( z3YMn);OvSutZSt;a_9++J{iccJT*U2d;iWK2}{`2b6X1MUrX_Z#n8@vwKGII!5T%R9rJ-KK53%{&XJi2w}Xr$z>q zs7fhLZ<=N)qsQoRTBZ)I(Iukla(VV)U4n1Bl_~75bE0RUZKrOx*KBs1O~9QT4w9so zB=053@LEnoHpu_IZgKejbQ^%~CR!n#;qniBO|EM{lgVx@JG z(E$sQu3M!vmi7DqR$5l~3As4mwPD;3q8<4&oSu#HSfm3_jVVt{OV}`51`m>>lTRA6 z^m`AYv9jM(UZCG`f+#izWEXjA{nPQ9^-Vm>W*?I%ekG_ zd`q`F)kX{{+~{QMa*g3$s#~$lSy|`oy2yDt04b#VBmAp7qz+18s*#(S#WLH|WzcDkfuTD{W&mJ}c-b^Ug4itTEU!yT zYQ)&m8UMqLe2?Yu1EqDSzIGV3l`}$l2vW)QJS8tlsRH#+zQmU=AArp({AH;x^P2KH zydpo!c*(D>@s~{b8U9uOLLts0r2rQI=X0fQHZd+)p(m^_>$o6b?ikCpJ ztF1Q7gI?{laTHj4O1Q9@#Zpg6Ab|FqF|EVDsZ3UVzdBi|JlbBIm{@E-TKOy|4Qr*q zk;-udN9C$9WA#X?M%DFo16XBzLMumwQ9RKoD=C9YSeZ!2%Boz6I52@zGLd$YYEmiH z5?NNtIL0Z(8heRit=L4aqoRr@U8RHyeZyfoHXc>xW~NJyD}(aC$zwV%ZESCCZ{ImlmmaT4k4=En hH&K<^3bjx7G2WmieTQBHd^)dfzj9F9+Hdk{?f;(&Yu^9> diff --git a/media/css/icomoon/fonts/icomoon.svg b/media/css/icomoon/fonts/icomoon.svg deleted file mode 100644 index 2ed9fdea..00000000 --- a/media/css/icomoon/fonts/icomoon.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - -Generated by IcoMoon - - - - - - - - - - - - \ No newline at end of file diff --git a/media/css/icomoon/fonts/icomoon.ttf b/media/css/icomoon/fonts/icomoon.ttf deleted file mode 100644 index 738c786b01eba020895dd5c910c868428a788fcc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2748 zcmaJ@-EUk+6+dU@&YiiRd-wCMH^$!eN3LnZw)V!}1|w&K+C~+DmR1EGkg`jXI+5Zy zBB|6$AS}cmzzZ)3i523ZFCZR3Jb)mtm8!N#v=UOKT7W76FMa6)60G~1d)Kj@Mj3m~ z{LaUmnRDjM+$AQWfc8kzlh42O#F|<7-yb0PBl_^l&ggdQ<+r{~#IxWpZIABU#+ZP= zj?rx2eEpU0zxlU&;33y%uU{KoC3R*Ss$W9CaUBBrcm5Cf55O;7-?{r*1VH3jvT}3x z%E-Ostbj+S#?I)q+jNTl0)7C#eQUIH?dj%k-v>X$8s~2B-nol?qWM3wdXj?p$E2XU z#IHbdaXNlNGxQ^CcdRkCeX&in8F<@iFc`MmgLWHqFQ?-q879fQNiumM=b;a|!bE_B6u=RrXqB4oO5jnY`w^8;A#Slg%M>hi#* z@i2*Y9>eSZC z0cvFhHS#Q7CR#>uoaYT}xdZYzr@g8>t(h#B_B+cR-RV~wF|-JypKZxaMtG_2#4;CU z{nJ|_m+6$>&|zpqS4uZflizcY%!DJp%its`F`jj=n}O(YI)aeu%qtIu<4FWH?yF8;cYf+T?Uj=2t7vUZ(rKbTQSa z&CH_A_Ou5+%@G8;k75P^V&uz~5emdsQNOn(Evu1Z%V+#AH}XA}llPU@q5Aq!*49r6 z+`z&Fyl49y2)QQ<*)EJgUNgONd!rZ zOzSuayh`ZtpO4@%^$&z_eb-xZed8Qv_MeuK+NgaU21fimzcIs{4)Xg5Sb*Y09#*1< zC5*Qc^@#Vv*5ljA^BnF=EOe2TtSi@XyZS|LQn@AjF?TuZ3O94R?52$^ZooFJfrD{o zGl#_XH;`Bu17@+PrEXVfYtlzKr>OR9V~*Fru&b>#+=JifcX1S0drr9UnZ;7iNdQoL z&Y0Hc-&JO-zF(cKR37WDwpy#*$10zdq+zWTI8r%|;HX?Rrdf}qYE)fcH-IWLEv+0C zMscfAR#FC)u+mDKWmT?39GJi3L#}&Y4~_Hl<)$@LTRN~2BmsbT3$KRXq;JDF7Zzu6~JLglV1g= zX6F;fVeR3WV&%F@SB>k+N_cuDi|fX(>S$?U7B5t#6tbjzLj z*)W+&JP!oLQhYF<{ot?h<$!!G@BbWKrMLJj|4DpL{uEL>$)|VhuOhU=m2+lFV*2$o0;U+UVh;lN z;uK5Zr73oRU!Gz`4RD3Mi?8h36#KYCSM2W#$AiTBEO6noz=h8O7d{JI_$;uCx#y;H z3!gXOcNZ_=F8*%OH|QFDm+sJwoNLo6b@6VVu(@$%cV~C^)=43~h>6?uD&3?J9GsYd ips&HTbv&ZG7_U;BzC*8rK9?{4)#>7SRMQkbeE1Xr|60xf diff --git a/media/css/icomoon/fonts/icomoon.woff b/media/css/icomoon/fonts/icomoon.woff deleted file mode 100644 index 4a50d36488069d8a3770a9fc148c6c635425a779..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2240 zcma)7Z){Ul6u)ol-7W(DsaPwsl*b z9dlzGU}LKrrR&l%R>8($%mBlTkU+wRPB99`4}O>$@x%NGc`tc2^W4`rC>9};I9M~+j~kl{3v^U6T(+#3_}T4hkZ{W|=H%#- zjuB!q5kU}GO@+(pa@7$b4SlbvPo}A>)72HGr?be)owERQ^P)^}sD4$VPa%Upo9n<* zt{0%9xlfRV$d$cx+49vn&%LnLYOorUoG-7F3-aZ+H{|PT9Y+ORt>?8u9$0I_CTjNpREvT-VWHZDB8iFw;Ls$X;Ft%eCYg~>j00%5OMuQOx5XI8 z4xsTAoa$FB^8_?227-KbE6}_YtW>5Li7gJkg#&k(iOr$-1Eg3V2lHb5hz>lVhH(R$ z<3SOk;cyh95N-rFxEmW$L1P%AOt}s72WON@5fod(if=Stcdi;3IA{n0UhuF{t(>;C zcX*%)s?XJp>rW3cUKI~`0}ujzFx48TW_6Qd6Nh0W&^yeoC>vN2sV&*STAVLct%Rp`DzdxGAfR$#B| zx5Q@vPrw@jb`?I;n(6V@Kzk66eimo|PWgKSEUrj+SzoB7k7-_Qy$G>*vOIBz$jiiS zS~By{|7=YB2{VeIJ4Ode^a_?5_&WOE=U9;(Vg)Y!20E}Bad8LY?+yGW;@`mMpxQO< z?EHmQZ2wVpv$|D%UYsn87DEvfxr@ti6uS{ZakOl*Y|=dix8PQEY7)m(6d_ExC(D?m z{Uyde4}ayq)amOy(jDo(P%AZ_lG}D)9{AvteB-KXPjhYA=Kd~w#{ zNVt3O*!WP#z{t>W`N;XenWny$cHdxhboA4K6aB|e!jLy|*{Lvb+&c4_V10@zo@;q@49po*iE>8=Hex0R{a*$ zFTx`IlaP*WsgF?XoZE!`*!PNz`94`mc$ZHd0&m@qjJF86ONHrK{0Y-~7Zy_DIXX^5 zjh&fTQ1hq-yWp!hXJJ!J!=FHM?$X(RW@phy5EC5>vwy5I87uSvDuD=?m94X&`KK*d z@?rL-`(z>Cf{@-qOqs@0o4&0re6+5zSqfR|7_vuff2T}1L&wQK^vVAVw zOvVi!ftZbDe36+H8UA#{xdt{N-eq7)mZOzCLk4~s3Jjcu-@*!hchds&aLy!7awc(- zGl`R&Nu1 \ No newline at end of file diff --git a/media/css/icomoon/icomoon-license.txt b/media/css/icomoon/icomoon-license.txt deleted file mode 100644 index 98ed6cfb..00000000 --- a/media/css/icomoon/icomoon-license.txt +++ /dev/null @@ -1,2 +0,0 @@ -Icon Set: IcoMoon Ultimate -- http://icomoon.io/ -License: Royalty Free -- http://icomoon.io/#icons/license diff --git a/media/css/icomoon/icomoon.css b/media/css/icomoon/icomoon.css deleted file mode 100644 index c035355d..00000000 --- a/media/css/icomoon/icomoon.css +++ /dev/null @@ -1,58 +0,0 @@ -@font-face { - font-family: 'phIcoMoon'; - src: url('fonts/icomoon.eot'); - src: url('fonts/icomoon.eot?#iefix') format('embedded-opentype'), - url('fonts/icomoon.svg#phIcoMoon') format('svg'), - url('fonts/icomoon.woff') format('woff'), - url('fonts/icomoon.ttf') format('truetype'); - font-weight: normal; - font-style: normal; -} - -[data-icon]:before { - font-family: 'phIcoMoon'; - content: attr(data-icon); - speak: none; -} -[class^="icon-"], -[class*=" icon-"] { - display: inline-block; - width: 14px; - height: 14px; - *margin-right: .3em; - line-height: 14px; -} -[class^="icon-"]:before, -[class*=" icon-"]:before { - font-family: 'phIcoMoon'; - font-style: normal; - speak: none; -} -[class^="icon-"].disabled, -[class*=" icon-"].disabled { - font-weight: normal; -} -.icon-ph-invoice:before { - font-family: 'phIcoMoon' !important; - content: "\e600"; -} -.icon-ph-del-note:before { - font-family: 'phIcoMoon' !important; - content: "\e601"; -} -.icon-ph-cart1:before { - font-family: 'phIcoMoon' !important; - content: "\e602"; -} -.icon-ph-cart2:before { - font-family: 'phIcoMoon' !important; - content: "\e603"; -} -.icon-ph-cart3:before { - font-family: 'phIcoMoon' !important; - content: "\e604"; -} -.icon-ph-earth:before { - font-family: 'phIcoMoon' !important; - content: "\e605"; -} diff --git a/media/css/icomoon/index.html b/media/css/icomoon/index.html deleted file mode 100644 index 3af63015..00000000 --- a/media/css/icomoon/index.html +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/media/css/main-product-hover.css b/media/css/main-product-hover.css new file mode 100644 index 00000000..30523657 --- /dev/null +++ b/media/css/main-product-hover.css @@ -0,0 +1,120 @@ +/* +body.preload *{ +animation-duration: 0s !important; +-webkit-animation-duration: 0s !important; +transition:background-color 0s, opacity 0s, color 0s, width 0s, height 0s, padding 0s, margin 0s !important; +} +*/ + +body.preload *{ + transition: padding 0s, margin 0s !important; +} + +.ph-item-box { + display: inline-block; + position: relative; + margin-bottom: 30px; + clear: both; + +} +.ph-item-box:hover{ + z-index: 999; +} + +/* substitution for thumbnail */ +.ph-item-box .ph-item{ + transition: all 0.3s; + background-color: #fff; + border: 1px solid #ddd; + border-radius: 4px; + display: -inline-block; + line-height: 1.42857; + + -webkit-box-sizing:content-box; + -moz-box-sizing:content-box; + box-sizing:content-box; + + padding: 0px; + + +} +.ph-item-box:hover .ph-item { + box-shadow: 0px 0px 5px rgba(1, 1, 1, 0.3); + + padding: 0px; + padding-bottom: 25px; + margin-bottom: -25px; + + display: relative; + z-index: 9; + clear:both; + +} + +.ph-item-box .ph-item-content { + padding: 13px; +} + + +.ph-item-box .ph-item-action-box .ph-item-action-fade{ + clear: both; + padding-top: 10px; + padding-bottom: 15px; + left: 0px; + right: 0px; + visibility: hidden; + opacity: 0; + position: absolute; + bottom: 0; + transition: all 0.3s; + + -webkit-box-sizing:content-box; + -moz-box-sizing:content-box; + box-sizing:content-box +} +.ph-item-box:hover .ph-item-action-box .ph-item-action-fade{ + visibility: visible; + opacity: 1; + bottom: -47px; +} + +.ph-item-box .ph-item-action-box{ + padding-bottom: 7px; + position: relative; + +} + +.ph-item-box .ph-item-action-fade a{ + /*display: block;*/ + /*max-width: 50%;*/ + /*overflow: hidden;*/ + white-space: nowrap; + transform: scale(0); + opacity: 0; + visibility: hidden; + + background: #f7f7f7; + text-align: center; + border-radius: 50%; + margin:auto; + display: inline-block; + width: 36px; + height: 36px; + line-height: 36px; + position: relative; + vertical-align: middle; + font-size: 18px; + padding: 0px; + +} +.ph-item-box:hover .ph-item-action-fade a{ + transform: scale(1); + opacity: 1; + visibility: visible; +} + +.ph-item-box .ph-item-action-fade a .glyphicon { + margin-left: -1px; + margin-top: 7px; +} + diff --git a/media/css/main-product-image-move.css b/media/css/main-product-image-move.css new file mode 100644 index 00000000..7b597e43 --- /dev/null +++ b/media/css/main-product-image-move.css @@ -0,0 +1,33 @@ +/* Switch images category or items view */ +.phIBoxOH { + position: relative; +} + +.phIBoxOH .phIBox { + border-radius: 0; + display: inline-block; + overflow: hidden; + position: relative; + text-align: center; +} + +.phIBoxOH .phIL, +.phIBoxOH .phIR { + display: inline-block; + transition: opacity 0.7s ease 0s, transform 0.7s ease 0s; +} + +.phIBoxOH:hover .phIL, +.phIBoxOH:hover .phIR { + transform: translate(100%, 0px); +} + +.phIBoxOH .phIBox .phIRBox { + left: 0; + padding: 0; + position: absolute; + top: 0; + transform: translate(-100%, 0px); + transition: all 0.5s ease-in-out 0s; + width: 100%; +} \ No newline at end of file diff --git a/media/css/main.css b/media/css/main.css index 9ec668d9..d0eeebef 100644 --- a/media/css/main.css +++ b/media/css/main.css @@ -90,7 +90,7 @@ } .ph-item-buy-now-box { - margin-top: -1px; + /* margin-top: -1px; */ } .pc-item-view .ph-item-buy-now-box { @@ -488,7 +488,7 @@ table tr th.ph-checkout-cart-image { .ph-idnr-box { margin: 5%; - margin-top: -9%; + margin-top: 0; } .ph-idnr-box-in { width: 100%; @@ -542,13 +542,42 @@ table.ph-idnr-box-in tr td { padding: 2px 5px; } .ph-idnr-to-pay { - background: #ddd; + background: #eee; padding: 20px; } +.ph-idnr-to-pay-value { + background: #eee; + padding: 20px; + text-align: right; +} .ph-category-item-compare { float: right; + margin: 2px; +} + +.ph-category-item-wishlist { + float: right; + margin: 2px; +} + +.ph-category-item-quickview { + float: right; + margin: 2px; +} + +.ph-category-item-compare .glyphicon-stats { + color: #4491e4; +} + +.ph-category-item-quickview .glyphicon-heart-empty, +.ph-category-item-wishlist .glyphicon-heart { + color: #EA7C7C; +} + +.ph-category-item-quickview .glyphicon-eye-open { + color: #555555; } .ph-comparison-table .img-responsive{width:100%;} @@ -890,4 +919,146 @@ ul.ph-filter-module-category-tree li .checkbox{ text-align: left; } +.ph-icon-pdf-text-box { + margin-top: -12px; +} +.ph-icon-pdf-text { + font-size: 60%; + margin-left: 6px; + margin-right: 6px; + +} + +/* Attribute */ + +.phSelectBoxButton { + display: inline-block; + margin: 3px; + padding: 7px; + width: 15px; + height: 15px; + cursor: pointer; + border: 2px solid transparent; + box-sizing: content-box; + border-radius: 2px; + text-decoration: none; +} + +.phSelectBoxButton.on { + + border: 2px solid transparent; + padding: 7px; + width: 15px; + height: 15px; + color: #fff; + box-sizing: content-box; + border-radius: 2px; + text-decoration: none; +} + +.phSelectBoxButton.on:after { + + position: relative; + top: -2px; + left: -3px; + font-family: 'Glyphicons Halflings'; + line-height: 1; + -webkit-font-smoothing: antialiased; + + content: '\e013'; /* Ok/check mark */ + box-sizing: content-box; + border-radius: 2px; + text-decoration: none; +} + +.phSelectBoxButton:hover, +.phSelectBoxButton.on:hover { + border: 2px solid #fff; +} + +a.phSelectBoxButton:hover, +a.phSelectBoxButton.on:hover, +a.phSelectBoxButton:visited, +a.phSelectBoxButton.on:visited, +a.phSelectBoxButton:active, +a.phSelectBoxButton.on:active, +a.phSelectBoxButton:focus, +a.phSelectBoxButton.on:focus { + text-decoration: none; +} + + +.phSelectBoxImage { + display: inline-block; + margin: 3px; + cursor: pointer; + border: 2px solid transparent; + box-sizing: content-box; + border-radius: 2px; + text-decoration: none; + position: relative; +} + +.phSelectBoxButton.on { + + border: 2px solid transparent; + color: #fff; + box-sizing: content-box; + border-radius: 2px; + text-decoration: none; +} + +.phSelectBoxImage.on:after { + + position: absolute; + top: 30%; + left: 40%; + font-family: 'Glyphicons Halflings'; + line-height: 1; + -webkit-font-smoothing: antialiased; + + content: '\e013'; /* Ok/check mark */ + box-sizing: content-box; + border-radius: 2px; + text-decoration: none; + color: #ffcc00; + +} + +.phSelectBoxImage:hover, +.phSelectBoxImage.on:hover { + border: 2px solid #fff; + background: #fff; +} + +a.phSelectBoxImage:hover, +a.phSelectBoxImage.on:hover, +a.phSelectBoxImage:visited, +a.phSelectBoxImage.on:visited, +a.phSelectBoxImage:active, +a.phSelectBoxImage.on:active, +a.phSelectBoxImage:focus, +a.phSelectBoxImage.on:focus { + text-decoration: none; +} + + +.ph-panel-body-color { + margin: 15px 5px; +} + +.ph-question-message { + +} + +.ph-item-image-full-left-box { + text-align: left; +} + +.phVMiddle, +.pc-wishlist-view .phVMiddle { + display: inline-block; + vertical-align: middle; + float: none; +} diff --git a/media/js/chartjs/Chart.min.js b/media/js/chartjs/Chart.min.js index b4d7e92b..c2aade15 100644 --- a/media/js/chartjs/Chart.min.js +++ b/media/js/chartjs/Chart.min.js @@ -1,40 +1,6 @@ -!function t(e,i,a){function s(n,r){if(!i[n]){if(!e[n]){var h="function"==typeof require&&require;if(!r&&h)return h(n,!0);if(o)return o(n,!0);var l=new Error("Cannot find module '"+n+"'");throw l.code="MODULE_NOT_FOUND",l}var c=i[n]={exports:{}};e[n][0].call(c.exports,function(t){var i=e[n][1][t];return s(i?i:t)},c,c.exports,t,e,i,a)}return i[n].exports}for(var o="function"==typeof require&&require,n=0;n=a?a/12.92:Math.pow((a+.055)/1.055,2.4)}return.2126*e[0]+.7152*e[1]+.0722*e[2]},contrast:function(t){var e=this.luminosity(),i=t.luminosity();return e>i?(e+.05)/(i+.05):(i+.05)/(e+.05)},level:function(t){var e=this.contrast(t);return e>=7.1?"AAA":e>=4.5?"AA":""},dark:function(){var t=this.values.rgb,e=(299*t[0]+587*t[1]+114*t[2])/1e3;return 128>e},light:function(){return!this.dark()},negate:function(){for(var t=[],e=0;3>e;e++)t[e]=255-this.values.rgb[e];return this.setValues("rgb",t),this},lighten:function(t){return this.values.hsl[2]+=this.values.hsl[2]*t,this.setValues("hsl",this.values.hsl),this},darken:function(t){return this.values.hsl[2]-=this.values.hsl[2]*t,this.setValues("hsl",this.values.hsl),this},saturate:function(t){return this.values.hsl[1]+=this.values.hsl[1]*t,this.setValues("hsl",this.values.hsl),this},desaturate:function(t){return this.values.hsl[1]-=this.values.hsl[1]*t,this.setValues("hsl",this.values.hsl),this},whiten:function(t){return this.values.hwb[1]+=this.values.hwb[1]*t,this.setValues("hwb",this.values.hwb),this},blacken:function(t){return this.values.hwb[2]+=this.values.hwb[2]*t,this.setValues("hwb",this.values.hwb),this},greyscale:function(){var t=this.values.rgb,e=.3*t[0]+.59*t[1]+.11*t[2];return this.setValues("rgb",[e,e,e]),this},clearer:function(t){return this.setValues("alpha",this.values.alpha-this.values.alpha*t),this},opaquer:function(t){return this.setValues("alpha",this.values.alpha+this.values.alpha*t),this},rotate:function(t){var e=this.values.hsl[0];return e=(e+t)%360,e=0>e?360+e:e,this.values.hsl[0]=e,this.setValues("hsl",this.values.hsl),this},mix:function(t,e){e=1-(null==e?.5:e);for(var i=2*e-1,a=this.alpha()-t.alpha(),s=((i*a==-1?i:(i+a)/(1+i*a))+1)/2,o=1-s,n=this.rgbArray(),r=t.rgbArray(),h=0;he&&(e+=360),a=(r+h)/2,i=h==r?0:.5>=a?l/(h+r):l/(2-h-r),[e,100*i,100*a]}function s(t){var e,i,a,s=t[0],o=t[1],n=t[2],r=Math.min(s,o,n),h=Math.max(s,o,n),l=h-r;return i=0==h?0:l/h*1e3/10,h==r?e=0:s==h?e=(o-n)/l:o==h?e=2+(n-s)/l:n==h&&(e=4+(s-o)/l),e=Math.min(60*e,360),0>e&&(e+=360),a=h/255*1e3/10,[e,i,a]}function o(t){var e=t[0],i=t[1],s=t[2],o=a(t)[0],n=1/255*Math.min(e,Math.min(i,s)),s=1-1/255*Math.max(e,Math.max(i,s));return[o,100*n,100*s]}function n(t){var e,i,a,s,o=t[0]/255,n=t[1]/255,r=t[2]/255;return s=Math.min(1-o,1-n,1-r),e=(1-o-s)/(1-s)||0,i=(1-n-s)/(1-s)||0,a=(1-r-s)/(1-s)||0,[100*e,100*i,100*a,100*s]}function h(t){return G[JSON.stringify(t)]}function l(t){var e=t[0]/255,i=t[1]/255,a=t[2]/255;e=e>.04045?Math.pow((e+.055)/1.055,2.4):e/12.92,i=i>.04045?Math.pow((i+.055)/1.055,2.4):i/12.92,a=a>.04045?Math.pow((a+.055)/1.055,2.4):a/12.92;var s=.4124*e+.3576*i+.1805*a,o=.2126*e+.7152*i+.0722*a,n=.0193*e+.1192*i+.9505*a;return[100*s,100*o,100*n]}function c(t){var e,i,a,s=l(t),o=s[0],n=s[1],r=s[2];return o/=95.047,n/=100,r/=108.883,o=o>.008856?Math.pow(o,1/3):7.787*o+16/116,n=n>.008856?Math.pow(n,1/3):7.787*n+16/116,r=r>.008856?Math.pow(r,1/3):7.787*r+16/116,e=116*n-16,i=500*(o-n),a=200*(n-r),[e,i,a]}function d(t){return B(c(t))}function u(t){var e,i,a,s,o,n=t[0]/360,r=t[1]/100,h=t[2]/100;if(0==r)return o=255*h,[o,o,o];i=.5>h?h*(1+r):h+r-h*r,e=2*h-i,s=[0,0,0];for(var l=0;3>l;l++)a=n+1/3*-(l-1),0>a&&a++,a>1&&a--,o=1>6*a?e+6*(i-e)*a:1>2*a?i:2>3*a?e+(i-e)*(2/3-a)*6:e,s[l]=255*o;return s}function m(t){var e,i,a=t[0],s=t[1]/100,o=t[2]/100;return o*=2,s*=1>=o?o:2-o,i=(o+s)/2,e=2*s/(o+s),[a,100*e,100*i]}function p(t){return o(u(t))}function f(t){return n(u(t))}function v(t){return h(u(t))}function x(t){var e=t[0]/60,i=t[1]/100,a=t[2]/100,s=Math.floor(e)%6,o=e-Math.floor(e),n=255*a*(1-i),r=255*a*(1-i*o),h=255*a*(1-i*(1-o)),a=255*a;switch(s){case 0:return[a,h,n];case 1:return[r,a,n];case 2:return[n,a,h];case 3:return[n,r,a];case 4:return[h,n,a];case 5:return[a,n,r]}}function y(t){var e,i,a=t[0],s=t[1]/100,o=t[2]/100;return i=(2-s)*o,e=s*o,e/=1>=i?i:2-i,e=e||0,i/=2,[a,100*e,100*i]}function k(t){return o(x(t))}function D(t){return n(x(t))}function w(t){return h(x(t))}function C(t){var e,i,a,s,o=t[0]/360,n=t[1]/100,h=t[2]/100,l=n+h;switch(l>1&&(n/=l,h/=l),e=Math.floor(6*o),i=1-h,a=6*o-e,0!=(1&e)&&(a=1-a),s=n+a*(i-n),e){default:case 6:case 0:r=i,g=s,b=n;break;case 1:r=s,g=i,b=n;break;case 2:r=n,g=i,b=s;break;case 3:r=n,g=s,b=i;break;case 4:r=s,g=n,b=i;break;case 5:r=i,g=n,b=s}return[255*r,255*g,255*b]}function S(t){return a(C(t))}function _(t){return s(C(t))}function A(t){return n(C(t))}function I(t){return h(C(t))}function M(t){var e,i,a,s=t[0]/100,o=t[1]/100,n=t[2]/100,r=t[3]/100;return e=1-Math.min(1,s*(1-r)+r),i=1-Math.min(1,o*(1-r)+r),a=1-Math.min(1,n*(1-r)+r),[255*e,255*i,255*a]}function P(t){return a(M(t))}function F(t){return s(M(t))}function R(t){return o(M(t))}function V(t){return h(M(t))}function T(t){var e,i,a,s=t[0]/100,o=t[1]/100,n=t[2]/100;return e=3.2406*s+-1.5372*o+n*-.4986,i=s*-.9689+1.8758*o+.0415*n,a=.0557*s+o*-.204+1.057*n,e=e>.0031308?1.055*Math.pow(e,1/2.4)-.055:e=12.92*e,i=i>.0031308?1.055*Math.pow(i,1/2.4)-.055:i=12.92*i,a=a>.0031308?1.055*Math.pow(a,1/2.4)-.055:a=12.92*a,e=Math.min(Math.max(0,e),1),i=Math.min(Math.max(0,i),1),a=Math.min(Math.max(0,a),1),[255*e,255*i,255*a]}function z(t){var e,i,a,s=t[0],o=t[1],n=t[2];return s/=95.047,o/=100,n/=108.883,s=s>.008856?Math.pow(s,1/3):7.787*s+16/116,o=o>.008856?Math.pow(o,1/3):7.787*o+16/116,n=n>.008856?Math.pow(n,1/3):7.787*n+16/116,e=116*o-16,i=500*(s-o),a=200*(o-n),[e,i,a]}function W(t){return B(z(t))}function L(t){var e,i,a,s,o=t[0],n=t[1],r=t[2];return 8>=o?(i=100*o/903.3,s=7.787*(i/100)+16/116):(i=100*Math.pow((o+16)/116,3),s=Math.pow(i/100,1/3)),e=.008856>=e/95.047?e=95.047*(n/500+s-16/116)/7.787:95.047*Math.pow(n/500+s,3),a=.008859>=a/108.883?a=108.883*(s-r/200-16/116)/7.787:108.883*Math.pow(s-r/200,3),[e,i,a]}function B(t){var e,i,a,s=t[0],o=t[1],n=t[2];return e=Math.atan2(n,o),i=360*e/2/Math.PI,0>i&&(i+=360),a=Math.sqrt(o*o+n*n),[s,a,i]}function O(t){return T(L(t))}function E(t){var e,i,a,s=t[0],o=t[1],n=t[2];return a=n/360*2*Math.PI,e=o*Math.cos(a),i=o*Math.sin(a),[s,e,i]}function N(t){return L(E(t))}function H(t){return O(E(t))}function q(t){return Q[t]}function Y(t){return a(q(t))}function j(t){return s(q(t))}function U(t){return o(q(t))}function X(t){return n(q(t))}function J(t){return c(q(t))}function Z(t){return l(q(t))}e.exports={rgb2hsl:a,rgb2hsv:s,rgb2hwb:o,rgb2cmyk:n,rgb2keyword:h,rgb2xyz:l,rgb2lab:c,rgb2lch:d,hsl2rgb:u,hsl2hsv:m,hsl2hwb:p,hsl2cmyk:f,hsl2keyword:v,hsv2rgb:x,hsv2hsl:y,hsv2hwb:k,hsv2cmyk:D,hsv2keyword:w,hwb2rgb:C,hwb2hsl:S,hwb2hsv:_,hwb2cmyk:A,hwb2keyword:I,cmyk2rgb:M,cmyk2hsl:P,cmyk2hsv:F,cmyk2hwb:R,cmyk2keyword:V,keyword2rgb:q,keyword2hsl:Y,keyword2hsv:j,keyword2hwb:U,keyword2cmyk:X,keyword2lab:J,keyword2xyz:Z,xyz2rgb:T,xyz2lab:z,xyz2lch:W,lab2xyz:L,lab2rgb:O,lab2lch:B,lch2lab:E,lch2xyz:N,lch2rgb:H};var Q={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},G={};for(var $ in Q)G[JSON.stringify(Q[$])]=$},{}],3:[function(t,e,i){var a=t("./conversions"),s=function(){return new l};for(var o in a){s[o+"Raw"]=function(t){return function(e){return"number"==typeof e&&(e=Array.prototype.slice.call(arguments)),a[t](e)}}(o);var n=/(\w+)2(\w+)/.exec(o),r=n[1],h=n[2];s[r]=s[r]||{},s[r][h]=s[o]=function(t){return function(e){"number"==typeof e&&(e=Array.prototype.slice.call(arguments));var i=a[t](e);if("string"==typeof i||void 0===i)return i;for(var s=0;se||t[3]&&t[3]<1?d(t,e):"rgb("+t[0]+", "+t[1]+", "+t[2]+")"}function d(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"rgba("+t[0]+", "+t[1]+", "+t[2]+", "+e+")"}function u(t,e){if(1>e||t[3]&&t[3]<1)return g(t,e);var i=Math.round(t[0]/255*100),a=Math.round(t[1]/255*100),s=Math.round(t[2]/255*100);return"rgb("+i+"%, "+a+"%, "+s+"%)"}function g(t,e){var i=Math.round(t[0]/255*100),a=Math.round(t[1]/255*100),s=Math.round(t[2]/255*100);return"rgba("+i+"%, "+a+"%, "+s+"%, "+(e||t[3]||1)+")"}function m(t,e){return 1>e||t[3]&&t[3]<1?p(t,e):"hsl("+t[0]+", "+t[1]+"%, "+t[2]+"%)"}function p(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hsla("+t[0]+", "+t[1]+"%, "+t[2]+"%, "+e+")"}function f(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hwb("+t[0]+", "+t[1]+"%, "+t[2]+"%"+(void 0!==e&&1!==e?", "+e:"")+")"}function b(t){return k[t.slice(0,3)]}function v(t,e,i){return Math.min(Math.max(e,t),i)}function x(t){var e=t.toString(16).toUpperCase();return e.length<2?"0"+e:e}var y=t("color-name");e.exports={getRgba:a,getHsla:s,getRgb:n,getHsl:r,getHwb:o,getAlpha:h,hexString:l,rgbString:c,rgbaString:d,percentString:u,percentaString:g,hslString:m,hslaString:p,hwbString:f,keyword:b};var k={};for(var D in y)k[y[D]]=D},{"color-name":5}],5:[function(t,e,i){e.exports={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]}},{}]},{},[1]),/*! - * Chart.js - * http://chartjs.org/ - * Version: 2.0.0-alpha - * - * Copyright 2015 Nick Downie - * Released under the MIT license - * https://github.com/nnnick/Chart.js/blob/master/LICENSE.md - */ -function(){"use strict";var t=this,e=t.Chart,i=function(t,e){this.config=e,t.length&&t[0].getContext&&(t=t[0]),t.getContext&&(t=t.getContext("2d")),this.ctx=t,this.canvas=t.canvas,this.width=t.canvas.width||parseInt(i.helpers.getStyle(t.canvas,"width"))||i.helpers.getMaximumWidth(t.canvas),this.height=t.canvas.height||parseInt(i.helpers.getStyle(t.canvas,"height"))||i.helpers.getMaximumHeight(t.canvas),this.aspectRatio=this.width/this.height,(isNaN(this.aspectRatio)||isFinite(this.aspectRatio)===!1)&&(this.aspectRatio=void 0!==e.aspectRatio?e.aspectRatio:2),this.originalCanvasStyleWidth=t.canvas.style.width,this.originalCanvasStyleHeight=t.canvas.style.height,i.helpers.retinaScale(this),e&&(this.controller=new i.Controller(this));var a=this;return i.helpers.addResizeListener(t.canvas.parentNode,function(){a.controller&&a.controller.config.options.responsive&&a.controller.resize()}),this.controller?this.controller:this};i.defaults={global:{responsive:!0,responsiveAnimationDuration:0,maintainAspectRatio:!0,events:["mousemove","mouseout","click","touchstart","touchmove","touchend"],hover:{onHover:null,mode:"single",animationDuration:400},onClick:null,defaultColor:"rgba(0,0,0,0.1)",elements:{},legendCallback:function(t){var e=[];e.push('
      ');for(var i=0;i'),t.data.datasets[i].label&&e.push(t.data.datasets[i].label),e.push("");return e.push("
    "),e.join("")}}},"undefined"!=typeof amd?define(function(){return i}):"object"==typeof module&&module.exports&&(module.exports=i),t.Chart=i,i.noConflict=function(){return t.Chart=e,i}}.call(this),function(){"use strict";var t=this,e=t.Chart,i=e.helpers={},a=i.each=function(t,e,i,a){var s=Array.prototype.slice.call(arguments,3);if(t)if(t.length===+t.length){var o;if(a)for(o=t.length-1;o>=0;o--)e.apply(i,[t[o],o].concat(s));else for(o=0;o=o[s].length||!o[s][a].type?o[s].push(i.configMerge(t.type?e.scaleService.getScaleDefaults(t.type):{},t)):t.type!==o[s][a].type?o[s][a]=i.configMerge(o[s][a],t.type?e.scaleService.getScaleDefaults(t.type):{},t):o[s][a]=i.configMerge(o[s][a],t)}):(o[s]=[],i.each(t,function(t){o[s].push(i.configMerge(t.type?e.scaleService.getScaleDefaults(t.type):{},t))})):o.hasOwnProperty(s)&&"object"==typeof o[s]&&null!==o[s]&&"object"==typeof t?o[s]=i.configMerge(o[s],t):o[s]=t)}),o},i.getValueAtIndexOrDefault=function(t,e,a){return void 0===t||null===t?a:i.isArray(t)?e=0;a--){var s=t[a];if(e(s))return s}},i.inherits=function(t){var e=this,i=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},a=function(){this.constructor=i};return a.prototype=e.prototype,i.prototype=new a,i.extend=n,t&&o(i.prototype,t),i.__super__=e.prototype,i}),r=i.noop=function(){},h=(i.uid=function(){var t=0;return function(){return"chart-"+t++}}(),i.warn=function(t){window.console&&"function"==typeof window.console.warn&&console.warn(t)},i.amd="function"==typeof define&&define.amd,i.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)}),l=(i.max=function(t){return Math.max.apply(Math,t)},i.min=function(t){return Math.min.apply(Math,t)},i.sign=function(t){return Math.sign?Math.sign(t):(t=+t,0===t||isNaN(t)?t:t>0?1:-1)},i.log10=function(t){return Math.log10?Math.log10(t):Math.log(t)/Math.LN10},i.getDecimalPlaces=function(t){if(t%1!==0&&h(t)){var e=t.toString();if(e.indexOf("e-")<0)return e.split(".")[1].length;if(e.indexOf(".")<0)return parseInt(e.split("e-")[1]);var i=e.split(".")[1].split("e-");return i[0].length+parseInt(i[1])}return 0},i.toRadians=function(t){return t*(Math.PI/180)},i.toDegrees=function(t){return t*(180/Math.PI)},i.getAngleFromPoint=function(t,e){var i=e.x-t.x,a=e.y-t.y,s=Math.sqrt(i*i+a*a),o=Math.atan2(a,i);return o<-.5*Math.PI&&(o+=2*Math.PI),{angle:o,distance:s}},i.aliasPixel=function(t){return t%2===0?0:.5},i.splineCurve=function(t,e,i,a){var s=t,o=e,n=i;s.skip&&(s=o),n.skip&&(n=o);var r=Math.sqrt(Math.pow(o.x-s.x,2)+Math.pow(o.y-s.y,2)),h=Math.sqrt(Math.pow(n.x-o.x,2)+Math.pow(n.y-o.y,2)),l=a*r/(r+h),c=a*h/(r+h);return{previous:{x:o.x-l*(n.x-s.x),y:o.y-l*(n.y-s.y)},next:{x:o.x+c*(n.x-s.x),y:o.y+c*(n.y-s.y)}}},i.nextItem=function(t,e,i){return i?e>=t.length-1?t[0]:t[e+1]:e>=t.length-1?t[t.length-1]:t[e+1]},i.previousItem=function(t,e,i){return i?0>=e?t[t.length-1]:t[e-1]:0>=e?t[0]:t[e-1]},i.niceNum=function(t,e){var a,s=Math.floor(i.log10(t)),o=t/Math.pow(10,s);return a=e?1.5>o?1:3>o?2:7>o?5:10:1>=o?1:2>=o?2:5>=o?5:10,a*Math.pow(10,s)},i.easingEffects={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-1*t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-0.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return 1*((t=t/1-1)*t*t+1)},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-1*((t=t/1-1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-0.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return 1*(t/=1)*t*t*t*t},easeOutQuint:function(t){return 1*((t=t/1-1)*t*t*t*t+1)},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return-1*Math.cos(t/1*(Math.PI/2))+1},easeOutSine:function(t){return 1*Math.sin(t/1*(Math.PI/2))},easeInOutSine:function(t){return-0.5*(Math.cos(Math.PI*t/1)-1)},easeInExpo:function(t){return 0===t?1:1*Math.pow(2,10*(t/1-1))},easeOutExpo:function(t){return 1===t?1:1*(-Math.pow(2,-10*t/1)+1)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(-Math.pow(2,-10*--t)+2)},easeInCirc:function(t){return t>=1?t:-1*(Math.sqrt(1-(t/=1)*t)-1)},easeOutCirc:function(t){return 1*Math.sqrt(1-(t=t/1-1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-0.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,i=0,a=1;return 0===t?0:1==(t/=1)?1:(i||(i=.3),at?-.5*(a*Math.pow(2,10*(t-=1))*Math.sin((1*t-e)*(2*Math.PI)/i)):a*Math.pow(2,-10*(t-=1))*Math.sin((1*t-e)*(2*Math.PI)/i)*.5+1)},easeInBack:function(t){var e=1.70158;return 1*(t/=1)*t*((e+1)*t-e)},easeOutBack:function(t){var e=1.70158;return 1*((t=t/1-1)*t*((e+1)*t+e)+1)},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?.5*(t*t*(((e*=1.525)+1)*t-e)):.5*((t-=2)*t*(((e*=1.525)+1)*t+e)+2)},easeInBounce:function(t){return 1-l.easeOutBounce(1-t)},easeOutBounce:function(t){return(t/=1)<1/2.75?1*(7.5625*t*t):2/2.75>t?1*(7.5625*(t-=1.5/2.75)*t+.75):2.5/2.75>t?1*(7.5625*(t-=2.25/2.75)*t+.9375):1*(7.5625*(t-=2.625/2.75)*t+.984375)},easeInOutBounce:function(t){return.5>t?.5*l.easeInBounce(2*t):.5*l.easeOutBounce(2*t-1)+.5}}),c=(i.requestAnimFrame=function(){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)}}(),i.cancelAnimFrame=function(){return window.cancelAnimationFrame||window.webkitCancelAnimationFrame||window.mozCancelAnimationFrame||window.oCancelAnimationFrame||window.msCancelAnimationFrame||function(t){return window.clearTimeout(t,1e3/60)}}(),i.getRelativePosition=function(t,e){var i,a,s=t.originalEvent||t,o=t.currentTarget||t.srcElement,n=o.getBoundingClientRect();return s.touches?(i=s.touches[0].clientX,a=s.touches[0].clientY):(i=s.clientX,a=s.clientY),i=Math.round((i-n.left)/(n.right-n.left)*o.width/e.currentDevicePixelRatio),a=Math.round((a-n.top)/(n.bottom-n.top)*o.height/e.currentDevicePixelRatio),{x:i,y:a}},i.addEvent=function(t,e,i){t.addEventListener?t.addEventListener(e,i):t.attachEvent?t.attachEvent("on"+e,i):t["on"+e]=i}),d=i.removeEvent=function(t,e,i){t.removeEventListener?t.removeEventListener(e,i,!1):t.detachEvent?t.detachEvent("on"+e,i):t["on"+e]=r},u=(i.bindEvents=function(t,e,i){t.events||(t.events={}),a(e,function(e){t.events[e]=function(){i.apply(t,arguments)},c(t.chart.canvas,e,t.events[e])})},i.unbindEvents=function(t,e){a(e,function(e,i){d(t.chart.canvas,i,e)})},i.getConstraintWidth=function(t){var e,i=document.defaultView.getComputedStyle(t)["max-width"],a=document.defaultView.getComputedStyle(t.parentNode)["max-width"],s=null!==i&&"none"!==i,o=null!==a&&"none"!==a;return(s||o)&&(e=Math.min(s?parseInt(i,10):Number.POSITIVE_INFINITY,o?parseInt(a,10):Number.POSITIVE_INFINITY)),e}),g=i.getConstraintHeight=function(t){var e,i=document.defaultView.getComputedStyle(t)["max-height"],a=document.defaultView.getComputedStyle(t.parentNode)["max-height"],s=null!==i&&"none"!==i,o=null!==a&&"none"!==a;return(i||a)&&(e=Math.min(s?parseInt(i,10):Number.POSITIVE_INFINITY,o?parseInt(a,10):Number.POSITIVE_INFINITY)),e},m=(i.getMaximumWidth=function(t){var e=t.parentNode,i=parseInt(m(e,"padding-left"))+parseInt(m(e,"padding-right")),a=e.clientWidth-i,s=u(t);return void 0!==s&&(a=Math.min(a,s)),a},i.getMaximumHeight=function(t){var e=t.parentNode,i=parseInt(m(e,"padding-top"))+parseInt(m(e,"padding-bottom")),a=e.clientHeight-i,s=g(t);return void 0!==s&&(a=Math.min(a,s)),a},i.getStyle=function(t,e){return t.currentStyle?t.currentStyle[e]:document.defaultView.getComputedStyle(t,null).getPropertyValue(e)});i.getMaximumSize=i.getMaximumWidth,i.retinaScale=function(t){var e=t.ctx,i=t.canvas.width,a=t.canvas.height;t.currentDevicePixelRatio=window.devicePixelRatio||1,1!==window.devicePixelRatio&&(e.canvas.height=a*window.devicePixelRatio,e.canvas.width=i*window.devicePixelRatio,e.scale(window.devicePixelRatio,window.devicePixelRatio),e.canvas.style.width=i+"px",e.canvas.style.height=a+"px",t.originalDevicePixelRatio=t.originalDevicePixelRatio||window.devicePixelRatio)},i.clear=function(t){t.ctx.clearRect(0,0,t.width,t.height)},i.fontString=function(t,e,i){return e+" "+t+"px "+i},i.longestText=function(t,e,i){t.font=e;var s=0;return a(i,function(e){var i=t.measureText(e).width;s=i>s?i:s}),s},i.drawRoundedRectangle=function(t,e,i,a,s,o){t.beginPath(),t.moveTo(e+o,i),t.lineTo(e+a-o,i),t.quadraticCurveTo(e+a,i,e+a,i+o),t.lineTo(e+a,i+s-o),t.quadraticCurveTo(e+a,i+s,e+a-o,i+s),t.lineTo(e+o,i+s),t.quadraticCurveTo(e,i+s,e,i+s-o),t.lineTo(e,i+o),t.quadraticCurveTo(e,i,e+o,i),t.closePath()},i.color=function(t){return window.Color?window.Color(t):(console.log("Color.js not found!"),t)},i.addResizeListener=function(t,e){var i=document.createElement("iframe"),a="chartjs-hidden-iframe";i.classlist?i.classlist.add(a):i.setAttribute("class",a),i.style.width="100%",i.style.display="block",i.style.border=0,i.style.height=0,i.style.margin=0,i.style.position="absolute",i.style.left=0,i.style.right=0,i.style.top=0,i.style.bottom=0,t.insertBefore(i,t.firstChild);(i.contentWindow||i).onresize=function(){e&&e()}},i.removeResizeListener=function(t){var e=t.querySelector(".chartjs-hidden-iframe");e&&e.parentNode.removeChild(e)},i.isArray=function(t){return Array.isArray?Array.isArray(t):"[object Array]"===Object.prototype.toString.call(arg)},i.isDatasetVisible=function(t){return!t.hidden}}.call(this),function(){"use strict";var t=this,e=t.Chart,i=e.helpers;e.elements={},e.Element=function(t){i.extend(this,t),this.initialize.apply(this,arguments)},i.extend(e.Element.prototype,{initialize:function(){},pivot:function(){return this._view||(this._view=i.clone(this._model)),this._start=i.clone(this._view),this},transition:function(t){return this._view||(this._view=i.clone(this._model)),this._start||this.pivot(),i.each(this._model,function(e,a){if("_"!==a[0]&&this._model.hasOwnProperty(a))if(this._view[a])if(this._model[a]===this._view[a]);else if("string"==typeof e)try{var s=i.color(this._start[a]).mix(i.color(this._model[a]),t);this._view[a]=s.rgbString()}catch(o){this._view[a]=e}else if("number"==typeof e){var n=void 0!==this._start[a]?this._start[a]:0;this._view[a]=(this._model[a]-n)*t+n}else this._view[a]=e;else"number"==typeof e?this._view[a]=e*t:this._view[a]=e||null;else;},this),1===t&&delete this._start,this},tooltipPosition:function(){return{x:this._model.x,y:this._model.y}},hasValue:function(){return i.isNumber(this._model.x)&&i.isNumber(this._model.y)}}),e.Element.extend=i.inherits}.call(this),function(){"use strict";var t=this,e=t.Chart,i=e.helpers;e.defaults.global.animation={duration:1e3,easing:"easeOutQuart",onProgress:function(){},onComplete:function(){}},e.Animation=e.Element.extend({currentStep:null,numSteps:60,easing:"",render:null,onAnimationProgress:null,onAnimationComplete:null}),e.animationService={frameDuration:17,animations:[],dropFrames:0,addAnimation:function(t,e,a,s){s||(t.animating=!0);for(var o=0;o1&&(e=Math.floor(this.dropFrames),this.dropFrames=this.dropFrames%1);for(var a=0;athis.animations[a].animationObject.numSteps&&(this.animations[a].animationObject.currentStep=this.animations[a].animationObject.numSteps),this.animations[a].animationObject.render(this.animations[a].chartInstance,this.animations[a].animationObject),this.animations[a].animationObject.currentStep==this.animations[a].animationObject.numSteps&&(this.animations[a].chartInstance.animating=!1,this.animations.splice(a,1),a--);var s=Date.now(),o=(s-t)/this.frameDuration;this.dropFrames+=o,this.animations.length>0&&i.requestAnimFrame.call(window,this.digestWrapper)}}}.call(this),function(){"use strict";var t=this,e=t.Chart,i=e.helpers;e.types={},e.instances={},e.controllers={},e.Controller=function(t){return this.chart=t,this.config=t.config,this.data=this.config.data,this.options=this.config.options=i.configMerge(e.defaults.global,e.defaults[this.config.type],this.config.options||{}),this.id=i.uid(),e.instances[this.id]=this,this.options.responsive&&this.resize(!0),this.initialize.call(this),this},i.extend(e.Controller.prototype,{initialize:function(){return this.bindEvents(),this.ensureScalesHaveIDs(),this.buildOrUpdateControllers(),this.buildScales(),this.resetElements(),this.initToolTip(),this.update(),this},clear:function(){return i.clear(this.chart),this},stop:function(){return e.animationService.cancelAnimation(this),this},resize:function(t){this.stop();var e=this.chart.canvas,a=i.getMaximumWidth(this.chart.canvas),s=this.options.maintainAspectRatio&&isNaN(this.chart.aspectRatio)===!1&&isFinite(this.chart.aspectRatio)&&0!==this.chart.aspectRatio?a/this.chart.aspectRatio:i.getMaximumHeight(this.chart.canvas);return e.width=this.chart.width=a,e.height=this.chart.height=s,i.retinaScale(this.chart),t||this.update(this.options.responsiveAnimationDuration),this},ensureScalesHaveIDs:function(){var t="x-axis-",e="y-axis-";this.options.scales&&(this.options.scales.xAxes&&this.options.scales.xAxes.length&&i.each(this.options.scales.xAxes,function(e,i){e.id=e.id||t+i},this),this.options.scales.yAxes&&this.options.scales.yAxes.length&&i.each(this.options.scales.yAxes,function(t,i){t.id=t.id||e+i},this))},buildScales:function(){if(this.scales={},this.options.scales&&(this.options.scales.xAxes&&this.options.scales.xAxes.length&&i.each(this.options.scales.xAxes,function(t,i){var a=e.scaleService.getScaleConstructor(t.type),s=new a({ctx:this.chart.ctx,options:t,data:this.data,id:t.id});this.scales[s.id]=s},this),this.options.scales.yAxes&&this.options.scales.yAxes.length&&i.each(this.options.scales.yAxes,function(t,i){var a=e.scaleService.getScaleConstructor(t.type),s=new a({ctx:this.chart.ctx,options:t,data:this.data,id:t.id});this.scales[s.id]=s},this)),this.options.scale){var t=e.scaleService.getScaleConstructor(this.options.scale.type),a=new t({ctx:this.chart.ctx,options:this.options.scale,data:this.data,chart:this.chart});this.scale=a,this.scales.radialScale=a}e.scaleService.update(this,this.chart.width,this.chart.height)},buildOrUpdateControllers:function(t){var a=[];if(i.each(this.data.datasets,function(i,s){i.type||(i.type=this.config.type);var o=i.type;return a.push(o),i.controller?void i.controller.updateIndex(s):(i.controller=new e.controllers[o](this,s),void(t&&i.controller.reset()))},this),a.length>1)for(var s=1;sl&&this.labelRotation<=this.options.ticks.maxRotation;){if(n=Math.cos(i.toRadians(this.labelRotation)),r=Math.sin(i.toRadians(this.labelRotation)),e=n*s,a=n*o,e+this.options.ticks.fontSize/2>this.yLabelWidth&&(this.paddingLeft=e+this.options.ticks.fontSize/2),this.paddingRight=this.options.ticks.fontSize/2,r*h>this.maxHeight){this.labelRotation--;break}this.labelRotation++,this.labelWidth=n*h}}else this.labelWidth=0,this.paddingRight=0,this.paddingLeft=0;this.margins&&(this.paddingLeft-=this.margins.left,this.paddingRight-=this.margins.right,this.paddingLeft=Math.max(this.paddingLeft,0),this.paddingRight=Math.max(this.paddingRight,0))},afterCalculateTickRotation:i.noop,beforeFit:i.noop,fit:function(){if(this.minSize={width:0,height:0},this.isHorizontal()?this.minSize.width=this.maxWidth:this.minSize.width=this.options.gridLines.show&&this.options.display?10:0,this.isHorizontal()?this.minSize.height=this.options.gridLines.show&&this.options.display?10:0:this.minSize.height=this.maxHeight,this.options.scaleLabel.show&&(this.isHorizontal()?this.minSize.height+=1.5*this.options.scaleLabel.fontSize:this.minSize.width+=1.5*this.options.scaleLabel.fontSize),this.options.ticks.show&&this.options.display){var t=i.fontString(this.options.ticks.fontSize,this.options.ticks.fontStyle,this.options.ticks.fontFamily);if(this.isHorizontal()){var e=(this.maxHeight-this.minSize.height,i.longestText(this.ctx,t,this.ticks)),a=Math.sin(i.toRadians(this.labelRotation))*e+1.5*this.options.ticks.fontSize;this.minSize.height=Math.min(this.maxHeight,this.minSize.height+a),t=i.fontString(this.options.ticks.fontSize,this.options.ticks.fontStyle,this.options.ticks.fontFamily),this.ctx.font=t;var s=this.ctx.measureText(this.ticks[0]).width,o=this.ctx.measureText(this.ticks[this.ticks.length-1]).width,n=Math.cos(i.toRadians(this.labelRotation)),r=Math.sin(i.toRadians(this.labelRotation));this.paddingLeft=0!==this.labelRotation?n*s+3:s/2+3,this.paddingRight=0!==this.labelRotation?r*(this.options.ticks.fontSize/2)+3:o/2+3}else{var h=this.maxWidth-this.minSize.width,l=i.longestText(this.ctx,t,this.ticks);h>l?this.minSize.width+=l:this.minSize.width=this.maxWidth,this.paddingTop=this.options.ticks.fontSize/2,this.paddingBottom=this.options.ticks.fontSize/2}}this.margins&&(this.paddingLeft-=this.margins.left,this.paddingTop-=this.margins.top,this.paddingRight-=this.margins.right,this.paddingBottom-=this.margins.bottom,this.paddingLeft=Math.max(this.paddingLeft,0),this.paddingTop=Math.max(this.paddingTop,0),this.paddingRight=Math.max(this.paddingRight,0),this.paddingBottom=Math.max(this.paddingBottom,0)),this.width=this.minSize.width,this.height=this.minSize.height},afterFit:i.noop,isHorizontal:function(){return"top"==this.options.position||"bottom"==this.options.position},getRightValue:function a(t){return null===t||"undefined"==typeof t?NaN:"number"==typeof t&&isNaN(t)?NaN:"object"==typeof t?a(this.isHorizontal()?t.x:t.y):t},getLabelForIndex:i.noop,getPixelForValue:i.noop,getPixelForTick:function(t,e){if(this.isHorizontal()){var i=this.width-(this.paddingLeft+this.paddingRight),a=i/Math.max(this.ticks.length-(this.options.gridLines.offsetGridLines?0:1),1),s=a*t+this.paddingLeft;return e&&(s+=a/2),this.left+Math.round(s)}var o=this.height-(this.paddingTop+this.paddingBottom);return this.top+t*(o/(this.ticks.length-1))},getPixelForDecimal:function(t,e){if(this.isHorizontal()){var i=this.width-(this.paddingLeft+this.paddingRight),a=i*t+this.paddingLeft;return this.left+Math.round(a)}return this.top+t*this.height},draw:function(t){if(this.options.display){var e,a,s,o,n=0!==this.labelRotation;this.ctx.fillStyle=this.options.ticks.fontColor;var r=i.fontString(this.options.ticks.fontSize,this.options.ticks.fontStyle,this.options.ticks.fontFamily);if(this.isHorizontal()){e=!0;var h="bottom"==this.options.position?this.top:this.bottom-10,l="bottom"==this.options.position?this.top+10:this.bottom;a=!1,(this.options.ticks.fontSize+4)*this.ticks.length>this.width-(this.paddingLeft+this.paddingRight)&&(a=1+Math.floor((this.options.ticks.fontSize+4)*this.ticks.length/(this.width-(this.paddingLeft+this.paddingRight)))),i.each(this.ticks,function(s,o){if(!(a>1&&o%a>0||void 0===s||null===s)){var c=this.getPixelForTick(o),d=this.getPixelForTick(o,this.options.gridLines.offsetGridLines);this.options.gridLines.show&&(o===("undefined"!=typeof this.zeroLineIndex?this.zeroLineIndex:0)?(this.ctx.lineWidth=this.options.gridLines.zeroLineWidth,this.ctx.strokeStyle=this.options.gridLines.zeroLineColor,e=!0):e&&(this.ctx.lineWidth=this.options.gridLines.lineWidth,this.ctx.strokeStyle=this.options.gridLines.color,e=!1),c+=i.aliasPixel(this.ctx.lineWidth),this.ctx.beginPath(),this.options.gridLines.drawTicks&&(this.ctx.moveTo(c,h),this.ctx.lineTo(c,l)),this.options.gridLines.drawOnChartArea&&(this.ctx.moveTo(c,t.top),this.ctx.lineTo(c,t.bottom)),this.ctx.stroke()),this.options.ticks.show&&(this.ctx.save(),this.ctx.translate(d,n?this.top+12:"top"===this.options.position?this.bottom-10:this.top+10),this.ctx.rotate(-1*i.toRadians(this.labelRotation)),this.ctx.font=r,this.ctx.textAlign=n?"right":"center", -this.ctx.textBaseline=n?"middle":"top"===this.options.position?"bottom":"top",this.ctx.fillText(s,0,0),this.ctx.restore())}},this),this.options.scaleLabel.show&&(this.ctx.textAlign="center",this.ctx.textBaseline="middle",this.ctx.fillStyle=this.options.scaleLabel.fontColor,this.ctx.font=i.fontString(this.options.scaleLabel.fontSize,this.options.scaleLabel.fontStyle,this.options.scaleLabel.fontFamily),s=this.left+(this.right-this.left)/2,o="bottom"==this.options.position?this.bottom-this.options.scaleLabel.fontSize/2:this.top+this.options.scaleLabel.fontSize/2,this.ctx.fillText(this.options.scaleLabel.labelString,s,o))}else{e=!0;var c="right"==this.options.position?this.left:this.right-5,d="right"==this.options.position?this.left+5:this.right;if(i.each(this.ticks,function(a,s){var o=this.getPixelForTick(s);if(this.options.gridLines.show&&(s===("undefined"!=typeof this.zeroLineIndex?this.zeroLineIndex:0)?(this.ctx.lineWidth=this.options.gridLines.zeroLineWidth,this.ctx.strokeStyle=this.options.gridLines.zeroLineColor,e=!0):e&&(this.ctx.lineWidth=this.options.gridLines.lineWidth,this.ctx.strokeStyle=this.options.gridLines.color,e=!1),o+=i.aliasPixel(this.ctx.lineWidth),this.ctx.beginPath(),this.options.gridLines.drawTicks&&(this.ctx.moveTo(c,o),this.ctx.lineTo(d,o)),this.options.gridLines.drawOnChartArea&&(this.ctx.moveTo(t.left,o),this.ctx.lineTo(t.right,o)),this.ctx.stroke()),this.options.ticks.show){var n,h=this.getPixelForTick(s,this.options.gridLines.offsetGridLines);this.ctx.save(),"left"==this.options.position?this.options.ticks.mirror?(n=this.right+this.options.ticks.padding,this.ctx.textAlign="left"):(n=this.right-this.options.ticks.padding,this.ctx.textAlign="right"):this.options.ticks.mirror?(n=this.left-this.options.ticks.padding,this.ctx.textAlign="right"):(n=this.left+this.options.ticks.padding,this.ctx.textAlign="left"),this.ctx.translate(n,h),this.ctx.rotate(-1*i.toRadians(this.labelRotation)),this.ctx.font=r,this.ctx.textBaseline="middle",this.ctx.fillText(a,0,0),this.ctx.restore()}},this),this.options.scaleLabel.show){s="left"==this.options.position?this.left+this.options.scaleLabel.fontSize/2:this.right-this.options.scaleLabel.fontSize/2,o=this.top+(this.bottom-this.top)/2;var u="left"==this.options.position?-.5*Math.PI:.5*Math.PI;this.ctx.save(),this.ctx.translate(s,o),this.ctx.rotate(u),this.ctx.textAlign="center",this.ctx.fillStyle=this.options.scaleLabel.fontColor,this.ctx.font=i.fontString(this.options.scaleLabel.fontSize,this.options.scaleLabel.fontStyle,this.options.scaleLabel.fontFamily),this.ctx.textBaseline="middle",this.ctx.fillText(this.options.scaleLabel.labelString,0,0),this.ctx.restore()}}}}})}.call(this),function(){"use strict";var t=this,e=t.Chart,i=e.helpers;e.scaleService={constructors:{},defaults:{},registerScaleType:function(t,e,a){this.constructors[t]=e,this.defaults[t]=i.clone(a)},getScaleConstructor:function(t){return this.constructors.hasOwnProperty(t)?this.constructors[t]:void 0},getScaleDefaults:function(t){return this.defaults.hasOwnProperty(t)?i.scaleMerge(e.defaults.scale,this.defaults[t]):{}},update:function(t,e,a){var s=e>30?5:2,o=a>30?5:2;if(t){var n=i.where(t.scales,function(t){return"left"==t.options.position}),r=i.where(t.scales,function(t){return"right"==t.options.position}),h=i.where(t.scales,function(t){return"top"==t.options.position}),l=i.where(t.scales,function(t){return"bottom"==t.options.position}),c=i.where(t.scales,function(t){return"chartArea"==t.options.position}),d=e/2,u=a/2;d-=2*s,u-=2*o;var g=(e-d)/(n.length+r.length),m=(a-u)/(h.length+l.length),p=[],f=function(t){var e=t.update(g,u);p.push({horizontal:!1,minSize:e,scale:t})},b=function(t){var e=t.update(d,m);p.push({horizontal:!0,minSize:e,scale:t})};i.each(n,f),i.each(r,f),i.each(h,b),i.each(l,b);var v=a-2*o,x=e-2*s;i.each(p,function(t){t.horizontal?v-=t.minSize.height:x-=t.minSize.width});var y=function(t){var e=i.findNextWhere(p,function(e){return e.scale===t});e&&t.update(e.minSize.width,v)},k=function(t){var e=i.findNextWhere(p,function(e){return e.scale===t}),a={left:D,right:w,top:0,bottom:0};e&&t.update(x,e.minSize.height,a)},D=s,w=s,C=o,S=o;i.each(n,y),i.each(r,y),i.each(n,function(t){D+=t.width}),i.each(r,function(t){w+=t.width}),i.each(h,k),i.each(l,k),i.each(h,function(t){C+=t.height}),i.each(l,function(t){S+=t.height}),i.each(n,function(t){var e=i.findNextWhere(p,function(e){return e.scale===t}),a={left:0,right:0,top:C,bottom:S};e&&t.update(e.minSize.width,v,a)}),i.each(r,function(t){var e=i.findNextWhere(p,function(e){return e.scale===t}),a={left:0,right:0,top:C,bottom:S};e&&t.update(e.minSize.width,v,a)}),D=s,w=s,C=o,S=o,i.each(n,function(t){D+=t.width}),i.each(r,function(t){w+=t.width}),i.each(h,function(t){C+=t.height}),i.each(l,function(t){S+=t.height});var _=a-C-S,A=e-D-w;(A!==x||_!==v)&&(i.each(n,function(t){t.height=_}),i.each(r,function(t){t.height=_}),i.each(h,function(t){t.width=A}),i.each(l,function(t){t.width=A}),v=_,x=A);var I=s,M=o,P=function(t){t.left=I,t.right=I+t.width,t.top=C,t.bottom=C+v,I=t.right},F=function(t){t.left=D,t.right=D+x,t.top=M,t.bottom=M+t.height,M=t.bottom};i.each(n,P),i.each(h,F),I+=x,M+=v,i.each(r,P),i.each(l,F),t.chartArea={left:D,top:C,right:D+x,bottom:C+v},i.each(c,function(e){e.left=t.chartArea.left,e.top=t.chartArea.top,e.right=t.chartArea.right,e.bottom=t.chartArea.bottom,e.update(x,v)})}}}}.call(this),function(){"use strict";function t(t,e){return e&&(a.isArray(e)?t=t.concat(e):t.push(e)),t}var e=this,i=e.Chart,a=i.helpers;i.defaults.global.tooltips={enabled:!0,custom:null,mode:"single",backgroundColor:"rgba(0,0,0,0.8)",titleFontFamily:"' 'Arial', sans-serif,Helvetica Neue', 'Helvetica'",titleFontSize:12,titleFontStyle:"bold",titleSpacing:2,titleMarginBottom:6,titleColor:"#fff",titleAlign:"left",bodyFontFamily:"' 'Arial', sans-serif,Helvetica Neue', 'Helvetica'",bodyFontSize:12,bodyFontStyle:"normal",bodySpacing:2,bodyColor:"#fff",bodyAlign:"left",footerFontFamily:"' 'Arial', sans-serif,Helvetica Neue', 'Helvetica'",footerFontSize:12,footerFontStyle:"bold",footerSpacing:2,footerMarginTop:6,footerColor:"#fff",footerAlign:"left",yPadding:6,xPadding:6,caretSize:5,cornerRadius:6,xOffset:10,multiKeyBackground:"#fff",callbacks:{beforeTitle:a.noop,title:function(t,e,i,s,o){return a.isArray(t)?t[0]:t},afterTitle:a.noop,beforeBody:a.noop,beforeLabel:a.noop,label:function(t,e,i,a,s){return this._data.datasets[a].label+": "+e},afterLabel:a.noop,afterBody:a.noop,beforeFooter:a.noop,footer:a.noop,afterFooter:a.noop}},i.Tooltip=i.Element.extend({initialize:function(){var t=this._options;a.extend(this,{_model:{xPadding:t.tooltips.xPadding,yPadding:t.tooltips.yPadding,xOffset:t.tooltips.xOffset,bodyColor:t.tooltips.bodyColor,_bodyFontFamily:t.tooltips.bodyFontFamily,_bodyFontStyle:t.tooltips.bodyFontStyle,bodyFontSize:t.tooltips.bodyFontSize,bodySpacing:t.tooltips.bodySpacing,_bodposition:t.tooltips.bodposition,titleColor:t.tooltips.titleColor,_titleFontFamily:t.tooltips.titleFontFamily,_titleFontStyle:t.tooltips.titleFontStyle,titleFontSize:t.tooltips.titleFontSize,_titleAlign:t.tooltips.titleAlign,titleSpacing:t.tooltips.titleSpacing,titleMarginBottom:t.tooltips.titleMarginBottom,footerColor:t.tooltips.footerColor,_footerFontFamily:t.tooltips.footerFontFamily,_footerFontStyle:t.tooltips.footerFontStyle,footerFontSize:t.tooltips.footerFontSize,_footerAlign:t.tooltips.footerAlign,footerSpacing:t.tooltips.footerSpacing,footerMarginTop:t.tooltips.footerMarginTop,caretSize:t.tooltips.caretSize,cornerRadius:t.tooltips.cornerRadius,backgroundColor:t.tooltips.backgroundColor,opacity:0,legendColorBackground:t.tooltips.multiKeyBackground}})},getTitle:function(){var e=this._options.tooltips.callbacks.beforeTitle.apply(this,arguments),i=this._options.tooltips.callbacks.title.apply(this,arguments),a=this._options.tooltips.callbacks.afterTitle.apply(this,arguments),s=[];return s=t(s,e),s=t(s,i),s=t(s,a)},getBeforeBody:function(t,e,i,s,o){var n=this._options.tooltips.callbacks.beforeBody.call(this,t,e,i,s,o);return a.isArray(n)?n:[n]},getBody:function(t,e,i,s){var o,n,r,h=[];if(a.isArray(t)){for(var l=[],c=0;cthis._chart.height&&(e.yAlign="bottom"),e.xAlign="right",e.x+r>this._chart.width&&(e.xAlign="left");var h=e.x,l=e.y;if(l="top"==e.yAlign?e.y-e.caretSize-e.cornerRadius:"bottom"==e.yAlign?e.y-o+e.caretSize+e.cornerRadius:e.y-o/2,h="left"==e.xAlign?e.x-r:"right"==e.xAlign?e.x+i+e.caretSize:e.x+r/2,this._options.tooltips.enabled&&(t.fillStyle=a.color(e.backgroundColor).alpha(e.opacity).rgbString(),a.drawRoundedRectangle(t,h,l,n,o,e.cornerRadius),t.fill()),this._options.tooltips.enabled&&(t.fillStyle=a.color(e.backgroundColor).alpha(e.opacity).rgbString(),"left"==e.xAlign?(t.beginPath(),t.moveTo(e.x-i,e.y),t.lineTo(e.x-i-e.caretSize,e.y-e.caretSize),t.lineTo(e.x-i-e.caretSize,e.y+e.caretSize),t.closePath(),t.fill()):(t.beginPath(),t.moveTo(e.x+i,e.y),t.lineTo(e.x+i+e.caretSize,e.y-e.caretSize),t.lineTo(e.x+i+e.caretSize,e.y+e.caretSize),t.closePath(),t.fill())),this._options.tooltips.enabled){var c=l+e.yPadding,d=h+e.xPadding;e.title.length&&(t.textAlign=e._titleAlign,t.textBaseline="top",t.fillStyle=a.color(e.titleColor).alpha(e.opacity).rgbString(),t.font=a.fontString(e.titleFontSize,e._titleFontStyle,e._titleFontFamily),a.each(e.title,function(i,a){t.fillText(i,d,c),c+=e.titleFontSize+e.titleSpacing,a+1==e.title.length&&(c+=e.titleMarginBottom-e.titleSpacing)},this)),t.textAlign=e._bodyAlign,t.textBaseline="top",t.fillStyle=a.color(e.bodyColor).alpha(e.opacity).rgbString(),t.font=a.fontString(e.bodyFontSize,e._bodyFontStyle,e._bodyFontFamily),a.each(e.beforeBody,function(i,a){t.fillText(e.beforeBody,d,c),c+=e.bodyFontSize+e.bodySpacing}),a.each(e.body,function(i,s){"single"!=this._options.tooltips.mode&&(t.fillStyle=a.color(e.labelColors[s].borderColor).alpha(e.opacity).rgbString(),t.fillRect(d,c,e.bodyFontSize,e.bodyFontSize),t.fillStyle=a.color(e.labelColors[s].backgroundColor).alpha(e.opacity).rgbString(),t.fillRect(d+1,c+1,e.bodyFontSize-2,e.bodyFontSize-2),t.fillStyle=a.color(e.bodyColor).alpha(e.opacity).rgbString()),t.fillText(i,d+("single"!=this._options.tooltips.mode?e.bodyFontSize+2:0),c),c+=e.bodyFontSize+e.bodySpacing},this),a.each(e.afterBody,function(i,a){t.fillText(e.afterBody,d,c),c+=e.bodyFontSize}),c-=e.bodySpacing,e.footer.length&&(c+=e.footerMarginTop,t.textAlign=e._footerAlign,t.textBaseline="top",t.fillStyle=a.color(e.footerColor).alpha(e.opacity).rgbString(),t.font=a.fontString(e.footerFontSize,e._footerFontStyle,e._footerFontFamily),a.each(e.footer,function(i,a){t.fillText(i,d,c),c+=e.footerFontSize+e.footerSpacing},this))}}}})}.call(this),function(){"use strict";var t=this,e=t.Chart,i=e.helpers;e.defaults.bar={hover:{mode:"label"},scales:{xAxes:[{type:"category",categoryPercentage:.8,barPercentage:.9,gridLines:{offsetGridLines:!0}}],yAxes:[{type:"linear"}]}},e.controllers.bar=function(t,e){this.initialize.call(this,t,e)},i.extend(e.controllers.bar.prototype,{initialize:function(t,e){this.chart=t,this.index=e,this.linkScales(),this.addElements()},updateIndex:function(t){this.index=t},linkScales:function(){this.getDataset().xAxisID||(this.getDataset().xAxisID=this.chart.options.scales.xAxes[0].id),this.getDataset().yAxisID||(this.getDataset().yAxisID=this.chart.options.scales.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getScaleForID:function(t){return this.chart.scales[t]},getBarCount:function(){var t=0;return i.each(this.chart.data.datasets,function(e){i.isDatasetVisible(e)&&("bar"===e.type?++t:void 0===e.type&&"bar"===this.chart.config.type&&++t)},this),t},addElements:function(){this.getDataset().metaData=this.getDataset().metaData||[],i.each(this.getDataset().data,function(t,i){this.getDataset().metaData[i]=this.getDataset().metaData[i]||new e.elements.Rectangle({_chart:this.chart.chart,_datasetIndex:this.index,_index:i})},this)},addElementAndReset:function(t){this.getDataset().metaData=this.getDataset().metaData||[];var i=new e.elements.Rectangle({_chart:this.chart.chart,_datasetIndex:this.index,_index:t}),a=this.getBarCount();this.updateElement(i,t,!0,a),this.getDataset().metaData.splice(t,0,i)},removeElement:function(t){this.getDataset().metaData.splice(t,1)},reset:function(){this.update(!0)},buildOrUpdateElements:function(){var t=this.getDataset().data.length,e=this.getDataset().metaData.length;if(e>t)this.getDataset().metaData.splice(t,e-t);else if(t>e)for(var i=e;t>i;++i)this.addElementAndReset(i)},update:function(t){var e=this.getBarCount();i.each(this.getDataset().metaData,function(i,a){this.updateElement(i,a,t,e)},this)},updateElement:function(t,e,a,s){var o,n=this.getScaleForID(this.getDataset().xAxisID),r=this.getScaleForID(this.getDataset().yAxisID);o=r.min<0&&r.max<0?r.getPixelForValue(r.max):r.min>0&&r.max>0?r.getPixelForValue(r.min):r.getPixelForValue(0),i.extend(t,{_chart:this.chart.chart,_xScale:n,_yScale:r,_datasetIndex:this.index,_index:e,_model:{x:this.calculateBarX(e,this.index),y:a?o:this.calculateBarY(e,this.index),label:this.chart.data.labels[e],datasetLabel:this.getDataset().label,base:this.calculateBarBase(this.index,e),width:this.calculateBarWidth(s),backgroundColor:t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:i.getValueAtIndexOrDefault(this.getDataset().backgroundColor,e,this.chart.options.elements.rectangle.backgroundColor),borderColor:t.custom&&t.custom.borderColor?t.custom.borderColor:i.getValueAtIndexOrDefault(this.getDataset().borderColor,e,this.chart.options.elements.rectangle.borderColor),borderWidth:t.custom&&t.custom.borderWidth?t.custom.borderWidth:i.getValueAtIndexOrDefault(this.getDataset().borderWidth,e,this.chart.options.elements.rectangle.borderWidth)}}),t.pivot()},calculateBarBase:function(t,e){var a=(this.getScaleForID(this.getDataset().xAxisID),this.getScaleForID(this.getDataset().yAxisID)),s=0;if(a.options.stacked){var o=this.chart.data.datasets[t].data[e];if(0>o)for(var n=0;t>n;n++){var r=this.chart.data.datasets[n];i.isDatasetVisible(r)&&r.yAxisID===a.id&&(s+=r.data[e]<0?r.data[e]:0)}else for(var h=0;t>h;h++){var l=this.chart.data.datasets[h];i.isDatasetVisible(l)&&l.yAxisID===a.id&&(s+=l.data[e]>0?l.data[e]:0)}return a.getPixelForValue(s)}return s=a.getPixelForValue(a.min),a.beginAtZero||a.min<=0&&a.max>=0||a.min>=0&&a.max<=0?s=a.getPixelForValue(0,0):a.min<0&&a.max<0&&(s=a.getPixelForValue(a.max)),s},getRuler:function(){var t=this.getScaleForID(this.getDataset().xAxisID),e=(this.getScaleForID(this.getDataset().yAxisID),this.getBarCount()),i=function(){for(var e=t.getPixelForValue(null,1)-t.getPixelForValue(null,0),i=2;ia;++a)i.isDatasetVisible(this.chart.data.datasets[a])&&("bar"===this.chart.data.datasets[a].type||void 0===this.chart.data.datasets[a].type&&"bar"===this.chart.config.type)&&++e;return e},calculateBarX:function(t,e){var i=this.getScaleForID(this.getDataset().yAxisID),a=this.getScaleForID(this.getDataset().xAxisID),s=this.getBarIndex(e),o=this.getRuler(),n=a.getPixelForValue(null,t,s,this.chart.isCombo);return n-=this.chart.isCombo?o.tickWidth/2:0,i.options.stacked?n+o.categoryWidth/2+o.categorySpacing:n+o.barWidth/2+o.categorySpacing+o.barWidth*s+o.barSpacing/2+o.barSpacing*s},calculateBarY:function(t,e){var a=(this.getScaleForID(this.getDataset().xAxisID),this.getScaleForID(this.getDataset().yAxisID)),s=this.getDataset().data[t];if(a.options.stacked){for(var o=0,n=0,r=0;e>r;r++){var h=this.chart.data.datasets[r];i.isDatasetVisible(h)&&(h.data[t]<0?n+=h.data[t]||0:o+=h.data[t]||0)}return 0>s?a.getPixelForValue(n+s):a.getPixelForValue(o+s)}return a.getPixelForValue(s)},draw:function(t){var e=t||1;i.each(this.getDataset().metaData,function(t,i){t.transition(e).draw()},this)},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],a=t._index;t._model.backgroundColor=t.custom&&t.custom.hoverBackgroundColor?t.custom.hoverBackgroundColor:i.getValueAtIndexOrDefault(e.hoverBackgroundColor,a,i.color(t._model.backgroundColor).saturate(.5).darken(.1).rgbString()),t._model.borderColor=t.custom&&t.custom.hoverBorderColor?t.custom.hoverBorderColor:i.getValueAtIndexOrDefault(e.hoverBorderColor,a,i.color(t._model.borderColor).saturate(.5).darken(.1).rgbString()),t._model.borderWidth=t.custom&&t.custom.hoverBorderWidth?t.custom.hoverBorderWidth:i.getValueAtIndexOrDefault(e.hoverBorderWidth,a,t._model.borderWidth)},removeHoverStyle:function(t){var e=(this.chart.data.datasets[t._datasetIndex],t._index);t._model.backgroundColor=t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:i.getValueAtIndexOrDefault(this.getDataset().backgroundColor,e,this.chart.options.elements.rectangle.backgroundColor),t._model.borderColor=t.custom&&t.custom.borderColor?t.custom.borderColor:i.getValueAtIndexOrDefault(this.getDataset().borderColor,e,this.chart.options.elements.rectangle.borderColor),t._model.borderWidth=t.custom&&t.custom.borderWidth?t.custom.borderWidth:i.getValueAtIndexOrDefault(this.getDataset().borderWidth,e,this.chart.options.elements.rectangle.borderWidth)}})}.call(this),function(){"use strict";var t=this,e=t.Chart,i=e.helpers;e.defaults.bubble={hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-0"}],yAxes:[{type:"linear",position:"left",id:"y-axis-0"}]},tooltips:{template:"(<%= value.x %>, <%= value.y %>, <%= value.r %>)",multiTemplate:"<%if (datasetLabel){%><%=datasetLabel%>: <%}%>(<%= value.x %>, <%= value.y %>, <%= value.r %>)"}},e.controllers.bubble=function(t,e){this.initialize.call(this,t,e)},i.extend(e.controllers.bubble.prototype,{initialize:function(t,e){this.chart=t,this.index=e,this.linkScales(),this.addElements()},updateIndex:function(t){this.index=t},linkScales:function(){this.getDataset().xAxisID||(this.getDataset().xAxisID=this.chart.options.scales.xAxes[0].id),this.getDataset().yAxisID||(this.getDataset().yAxisID=this.chart.options.scales.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getScaleForId:function(t){return this.chart.scales[t]},addElements:function(){this.getDataset().metaData=this.getDataset().metaData||[],i.each(this.getDataset().data,function(t,i){this.getDataset().metaData[i]=this.getDataset().metaData[i]||new e.elements.Point({_chart:this.chart.chart,_datasetIndex:this.index,_index:i})},this)},addElementAndReset:function(t){this.getDataset().metaData=this.getDataset().metaData||[];var i=new e.elements.Point({_chart:this.chart.chart,_datasetIndex:this.index,_index:t});this.updateElement(i,t,!0),this.getDataset().metaData.splice(t,0,i)},removeElement:function(t){this.getDataset().metaData.splice(t,1)},reset:function(){this.update(!0)},buildOrUpdateElements:function(){var t=this.getDataset().data.length,e=this.getDataset().metaData.length;if(e>t)this.getDataset().metaData.splice(t,e-t);else if(t>e)for(var i=e;t>i;++i)this.addElementAndReset(i)},update:function(t){var e,a=this.getDataset().metaData,s=this.getScaleForId(this.getDataset().yAxisID);this.getScaleForId(this.getDataset().xAxisID);e=s.min<0&&s.max<0?s.getPixelForValue(s.max):s.min>0&&s.max>0?s.getPixelForValue(s.min):s.getPixelForValue(0),i.each(a,function(e,i){this.updateElement(e,i,t)},this)},updateElement:function(t,e,a){var s,o=this.getScaleForId(this.getDataset().yAxisID),n=this.getScaleForId(this.getDataset().xAxisID);s=o.min<0&&o.max<0?o.getPixelForValue(o.max):o.min>0&&o.max>0?o.getPixelForValue(o.min):o.getPixelForValue(0),i.extend(t,{_chart:this.chart.chart,_xScale:n,_yScale:o,_datasetIndex:this.index,_index:e,_model:{x:a?n.getPixelForDecimal(.5):n.getPixelForValue(this.getDataset().data[e],e,this.index,this.chart.isCombo),y:a?s:o.getPixelForValue(this.getDataset().data[e],e,this.index),radius:a?0:t.custom&&t.custom.radius?t.custom.radius:this.getRadius(this.getDataset().data[e]),backgroundColor:t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:i.getValueAtIndexOrDefault(this.getDataset().backgroundColor,e,this.chart.options.elements.point.backgroundColor),borderColor:t.custom&&t.custom.borderColor?t.custom.borderColor:i.getValueAtIndexOrDefault(this.getDataset().borderColor,e,this.chart.options.elements.point.borderColor),borderWidth:t.custom&&t.custom.borderWidth?t.custom.borderWidth:i.getValueAtIndexOrDefault(this.getDataset().borderWidth,e,this.chart.options.elements.point.borderWidth),hitRadius:t.custom&&t.custom.hitRadius?t.custom.hitRadius:i.getValueAtIndexOrDefault(this.getDataset().hitRadius,e,this.chart.options.elements.point.hitRadius)}}),t._model.skip=t.custom&&t.custom.skip?t.custom.skip:isNaN(t._model.x)||isNaN(t._model.y),t.pivot()},getRadius:function(t){return t.r||this.chart.options.elements.point.radius},draw:function(t){var e=t||1;i.each(this.getDataset().metaData,function(t,i){t.transition(e),t.draw()},this)},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],a=t._index;t._model.radius=t.custom&&t.custom.hoverRadius?t.custom.hoverRadius:i.getValueAtIndexOrDefault(e.hoverRadius,a,this.chart.options.elements.point.hoverRadius)+this.getRadius(this.getDataset().data[t._index]),t._model.backgroundColor=t.custom&&t.custom.hoverBackgroundColor?t.custom.hoverBackgroundColor:i.getValueAtIndexOrDefault(e.hoverBackgroundColor,a,i.color(t._model.backgroundColor).saturate(.5).darken(.1).rgbString()),t._model.borderColor=t.custom&&t.custom.hoverBorderColor?t.custom.hoverBorderColor:i.getValueAtIndexOrDefault(e.hoverBorderColor,a,i.color(t._model.borderColor).saturate(.5).darken(.1).rgbString()),t._model.borderWidth=t.custom&&t.custom.hoverBorderWidth?t.custom.hoverBorderWidth:i.getValueAtIndexOrDefault(e.hoverBorderWidth,a,t._model.borderWidth)},removeHoverStyle:function(t){var e=(this.chart.data.datasets[t._datasetIndex],t._index);t._model.radius=t.custom&&t.custom.radius?t.custom.radius:this.getRadius(this.getDataset().data[t._index]),t._model.backgroundColor=t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:i.getValueAtIndexOrDefault(this.getDataset().backgroundColor,e,this.chart.options.elements.point.backgroundColor),t._model.borderColor=t.custom&&t.custom.borderColor?t.custom.borderColor:i.getValueAtIndexOrDefault(this.getDataset().borderColor,e,this.chart.options.elements.point.borderColor),t._model.borderWidth=t.custom&&t.custom.borderWidth?t.custom.borderWidth:i.getValueAtIndexOrDefault(this.getDataset().borderWidth,e,this.chart.options.elements.point.borderWidth)}})}.call(this),function(){"use strict";var t=this,e=t.Chart,i=e.helpers;e.defaults.doughnut={animation:{animateRotate:!0,animateScale:!1},hover:{mode:"single"},cutoutPercentage:50},e.defaults.pie=i.clone(e.defaults.doughnut),i.extend(e.defaults.pie,{cutoutPercentage:0}),e.controllers.doughnut=e.controllers.pie=function(t,e){this.initialize.call(this,t,e)},i.extend(e.controllers.doughnut.prototype,{initialize:function(t,e){this.chart=t,this.index=e,this.linkScales(),this.addElements()},updateIndex:function(t){this.index=t},linkScales:function(){},getDataset:function(){return this.chart.data.datasets[this.index]},addElements:function(){this.getDataset().metaData=this.getDataset().metaData||[],i.each(this.getDataset().data,function(t,i){this.getDataset().metaData[i]=this.getDataset().metaData[i]||new e.elements.Arc({_chart:this.chart.chart,_datasetIndex:this.index,_index:i})},this)},addElementAndReset:function(t,a){this.getDataset().metaData=this.getDataset().metaData||[];var s=new e.elements.Arc({_chart:this.chart.chart,_datasetIndex:this.index,_index:t});a&&i.isArray(this.getDataset().backgroundColor)&&this.getDataset().backgroundColor.splice(t,0,a),this.updateElement(s,t,!0),this.getDataset().metaData.splice(t,0,s)},removeElement:function(t){this.getDataset().metaData.splice(t,1)},reset:function(){this.update(!0)},buildOrUpdateElements:function(){var t=this.getDataset().data.length,e=this.getDataset().metaData.length;if(e>t)this.getDataset().metaData.splice(t,e-t);else if(t>e)for(var i=e;t>i;++i)this.addElementAndReset(i)},getVisibleDatasetCount:function(){return i.where(this.chart.data.datasets,function(t){return i.isDatasetVisible(t)}).length},getRingIndex:function(t){for(var e=0,a=0;t>a;++a)i.isDatasetVisible(this.chart.data.datasets[a])&&++e;return e},update:function(t){this.chart.outerRadius=Math.max(i.min([this.chart.chart.width,this.chart.chart.height])/2-this.chart.options.elements.arc.borderWidth/2,0),this.chart.innerRadius=Math.max(this.chart.options.cutoutPercentage?this.chart.outerRadius/100*this.chart.options.cutoutPercentage:1,0),this.chart.radiusLength=(this.chart.outerRadius-this.chart.innerRadius)/this.getVisibleDatasetCount(),this.getDataset().total=0,i.each(this.getDataset().data,function(t){this.getDataset().total+=Math.abs(t)},this),this.outerRadius=this.chart.outerRadius-this.chart.radiusLength*this.getRingIndex(this.index),this.innerRadius=this.outerRadius-this.chart.radiusLength,i.each(this.getDataset().metaData,function(e,i){this.updateElement(e,i,t)},this)},updateElement:function(t,e,a){var s={x:this.chart.chart.width/2,y:this.chart.chart.height/2,startAngle:Math.PI*-.5,circumference:this.chart.options.animation.animateRotate?0:this.calculateCircumference(this.getDataset().data[e]),outerRadius:this.chart.options.animation.animateScale?0:this.outerRadius,innerRadius:this.chart.options.animation.animateScale?0:this.innerRadius};i.extend(t,{_chart:this.chart.chart,_datasetIndex:this.index,_index:e,_model:a?s:{x:this.chart.chart.width/2,y:this.chart.chart.height/2,circumference:this.calculateCircumference(this.getDataset().data[e]),outerRadius:this.outerRadius,innerRadius:this.innerRadius,backgroundColor:t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:i.getValueAtIndexOrDefault(this.getDataset().backgroundColor,e,this.chart.options.elements.arc.backgroundColor),hoverBackgroundColor:t.custom&&t.custom.hoverBackgroundColor?t.custom.hoverBackgroundColor:i.getValueAtIndexOrDefault(this.getDataset().hoverBackgroundColor,e,this.chart.options.elements.arc.hoverBackgroundColor),borderWidth:t.custom&&t.custom.borderWidth?t.custom.borderWidth:i.getValueAtIndexOrDefault(this.getDataset().borderWidth,e,this.chart.options.elements.arc.borderWidth),borderColor:t.custom&&t.custom.borderColor?t.custom.borderColor:i.getValueAtIndexOrDefault(this.getDataset().borderColor,e,this.chart.options.elements.arc.borderColor),label:i.getValueAtIndexOrDefault(this.getDataset().label,e,this.chart.data.labels[e])}}),a||(0===e?t._model.startAngle=Math.PI*-.5:t._model.startAngle=this.getDataset().metaData[e-1]._model.endAngle,t._model.endAngle=t._model.startAngle+t._model.circumference,e0?1.999999*Math.PI*(t/this.getDataset().total):0}})}.call(this),function(){"use strict";var t=this,e=t.Chart,i=e.helpers;e.defaults.line={hover:{mode:"label"},scales:{xAxes:[{type:"category",id:"x-axis-0"}],yAxes:[{type:"linear",id:"y-axis-0"}]}},e.controllers.line=function(t,e){this.initialize.call(this,t,e)},i.extend(e.controllers.line.prototype,{ -initialize:function(t,e){this.chart=t,this.index=e,this.linkScales(),this.addElements()},updateIndex:function(t){this.index=t},linkScales:function(){this.getDataset().xAxisID||(this.getDataset().xAxisID=this.chart.options.scales.xAxes[0].id),this.getDataset().yAxisID||(this.getDataset().yAxisID=this.chart.options.scales.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getScaleForId:function(t){return this.chart.scales[t]},addElements:function(){this.getDataset().metaData=this.getDataset().metaData||[],this.getDataset().metaDataset=this.getDataset().metaDataset||new e.elements.Line({_chart:this.chart.chart,_datasetIndex:this.index,_points:this.getDataset().metaData}),i.each(this.getDataset().data,function(t,i){this.getDataset().metaData[i]=this.getDataset().metaData[i]||new e.elements.Point({_chart:this.chart.chart,_datasetIndex:this.index,_index:i})},this)},addElementAndReset:function(t){this.getDataset().metaData=this.getDataset().metaData||[];var i=new e.elements.Point({_chart:this.chart.chart,_datasetIndex:this.index,_index:t});this.updateElement(i,t,!0),this.getDataset().metaData.splice(t,0,i),this.updateBezierControlPoints()},removeElement:function(t){this.getDataset().metaData.splice(t,1)},reset:function(){this.update(!0)},buildOrUpdateElements:function(){var t=this.getDataset().data.length,e=this.getDataset().metaData.length;if(e>t)this.getDataset().metaData.splice(t,e-t);else if(t>e)for(var i=e;t>i;++i)this.addElementAndReset(i)},update:function(t){var e,a=this.getDataset().metaDataset,s=this.getDataset().metaData,o=this.getScaleForId(this.getDataset().yAxisID);this.getScaleForId(this.getDataset().xAxisID);e=o.min<0&&o.max<0?o.getPixelForValue(o.max):o.min>0&&o.max>0?o.getPixelForValue(o.min):o.getPixelForValue(0),i.extend(a,{_scale:o,_datasetIndex:this.index,_children:s,_model:{tension:a.custom&&a.custom.tension?a.custom.tension:this.getDataset().tension||this.chart.options.elements.line.tension,backgroundColor:a.custom&&a.custom.backgroundColor?a.custom.backgroundColor:this.getDataset().backgroundColor||this.chart.options.elements.line.backgroundColor,borderWidth:a.custom&&a.custom.borderWidth?a.custom.borderWidth:this.getDataset().borderWidth||this.chart.options.elements.line.borderWidth,borderColor:a.custom&&a.custom.borderColor?a.custom.borderColor:this.getDataset().borderColor||this.chart.options.elements.line.borderColor,borderCapStyle:a.custom&&a.custom.borderCapStyle?a.custom.borderCapStyle:this.getDataset().borderCapStyle||this.chart.options.elements.line.borderCapStyle,borderDash:a.custom&&a.custom.borderDash?a.custom.borderDash:this.getDataset().borderDash||this.chart.options.elements.line.borderDash,borderDashOffset:a.custom&&a.custom.borderDashOffset?a.custom.borderDashOffset:this.getDataset().borderDashOffset||this.chart.options.elements.line.borderDashOffset,borderJoinStyle:a.custom&&a.custom.borderJoinStyle?a.custom.borderJoinStyle:this.getDataset().borderJoinStyle||this.chart.options.elements.line.borderJoinStyle,fill:a.custom&&a.custom.fill?a.custom.fill:void 0!==this.getDataset().fill?this.getDataset().fill:this.chart.options.elements.line.fill,scaleTop:o.top,scaleBottom:o.bottom,scaleZero:e}}),a.pivot(),i.each(s,function(e,i){this.updateElement(e,i,t)},this),this.updateBezierControlPoints()},updateElement:function(t,e,a){var s,o=this.getScaleForId(this.getDataset().yAxisID),n=this.getScaleForId(this.getDataset().xAxisID);s=o.min<0&&o.max<0?o.getPixelForValue(o.max):o.min>0&&o.max>0?o.getPixelForValue(o.min):o.getPixelForValue(0),i.extend(t,{_chart:this.chart.chart,_xScale:n,_yScale:o,_datasetIndex:this.index,_index:e,_model:{x:n.getPixelForValue(this.getDataset().data[e],e,this.index,this.chart.isCombo),y:a?s:o.getPixelForValue(this.getDataset().data[e],e,this.index),tension:t.custom&&t.custom.tension?t.custom.tension:this.getDataset().tension||this.chart.options.elements.line.tension,radius:t.custom&&t.custom.radius?t.custom.radius:i.getValueAtIndexOrDefault(this.getDataset().radius,e,this.chart.options.elements.point.radius),backgroundColor:t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:i.getValueAtIndexOrDefault(this.getDataset().pointBackgroundColor,e,this.chart.options.elements.point.backgroundColor),borderColor:t.custom&&t.custom.borderColor?t.custom.borderColor:i.getValueAtIndexOrDefault(this.getDataset().pointBorderColor,e,this.chart.options.elements.point.borderColor),borderWidth:t.custom&&t.custom.borderWidth?t.custom.borderWidth:i.getValueAtIndexOrDefault(this.getDataset().pointBorderWidth,e,this.chart.options.elements.point.borderWidth),hitRadius:t.custom&&t.custom.hitRadius?t.custom.hitRadius:i.getValueAtIndexOrDefault(this.getDataset().hitRadius,e,this.chart.options.elements.point.hitRadius)}}),t._model.skip=t.custom&&t.custom.skip?t.custom.skip:isNaN(t._model.x)||isNaN(t._model.y)},updateBezierControlPoints:function(){i.each(this.getDataset().metaData,function(t,e){var a=i.splineCurve(i.previousItem(this.getDataset().metaData,e)._model,t._model,i.nextItem(this.getDataset().metaData,e)._model,t._model.tension);t._model.controlPointPreviousX=a.previous.x,t._model.controlPointNextX=a.next.x,a.next.y>this.chart.chartArea.bottom?t._model.controlPointNextY=this.chart.chartArea.bottom:a.next.ythis.chart.chartArea.bottom?t._model.controlPointPreviousY=this.chart.chartArea.bottom:a.previous.yt)this.getDataset().metaData.splice(t,e-t);else if(t>e)for(var i=e;t>i;++i)this.addElementAndReset(i)},getVisibleDatasetCount:function(){return i.where(this.chart.data.datasets,function(t){return i.isDatasetVisible(t)}).length},update:function(t){this.chart.outerRadius=Math.max((i.min([this.chart.chart.width,this.chart.chart.height])-this.chart.options.elements.arc.borderWidth/2)/2,0),this.chart.innerRadius=Math.max(this.chart.options.cutoutPercentage?this.chart.outerRadius/100*this.chart.options.cutoutPercentage:1,0),this.chart.radiusLength=(this.chart.outerRadius-this.chart.innerRadius)/this.getVisibleDatasetCount(),this.getDataset().total=0,i.each(this.getDataset().data,function(t){this.getDataset().total+=Math.abs(t)},this),this.outerRadius=this.chart.outerRadius-this.chart.radiusLength*this.index,this.innerRadius=this.outerRadius-this.chart.radiusLength,i.each(this.getDataset().metaData,function(e,i){this.updateElement(e,i,t)},this)},updateElement:function(t,e,a){var s=1/this.getDataset().data.length*2,o=-.5*Math.PI+Math.PI*s*e,n=o+s*Math.PI,r={x:this.chart.chart.width/2,y:this.chart.chart.height/2,innerRadius:0,outerRadius:this.chart.options.animateScale?0:this.chart.scale.getDistanceFromCenterForValue(this.getDataset().data[e]),startAngle:this.chart.options.animateRotate?Math.PI*-.5:o,endAngle:this.chart.options.animateRotate?Math.PI*-.5:n,backgroundColor:t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:i.getValueAtIndexOrDefault(this.getDataset().backgroundColor,e,this.chart.options.elements.arc.backgroundColor),hoverBackgroundColor:t.custom&&t.custom.hoverBackgroundColor?t.custom.hoverBackgroundColor:i.getValueAtIndexOrDefault(this.getDataset().hoverBackgroundColor,e,this.chart.options.elements.arc.hoverBackgroundColor),borderWidth:t.custom&&t.custom.borderWidth?t.custom.borderWidth:i.getValueAtIndexOrDefault(this.getDataset().borderWidth,e,this.chart.options.elements.arc.borderWidth),borderColor:t.custom&&t.custom.borderColor?t.custom.borderColor:i.getValueAtIndexOrDefault(this.getDataset().borderColor,e,this.chart.options.elements.arc.borderColor),label:i.getValueAtIndexOrDefault(this.chart.data.labels,e,this.chart.data.labels[e])};i.extend(t,{_chart:this.chart.chart,_datasetIndex:this.index,_index:e,_model:a?r:{x:this.chart.chart.width/2,y:this.chart.chart.height/2,innerRadius:0,outerRadius:this.chart.scale.getDistanceFromCenterForValue(this.getDataset().data[e]),startAngle:o,endAngle:n,backgroundColor:t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:i.getValueAtIndexOrDefault(this.getDataset().backgroundColor,e,this.chart.options.elements.arc.backgroundColor),hoverBackgroundColor:t.custom&&t.custom.hoverBackgroundColor?t.custom.hoverBackgroundColor:i.getValueAtIndexOrDefault(this.getDataset().hoverBackgroundColor,e,this.chart.options.elements.arc.hoverBackgroundColor),borderWidth:t.custom&&t.custom.borderWidth?t.custom.borderWidth:i.getValueAtIndexOrDefault(this.getDataset().borderWidth,e,this.chart.options.elements.arc.borderWidth),borderColor:t.custom&&t.custom.borderColor?t.custom.borderColor:i.getValueAtIndexOrDefault(this.getDataset().borderColor,e,this.chart.options.elements.arc.borderColor),label:i.getValueAtIndexOrDefault(this.chart.data.labels,e,this.chart.data.labels[e])}}),t.pivot()},draw:function(t){var e=t||1;i.each(this.getDataset().metaData,function(t,i){t.transition(e).draw()},this)},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],a=t._index;t._model.backgroundColor=t.custom&&t.custom.hoverBackgroundColor?t.custom.hoverBackgroundColor:i.getValueAtIndexOrDefault(e.hoverBackgroundColor,a,i.color(t._model.backgroundColor).saturate(.5).darken(.1).rgbString()),t._model.borderColor=t.custom&&t.custom.hoverBorderColor?t.custom.hoverBorderColor:i.getValueAtIndexOrDefault(e.hoverBorderColor,a,i.color(t._model.borderColor).saturate(.5).darken(.1).rgbString()),t._model.borderWidth=t.custom&&t.custom.hoverBorderWidth?t.custom.hoverBorderWidth:i.getValueAtIndexOrDefault(e.borderWidth,a,t._model.borderWidth)},removeHoverStyle:function(t){var e=(this.chart.data.datasets[t._datasetIndex],t._index);t._model.backgroundColor=t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:i.getValueAtIndexOrDefault(this.getDataset().backgroundColor,e,this.chart.options.elements.arc.backgroundColor),t._model.borderColor=t.custom&&t.custom.borderColor?t.custom.borderColor:i.getValueAtIndexOrDefault(this.getDataset().borderColor,e,this.chart.options.elements.arc.borderColor),t._model.borderWidth=t.custom&&t.custom.borderWidth?t.custom.borderWidth:i.getValueAtIndexOrDefault(this.getDataset().borderWidth,e,this.chart.options.elements.arc.borderWidth)},calculateCircumference:function(t){return this.getDataset().total>0?2*Math.PI*(t/this.getDataset().total):0},updateScaleRange:function(){i.extend(this.chart.scale,{size:i.min([this.chart.width,this.chart.height]),xCenter:this.chart.width/2,yCenter:this.chart.height/2})}})}.call(this),function(){"use strict";var t=this,e=t.Chart,i=e.helpers;e.defaults.radar={scale:{type:"radialLinear"},elements:{line:{tension:0}}},e.controllers.radar=function(t,e){this.initialize.call(this,t,e)},i.extend(e.controllers.radar.prototype,{initialize:function(t,e){this.chart=t,this.index=e,this.linkScales(),this.addElements()},updateIndex:function(t){this.index=t},linkScales:function(){},getDataset:function(){return this.chart.data.datasets[this.index]},getScaleForId:function(t){return this.chart.scales[t]},addElements:function(){this.getDataset().metaData=this.getDataset().metaData||[],this.getDataset().metaDataset=this.getDataset().metaDataset||new e.elements.Line({_chart:this.chart.chart,_datasetIndex:this.index,_points:this.getDataset().metaData,_loop:!0}),i.each(this.getDataset().data,function(t,i){this.getDataset().metaData[i]=this.getDataset().metaData[i]||new e.elements.Point({_chart:this.chart.chart,_datasetIndex:this.index,_index:i,_model:{x:0,y:0}})},this)},addElementAndReset:function(t){this.getDataset().metaData=this.getDataset().metaData||[];var i=new e.elements.Point({_chart:this.chart.chart,_datasetIndex:this.index,_index:t});this.updateElement(i,t,!0),this.getDataset().metaData.splice(t,0,i),this.updateBezierControlPoints()},removeElement:function(t){this.getDataset().metaData.splice(t,1)},reset:function(){this.update(!0)},buildOrUpdateElements:function(){var t=this.getDataset().data.length,e=this.getDataset().metaData.length;if(e>t)this.getDataset().metaData.splice(t,e-t);else if(t>e)for(var i=e;t>i;++i)this.addElementAndReset(i)},update:function(t){var e,a=(this.getDataset().metaDataset,this.getDataset().metaData),s=this.chart.scale;e=s.min<0&&s.max<0?s.getPointPositionForValue(0,s.max):s.min>0&&s.max>0?s.getPointPositionForValue(0,s.min):s.getPointPositionForValue(0,0),i.extend(this.getDataset().metaDataset,{_datasetIndex:this.index,_children:this.getDataset().metaData,_model:{tension:this.getDataset().tension||this.chart.options.elements.line.tension,backgroundColor:this.getDataset().backgroundColor||this.chart.options.elements.line.backgroundColor,borderWidth:this.getDataset().borderWidth||this.chart.options.elements.line.borderWidth,borderColor:this.getDataset().borderColor||this.chart.options.elements.line.borderColor,fill:void 0!==this.getDataset().fill?this.getDataset().fill:this.chart.options.elements.line.fill,scaleTop:s.top,scaleBottom:s.bottom,scaleZero:e}}),this.getDataset().metaDataset.pivot(),i.each(a,function(e,i){this.updateElement(e,i,t)},this),this.updateBezierControlPoints()},updateElement:function(t,e,a){var s=this.chart.scale.getPointPositionForValue(e,this.getDataset().data[e]);i.extend(t,{_datasetIndex:this.index,_index:e,_model:{x:a?this.chart.scale.xCenter:s.x,y:a?this.chart.scale.yCenter:s.y,tension:t.custom&&t.custom.tension?t.custom.tension:this.chart.options.elements.line.tension,radius:t.custom&&t.custom.radius?t.custom.pointRadius:i.getValueAtIndexOrDefault(this.getDataset().pointRadius,e,this.chart.options.elements.point.radius),backgroundColor:t.custom&&t.custom.backgroundColor?t.custom.backgroundColor:i.getValueAtIndexOrDefault(this.getDataset().pointBackgroundColor,e,this.chart.options.elements.point.backgroundColor),borderColor:t.custom&&t.custom.borderColor?t.custom.borderColor:i.getValueAtIndexOrDefault(this.getDataset().pointBorderColor,e,this.chart.options.elements.point.borderColor),borderWidth:t.custom&&t.custom.borderWidth?t.custom.borderWidth:i.getValueAtIndexOrDefault(this.getDataset().pointBorderWidth,e,this.chart.options.elements.point.borderWidth),hitRadius:t.custom&&t.custom.hitRadius?t.custom.hitRadius:i.getValueAtIndexOrDefault(this.getDataset().hitRadius,e,this.chart.options.elements.point.hitRadius)}}),t._model.skip=t.custom&&t.custom.skip?t.custom.skip:isNaN(t._model.x)||isNaN(t._model.y)},updateBezierControlPoints:function(){i.each(this.getDataset().metaData,function(t,e){var a=i.splineCurve(i.previousItem(this.getDataset().metaData,e,!0)._model,t._model,i.nextItem(this.getDataset().metaData,e,!0)._model,t._model.tension);t._model.controlPointPreviousX=a.previous.x,t._model.controlPointNextX=a.next.x,a.next.y>this.chart.chartArea.bottom?t._model.controlPointNextY=this.chart.chartArea.bottom:a.next.ythis.chart.chartArea.bottom?t._model.controlPointPreviousY=this.chart.chartArea.bottom:a.previous.y1&&t!==Math.floor(t)&&(s=t-Math.floor(t));var o=i.log10(Math.abs(s)),n="";if(0!==t){var r=-1*Math.floor(o);r=Math.max(Math.min(r,20),0),n=t.toFixed(r)}else n="0";return n}}},s=e.Scale.extend({buildTicks:function(){this.min=null,this.max=null;var t=[],e=[];if(this.options.stacked){i.each(this.data.datasets,function(a){i.isDatasetVisible(a)&&(this.isHorizontal()?a.xAxisID===this.id:a.yAxisID===this.id)&&i.each(a.data,function(i,a){var s=this.getRightValue(i);isNaN(s)||(t[a]=t[a]||0,e[a]=e[a]||0,this.options.relativePoints?t[a]=100:0>s?e[a]+=s:t[a]+=s)},this)},this);var a=t.concat(e);this.min=i.min(a),this.max=i.max(a)}else i.each(this.data.datasets,function(t){i.isDatasetVisible(t)&&(this.isHorizontal()?t.xAxisID===this.id:t.yAxisID===this.id)&&i.each(t.data,function(t,e){var i=this.getRightValue(t);isNaN(i)||(null===this.min?this.min=i:ithis.max&&(this.max=i))},this)},this);this.min===this.max&&(this.min--,this.max++),this.ticks=[];var s;if(s=this.isHorizontal()?Math.min(11,Math.ceil(this.width/50)):Math.min(11,Math.ceil(this.height/(2*this.options.ticks.fontSize))),s=Math.max(2,s),this.options.ticks.beginAtZero){var o=i.sign(this.min),n=i.sign(this.max);0>o&&0>n?this.max=0:o>0&&n>0&&(this.min=0)}for(var r=i.niceNum(this.max-this.min,!1),h=i.niceNum(r/(s-1),!0),l=Math.floor(this.min/h)*h,c=Math.ceil(this.max/h)*h,d=Math.ceil((c-l)/h),u=0;d>=u;++u)this.ticks.push(l+u*h);("left"==this.options.position||"right"==this.options.position)&&this.ticks.reverse(),this.max=i.max(this.ticks),this.min=i.min(this.ticks),this.options.ticks.reverse?(this.ticks.reverse(),this.start=this.max,this.end=this.min):(this.start=this.min,this.end=this.max),this.zeroLineIndex=this.ticks.indexOf(0)},getLabelForIndex:function(t,e){return this.getRightValue(this.data.datasets[e].data[t])},getPixelForValue:function(t,e,i,a){var s,o=this.getRightValue(t),n=this.end-this.start;if(this.isHorizontal()){var r=this.width-(this.paddingLeft+this.paddingRight);return s=this.left+r/n*(o-this.start),Math.round(s+this.paddingLeft)}var h=this.height-(this.paddingTop+this.paddingBottom);return s=this.bottom-this.paddingBottom-h/n*(o-this.start),Math.round(s)}});e.scaleService.registerScaleType("linear",s,a)}.call(this),function(){"use strict";var t=this,e=t.Chart,i=e.helpers,a={position:"left",ticks:{callback:function(t){var i=t/Math.pow(10,Math.floor(e.helpers.log10(t)));return 1===i||2===i||5===i?t.toExponential():""}}},s=e.Scale.extend({buildTicks:function(){this.min=null,this.max=null;var t=[];this.options.stacked?(i.each(this.data.datasets,function(e){i.isDatasetVisible(e)&&(this.isHorizontal()?e.xAxisID===this.id:e.yAxisID===this.id)&&i.each(e.data,function(e,i){var a=this.getRightValue(e);isNaN(a)||(t[i]=t[i]||0,this.options.relativePoints?t[i]=100:t[i]+=a)},this)},this),this.min=i.min(t),this.max=i.max(t)):i.each(this.data.datasets,function(t){i.isDatasetVisible(t)&&(this.isHorizontal()?t.xAxisID===this.id:t.yAxisID===this.id)&&i.each(t.data,function(t,e){var i=this.getRightValue(t);isNaN(i)||(null===this.min?this.min=i:ithis.max&&(this.max=i))},this)},this),this.min===this.max&&(0!==this.min&&null!==this.min?(this.min=Math.pow(10,Math.floor(i.log10(this.min))-1),this.max=Math.pow(10,Math.floor(i.log10(this.max))+1)):(this.min=1,this.max=10)),this.tickValues=[];for(var e=Math.floor(i.log10(this.min)),a=Math.ceil(i.log10(this.max)),s=e;a>s;++s)for(var o=1;10>o;++o)this.tickValues.push(o*Math.pow(10,s));this.tickValues.push(1*Math.pow(10,a)),("left"==this.options.position||"right"==this.options.position)&&this.tickValues.reverse(),this.max=i.max(this.tickValues),this.min=i.min(this.tickValues),this.options.ticks.reverse?(this.tickValues.reverse(),this.start=this.max,this.end=this.min):(this.start=this.min,this.end=this.max),this.ticks=this.tickValues.slice()},getLabelForIndex:function(t,e){return this.getRightValue(this.data.datasets[e].data[t])},getPixelForTick:function(t,e){return this.getPixelForValue(this.tickValues[t],null,null,e)},getPixelForValue:function(t,e,a,s){var o,n=this.getRightValue(t),r=i.log10(this.end)-i.log10(this.start);if(this.isHorizontal()){if(0!==n){var h=this.width-(this.paddingLeft+this.paddingRight);return o=this.left+h/r*(i.log10(n)-i.log10(this.start)),o+this.paddingLeft}o=this.left+this.paddingLeft}else{if(0!==n){var l=this.height-(this.paddingTop+this.paddingBottom);return this.bottom-this.paddingBottom-l/r*(i.log10(n)-i.log10(this.start))}o=this.top+this.paddingTop}}});e.scaleService.registerScaleType("logarithmic",s,a)}.call(this),function(){"use strict";var t=this,e=t.Chart,i=e.helpers,a={display:!0,animate:!0,lineArc:!1,position:"chartArea",angleLines:{show:!0,color:"rgba(0, 0, 0, 0.1)",lineWidth:1},ticks:{showLabelBackdrop:!0,backdropColor:"rgba(255,255,255,0.75)",backdropPaddingY:2,backdropPaddingX:2},pointLabels:{fontFamily:"'Arial'",fontStyle:"normal",fontSize:10,fontColor:"#666"}},s=e.Scale.extend({getValueCount:function(){return this.data.labels.length},setDimensions:function(){this.width=this.maxWidth,this.height=this.maxHeight,this.xCenter=Math.round(this.width/2),this.yCenter=Math.round(this.height/2);var t=i.min([this.height,this.width]);this.drawingArea=this.options.display?t/2-(this.options.ticks.fontSize/2+this.options.ticks.backdropPaddingY):t/2},buildTicks:function(){this.min=null,this.max=null,i.each(this.data.datasets,function(t){i.isDatasetVisible(t)&&i.each(t.data,function(t,e){var i=this.getRightValue(t);isNaN(i)||(null===this.min?this.min=i:ithis.max&&(this.max=i))},this)},this),this.min===this.max&&(this.min--,this.max++),this.ticks=[];var t=Math.min(11,Math.ceil(this.drawingArea/(1.5*this.options.ticks.fontSize)));if(t=Math.max(2,t),this.options.ticks.beginAtZero){var e=i.sign(this.min),a=i.sign(this.max);0>e&&0>a?this.max=0:e>0&&a>0&&(this.min=0)}for(var s=i.niceNum(this.max-this.min,!1),o=i.niceNum(s/(t-1),!0),n=Math.floor(this.min/o)*o,r=Math.ceil(this.max/o)*o,h=n;r>=h;h+=o)this.ticks.push(h);this.max=i.max(this.ticks),this.min=i.min(this.ticks),this.options.ticks.reverse?(this.ticks.reverse(),this.start=this.max,this.end=this.min):(this.start=this.min,this.end=this.max),this.zeroLineIndex=this.ticks.indexOf(0)},getCircumference:function(){return 2*Math.PI/this.getValueCount()},fit:function(){var t,e,a,s,o,n,r,h,l,c,d,u,g=i.min([this.height/2-this.options.pointLabels.fontSize-5,this.width/2]),m=this.width,p=0;for(this.ctx.font=i.fontString(this.options.pointLabels.fontSize,this.options.pointLabels.fontStyle,this.options.pointLabels.fontFamily),e=0;em&&(m=t.x+s,o=e),t.x-sm&&(m=t.x+a,o=e):e>this.getValueCount()/2&&t.x-a0||this.options.reverse){var s=this.getDistanceFromCenterForValue(this.ticks[a]),o=this.yCenter-s;if(this.options.gridLines.show)if(t.strokeStyle=this.options.gridLines.color,t.lineWidth=this.options.gridLines.lineWidth,this.options.lineArc)t.beginPath(),t.arc(this.xCenter,this.yCenter,s,0,2*Math.PI),t.closePath(),t.stroke();else{t.beginPath();for(var n=0;n=0;e--){if(this.options.angleLines.show){var a=this.getPointPosition(e,this.getDistanceFromCenterForValue(this.options.reverse?this.min:this.max));t.beginPath(),t.moveTo(this.xCenter,this.yCenter),t.lineTo(a.x,a.y),t.stroke(),t.closePath()}var s=this.getPointPosition(e,this.getDistanceFromCenterForValue(this.options.reverse?this.min:this.max)+5);t.font=i.fontString(this.options.pointLabels.fontSize,this.options.pointLabels.fontStyle,this.options.pointLabels.fontFamily),t.fillStyle=this.options.pointLabels.fontColor;var o=this.data.labels.length,n=this.data.labels.length/2,r=n/2,h=r>e||e>o-r,l=e===r||e===o-r;0===e?t.textAlign="center":e===n?t.textAlign="center":n>e?t.textAlign="left":t.textAlign="right",l?t.textBaseline="middle":h?t.textBaseline="bottom":t.textBaseline="top",t.fillText(this.data.labels[e],s.x,s.y)}}}}});e.scaleService.registerScaleType("radialLinear",s,a)}.call(this),function(){"use strict";if(!window.moment)return void console.warn("Chart.js - Moment.js could not be found! You must include it before Chart.js to use the time scale. Download at http://momentjs.com/");var t=this,e=t.Chart,i=e.helpers,a={units:["millisecond","second","minute","hour","day","week","month","quarter","year"],unit:{millisecond:{display:"SSS [ms]",maxStep:1e3},second:{display:"h:mm:ss a",maxStep:60},minute:{display:"h:mm:ss a",maxStep:60},hour:{display:"MMM D, hA",maxStep:24},day:{display:"ll",maxStep:7},week:{display:"ll",maxStep:4.3333},month:{display:"MMM YYYY",maxStep:12},quarter:{display:"[Q]Q - YYYY",maxStep:4},year:{ -display:"YYYY",maxStep:!1}}},s={position:"bottom",time:{format:!1,unit:!1,round:!1,displayFormat:!1}},o=e.Scale.extend({getLabelMoment:function(t,e){return this.labelMoments[t][e]},buildLabelMoments:function(){var t=[];this.data.labels&&this.data.labels.length>0?(i.each(this.data.labels,function(e,i){var a=this.parseTime(e);this.options.time.round&&a.startOf(this.options.time.round),t.push(a)},this),this.options.time.min?this.firstTick=this.parseTime(this.options.time.min):this.firstTick=moment.min.call(this,t),this.options.time.max?this.lastTick=this.parseTime(this.options.time.max):this.lastTick=moment.max.call(this,t)):(this.firstTick=null,this.lastTick=null),i.each(this.data.datasets,function(e,a){var s=[];"object"==typeof e.data[0]?i.each(e.data,function(t,e){var i=this.parseTime(this.getRightValue(t));this.options.time.round&&i.startOf(this.options.time.round),s.push(i),this.firstTick=null!==this.firstTick?moment.min(this.firstTick,i):i,this.lastTick=null!==this.lastTick?moment.max(this.lastTick,i):i},this):s=t,this.labelMoments.push(s)},this),this.firstTick=this.firstTick.clone(),this.lastTick=this.lastTick.clone()},buildTicks:function(t){if(this.ticks=[],this.labelMoments=[],this.buildLabelMoments(),this.options.time.unit)this.tickUnit=this.options.time.unit||"day",this.displayFormat=a.unit[this.tickUnit].display,this.tickRange=Math.ceil(this.lastTick.diff(this.firstTick,this.tickUnit,!0));else{var e=this.width-(this.paddingLeft+this.paddingRight),s=e/this.options.ticks.fontSize+4,o=this.options.time.round?0:2;this.tickUnit="millisecond",this.tickRange=Math.ceil(this.lastTick.diff(this.firstTick,this.tickUnit,!0)+o),this.displayFormat=a.unit[this.tickUnit].display,i.each(a.units,function(t){this.tickRange<=s||(this.tickUnit=t,this.tickRange=Math.ceil(this.lastTick.diff(this.firstTick,this.tickUnit)+o),this.displayFormat=a.unit[t].display)},this)}this.firstTick.startOf(this.tickUnit),this.lastTick.endOf(this.tickUnit),this.smallestLabelSeparation=this.width,i.each(this.data.datasets,function(t,e){for(var i=1;i1.5*Math.PI?a.startAngle-2*Math.PI:a.startAngle,n=a.endAngle<-.5*Math.PI?a.endAngle+2*Math.PI:a.endAngle>1.5*Math.PI?a.endAngle-2*Math.PI:a.endAngle,r=s.angle>=o&&s.angle<=n,h=s.distance>=a.innerRadius&&s.distance<=a.outerRadius;return r&&h}return!1},tooltipPosition:function(){var t=this._view,e=t.startAngle+(t.endAngle-t.startAngle)/2,i=(t.outerRadius-t.innerRadius)/2+t.innerRadius;return{x:t.x+Math.cos(e)*i,y:t.y+Math.sin(e)*i}},draw:function(){var t=this._chart.ctx,e=this._view;t.beginPath(),t.arc(e.x,e.y,e.outerRadius,e.startAngle,e.endAngle),t.arc(e.x,e.y,e.innerRadius,e.endAngle,e.startAngle,!0),t.closePath(),t.strokeStyle=e.borderColor,t.lineWidth=e.borderWidth,t.fillStyle=e.backgroundColor,t.fill(),t.lineJoin="bevel",e.borderWidth&&t.stroke()}})}.call(this),/*! - * Chart.js - * http://chartjs.org/ - * Version: 2.0.0-alpha - * - * Copyright 2015 Nick Downie - * Released under the MIT license - * https://github.com/nnnick/Chart.js/blob/master/LICENSE.md - */ -function(){"use strict";var t=this,e=t.Chart,i=e.helpers;e.defaults.global.elements.line={tension:.4,backgroundColor:e.defaults.global.defaultColor,borderWidth:3,borderColor:e.defaults.global.defaultColor,borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",fill:!0},e.elements.Line=e.Element.extend({draw:function(){var t=this._view,a=this._chart.ctx,s=this._children[0],o=this._children[this._children.length-1];if(a.save(),i.each(this._children,function(e,s){var o=i.previousItem(this._children,s),n=i.nextItem(this._children,s);return s||a.moveTo(e._view.x,t.scaleZero),e._view.skip&&!this.loop?(a.lineTo(o._view.x,t.scaleZero),void a.moveTo(n._view.x,t.scaleZero)):o._view.skip?void a.lineTo(e._view.x,e._view.y):t.tension>0&&s?void a.bezierCurveTo(o._view.controlPointNextX,o._view.controlPointNextY,e._view.controlPointPreviousX,e._view.controlPointPreviousY,e._view.x,e._view.y):void a.lineTo(e._view.x,e._view.y)},this),this._loop){if(t.tension>0&&!s._view.skip)return void a.bezierCurveTo(o._view.controlPointNextX,o._view.controlPointNextY,s._view.controlPointPreviousX,s._view.controlPointPreviousY,s._view.x,s._view.y);a.lineTo(s._view.x,s._view.y)}if(this._children.length>0&&t.fill&&(a.lineTo(this._children[this._children.length-1]._view.x,t.scaleZero),a.lineTo(this._children[0]._view.x,t.scaleZero),a.fillStyle=t.backgroundColor||e.defaults.global.defaultColor,a.closePath(),a.fill()),a.lineCap=t.borderCapStyle||e.defaults.global.elements.line.borderCapStyle,a.setLineDash&&a.setLineDash(t.borderDash||e.defaults.global.elements.line.borderDash),a.lineDashOffset=t.borderDashOffset||e.defaults.global.elements.line.borderDashOffset,a.lineJoin=t.borderJoinStyle||e.defaults.global.elements.line.borderJoinStyle,a.lineWidth=t.borderWidth||e.defaults.global.elements.line.borderWidth,a.strokeStyle=t.borderColor||e.defaults.global.defaultColor,a.beginPath(),i.each(this._children,function(e,s){var o=i.previousItem(this._children,s),n=i.nextItem(this._children,s);return s||a.moveTo(e._view.x,t.scaleZero),e._view.skip&&!this.loop?void a.moveTo(n._view.x,t.scaleZero):o._view.skip?void a.moveTo(e._view.x,e._view.y):t.tension>0&&s?void a.bezierCurveTo(o._view.controlPointNextX,o._view.controlPointNextY,e._view.controlPointPreviousX,e._view.controlPointPreviousY,e._view.x,e._view.y):void a.lineTo(e._view.x,e._view.y)},this),this._loop&&!s._view.skip){if(t.tension>0)return void a.bezierCurveTo(o._view.controlPointNextX,o._view.controlPointNextY,s._view.controlPointPreviousX,s._view.controlPointPreviousY,s._view.x,s._view.y);a.lineTo(s._view.x,s._view.y)}a.stroke(),a.restore()}})}.call(this),/*! - * Chart.js - * http://chartjs.org/ - * Version: 2.0.0-alpha - * - * Copyright 2015 Nick Downie - * Released under the MIT license - * https://github.com/nnnick/Chart.js/blob/master/LICENSE.md - */ -function(){"use strict";var t=this,e=t.Chart;e.helpers;e.defaults.global.elements.point={radius:3,backgroundColor:e.defaults.global.defaultColor,borderWidth:1,borderColor:e.defaults.global.defaultColor,hitRadius:1,hoverRadius:4,hoverBorderWidth:1},e.elements.Point=e.Element.extend({inRange:function(t,e){var i=this._view;if(i){var a=i.hitRadius+i.radius;return Math.pow(t-i.x,2)+Math.pow(e-i.y,2)0||t.borderWidth>0)&&(i.beginPath(),i.arc(t.x,t.y,t.radius||e.defaults.global.elements.point.radius,0,2*Math.PI),i.closePath(),i.strokeStyle=t.borderColor||e.defaults.global.defaultColor,i.lineWidth=t.borderWidth||e.defaults.global.elements.point.borderWidth,i.fillStyle=t.backgroundColor||e.defaults.global.defaultColor,i.fill(),i.stroke())}})}.call(this),function(){"use strict";var t=this,e=t.Chart;e.helpers;e.defaults.global.elements.rectangle={backgroundColor:e.defaults.global.defaultColor,borderWidth:0,borderColor:e.defaults.global.defaultColor},e.elements.Rectangle=e.Element.extend({draw:function(){var t=this._chart.ctx,e=this._view,i=e.width/2,a=e.x-i,s=e.x+i,o=e.base-(e.base-e.y),n=e.borderWidth/2;e.borderWidth&&(a+=n,s-=n,o+=n),t.beginPath(),t.fillStyle=e.backgroundColor,t.strokeStyle=e.borderColor,t.lineWidth=e.borderWidth,t.moveTo(a,e.base),t.lineTo(a,o),t.lineTo(s,o),t.lineTo(s,e.base),t.fill(),e.borderWidth&&t.stroke()},height:function(){var t=this._view;return t.base-t.y},inRange:function(t,e){var i=this._view,a=!1;return i&&(a=i.y=i.x-i.width/2&&t<=i.x+i.width/2&&e>=i.y&&e<=i.base:t>=i.x-i.width/2&&t<=i.x+i.width/2&&e>=i.base&&e<=i.y),a},inLabelRange:function(t){var e=this._view;return e?t>=e.x-e.width/2&&t<=e.x+e.width/2:!1},tooltipPosition:function(){var t=this._view;return t.y, <%= value.y %>)",multiTemplate:"<%if (datasetLabel){%><%=datasetLabel%>: <%}%>(<%= value.x %>, <%= value.y %>)"}};e.Bubble=function(t,s){return s.options=i.configMerge(a,s.options),s.type="bubble",new e(t,s)}}.call(this),function(){"use strict";var t=this,e=t.Chart,i=e.helpers,a={aspectRatio:1,legendTemplate:'
      <% for (var i = 0; i < data.datasets[0].data.length; i++){%>
    • <%if(data.labels && i < data.labels.length){%><%=data.labels[i]%><%}%>
      • <%}%>
    '};e.Doughnut=function(t,s){return s.options=i.configMerge(a,s.options),s.type="doughnut",new e(t,s)}}.call(this),function(){"use strict";var t=this,e=t.Chart;e.helpers;e.Line=function(t,i){return i.type="line",new e(t,i)}}.call(this),function(){"use strict";var t=this,e=t.Chart,i=e.helpers,a={aspectRatio:1,legendTemplate:'
      <% for (var i = 0; i < data.datasets[0].data.length; i++){%>
    • <%if(data.labels && i < data.labels.length){%><%=data.labels[i]%><%}%>
      • <%}%>
    '};e.PolarArea=function(t,s){return s.options=i.configMerge(a,s.options),s.type="polarArea",new e(t,s)}}.call(this),function(){"use strict";var t=this,e=t.Chart,i=e.helpers,a={aspectRatio:1};e.Radar=function(t,s){return s.options=i.configMerge(a,s.options),s.type="radar",new e(t,s)}}.call(this),function(){"use strict";var t=this,e=t.Chart,i=e.helpers,a={hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-1"}],yAxes:[{type:"linear",position:"left",id:"y-axis-1"}]},tooltips:{template:"(<%= value.x %>, <%= value.y %>)",multiTemplate:"<%if (datasetLabel){%><%=datasetLabel%>: <%}%>(<%= value.x %>, <%= value.y %>)"}};e.Scatter=function(t,s){return s.options=i.configMerge(a,s.options),s.type="line",new e(t,s)}}.call(this); \ No newline at end of file +!function(a){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=a();else if("function"==typeof define&&define.amd)define([],a);else{var b;b="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,b.Chart=a()}}(function(){var a;return function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c?c:a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;gc?(b+.05)/(c+.05):(c+.05)/(b+.05)},level:function(a){var b=this.contrast(a);return b>=7.1?"AAA":b>=4.5?"AA":""},dark:function(){var a=this.values.rgb,b=(299*a[0]+587*a[1]+114*a[2])/1e3;return b<128},light:function(){return!this.dark()},negate:function(){for(var a=[],b=0;b<3;b++)a[b]=255-this.values.rgb[b];return this.setValues("rgb",a),this},lighten:function(a){var b=this.values.hsl;return b[2]+=b[2]*a,this.setValues("hsl",b),this},darken:function(a){var b=this.values.hsl;return b[2]-=b[2]*a,this.setValues("hsl",b),this},saturate:function(a){var b=this.values.hsl;return b[1]+=b[1]*a,this.setValues("hsl",b),this},desaturate:function(a){var b=this.values.hsl;return b[1]-=b[1]*a,this.setValues("hsl",b),this},whiten:function(a){var b=this.values.hwb;return b[1]+=b[1]*a,this.setValues("hwb",b),this},blacken:function(a){var b=this.values.hwb;return b[2]+=b[2]*a,this.setValues("hwb",b),this},greyscale:function(){var a=this.values.rgb,b=.3*a[0]+.59*a[1]+.11*a[2];return this.setValues("rgb",[b,b,b]),this},clearer:function(a){var b=this.values.alpha;return this.setValues("alpha",b-b*a),this},opaquer:function(a){var b=this.values.alpha;return this.setValues("alpha",b+b*a),this},rotate:function(a){var b=this.values.hsl,c=(b[0]+a)%360;return b[0]=c<0?360+c:c,this.setValues("hsl",b),this},mix:function(a,b){var c=this,d=a,e=void 0===b?.5:b,f=2*e-1,g=c.alpha()-d.alpha(),h=((f*g===-1?f:(f+g)/(1+f*g))+1)/2,i=1-h;return this.rgb(h*c.red()+i*d.red(),h*c.green()+i*d.green(),h*c.blue()+i*d.blue()).alpha(c.alpha()*e+d.alpha()*(1-e))},toJSON:function(){return this.rgb()},clone:function(){var d,e,a=new f,b=this.values,c=a.values;for(var g in b)b.hasOwnProperty(g)&&(d=b[g],e={}.toString.call(d),"[object Array]"===e?c[g]=d.slice(0):"[object Number]"===e?c[g]=d:console.error("unexpected color value:",d));return a}},f.prototype.spaces={rgb:["red","green","blue"],hsl:["hue","saturation","lightness"],hsv:["hue","saturation","value"],hwb:["hue","whiteness","blackness"],cmyk:["cyan","magenta","yellow","black"]},f.prototype.maxes={rgb:[255,255,255],hsl:[360,100,100],hsv:[360,100,100],hwb:[360,100,100],cmyk:[100,100,100,100]},f.prototype.getValues=function(a){for(var b=this.values,c={},d=0;d.04045?Math.pow((b+.055)/1.055,2.4):b/12.92,c=c>.04045?Math.pow((c+.055)/1.055,2.4):c/12.92,d=d>.04045?Math.pow((d+.055)/1.055,2.4):d/12.92;var e=.4124*b+.3576*c+.1805*d,f=.2126*b+.7152*c+.0722*d,g=.0193*b+.1192*c+.9505*d;return[100*e,100*f,100*g]}function l(a){var f,g,h,b=k(a),c=b[0],d=b[1],e=b[2];return c/=95.047,d/=100,e/=108.883,c=c>.008856?Math.pow(c,1/3):7.787*c+16/116,d=d>.008856?Math.pow(d,1/3):7.787*d+16/116,e=e>.008856?Math.pow(e,1/3):7.787*e+16/116,f=116*d-16,g=500*(c-d),h=200*(d-e),[f,g,h]}function m(a){return M(l(a))}function n(a){var e,f,g,h,i,b=a[0]/360,c=a[1]/100,d=a[2]/100;if(0==c)return i=255*d,[i,i,i];f=d<.5?d*(1+c):d+c-d*c,e=2*d-f,h=[0,0,0];for(var j=0;j<3;j++)g=b+1/3*-(j-1),g<0&&g++,g>1&&g--,i=6*g<1?e+6*(f-e)*g:2*g<1?f:3*g<2?e+(f-e)*(2/3-g)*6:e,h[j]=255*i;return h}function o(a){var e,f,b=a[0],c=a[1]/100,d=a[2]/100;return 0===d?[0,0,0]:(d*=2,c*=d<=1?d:2-d,f=(d+c)/2,e=2*c/(d+c),[b,100*e,100*f])}function p(a){return h(n(a))}function q(a){return i(n(a))}function s(a){return j(n(a))}function t(a){var b=a[0]/60,c=a[1]/100,d=a[2]/100,e=Math.floor(b)%6,f=b-Math.floor(b),g=255*d*(1-c),h=255*d*(1-c*f),i=255*d*(1-c*(1-f)),d=255*d;switch(e){case 0:return[d,i,g];case 1:return[h,d,g];case 2:return[g,d,i];case 3:return[g,h,d];case 4:return[i,g,d];case 5:return[d,g,h]}}function u(a){var e,f,b=a[0],c=a[1]/100,d=a[2]/100;return f=(2-c)*d,e=c*d,e/=f<=1?f:2-f,e=e||0,f/=2,[b,100*e,100*f]}function v(a){return h(t(a))}function w(a){return i(t(a))}function x(a){return j(t(a))}function y(a){var h,i,j,k,c=a[0]/360,d=a[1]/100,e=a[2]/100,f=d+e;switch(f>1&&(d/=f,e/=f),h=Math.floor(6*c),i=1-e,j=6*c-h,0!=(1&h)&&(j=1-j),k=d+j*(i-d),h){default:case 6:case 0:r=i,g=k,b=d;break;case 1:r=k,g=i,b=d;break;case 2:r=d,g=i,b=k;break;case 3:r=d,g=k,b=i;break;case 4:r=k,g=d,b=i;break;case 5:r=i,g=d,b=k}return[255*r,255*g,255*b]}function z(a){return e(y(a))}function A(a){return f(y(a))}function B(a){return i(y(a))}function C(a){return j(y(a))}function D(a){var f,g,h,b=a[0]/100,c=a[1]/100,d=a[2]/100,e=a[3]/100;return f=1-Math.min(1,b*(1-e)+e),g=1-Math.min(1,c*(1-e)+e),h=1-Math.min(1,d*(1-e)+e),[255*f,255*g,255*h]}function E(a){return e(D(a))}function F(a){return f(D(a))}function G(a){return h(D(a))}function H(a){return j(D(a))}function I(a){var e,f,g,b=a[0]/100,c=a[1]/100,d=a[2]/100;return e=3.2406*b+c*-1.5372+d*-.4986,f=b*-.9689+1.8758*c+.0415*d,g=.0557*b+c*-.204+1.057*d,e=e>.0031308?1.055*Math.pow(e,1/2.4)-.055:e=12.92*e,f=f>.0031308?1.055*Math.pow(f,1/2.4)-.055:f=12.92*f,g=g>.0031308?1.055*Math.pow(g,1/2.4)-.055:g=12.92*g,e=Math.min(Math.max(0,e),1),f=Math.min(Math.max(0,f),1),g=Math.min(Math.max(0,g),1),[255*e,255*f,255*g]}function J(a){var e,f,g,b=a[0],c=a[1],d=a[2];return b/=95.047,c/=100,d/=108.883,b=b>.008856?Math.pow(b,1/3):7.787*b+16/116,c=c>.008856?Math.pow(c,1/3):7.787*c+16/116,d=d>.008856?Math.pow(d,1/3):7.787*d+16/116,e=116*c-16,f=500*(b-c),g=200*(c-d),[e,f,g]}function K(a){return M(J(a))}function L(a){var e,f,g,h,b=a[0],c=a[1],d=a[2];return b<=8?(f=100*b/903.3,h=7.787*(f/100)+16/116):(f=100*Math.pow((b+16)/116,3),h=Math.pow(f/100,1/3)),e=e/95.047<=.008856?e=95.047*(c/500+h-16/116)/7.787:95.047*Math.pow(c/500+h,3),g=g/108.883<=.008859?g=108.883*(h-d/200-16/116)/7.787:108.883*Math.pow(h-d/200,3),[e,f,g]}function M(a){var e,f,g,b=a[0],c=a[1],d=a[2];return e=Math.atan2(d,c),f=360*e/2/Math.PI,f<0&&(f+=360),g=Math.sqrt(c*c+d*d),[b,g,f]}function N(a){return I(L(a))}function O(a){var e,f,g,b=a[0],c=a[1],d=a[2];return g=d/360*2*Math.PI,e=c*Math.cos(g),f=c*Math.sin(g),[b,e,f]}function P(a){return L(O(a))}function Q(a){return N(O(a))}function R(a){return Y[a]}function S(a){return e(R(a))}function T(a){return f(R(a))}function U(a){return h(R(a))}function V(a){return i(R(a))}function W(a){return l(R(a))}function X(a){return k(R(a))}c.exports={rgb2hsl:e,rgb2hsv:f,rgb2hwb:h,rgb2cmyk:i,rgb2keyword:j,rgb2xyz:k,rgb2lab:l,rgb2lch:m,hsl2rgb:n,hsl2hsv:o,hsl2hwb:p,hsl2cmyk:q,hsl2keyword:s,hsv2rgb:t,hsv2hsl:u,hsv2hwb:v,hsv2cmyk:w,hsv2keyword:x,hwb2rgb:y,hwb2hsl:z,hwb2hsv:A,hwb2cmyk:B,hwb2keyword:C,cmyk2rgb:D,cmyk2hsl:E,cmyk2hsv:F,cmyk2hwb:G,cmyk2keyword:H,keyword2rgb:R,keyword2hsl:S,keyword2hsv:T,keyword2hwb:U,keyword2cmyk:V,keyword2lab:W,keyword2xyz:X,xyz2rgb:I,xyz2lab:J,xyz2lch:K,lab2xyz:L,lab2rgb:N,lab2lch:M,lch2lab:O,lch2xyz:P,lch2rgb:Q};var Y={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},Z={};for(var $ in Y)Z[JSON.stringify(Y[$])]=$},{}],4:[function(a,b,c){var d=a(3),e=function(){return new j};for(var f in d){e[f+"Raw"]=function(a){return function(b){return"number"==typeof b&&(b=Array.prototype.slice.call(arguments)),d[a](b)}}(f);var g=/(\w+)2(\w+)/.exec(f),h=g[1],i=g[2];e[h]=e[h]||{},e[h][i]=e[f]=function(a){return function(b){"number"==typeof b&&(b=Array.prototype.slice.call(arguments));var c=d[a](b);if("string"==typeof c||void 0===c)return c;for(var e=0;e0)for(c in t)d=t[c],e=b[d],s(e)||(a[d]=e);return a}function w(a){u(this,a),this._d=new Date(null!=a._d?a._d.getTime():NaN),v===!1&&(v=!0,d.updateOffset(this),v=!1)}function x(a){return a instanceof w||null!=a&&null!=a._isAMomentObject}function y(a){return a<0?Math.ceil(a)||0:Math.floor(a)}function z(a){var b=+a,c=0;return 0!==b&&isFinite(b)&&(c=y(b)),c}function A(a,b,c){var g,d=Math.min(a.length,b.length),e=Math.abs(a.length-b.length),f=0;for(g=0;g0?"future":"past"];return F(c)?c(b):c.replace(/%s/i,b)}function X(a,b){var c=a.toLowerCase();W[c]=W[c+"s"]=W[b]=a}function Y(a){return"string"==typeof a?W[a]||W[a.toLowerCase()]:void 0}function Z(a){var c,d,b={};for(d in a)k(a,d)&&(c=Y(d),c&&(b[c]=a[d]));return b}function _(a,b){$[a]=b}function aa(a){var b=[];for(var c in a)b.push({unit:c,priority:$[c]});return b.sort(function(a,b){return a.priority-b.priority}),b}function ba(a,b){return function(c){return null!=c?(da(this,a,c),d.updateOffset(this,b),this):ca(this,a)}}function ca(a,b){return a.isValid()?a._d["get"+(a._isUTC?"UTC":"")+b]():NaN}function da(a,b,c){a.isValid()&&a._d["set"+(a._isUTC?"UTC":"")+b](c)}function ea(a){return a=Y(a),F(this[a])?this[a]():this}function fa(a,b){if("object"==typeof a){a=Z(a);for(var c=aa(a),d=0;d=0;return(f?c?"+":"":"-")+Math.pow(10,Math.max(0,e)).toString().substr(1)+d}function la(a,b,c,d){var e=d;"string"==typeof d&&(e=function(){return this[d]()}),a&&(ka[a]=e),b&&(ka[b[0]]=function(){return ga(e.apply(this,arguments),b[1],b[2])}),c&&(ka[c]=function(){return this.localeData().ordinal(e.apply(this,arguments),a)})}function ma(a){return a.match(/\[[\s\S]/)?a.replace(/^\[|\]$/g,""):a.replace(/\\/g,"")}function na(a){var c,d,b=a.match(ha);for(c=0,d=b.length;c=0&&ia.test(a);)a=a.replace(ia,d),ia.lastIndex=0,c-=1;return a}function Ia(a,b,c){Ha[a]=F(b)?b:function(a,d){return a&&c?c:b}}function Ja(a,b){return k(Ha,a)?Ha[a](b._strict,b._locale):new RegExp(Ka(a))}function Ka(a){return La(a.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(a,b,c,d,e){return b||c||d||e}))}function La(a){return a.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}function Na(a,b){var c,d=b;for("string"==typeof a&&(a=[a]),"number"==typeof b&&(d=function(a,c){c[b]=z(a)}),c=0;c=0&&isFinite(h.getFullYear())&&h.setFullYear(a),h}function tb(a){var b=new Date(Date.UTC.apply(null,arguments));return a<100&&a>=0&&isFinite(b.getUTCFullYear())&&b.setUTCFullYear(a),b}function ub(a,b,c){var d=7+b-c,e=(7+tb(a,0,d).getUTCDay()-b)%7;return-e+d-1}function vb(a,b,c,d,e){var i,j,f=(7+c-d)%7,g=ub(a,d,e),h=1+7*(b-1)+f+g;return h<=0?(i=a-1,j=ob(i)+h):h>ob(a)?(i=a+1,j=h-ob(a)):(i=a,j=h),{year:i,dayOfYear:j}}function wb(a,b,c){var f,g,d=ub(a.year(),b,c),e=Math.floor((a.dayOfYear()-d-1)/7)+1;return e<1?(g=a.year()-1,f=e+xb(g,b,c)):e>xb(a.year(),b,c)?(f=e-xb(a.year(),b,c),g=a.year()+1):(g=a.year(),f=e),{week:f,year:g}}function xb(a,b,c){var d=ub(a,b,c),e=ub(a+1,b,c);return(ob(a)-d+e)/7}function yb(a){return wb(a,this._week.dow,this._week.doy).week}function Ab(){return this._week.dow}function Bb(){return this._week.doy}function Cb(a){var b=this.localeData().week(this);return null==a?b:this.add(7*(a-b),"d")}function Db(a){var b=wb(this,1,4).week;return null==a?b:this.add(7*(a-b),"d")}function Eb(a,b){return"string"!=typeof a?a:isNaN(a)?(a=b.weekdaysParse(a),"number"==typeof a?a:null):parseInt(a,10)}function Fb(a,b){return"string"==typeof a?b.weekdaysParse(a)%7||7:isNaN(a)?null:a}function Hb(a,b){return f(this._weekdays)?this._weekdays[a.day()]:this._weekdays[this._weekdays.isFormat.test(b)?"format":"standalone"][a.day()]}function Jb(a){return this._weekdaysShort[a.day()]}function Lb(a){return this._weekdaysMin[a.day()]}function Mb(a,b,c){var d,e,f,g=a.toLocaleLowerCase();if(!this._weekdaysParse)for(this._weekdaysParse=[],this._shortWeekdaysParse=[],this._minWeekdaysParse=[],d=0;d<7;++d)f=m([2e3,1]).day(d),this._minWeekdaysParse[d]=this.weekdaysMin(f,"").toLocaleLowerCase(),this._shortWeekdaysParse[d]=this.weekdaysShort(f,"").toLocaleLowerCase(),this._weekdaysParse[d]=this.weekdays(f,"").toLocaleLowerCase();return c?"dddd"===b?(e=Za.call(this._weekdaysParse,g),e!==-1?e:null):"ddd"===b?(e=Za.call(this._shortWeekdaysParse,g),e!==-1?e:null):(e=Za.call(this._minWeekdaysParse,g),e!==-1?e:null):"dddd"===b?(e=Za.call(this._weekdaysParse,g),e!==-1?e:(e=Za.call(this._shortWeekdaysParse,g),e!==-1?e:(e=Za.call(this._minWeekdaysParse,g),e!==-1?e:null))):"ddd"===b?(e=Za.call(this._shortWeekdaysParse,g),e!==-1?e:(e=Za.call(this._weekdaysParse,g),e!==-1?e:(e=Za.call(this._minWeekdaysParse,g),e!==-1?e:null))):(e=Za.call(this._minWeekdaysParse,g),e!==-1?e:(e=Za.call(this._weekdaysParse,g),e!==-1?e:(e=Za.call(this._shortWeekdaysParse,g),e!==-1?e:null)))}function Nb(a,b,c){var d,e,f;if(this._weekdaysParseExact)return Mb.call(this,a,b,c);for(this._weekdaysParse||(this._weekdaysParse=[],this._minWeekdaysParse=[],this._shortWeekdaysParse=[],this._fullWeekdaysParse=[]),d=0;d<7;d++){if(e=m([2e3,1]).day(d),c&&!this._fullWeekdaysParse[d]&&(this._fullWeekdaysParse[d]=new RegExp("^"+this.weekdays(e,"").replace(".",".?")+"$","i"),this._shortWeekdaysParse[d]=new RegExp("^"+this.weekdaysShort(e,"").replace(".",".?")+"$","i"),this._minWeekdaysParse[d]=new RegExp("^"+this.weekdaysMin(e,"").replace(".",".?")+"$","i")),this._weekdaysParse[d]||(f="^"+this.weekdays(e,"")+"|^"+this.weekdaysShort(e,"")+"|^"+this.weekdaysMin(e,""),this._weekdaysParse[d]=new RegExp(f.replace(".",""),"i")),c&&"dddd"===b&&this._fullWeekdaysParse[d].test(a))return d;if(c&&"ddd"===b&&this._shortWeekdaysParse[d].test(a))return d;if(c&&"dd"===b&&this._minWeekdaysParse[d].test(a))return d;if(!c&&this._weekdaysParse[d].test(a))return d}}function Ob(a){if(!this.isValid())return null!=a?this:NaN;var b=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=a?(a=Eb(a,this.localeData()),this.add(a-b,"d")):b}function Pb(a){if(!this.isValid())return null!=a?this:NaN;var b=(this.day()+7-this.localeData()._week.dow)%7;return null==a?b:this.add(a-b,"d")}function Qb(a){if(!this.isValid())return null!=a?this:NaN;if(null!=a){var b=Fb(a,this.localeData());return this.day(this.day()%7?b:b-7)}return this.day()||7}function Sb(a){return this._weekdaysParseExact?(k(this,"_weekdaysRegex")||Xb.call(this),a?this._weekdaysStrictRegex:this._weekdaysRegex):(k(this,"_weekdaysRegex")||(this._weekdaysRegex=Rb),this._weekdaysStrictRegex&&a?this._weekdaysStrictRegex:this._weekdaysRegex)}function Ub(a){return this._weekdaysParseExact?(k(this,"_weekdaysRegex")||Xb.call(this),a?this._weekdaysShortStrictRegex:this._weekdaysShortRegex):(k(this,"_weekdaysShortRegex")||(this._weekdaysShortRegex=Tb),this._weekdaysShortStrictRegex&&a?this._weekdaysShortStrictRegex:this._weekdaysShortRegex)}function Wb(a){return this._weekdaysParseExact?(k(this,"_weekdaysRegex")||Xb.call(this),a?this._weekdaysMinStrictRegex:this._weekdaysMinRegex):(k(this,"_weekdaysMinRegex")||(this._weekdaysMinRegex=Vb),this._weekdaysMinStrictRegex&&a?this._weekdaysMinStrictRegex:this._weekdaysMinRegex)}function Xb(){function a(a,b){return b.length-a.length}var f,g,h,i,j,b=[],c=[],d=[],e=[];for(f=0;f<7;f++)g=m([2e3,1]).day(f),h=this.weekdaysMin(g,""),i=this.weekdaysShort(g,""),j=this.weekdays(g,""),b.push(h),c.push(i),d.push(j),e.push(h),e.push(i),e.push(j);for(b.sort(a),c.sort(a),d.sort(a),e.sort(a),f=0;f<7;f++)c[f]=La(c[f]),d[f]=La(d[f]),e[f]=La(e[f]);this._weekdaysRegex=new RegExp("^("+e.join("|")+")","i"),this._weekdaysShortRegex=this._weekdaysRegex,this._weekdaysMinRegex=this._weekdaysRegex,this._weekdaysStrictRegex=new RegExp("^("+d.join("|")+")","i"),this._weekdaysShortStrictRegex=new RegExp("^("+c.join("|")+")","i"),this._weekdaysMinStrictRegex=new RegExp("^("+b.join("|")+")","i")}function Yb(){return this.hours()%12||12}function Zb(){return this.hours()||24}function $b(a,b){la(a,0,0,function(){return this.localeData().meridiem(this.hours(),this.minutes(),b)})}function _b(a,b){return b._meridiemParse}function ac(a){return"p"===(a+"").toLowerCase().charAt(0)}function cc(a,b,c){return a>11?c?"pm":"PM":c?"am":"AM"}function hc(a){return a?a.toLowerCase().replace("_","-"):a}function ic(a){for(var c,d,e,f,b=0;b0;){if(e=jc(f.slice(0,c).join("-")))return e;if(d&&d.length>=c&&A(f,d,!0)>=c-1)break;c--}b++}return null}function jc(a){var d=null;if(!fc[a]&&"undefined"!=typeof c&&c&&c.exports)try{d=gc._abbr,b("./locale/"+a),kc(d)}catch(a){}return fc[a]}function kc(a,b){var c;return a&&(c=s(b)?nc(a):lc(a,b),c&&(gc=c)),gc._abbr}function lc(a,b){if(null!==b){var c=ec;return b.abbr=a,null!=fc[a]?(E("defineLocaleOverride","use moment.updateLocale(localeName, config) to change an existing locale. moment.defineLocale(localeName, config) should only be used for creating a new locale See http://momentjs.com/guides/#/warnings/define-locale/ for more info."),c=fc[a]._config):null!=b.parentLocale&&(null!=fc[b.parentLocale]?c=fc[b.parentLocale]._config:E("parentLocaleUndefined","specified parentLocale is not defined yet. See http://momentjs.com/guides/#/warnings/parent-locale/")),fc[a]=new I(H(c,b)),kc(a),fc[a]}return delete fc[a],null}function mc(a,b){if(null!=b){var c,d=ec;null!=fc[a]&&(d=fc[a]._config),b=H(d,b),c=new I(b),c.parentLocale=fc[a],fc[a]=c,kc(a)}else null!=fc[a]&&(null!=fc[a].parentLocale?fc[a]=fc[a].parentLocale:null!=fc[a]&&delete fc[a]);return fc[a]}function nc(a){var b;if(a&&a._locale&&a._locale._abbr&&(a=a._locale._abbr),!a)return gc;if(!f(a)){if(b=jc(a))return b;a=[a]}return ic(a)}function oc(){return J(fc)}function pc(a){var b,c=a._a;return c&&o(a).overflow===-2&&(b=c[Ra]<0||c[Ra]>11?Ra:c[Sa]<1||c[Sa]>$a(c[Qa],c[Ra])?Sa:c[Ta]<0||c[Ta]>24||24===c[Ta]&&(0!==c[Ua]||0!==c[Va]||0!==c[Wa])?Ta:c[Ua]<0||c[Ua]>59?Ua:c[Va]<0||c[Va]>59?Va:c[Wa]<0||c[Wa]>999?Wa:-1,o(a)._overflowDayOfYear&&(bSa)&&(b=Sa),o(a)._overflowWeeks&&b===-1&&(b=Xa),o(a)._overflowWeekday&&b===-1&&(b=Ya),o(a).overflow=b),a}function wc(a){var b,c,f,g,h,i,d=a._i,e=qc.exec(d)||rc.exec(d);if(e){for(o(a).iso=!0,b=0,c=tc.length;bob(f)&&(o(a)._overflowDayOfYear=!0),c=tb(f,0,a._dayOfYear),a._a[Ra]=c.getUTCMonth(),a._a[Sa]=c.getUTCDate()),b=0;b<3&&null==a._a[b];++b)a._a[b]=d[b]=e[b];for(;b<7;b++)a._a[b]=d[b]=null==a._a[b]?2===b?1:0:a._a[b];24===a._a[Ta]&&0===a._a[Ua]&&0===a._a[Va]&&0===a._a[Wa]&&(a._nextDay=!0,a._a[Ta]=0),a._d=(a._useUTC?tb:sb).apply(null,d),null!=a._tzm&&a._d.setUTCMinutes(a._d.getUTCMinutes()-a._tzm),a._nextDay&&(a._a[Ta]=24)}}function Bc(a){var b,c,d,e,f,g,h,i;b=a._w,null!=b.GG||null!=b.W||null!=b.E?(f=1,g=4,c=yc(b.GG,a._a[Qa],wb(Kc(),1,4).year),d=yc(b.W,1),e=yc(b.E,1),(e<1||e>7)&&(i=!0)):(f=a._locale._week.dow,g=a._locale._week.doy,c=yc(b.gg,a._a[Qa],wb(Kc(),f,g).year),d=yc(b.w,1),null!=b.d?(e=b.d,(e<0||e>6)&&(i=!0)):null!=b.e?(e=b.e+f,(b.e<0||b.e>6)&&(i=!0)):e=f),d<1||d>xb(c,f,g)?o(a)._overflowWeeks=!0:null!=i?o(a)._overflowWeekday=!0:(h=vb(c,d,e,f,g),a._a[Qa]=h.year,a._dayOfYear=h.dayOfYear)}function Cc(a){if(a._f===d.ISO_8601)return void wc(a);a._a=[],o(a).empty=!0;var c,e,f,g,h,b=""+a._i,i=b.length,j=0;for(f=pa(a._f,a._locale).match(ha)||[],c=0;c0&&o(a).unusedInput.push(h),b=b.slice(b.indexOf(e)+e.length),j+=e.length),ka[g]?(e?o(a).empty=!1:o(a).unusedTokens.push(g),Pa(g,e,a)):a._strict&&!e&&o(a).unusedTokens.push(g);o(a).charsLeftOver=i-j,b.length>0&&o(a).unusedInput.push(b),a._a[Ta]<=12&&o(a).bigHour===!0&&a._a[Ta]>0&&(o(a).bigHour=void 0),o(a).parsedDateParts=a._a.slice(0),o(a).meridiem=a._meridiem,a._a[Ta]=Dc(a._locale,a._a[Ta],a._meridiem),Ac(a),pc(a)}function Dc(a,b,c){var d;return null==c?b:null!=a.meridiemHour?a.meridiemHour(b,c):null!=a.isPM?(d=a.isPM(c),d&&b<12&&(b+=12),d||12!==b||(b=0),b):b}function Ec(a){var b,c,d,e,f;if(0===a._f.length)return o(a).invalidFormat=!0,void(a._d=new Date(NaN));for(e=0;ethis.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()}function dd(){if(!s(this._isDSTShifted))return this._isDSTShifted;var a={};if(u(a,this),a=Hc(a),a._a){var b=a._isUTC?m(a._a):Kc(a._a);this._isDSTShifted=this.isValid()&&A(a._a,b.toArray())>0}else this._isDSTShifted=!1;return this._isDSTShifted}function ed(){return!!this.isValid()&&!this._isUTC}function fd(){return!!this.isValid()&&this._isUTC}function gd(){return!!this.isValid()&&(this._isUTC&&0===this._offset)}function jd(a,b){var e,f,g,c=a,d=null;return Sc(a)?c={ms:a._milliseconds,d:a._days,M:a._months}:"number"==typeof a?(c={},b?c[b]=a:c.milliseconds=a):(d=hd.exec(a))?(e="-"===d[1]?-1:1,c={y:0,d:z(d[Sa])*e,h:z(d[Ta])*e,m:z(d[Ua])*e,s:z(d[Va])*e,ms:z(d[Wa])*e}):(d=id.exec(a))?(e="-"===d[1]?-1:1,c={y:kd(d[2],e),M:kd(d[3],e),w:kd(d[4],e),d:kd(d[5],e),h:kd(d[6],e),m:kd(d[7],e),s:kd(d[8],e)}):null==c?c={}:"object"==typeof c&&("from"in c||"to"in c)&&(g=md(Kc(c.from),Kc(c.to)),c={},c.ms=g.milliseconds,c.M=g.months),f=new Rc(c),Sc(a)&&k(a,"_locale")&&(f._locale=a._locale),f}function kd(a,b){var c=a&&parseFloat(a.replace(",","."));return(isNaN(c)?0:c)*b}function ld(a,b){var c={milliseconds:0,months:0};return c.months=b.month()-a.month()+12*(b.year()-a.year()),a.clone().add(c.months,"M").isAfter(b)&&--c.months,c.milliseconds=+b-+a.clone().add(c.months,"M"),c}function md(a,b){var c;return a.isValid()&&b.isValid()?(b=Wc(b,a),a.isBefore(b)?c=ld(a,b):(c=ld(b,a),c.milliseconds=-c.milliseconds,c.months=-c.months),c):{milliseconds:0,months:0}}function nd(a){return a<0?Math.round(-1*a)*-1:Math.round(a)}function od(a,b){return function(c,d){var e,f;return null===d||isNaN(+d)||(E(b,"moment()."+b+"(period, number) is deprecated. Please use moment()."+b+"(number, period). See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info."),f=c,c=d,d=f),c="string"==typeof c?+c:c,e=jd(c,d),pd(this,e,a),this}}function pd(a,b,c,e){var f=b._milliseconds,g=nd(b._days),h=nd(b._months);a.isValid()&&(e=null==e||e,f&&a._d.setTime(a._d.valueOf()+f*c),g&&da(a,"Date",ca(a,"Date")+g*c),h&&gb(a,ca(a,"Month")+h*c),e&&d.updateOffset(a,g||h))}function sd(a,b){var c=a.diff(b,"days",!0);return c<-6?"sameElse":c<-1?"lastWeek":c<0?"lastDay":c<1?"sameDay":c<2?"nextDay":c<7?"nextWeek":"sameElse"}function td(a,b){var c=a||Kc(),e=Wc(c,this).startOf("day"),f=d.calendarFormat(this,e)||"sameElse",g=b&&(F(b[f])?b[f].call(this,c):b[f]);return this.format(g||this.localeData().calendar(f,this,Kc(c)))}function ud(){return new w(this)}function vd(a,b){var c=x(a)?a:Kc(a);return!(!this.isValid()||!c.isValid())&&(b=Y(s(b)?"millisecond":b),"millisecond"===b?this.valueOf()>c.valueOf():c.valueOf()f&&(b=f),de.call(this,a,b,c,d,e))}function de(a,b,c,d,e){var f=vb(a,b,c,d,e),g=tb(f.year,0,f.dayOfYear);return this.year(g.getUTCFullYear()),this.month(g.getUTCMonth()),this.date(g.getUTCDate()),this}function ee(a){return null==a?Math.ceil((this.month()+1)/3):this.month(3*(a-1)+this.month()%3)}function ge(a){var b=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return null==a?b:this.add(a-b,"d")}function ke(a,b){b[Wa]=z(1e3*("0."+a))}function me(){return this._isUTC?"UTC":""}function ne(){return this._isUTC?"Coordinated Universal Time":""}function qe(a){return Kc(1e3*a)}function re(){return Kc.apply(null,arguments).parseZone()}function se(a){return a}function ue(a,b,c,d){var e=nc(),f=m().set(d,b);return e[c](f,a)}function ve(a,b,c){if("number"==typeof a&&(b=a,a=void 0),a=a||"",null!=b)return ue(a,b,c,"month");var d,e=[];for(d=0;d<12;d++)e[d]=ue(a,d,c,"month");return e}function we(a,b,c,d){"boolean"==typeof a?("number"==typeof b&&(c=b,b=void 0),b=b||""):(b=a,c=b,a=!1,"number"==typeof b&&(c=b,b=void 0),b=b||"");var e=nc(),f=a?e._week.dow:0;if(null!=c)return ue(b,(c+f)%7,d,"day");var g,h=[];for(g=0;g<7;g++)h[g]=ue(b,(g+f)%7,d,"day");return h}function xe(a,b){return ve(a,b,"months")}function ye(a,b){return ve(a,b,"monthsShort")}function ze(a,b,c){return we(a,b,c,"weekdays")}function Ae(a,b,c){return we(a,b,c,"weekdaysShort")}function Be(a,b,c){return we(a,b,c,"weekdaysMin")}function De(){var a=this._data;return this._milliseconds=Ce(this._milliseconds),this._days=Ce(this._days),this._months=Ce(this._months),a.milliseconds=Ce(a.milliseconds),a.seconds=Ce(a.seconds),a.minutes=Ce(a.minutes),a.hours=Ce(a.hours),a.months=Ce(a.months),a.years=Ce(a.years),this}function Ee(a,b,c,d){var e=jd(b,c);return a._milliseconds+=d*e._milliseconds,a._days+=d*e._days,a._months+=d*e._months,a._bubble()}function Fe(a,b){return Ee(this,a,b,1)}function Ge(a,b){return Ee(this,a,b,-1)}function He(a){return a<0?Math.floor(a):Math.ceil(a)}function Ie(){var e,f,g,h,i,a=this._milliseconds,b=this._days,c=this._months,d=this._data;return a>=0&&b>=0&&c>=0||a<=0&&b<=0&&c<=0||(a+=864e5*He(Ke(c)+b),b=0,c=0),d.milliseconds=a%1e3,e=y(a/1e3),d.seconds=e%60,f=y(e/60),d.minutes=f%60,g=y(f/60),d.hours=g%24,b+=y(g/24),i=y(Je(b)),c+=i,b-=He(Ke(i)),h=y(c/12),c%=12,d.days=b,d.months=c,d.years=h,this}function Je(a){return 4800*a/146097}function Ke(a){return 146097*a/4800}function Le(a){var b,c,d=this._milliseconds;if(a=Y(a),"month"===a||"year"===a)return b=this._days+d/864e5,c=this._months+Je(b),"month"===a?c:c/12;switch(b=this._days+Math.round(Ke(this._months)),a){case"week":return b/7+d/6048e5;case"day":return b+d/864e5;case"hour":return 24*b+d/36e5;case"minute":return 1440*b+d/6e4;case"second":return 86400*b+d/1e3;case"millisecond":return Math.floor(864e5*b)+d;default:throw new Error("Unknown unit "+a)}}function Me(){return this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*z(this._months/12)}function Ne(a){return function(){return this.as(a)}}function We(a){return a=Y(a),this[a+"s"]()}function Xe(a){return function(){return this._data[a]}}function df(){return y(this.days()/7)}function gf(a,b,c,d,e){return e.relativeTime(b||1,!!c,a,d)}function hf(a,b,c){var d=jd(a).abs(),e=ef(d.as("s")),f=ef(d.as("m")),g=ef(d.as("h")),h=ef(d.as("d")),i=ef(d.as("M")),j=ef(d.as("y")),k=e0,k[4]=c,gf.apply(null,k)}function jf(a){return void 0===a?ef:"function"==typeof a&&(ef=a,!0)}function kf(a,b){return void 0!==ff[a]&&(void 0===b?ff[a]:(ff[a]=b,!0))}function lf(a){var b=this.localeData(),c=hf(this,!a,b);return a&&(c=b.pastFuture(+this,c)),b.postformat(c)}function nf(){var d,e,f,a=mf(this._milliseconds)/1e3,b=mf(this._days),c=mf(this._months);d=y(a/60),e=y(d/60),a%=60,d%=60,f=y(c/12),c%=12;var g=f,h=c,i=b,j=e,k=d,l=a,m=this.asSeconds();return m?(m<0?"-":"")+"P"+(g?g+"Y":"")+(h?h+"M":"")+(i?i+"D":"")+(j||k||l?"T":"")+(j?j+"H":"")+(k?k+"M":"")+(l?l+"S":""):"P0D"}var a,p;p=Array.prototype.some?Array.prototype.some:function(a){for(var b=Object(this),c=b.length>>>0,d=0;d68?1900:2e3)};var qb=ba("FullYear",!0);la("w",["ww",2],"wo","week"),la("W",["WW",2],"Wo","isoWeek"),X("week","w"),X("isoWeek","W"),_("week",5),_("isoWeek",5),Ia("w",va),Ia("ww",va,ra),Ia("W",va),Ia("WW",va,ra),Oa(["w","ww","W","WW"],function(a,b,c,d){b[d.substr(0,1)]=z(a)});var zb={dow:0,doy:6};la("d",0,"do","day"),la("dd",0,0,function(a){return this.localeData().weekdaysMin(this,a)}),la("ddd",0,0,function(a){return this.localeData().weekdaysShort(this,a)}),la("dddd",0,0,function(a){return this.localeData().weekdays(this,a)}),la("e",0,0,"weekday"),la("E",0,0,"isoWeekday"),X("day","d"),X("weekday","e"),X("isoWeekday","E"),_("day",11),_("weekday",11),_("isoWeekday",11),Ia("d",va),Ia("e",va),Ia("E",va),Ia("dd",function(a,b){return b.weekdaysMinRegex(a)}),Ia("ddd",function(a,b){return b.weekdaysShortRegex(a)}),Ia("dddd",function(a,b){return b.weekdaysRegex(a)}),Oa(["dd","ddd","dddd"],function(a,b,c,d){var e=c._locale.weekdaysParse(a,d,c._strict);null!=e?b.d=e:o(c).invalidWeekday=a}),Oa(["d","e","E"],function(a,b,c,d){b[d]=z(a)});var Gb="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),Ib="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),Kb="Su_Mo_Tu_We_Th_Fr_Sa".split("_"),Rb=Ga,Tb=Ga,Vb=Ga;la("H",["HH",2],0,"hour"),la("h",["hh",2],0,Yb),la("k",["kk",2],0,Zb),la("hmm",0,0,function(){return""+Yb.apply(this)+ga(this.minutes(),2)}),la("hmmss",0,0,function(){return""+Yb.apply(this)+ga(this.minutes(),2)+ga(this.seconds(),2)}),la("Hmm",0,0,function(){return""+this.hours()+ga(this.minutes(),2)}),la("Hmmss",0,0,function(){return""+this.hours()+ga(this.minutes(),2)+ga(this.seconds(),2)}),$b("a",!0),$b("A",!1),X("hour","h"),_("hour",13),Ia("a",_b),Ia("A",_b),Ia("H",va),Ia("h",va),Ia("HH",va,ra),Ia("hh",va,ra),Ia("hmm",wa),Ia("hmmss",xa),Ia("Hmm",wa),Ia("Hmmss",xa),Na(["H","HH"],Ta),Na(["a","A"],function(a,b,c){c._isPm=c._locale.isPM(a),c._meridiem=a}),Na(["h","hh"],function(a,b,c){b[Ta]=z(a),o(c).bigHour=!0}),Na("hmm",function(a,b,c){var d=a.length-2;b[Ta]=z(a.substr(0,d)),b[Ua]=z(a.substr(d)),o(c).bigHour=!0}),Na("hmmss",function(a,b,c){var d=a.length-4,e=a.length-2;b[Ta]=z(a.substr(0,d)),b[Ua]=z(a.substr(d,2)),b[Va]=z(a.substr(e)),o(c).bigHour=!0}),Na("Hmm",function(a,b,c){var d=a.length-2;b[Ta]=z(a.substr(0,d)),b[Ua]=z(a.substr(d))}),Na("Hmmss",function(a,b,c){var d=a.length-4,e=a.length-2;b[Ta]=z(a.substr(0,d)),b[Ua]=z(a.substr(d,2)),b[Va]=z(a.substr(e))});var gc,bc=/[ap]\.?m?\.?/i,dc=ba("Hours",!0),ec={calendar:K,longDateFormat:M,invalidDate:O,ordinal:Q,ordinalParse:R,relativeTime:T,months:ab,monthsShort:cb,week:zb,weekdays:Gb,weekdaysMin:Kb,weekdaysShort:Ib,meridiemParse:bc},fc={},qc=/^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?/,rc=/^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?/,sc=/Z|[+-]\d\d(?::?\d\d)?/,tc=[["YYYYYY-MM-DD",/[+-]\d{6}-\d\d-\d\d/],["YYYY-MM-DD",/\d{4}-\d\d-\d\d/],["GGGG-[W]WW-E",/\d{4}-W\d\d-\d/],["GGGG-[W]WW",/\d{4}-W\d\d/,!1],["YYYY-DDD",/\d{4}-\d{3}/],["YYYY-MM",/\d{4}-\d\d/,!1],["YYYYYYMMDD",/[+-]\d{10}/],["YYYYMMDD",/\d{8}/],["GGGG[W]WWE",/\d{4}W\d{3}/],["GGGG[W]WW",/\d{4}W\d{2}/,!1],["YYYYDDD",/\d{7}/]],uc=[["HH:mm:ss.SSSS",/\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss,SSSS",/\d\d:\d\d:\d\d,\d+/],["HH:mm:ss",/\d\d:\d\d:\d\d/],["HH:mm",/\d\d:\d\d/],["HHmmss.SSSS",/\d\d\d\d\d\d\.\d+/],["HHmmss,SSSS",/\d\d\d\d\d\d,\d+/],["HHmmss",/\d\d\d\d\d\d/],["HHmm",/\d\d\d\d/],["HH",/\d\d/]],vc=/^\/?Date\((\-?\d+)/i; +d.createFromInputFallback=C("moment construction falls back to js Date. This is discouraged and will be removed in upcoming major release. Please refer to http://momentjs.com/guides/#/warnings/js-date/ for more info.",function(a){a._d=new Date(a._i+(a._useUTC?" UTC":""))}),d.ISO_8601=function(){};var Lc=C("moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/",function(){var a=Kc.apply(null,arguments);return this.isValid()&&a.isValid()?athis?this:a:r()}),Qc=function(){return Date.now?Date.now():+new Date};Tc("Z",":"),Tc("ZZ",""),Ia("Z",Ea),Ia("ZZ",Ea),Na(["Z","ZZ"],function(a,b,c){c._useUTC=!0,c._tzm=Vc(Ea,a)});var Uc=/([\+\-]|\d\d)/gi;d.updateOffset=function(){};var hd=/^(\-)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?\d*)?$/,id=/^(-)?P(?:(-?[0-9,.]*)Y)?(?:(-?[0-9,.]*)M)?(?:(-?[0-9,.]*)W)?(?:(-?[0-9,.]*)D)?(?:T(?:(-?[0-9,.]*)H)?(?:(-?[0-9,.]*)M)?(?:(-?[0-9,.]*)S)?)?$/;jd.fn=Rc.prototype;var qd=od(1,"add"),rd=od(-1,"subtract");d.defaultFormat="YYYY-MM-DDTHH:mm:ssZ",d.defaultFormatUtc="YYYY-MM-DDTHH:mm:ss[Z]";var Ld=C("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",function(a){return void 0===a?this.localeData():this.locale(a)});la(0,["gg",2],0,function(){return this.weekYear()%100}),la(0,["GG",2],0,function(){return this.isoWeekYear()%100}),Zd("gggg","weekYear"),Zd("ggggg","weekYear"),Zd("GGGG","isoWeekYear"),Zd("GGGGG","isoWeekYear"),X("weekYear","gg"),X("isoWeekYear","GG"),_("weekYear",1),_("isoWeekYear",1),Ia("G",Ca),Ia("g",Ca),Ia("GG",va,ra),Ia("gg",va,ra),Ia("GGGG",za,ta),Ia("gggg",za,ta),Ia("GGGGG",Aa,ua),Ia("ggggg",Aa,ua),Oa(["gggg","ggggg","GGGG","GGGGG"],function(a,b,c,d){b[d.substr(0,2)]=z(a)}),Oa(["gg","GG"],function(a,b,c,e){b[e]=d.parseTwoDigitYear(a)}),la("Q",0,"Qo","quarter"),X("quarter","Q"),_("quarter",7),Ia("Q",qa),Na("Q",function(a,b){b[Ra]=3*(z(a)-1)}),la("D",["DD",2],"Do","date"),X("date","D"),_("date",9),Ia("D",va),Ia("DD",va,ra),Ia("Do",function(a,b){return a?b._ordinalParse:b._ordinalParseLenient}),Na(["D","DD"],Sa),Na("Do",function(a,b){b[Sa]=z(a.match(va)[0],10)});var fe=ba("Date",!0);la("DDD",["DDDD",3],"DDDo","dayOfYear"),X("dayOfYear","DDD"),_("dayOfYear",4),Ia("DDD",ya),Ia("DDDD",sa),Na(["DDD","DDDD"],function(a,b,c){c._dayOfYear=z(a)}),la("m",["mm",2],0,"minute"),X("minute","m"),_("minute",14),Ia("m",va),Ia("mm",va,ra),Na(["m","mm"],Ua);var he=ba("Minutes",!1);la("s",["ss",2],0,"second"),X("second","s"),_("second",15),Ia("s",va),Ia("ss",va,ra),Na(["s","ss"],Va);var ie=ba("Seconds",!1);la("S",0,0,function(){return~~(this.millisecond()/100)}),la(0,["SS",2],0,function(){return~~(this.millisecond()/10)}),la(0,["SSS",3],0,"millisecond"),la(0,["SSSS",4],0,function(){return 10*this.millisecond()}),la(0,["SSSSS",5],0,function(){return 100*this.millisecond()}),la(0,["SSSSSS",6],0,function(){return 1e3*this.millisecond()}),la(0,["SSSSSSS",7],0,function(){return 1e4*this.millisecond()}),la(0,["SSSSSSSS",8],0,function(){return 1e5*this.millisecond()}),la(0,["SSSSSSSSS",9],0,function(){return 1e6*this.millisecond()}),X("millisecond","ms"),_("millisecond",16),Ia("S",ya,qa),Ia("SS",ya,ra),Ia("SSS",ya,sa);var je;for(je="SSSS";je.length<=9;je+="S")Ia(je,Ba);for(je="S";je.length<=9;je+="S")Na(je,ke);var le=ba("Milliseconds",!1);la("z",0,0,"zoneAbbr"),la("zz",0,0,"zoneName");var oe=w.prototype;oe.add=qd,oe.calendar=td,oe.clone=ud,oe.diff=Bd,oe.endOf=Od,oe.format=Fd,oe.from=Gd,oe.fromNow=Hd,oe.to=Id,oe.toNow=Jd,oe.get=ea,oe.invalidAt=Xd,oe.isAfter=vd,oe.isBefore=wd,oe.isBetween=xd,oe.isSame=yd,oe.isSameOrAfter=zd,oe.isSameOrBefore=Ad,oe.isValid=Vd,oe.lang=Ld,oe.locale=Kd,oe.localeData=Md,oe.max=Mc,oe.min=Lc,oe.parsingFlags=Wd,oe.set=fa,oe.startOf=Nd,oe.subtract=rd,oe.toArray=Sd,oe.toObject=Td,oe.toDate=Rd,oe.toISOString=Ed,oe.toJSON=Ud,oe.toString=Dd,oe.unix=Qd,oe.valueOf=Pd,oe.creationData=Yd,oe.year=qb,oe.isLeapYear=rb,oe.weekYear=$d,oe.isoWeekYear=_d,oe.quarter=oe.quarters=ee,oe.month=hb,oe.daysInMonth=ib,oe.week=oe.weeks=Cb,oe.isoWeek=oe.isoWeeks=Db,oe.weeksInYear=be,oe.isoWeeksInYear=ae,oe.date=fe,oe.day=oe.days=Ob,oe.weekday=Pb,oe.isoWeekday=Qb,oe.dayOfYear=ge,oe.hour=oe.hours=dc,oe.minute=oe.minutes=he,oe.second=oe.seconds=ie,oe.millisecond=oe.milliseconds=le,oe.utcOffset=Yc,oe.utc=$c,oe.local=_c,oe.parseZone=ad,oe.hasAlignedHourOffset=bd,oe.isDST=cd,oe.isLocal=ed,oe.isUtcOffset=fd,oe.isUtc=gd,oe.isUTC=gd,oe.zoneAbbr=me,oe.zoneName=ne,oe.dates=C("dates accessor is deprecated. Use date instead.",fe),oe.months=C("months accessor is deprecated. Use month instead",hb),oe.years=C("years accessor is deprecated. Use year instead",qb),oe.zone=C("moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/",Zc),oe.isDSTShifted=C("isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information",dd);var pe=oe,te=I.prototype;te.calendar=L,te.longDateFormat=N,te.invalidDate=P,te.ordinal=S,te.preparse=se,te.postformat=se,te.relativeTime=U,te.pastFuture=V,te.set=G,te.months=bb,te.monthsShort=db,te.monthsParse=fb,te.monthsRegex=mb,te.monthsShortRegex=kb,te.week=yb,te.firstDayOfYear=Bb,te.firstDayOfWeek=Ab,te.weekdays=Hb,te.weekdaysMin=Lb,te.weekdaysShort=Jb,te.weekdaysParse=Nb,te.weekdaysRegex=Sb,te.weekdaysShortRegex=Ub,te.weekdaysMinRegex=Wb,te.isPM=ac,te.meridiem=cc,kc("en",{ordinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(a){var b=a%10,c=1===z(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c}}),d.lang=C("moment.lang is deprecated. Use moment.locale instead.",kc),d.langData=C("moment.langData is deprecated. Use moment.localeData instead.",nc);var Ce=Math.abs,Oe=Ne("ms"),Pe=Ne("s"),Qe=Ne("m"),Re=Ne("h"),Se=Ne("d"),Te=Ne("w"),Ue=Ne("M"),Ve=Ne("y"),Ye=Xe("milliseconds"),Ze=Xe("seconds"),$e=Xe("minutes"),_e=Xe("hours"),af=Xe("days"),bf=Xe("months"),cf=Xe("years"),ef=Math.round,ff={s:45,m:45,h:22,d:26,M:11},mf=Math.abs,of=Rc.prototype;of.abs=De,of.add=Fe,of.subtract=Ge,of.as=Le,of.asMilliseconds=Oe,of.asSeconds=Pe,of.asMinutes=Qe,of.asHours=Re,of.asDays=Se,of.asWeeks=Te,of.asMonths=Ue,of.asYears=Ve,of.valueOf=Me,of._bubble=Ie,of.get=We,of.milliseconds=Ye,of.seconds=Ze,of.minutes=$e,of.hours=_e,of.days=af,of.weeks=df,of.months=bf,of.years=cf,of.humanize=lf,of.toISOString=nf,of.toString=nf,of.toJSON=nf,of.locale=Kd,of.localeData=Md,of.toIsoString=C("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",nf),of.lang=Ld,la("X",0,0,"unix"),la("x",0,0,"valueOf"),Ia("x",Ca),Ia("X",Fa),Na("X",function(a,b,c){c._d=new Date(1e3*parseFloat(a,10))}),Na("x",function(a,b,c){c._d=new Date(z(a))}),d.version="2.14.1",e(Kc),d.fn=pe,d.min=Oc,d.max=Pc,d.now=Qc,d.utc=m,d.unix=qe,d.months=xe,d.isDate=i,d.locale=kc,d.invalid=r,d.duration=jd,d.isMoment=x,d.weekdays=ze,d.parseZone=re,d.localeData=nc,d.isDuration=Sc,d.monthsShort=ye,d.weekdaysMin=Be,d.defineLocale=lc,d.updateLocale=mc,d.locales=oc,d.weekdaysShort=Ae,d.normalizeUnits=Y,d.relativeTimeRounding=jf,d.relativeTimeThreshold=kf,d.calendarFormat=sd,d.prototype=pe;var pf=d;return pf})},{}],7:[function(a,b,c){var d=a(27)();a(26)(d),a(22)(d),a(25)(d),a(21)(d),a(23)(d),a(24)(d),a(28)(d),a(32)(d),a(30)(d),a(31)(d),a(33)(d),a(29)(d),a(34)(d),a(35)(d),a(36)(d),a(37)(d),a(38)(d),a(41)(d),a(39)(d),a(40)(d),a(42)(d),a(43)(d),a(44)(d),a(15)(d),a(16)(d),a(17)(d),a(18)(d),a(19)(d),a(20)(d),a(8)(d),a(9)(d),a(10)(d),a(11)(d),a(12)(d),a(13)(d),a(14)(d),window.Chart=b.exports=d},{10:10,11:11,12:12,13:13,14:14,15:15,16:16,17:17,18:18,19:19,20:20,21:21,22:22,23:23,24:24,25:25,26:26,27:27,28:28,29:29,30:30,31:31,32:32,33:33,34:34,35:35,36:36,37:37,38:38,39:39,40:40,41:41,42:42,43:43,44:44,8:8,9:9}],8:[function(a,b,c){"use strict";b.exports=function(a){a.Bar=function(b,c){return c.type="bar",new a(b,c)}}},{}],9:[function(a,b,c){"use strict";b.exports=function(a){a.Bubble=function(b,c){return c.type="bubble",new a(b,c)}}},{}],10:[function(a,b,c){"use strict";b.exports=function(a){a.Doughnut=function(b,c){return c.type="doughnut",new a(b,c)}}},{}],11:[function(a,b,c){"use strict";b.exports=function(a){a.Line=function(b,c){return c.type="line",new a(b,c)}}},{}],12:[function(a,b,c){"use strict";b.exports=function(a){a.PolarArea=function(b,c){return c.type="polarArea",new a(b,c)}}},{}],13:[function(a,b,c){"use strict";b.exports=function(a){a.Radar=function(b,c){return c.options=a.helpers.configMerge({aspectRatio:1},c.options),c.type="radar",new a(b,c)}}},{}],14:[function(a,b,c){"use strict";b.exports=function(a){var b={hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-1"}],yAxes:[{type:"linear",position:"left",id:"y-axis-1"}]},tooltips:{callbacks:{title:function(){return""},label:function(a){return"("+a.xLabel+", "+a.yLabel+")"}}}};a.defaults.scatter=b,a.controllers.scatter=a.controllers.line,a.Scatter=function(b,c){return c.type="scatter",new a(b,c)}}},{}],15:[function(a,b,c){"use strict";b.exports=function(a){var b=a.helpers;a.defaults.bar={hover:{mode:"label"},scales:{xAxes:[{type:"category",categoryPercentage:.8,barPercentage:.9,gridLines:{offsetGridLines:!0}}],yAxes:[{type:"linear"}]}},a.controllers.bar=a.DatasetController.extend({dataElementType:a.elements.Rectangle,initialize:function(b,c){a.DatasetController.prototype.initialize.call(this,b,c),this.getMeta().bar=!0},getBarCount:function(){var a=this,c=0;return b.each(a.chart.data.datasets,function(b,d){var e=a.chart.getDatasetMeta(d);e.bar&&a.chart.isDatasetVisible(d)&&++c},a),c},update:function(a){var c=this;b.each(c.getMeta().data,function(b,d){c.updateElement(b,d,a)},c)},updateElement:function(a,c,d){var e=this,f=e.getMeta(),g=e.getScaleForId(f.xAxisID),h=e.getScaleForId(f.yAxisID),i=h.getBasePixel(),j=e.chart.options.elements.rectangle,k=a.custom||{},l=e.getDataset();b.extend(a,{_xScale:g,_yScale:h,_datasetIndex:e.index,_index:c,_model:{x:e.calculateBarX(c,e.index),y:d?i:e.calculateBarY(c,e.index),label:e.chart.data.labels[c],datasetLabel:l.label,base:d?i:e.calculateBarBase(e.index,c),width:e.calculateBarWidth(c),backgroundColor:k.backgroundColor?k.backgroundColor:b.getValueAtIndexOrDefault(l.backgroundColor,c,j.backgroundColor),borderSkipped:k.borderSkipped?k.borderSkipped:j.borderSkipped,borderColor:k.borderColor?k.borderColor:b.getValueAtIndexOrDefault(l.borderColor,c,j.borderColor),borderWidth:k.borderWidth?k.borderWidth:b.getValueAtIndexOrDefault(l.borderWidth,c,j.borderWidth)}}),a.pivot()},calculateBarBase:function(a,b){var c=this,d=c.getMeta(),e=c.getScaleForId(d.yAxisID),f=0;if(e.options.stacked){for(var g=c.chart,h=g.data.datasets,i=Number(h[a].data[b]),j=0;j0&&(a[0].yLabel?c=a[0].yLabel:b.labels.length>0&&a[0].index=c.y-c.height/2&&b<=c.y+c.height/2&&a>=c.x&&a<=c.base:b>=c.y-c.height/2&&b<=c.y+c.height/2&&a>=c.base&&a<=c.x),d}}),a.pivot()},calculateBarBase:function(a,b){var c=this,d=c.getMeta(),e=c.getScaleForId(d.xAxisID),f=0;if(e.options.stacked){for(var g=c.chart,h=g.data.datasets,i=Number(h[a].data[b]),j=0;j');var c=a.data,d=c.datasets,e=c.labels;if(d.length)for(var f=0;f'),e[f]&&b.push(e[f]),b.push("");return b.push("
"),b.join("")},legend:{labels:{generateLabels:function(a){var c=a.data;return c.labels.length&&c.datasets.length?c.labels.map(function(d,e){var f=a.getDatasetMeta(0),g=c.datasets[0],h=f.data[e],i=h&&h.custom||{},j=b.getValueAtIndexOrDefault,k=a.options.elements.arc,l=i.backgroundColor?i.backgroundColor:j(g.backgroundColor,e,k.backgroundColor),m=i.borderColor?i.borderColor:j(g.borderColor,e,k.borderColor),n=i.borderWidth?i.borderWidth:j(g.borderWidth,e,k.borderWidth);return{text:d,fillStyle:l,strokeStyle:m,lineWidth:n,hidden:isNaN(g.data[e])||f.data[e].hidden,index:e}}):[]}},onClick:function(a,b){var e,f,g,c=b.index,d=this.chart;for(e=0,f=(d.data.datasets||[]).length;e=Math.PI?-1:o<-Math.PI?1:0);var p=o+n,q={x:Math.cos(o),y:Math.sin(o)},r={x:Math.cos(p),y:Math.sin(p)},s=o<=0&&0<=p||o<=2*Math.PI&&2*Math.PI<=p,t=o<=.5*Math.PI&&.5*Math.PI<=p||o<=2.5*Math.PI&&2.5*Math.PI<=p,u=o<=-Math.PI&&-Math.PI<=p||o<=Math.PI&&Math.PI<=p,v=o<=.5*-Math.PI&&.5*-Math.PI<=p||o<=1.5*Math.PI&&1.5*Math.PI<=p,w=m/100,x={x:u?-1:Math.min(q.x*(q.x<0?1:w),r.x*(r.x<0?1:w)),y:v?-1:Math.min(q.y*(q.y<0?1:w),r.y*(r.y<0?1:w))},y={x:s?1:Math.max(q.x*(q.x>0?1:w),r.x*(r.x>0?1:w)),y:t?1:Math.max(q.y*(q.y>0?1:w),r.y*(r.y>0?1:w))},z={width:.5*(y.x-x.x),height:.5*(y.y-x.y)};j=Math.min(h/z.width,i/z.height),k={x:(y.x+x.x)*-.5,y:(y.y+x.y)*-.5}}d.borderWidth=c.getMaxBorderWidth(l.data),d.outerRadius=Math.max((j-d.borderWidth)/2,0),d.innerRadius=Math.max(m?d.outerRadius/100*m:1,0),d.radiusLength=(d.outerRadius-d.innerRadius)/d.getVisibleDatasetCount(),d.offsetX=k.x*d.outerRadius,d.offsetY=k.y*d.outerRadius,l.total=c.calculateTotal(),c.outerRadius=d.outerRadius-d.radiusLength*c.getRingIndex(c.index),c.innerRadius=c.outerRadius-d.radiusLength,b.each(l.data,function(b,d){c.updateElement(b,d,a)})},updateElement:function(a,c,d){var e=this,f=e.chart,g=f.chartArea,h=f.options,i=h.animation,j=(g.left+g.right)/2,k=(g.top+g.bottom)/2,l=h.rotation,m=h.rotation,n=e.getDataset(),o=d&&i.animateRotate?0:a.hidden?0:e.calculateCircumference(n.data[c])*(h.circumference/(2*Math.PI)),p=d&&i.animateScale?0:e.innerRadius,q=d&&i.animateScale?0:e.outerRadius,r=b.getValueAtIndexOrDefault;b.extend(a,{_datasetIndex:e.index,_index:c,_model:{x:j+f.offsetX,y:k+f.offsetY,startAngle:l,endAngle:m,circumference:o,outerRadius:q,innerRadius:p,label:r(n.label,c,f.data.labels[c])}});var s=a._model;this.removeHoverStyle(a),d&&i.animateRotate||(0===c?s.startAngle=h.rotation:s.startAngle=e.getMeta().data[c-1]._model.endAngle,s.endAngle=s.startAngle+s.circumference),a.pivot()},removeHoverStyle:function(b){a.DatasetController.prototype.removeHoverStyle.call(this,b,this.chart.options.elements.arc)},calculateTotal:function(){var e,a=this.getDataset(),c=this.getMeta(),d=0;return b.each(c.data,function(b,c){e=a.data[c],isNaN(e)||b.hidden||(d+=Math.abs(e))}),d},calculateCircumference:function(a){var b=this.getMeta().total;return b>0&&!isNaN(a)?2*Math.PI*(a/b):0},getMaxBorderWidth:function(a){for(var e,f,b=0,c=this.index,d=a.length,g=0;gb?e:b,b=f>b?f:b;return b}})}},{}],18:[function(a,b,c){"use strict";b.exports=function(a){function c(a,c){return b.getValueOrDefault(a.showLine,c.showLines)}var b=a.helpers;a.defaults.line={showLines:!0,spanGaps:!1,hover:{mode:"label"},scales:{xAxes:[{type:"category",id:"x-axis-0"}],yAxes:[{type:"linear",id:"y-axis-0"}]}},a.controllers.line=a.DatasetController.extend({datasetElementType:a.elements.Line,dataElementType:a.elements.Point,addElementAndReset:function(b){var d=this,e=d.chart.options,f=d.getMeta();a.DatasetController.prototype.addElementAndReset.call(d,b),c(d.getDataset(),e)&&0!==f.dataset._model.tension&&d.updateBezierControlPoints()},update:function(a){var k,l,m,d=this,e=d.getMeta(),f=e.dataset,g=e.data||[],h=d.chart.options,i=h.elements.line,j=d.getScaleForId(e.yAxisID),n=d.getDataset(),o=c(n,h);for(o&&(m=f.custom||{},void 0!==n.tension&&void 0===n.lineTension&&(n.lineTension=n.tension),f._scale=j,f._datasetIndex=d.index,f._children=g,f._model={spanGaps:n.spanGaps?n.spanGaps:h.spanGaps,tension:m.tension?m.tension:b.getValueOrDefault(n.lineTension,i.tension),backgroundColor:m.backgroundColor?m.backgroundColor:n.backgroundColor||i.backgroundColor,borderWidth:m.borderWidth?m.borderWidth:n.borderWidth||i.borderWidth,borderColor:m.borderColor?m.borderColor:n.borderColor||i.borderColor,borderCapStyle:m.borderCapStyle?m.borderCapStyle:n.borderCapStyle||i.borderCapStyle,borderDash:m.borderDash?m.borderDash:n.borderDash||i.borderDash,borderDashOffset:m.borderDashOffset?m.borderDashOffset:n.borderDashOffset||i.borderDashOffset,borderJoinStyle:m.borderJoinStyle?m.borderJoinStyle:n.borderJoinStyle||i.borderJoinStyle,fill:m.fill?m.fill:void 0!==n.fill?n.fill:i.fill,steppedLine:m.steppedLine?m.steppedLine:b.getValueOrDefault(n.steppedLine,i.stepped),scaleTop:j.top,scaleBottom:j.bottom,scaleZero:j.getBasePixel()},f.pivot()),k=0,l=g.length;k');var c=a.data,d=c.datasets,e=c.labels;if(d.length)for(var f=0;f'),e[f]&&b.push(e[f]),b.push("");return b.push(""),b.join("")},legend:{labels:{generateLabels:function(a){var c=a.data;return c.labels.length&&c.datasets.length?c.labels.map(function(d,e){var f=a.getDatasetMeta(0),g=c.datasets[0],h=f.data[e],i=h.custom||{},j=b.getValueAtIndexOrDefault,k=a.options.elements.arc,l=i.backgroundColor?i.backgroundColor:j(g.backgroundColor,e,k.backgroundColor),m=i.borderColor?i.borderColor:j(g.borderColor,e,k.borderColor),n=i.borderWidth?i.borderWidth:j(g.borderWidth,e,k.borderWidth);return{text:d,fillStyle:l,strokeStyle:m,lineWidth:n,hidden:isNaN(g.data[e])||f.data[e].hidden,index:e}}):[]}},onClick:function(a,b){var e,f,g,c=b.index,d=this.chart;for(e=0,f=(d.data.datasets||[]).length;e0&&!isNaN(a)?2*Math.PI/b:0}})}},{}],20:[function(a,b,c){"use strict";b.exports=function(a){var b=a.helpers;a.defaults.radar={scale:{type:"radialLinear"},elements:{line:{tension:0}}},a.controllers.radar=a.DatasetController.extend({datasetElementType:a.elements.Line,dataElementType:a.elements.Point,linkScales:b.noop,addElementAndReset:function(b){a.DatasetController.prototype.addElementAndReset.call(this,b),this.updateBezierControlPoints()},update:function(a){var c=this,d=c.getMeta(),e=d.dataset,f=d.data,g=e.custom||{},h=c.getDataset(),i=c.chart.options.elements.line,j=c.chart.scale;void 0!==h.tension&&void 0===h.lineTension&&(h.lineTension=h.tension),b.extend(d.dataset,{_datasetIndex:c.index,_children:f,_loop:!0,_model:{tension:g.tension?g.tension:b.getValueOrDefault(h.lineTension,i.tension),backgroundColor:g.backgroundColor?g.backgroundColor:h.backgroundColor||i.backgroundColor,borderWidth:g.borderWidth?g.borderWidth:h.borderWidth||i.borderWidth,borderColor:g.borderColor?g.borderColor:h.borderColor||i.borderColor,fill:g.fill?g.fill:void 0!==h.fill?h.fill:i.fill,borderCapStyle:g.borderCapStyle?g.borderCapStyle:h.borderCapStyle||i.borderCapStyle,borderDash:g.borderDash?g.borderDash:h.borderDash||i.borderDash,borderDashOffset:g.borderDashOffset?g.borderDashOffset:h.borderDashOffset||i.borderDashOffset,borderJoinStyle:g.borderJoinStyle?g.borderJoinStyle:h.borderJoinStyle||i.borderJoinStyle,scaleTop:j.top,scaleBottom:j.bottom,scaleZero:j.getBasePosition()}}),d.dataset.pivot(),b.each(f,function(b,d){c.updateElement(b,d,a)},c),c.updateBezierControlPoints()},updateElement:function(a,c,d){var e=this,f=a.custom||{},g=e.getDataset(),h=e.chart.scale,i=e.chart.options.elements.point,j=h.getPointPositionForValue(c,g.data[c]);b.extend(a,{_datasetIndex:e.index,_index:c,_scale:h,_model:{x:d?h.xCenter:j.x,y:d?h.yCenter:j.y,tension:f.tension?f.tension:b.getValueOrDefault(g.tension,e.chart.options.elements.line.tension),radius:f.radius?f.radius:b.getValueAtIndexOrDefault(g.pointRadius,c,i.radius),backgroundColor:f.backgroundColor?f.backgroundColor:b.getValueAtIndexOrDefault(g.pointBackgroundColor,c,i.backgroundColor),borderColor:f.borderColor?f.borderColor:b.getValueAtIndexOrDefault(g.pointBorderColor,c,i.borderColor),borderWidth:f.borderWidth?f.borderWidth:b.getValueAtIndexOrDefault(g.pointBorderWidth,c,i.borderWidth),pointStyle:f.pointStyle?f.pointStyle:b.getValueAtIndexOrDefault(g.pointStyle,c,i.pointStyle),hitRadius:f.hitRadius?f.hitRadius:b.getValueAtIndexOrDefault(g.hitRadius,c,i.hitRadius)}}),a._model.skip=f.skip?f.skip:isNaN(a._model.x)||isNaN(a._model.y)},updateBezierControlPoints:function(){var a=this.chart.chartArea,c=this.getMeta();b.each(c.data,function(d,e){var f=d._model,g=b.splineCurve(b.previousItem(c.data,e,!0)._model,f,b.nextItem(c.data,e,!0)._model,f.tension);f.controlPointPreviousX=Math.max(Math.min(g.previous.x,a.right),a.left),f.controlPointPreviousY=Math.max(Math.min(g.previous.y,a.bottom),a.top),f.controlPointNextX=Math.max(Math.min(g.next.x,a.right),a.left),f.controlPointNextY=Math.max(Math.min(g.next.y,a.bottom),a.top),d.pivot()})},draw:function(a){var c=this.getMeta(),d=a||1;b.each(c.data,function(a){a.transition(d)}),c.dataset.transition(d).draw(),b.each(c.data,function(a){a.draw()})},setHoverStyle:function(a){var c=this.chart.data.datasets[a._datasetIndex],d=a.custom||{},e=a._index,f=a._model;f.radius=d.hoverRadius?d.hoverRadius:b.getValueAtIndexOrDefault(c.pointHoverRadius,e,this.chart.options.elements.point.hoverRadius),f.backgroundColor=d.hoverBackgroundColor?d.hoverBackgroundColor:b.getValueAtIndexOrDefault(c.pointHoverBackgroundColor,e,b.getHoverColor(f.backgroundColor)),f.borderColor=d.hoverBorderColor?d.hoverBorderColor:b.getValueAtIndexOrDefault(c.pointHoverBorderColor,e,b.getHoverColor(f.borderColor)),f.borderWidth=d.hoverBorderWidth?d.hoverBorderWidth:b.getValueAtIndexOrDefault(c.pointHoverBorderWidth,e,f.borderWidth)},removeHoverStyle:function(a){var c=this.chart.data.datasets[a._datasetIndex],d=a.custom||{},e=a._index,f=a._model,g=this.chart.options.elements.point;f.radius=d.radius?d.radius:b.getValueAtIndexOrDefault(c.radius,e,g.radius),f.backgroundColor=d.backgroundColor?d.backgroundColor:b.getValueAtIndexOrDefault(c.pointBackgroundColor,e,g.backgroundColor),f.borderColor=d.borderColor?d.borderColor:b.getValueAtIndexOrDefault(c.pointBorderColor,e,g.borderColor),f.borderWidth=d.borderWidth?d.borderWidth:b.getValueAtIndexOrDefault(c.pointBorderWidth,e,g.borderWidth)}})}},{}],21:[function(a,b,c){"use strict";b.exports=function(a){var b=a.helpers;a.defaults.global.animation={duration:1e3,easing:"easeOutQuart",onProgress:b.noop,onComplete:b.noop},a.Animation=a.Element.extend({currentStep:null,numSteps:60,easing:"",render:null,onAnimationProgress:null,onAnimationComplete:null}),a.animationService={frameDuration:17,animations:[],dropFrames:0,request:null,addAnimation:function(a,b,c,d){var e=this;d||(a.animating=!0);for(var f=0;f1&&(c=Math.floor(a.dropFrames),a.dropFrames=a.dropFrames%1);for(var d=0;da.animations[d].animationObject.numSteps&&(a.animations[d].animationObject.currentStep=a.animations[d].animationObject.numSteps),a.animations[d].animationObject.render(a.animations[d].chartInstance,a.animations[d].animationObject),a.animations[d].animationObject.onAnimationProgress&&a.animations[d].animationObject.onAnimationProgress.call&&a.animations[d].animationObject.onAnimationProgress.call(a.animations[d].chartInstance,a.animations[d]),a.animations[d].animationObject.currentStep===a.animations[d].animationObject.numSteps?(a.animations[d].animationObject.onAnimationComplete&&a.animations[d].animationObject.onAnimationComplete.call&&a.animations[d].animationObject.onAnimationComplete.call(a.animations[d].chartInstance,a.animations[d]),a.animations[d].chartInstance.animating=!1,a.animations.splice(d,1)):++d;var e=Date.now(),f=(e-b)/a.frameDuration;a.dropFrames+=f,a.animations.length>0&&a.requestAnimationFrame()}}}},{}],22:[function(a,b,c){"use strict";b.exports=function(a){var b=a.canvasHelpers={};b.drawPoint=function(a,b,c,d,e){var f,g,h,i,j,k;if("object"==typeof b&&(f=b.toString(),"[object HTMLImageElement]"===f||"[object HTMLCanvasElement]"===f))return void a.drawImage(b,d-b.width/2,e-b.height/2);if(!(isNaN(c)||c<=0)){switch(b){default:a.beginPath(),a.arc(d,e,c,0,2*Math.PI),a.closePath(),a.fill();break;case"triangle":a.beginPath(),g=3*c/Math.sqrt(3),j=g*Math.sqrt(3)/2,a.moveTo(d-g/2,e+j/3),a.lineTo(d+g/2,e+j/3),a.lineTo(d,e-2*j/3),a.closePath(),a.fill();break;case"rect":k=1/Math.SQRT2*c,a.beginPath(),a.fillRect(d-k,e-k,2*k,2*k),a.strokeRect(d-k,e-k,2*k,2*k);break;case"rectRot":k=1/Math.SQRT2*c,a.beginPath(),a.moveTo(d-k,e),a.lineTo(d,e+k),a.lineTo(d+k,e),a.lineTo(d,e-k),a.closePath(),a.fill();break;case"cross":a.beginPath(),a.moveTo(d,e+c),a.lineTo(d,e-c),a.moveTo(d-c,e),a.lineTo(d+c,e),a.closePath();break;case"crossRot":a.beginPath(),h=Math.cos(Math.PI/4)*c,i=Math.sin(Math.PI/4)*c,a.moveTo(d-h,e-i),a.lineTo(d+h,e+i),a.moveTo(d-h,e+i),a.lineTo(d+h,e-i),a.closePath();break;case"star":a.beginPath(),a.moveTo(d,e+c),a.lineTo(d,e-c),a.moveTo(d-c,e),a.lineTo(d+c,e),h=Math.cos(Math.PI/4)*c,i=Math.sin(Math.PI/4)*c,a.moveTo(d-h,e-i),a.lineTo(d+h,e+i),a.moveTo(d-h,e+i),a.lineTo(d+h,e-i),a.closePath();break;case"line":a.beginPath(),a.moveTo(d-c,e),a.lineTo(d+c,e),a.closePath();break;case"dash":a.beginPath(),a.moveTo(d,e),a.lineTo(d+c,e),a.closePath()}a.stroke()}}}},{}],23:[function(a,b,c){"use strict";b.exports=function(a){var b=a.helpers;a.types={},a.instances={},a.controllers={},a.Controller=function(c){return this.chart=c,this.config=c.config,this.options=this.config.options=b.configMerge(a.defaults.global,a.defaults[this.config.type],this.config.options||{}),this.id=b.uid(),Object.defineProperty(this,"data",{get:function(){return this.config.data}}),a.instances[this.id]=this,this.options.responsive&&this.resize(!0),this.initialize(),this},b.extend(a.Controller.prototype,{initialize:function(){var b=this;return a.plugins.notify("beforeInit",[b]),b.bindEvents(),b.ensureScalesHaveIDs(),b.buildOrUpdateControllers(),b.buildScales(),b.updateLayout(),b.resetElements(),b.initToolTip(),b.update(),a.plugins.notify("afterInit",[b]),b},clear:function(){return b.clear(this.chart),this},stop:function(){return a.animationService.cancelAnimation(this),this},resize:function(d){var e=this,f=e.chart,g=f.canvas,h=b.getMaximumWidth(g),i=f.aspectRatio,j=e.options.maintainAspectRatio&&isNaN(i)===!1&&isFinite(i)&&0!==i?h/i:b.getMaximumHeight(g),k=f.width!==h||f.height!==j;if(!k)return e;g.width=f.width=h,g.height=f.height=j,b.retinaScale(f);var l={width:h,height:j};return a.plugins.notify("resize",[e,l]),e.options.onResize&&e.options.onResize(e,l),d||(e.stop(),e.update(e.options.responsiveAnimationDuration)),e},ensureScalesHaveIDs:function(){var a=this.options,c=a.scales||{},d=a.scale;b.each(c.xAxes,function(a,b){a.id=a.id||"x-axis-"+b}),b.each(c.yAxes,function(a,b){a.id=a.id||"y-axis-"+b}),d&&(d.id=d.id||"scale")},buildScales:function(){var c=this,d=c.options,e=c.scales={},f=[];d.scales&&(f=f.concat((d.scales.xAxes||[]).map(function(a){return{options:a,dtype:"category"}}),(d.scales.yAxes||[]).map(function(a){return{options:a,dtype:"linear"}}))),d.scale&&f.push({options:d.scale,dtype:"radialLinear",isDefault:!0}),b.each(f,function(d){var f=d.options,g=b.getValueOrDefault(f.type,d.dtype),h=a.scaleService.getScaleConstructor(g);if(h){var i=new h({id:f.id,options:f,ctx:c.chart.ctx,chart:c});e[i.id]=i,d.isDefault&&(c.scale=i)}}),a.scaleService.addScalesToLayout(this)},updateLayout:function(){a.layoutService.update(this,this.chart.width,this.chart.height)},buildOrUpdateControllers:function(){var c=this,d=[],e=[];if(b.each(c.data.datasets,function(b,f){var g=c.getDatasetMeta(f);g.type||(g.type=b.type||c.config.type),d.push(g.type),g.controller?g.controller.updateIndex(f):(g.controller=new a.controllers[g.type](c,f),e.push(g.controller))},c),d.length>1)for(var f=1;f0&&(b=this.getDatasetMeta(b[0]._datasetIndex).data),b},getDatasetMeta:function(a){var b=this,c=b.data.datasets[a];c._meta||(c._meta={});var d=c._meta[b.id];return d||(d=c._meta[b.id]={type:null,data:[],dataset:null,controller:null,hidden:null,xAxisID:null,yAxisID:null}),d},getVisibleDatasetCount:function(){for(var a=0,b=0,c=this.data.datasets.length;bd)for(var e=d;e=0;f--)c.call(d,a[f],f);else for(f=0;f=e[d].length||!e[d][f].type?e[d].push(b.configMerge(h,c)):c.type&&c.type!==e[d][f].type?e[d][f]=b.configMerge(e[d][f],h,c):e[d][f]=b.configMerge(e[d][f],c)}):(e[d]=[],b.each(c,function(c){var f=b.getValueOrDefault(c.type,"xAxes"===d?"category":"linear");e[d].push(b.configMerge(a.scaleService.getScaleDefaults(f),c))})):e.hasOwnProperty(d)&&"object"==typeof e[d]&&null!==e[d]&&"object"==typeof c?e[d]=b.configMerge(e[d],c):e[d]=c}),e},b.getValueAtIndexOrDefault=function(a,c,d){return void 0===a||null===a?d:b.isArray(a)?c=0;d--){var e=a[d];if(b(e))return e}},b.inherits=function(a){var c=this,d=a&&a.hasOwnProperty("constructor")?a.constructor:function(){return c.apply(this,arguments)},e=function(){this.constructor=d};return e.prototype=c.prototype,d.prototype=new e,d.extend=b.inherits,a&&b.extend(d.prototype,a),d.__super__=c.prototype,d},b.noop=function(){},b.uid=function(){var a=0;return function(){return a++}}(),b.isNumber=function(a){return!isNaN(parseFloat(a))&&isFinite(a)},b.almostEquals=function(a,b,c){return Math.abs(a-b)0?1:-1},b.log10=Math.log10?function(a){return Math.log10(a)}:function(a){return Math.log(a)/Math.LN10},b.toRadians=function(a){return a*(Math.PI/180)},b.toDegrees=function(a){return a*(180/Math.PI)},b.getAngleFromPoint=function(a,b){var c=b.x-a.x,d=b.y-a.y,e=Math.sqrt(c*c+d*d),f=Math.atan2(d,c);return f<-.5*Math.PI&&(f+=2*Math.PI),{angle:f,distance:e}},b.aliasPixel=function(a){return a%2===0?0:.5},b.splineCurve=function(a,b,c,d){var e=a.skip?b:a,f=b,g=c.skip?b:c,h=Math.sqrt(Math.pow(f.x-e.x,2)+Math.pow(f.y-e.y,2)),i=Math.sqrt(Math.pow(g.x-f.x,2)+Math.pow(g.y-f.y,2)),j=h/(h+i),k=i/(h+i);j=isNaN(j)?0:j,k=isNaN(k)?0:k;var l=d*j,m=d*k;return{previous:{x:f.x-l*(g.x-e.x),y:f.y-l*(g.y-e.y)},next:{x:f.x+m*(g.x-e.x),y:f.y+m*(g.y-e.y)}}},b.nextItem=function(a,b,c){return c?b>=a.length-1?a[0]:a[b+1]:b>=a.length-1?a[a.length-1]:a[b+1]},b.previousItem=function(a,b,c){return c?b<=0?a[a.length-1]:a[b-1]:b<=0?a[0]:a[b-1]},b.niceNum=function(a,c){var f,d=Math.floor(b.log10(a)),e=a/Math.pow(10,d);return f=c?e<1.5?1:e<3?2:e<7?5:10:e<=1?1:e<=2?2:e<=5?5:10,f*Math.pow(10,d)};var c=b.easingEffects={linear:function(a){return a},easeInQuad:function(a){return a*a},easeOutQuad:function(a){return-1*a*(a-2)},easeInOutQuad:function(a){return(a/=.5)<1?.5*a*a:-.5*(--a*(a-2)-1)},easeInCubic:function(a){return a*a*a},easeOutCubic:function(a){return 1*((a=a/1-1)*a*a+1)},easeInOutCubic:function(a){return(a/=.5)<1?.5*a*a*a:.5*((a-=2)*a*a+2)},easeInQuart:function(a){return a*a*a*a},easeOutQuart:function(a){return-1*((a=a/1-1)*a*a*a-1)},easeInOutQuart:function(a){return(a/=.5)<1?.5*a*a*a*a:-.5*((a-=2)*a*a*a-2)},easeInQuint:function(a){return 1*(a/=1)*a*a*a*a},easeOutQuint:function(a){return 1*((a=a/1-1)*a*a*a*a+1)},easeInOutQuint:function(a){return(a/=.5)<1?.5*a*a*a*a*a:.5*((a-=2)*a*a*a*a+2)},easeInSine:function(a){return-1*Math.cos(a/1*(Math.PI/2))+1},easeOutSine:function(a){return 1*Math.sin(a/1*(Math.PI/2))},easeInOutSine:function(a){return-.5*(Math.cos(Math.PI*a/1)-1)},easeInExpo:function(a){return 0===a?1:1*Math.pow(2,10*(a/1-1))},easeOutExpo:function(a){return 1===a?1:1*(-Math.pow(2,-10*a/1)+1)},easeInOutExpo:function(a){return 0===a?0:1===a?1:(a/=.5)<1?.5*Math.pow(2,10*(a-1)):.5*(-Math.pow(2,-10*--a)+2)},easeInCirc:function(a){return a>=1?a:-1*(Math.sqrt(1-(a/=1)*a)-1)},easeOutCirc:function(a){return 1*Math.sqrt(1-(a=a/1-1)*a)},easeInOutCirc:function(a){return(a/=.5)<1?-.5*(Math.sqrt(1-a*a)-1):.5*(Math.sqrt(1-(a-=2)*a)+1)},easeInElastic:function(a){var b=1.70158,c=0,d=1;return 0===a?0:1===(a/=1)?1:(c||(c=.3),d0?(d=i[0].clientX,e=i[0].clientY):(d=f.clientX,e=f.clientY);var j=parseFloat(b.getStyle(g,"padding-left")),k=parseFloat(b.getStyle(g,"padding-top")),l=parseFloat(b.getStyle(g,"padding-right")),m=parseFloat(b.getStyle(g,"padding-bottom")),n=h.right-h.left-j-l,o=h.bottom-h.top-k-m;return d=Math.round((d-h.left-j)/n*g.width/c.currentDevicePixelRatio),e=Math.round((e-h.top-k)/o*g.height/c.currentDevicePixelRatio),{x:d,y:e}},b.addEvent=function(a,b,c){a.addEventListener?a.addEventListener(b,c):a.attachEvent?a.attachEvent("on"+b,c):a["on"+b]=c},b.removeEvent=function(a,c,d){a.removeEventListener?a.removeEventListener(c,d,!1):a.detachEvent?a.detachEvent("on"+c,d):a["on"+c]=b.noop},b.bindEvents=function(a,c,d){var e=a.events=a.events||{};b.each(c,function(c){e[c]=function(){d.apply(a,arguments)},b.addEvent(a.chart.canvas,c,e[c])})},b.unbindEvents=function(a,c){var d=a.chart.canvas;b.each(c,function(a,c){b.removeEvent(d,c,a)})},b.getConstraintWidth=function(a){return g(a,"max-width","clientWidth")},b.getConstraintHeight=function(a){return g(a,"max-height","clientHeight")},b.getMaximumWidth=function(a){var c=a.parentNode,d=parseInt(b.getStyle(c,"padding-left"))+parseInt(b.getStyle(c,"padding-right")),e=c.clientWidth-d,f=b.getConstraintWidth(a);return isNaN(f)?e:Math.min(e,f)},b.getMaximumHeight=function(a){var c=a.parentNode,d=parseInt(b.getStyle(c,"padding-top"))+parseInt(b.getStyle(c,"padding-bottom")),e=c.clientHeight-d,f=b.getConstraintHeight(a);return isNaN(f)?e:Math.min(e,f)},b.getStyle=function(a,b){return a.currentStyle?a.currentStyle[b]:document.defaultView.getComputedStyle(a,null).getPropertyValue(b)},b.retinaScale=function(a){var b=a.ctx,c=a.canvas,d=c.width,e=c.height,f=a.currentDevicePixelRatio=window.devicePixelRatio||1;1!==f&&(c.height=e*f,c.width=d*f,b.scale(f,f),a.originalDevicePixelRatio=a.originalDevicePixelRatio||f),c.style.width=d+"px", +c.style.height=e+"px"},b.clear=function(a){a.ctx.clearRect(0,0,a.width,a.height)},b.fontString=function(a,b,c){return b+" "+a+"px "+c},b.longestText=function(a,c,d,e){e=e||{};var f=e.data=e.data||{},g=e.garbageCollect=e.garbageCollect||[];e.font!==c&&(f=e.data={},g=e.garbageCollect=[],e.font=c),a.font=c;var h=0;b.each(d,function(c){void 0!==c&&null!==c&&b.isArray(c)!==!0?h=b.measureText(a,f,g,h,c):b.isArray(c)&&b.each(c,function(c){void 0===c||null===c||b.isArray(c)||(h=b.measureText(a,f,g,h,c))})});var i=g.length/2;if(i>d.length){for(var j=0;jd&&(d=f),d},b.numberOfLabelLines=function(a){var c=1;return b.each(a,function(a){b.isArray(a)&&a.length>c&&(c=a.length)}),c},b.drawRoundedRectangle=function(a,b,c,d,e,f){a.beginPath(),a.moveTo(b+f,c),a.lineTo(b+d-f,c),a.quadraticCurveTo(b+d,c,b+d,c+f),a.lineTo(b+d,c+e-f),a.quadraticCurveTo(b+d,c+e,b+d-f,c+e),a.lineTo(b+f,c+e),a.quadraticCurveTo(b,c+e,b,c+e-f),a.lineTo(b,c+f),a.quadraticCurveTo(b,c,b+f,c),a.closePath()},b.color=function(b){return d?d(b instanceof CanvasGradient?a.defaults.global.defaultColor:b):(console.log("Color.js not found!"),b)},b.addResizeListener=function(a,b){var c=document.createElement("iframe"),d="chartjs-hidden-iframe";c.classlist?c.classlist.add(d):c.setAttribute("class",d);var e=c.style;e.width="100%",e.display="block",e.border=0,e.height=0,e.margin=0,e.position="absolute",e.left=0,e.right=0,e.top=0,e.bottom=0,a.insertBefore(c,a.firstChild),(c.contentWindow||c).onresize=function(){b&&b()}},b.removeResizeListener=function(a){var b=a.querySelector(".chartjs-hidden-iframe");b&&b.parentNode.removeChild(b)},b.isArray=Array.isArray?function(a){return Array.isArray(a)}:function(a){return"[object Array]"===Object.prototype.toString.call(a)},b.arrayEquals=function(a,c){var d,e,f,g;if(!a||!c||a.length!=c.length)return!1;for(d=0,e=a.length;d');for(var c=0;c'),a.data.datasets[c].label&&b.push(a.data.datasets[c].label),b.push("");return b.push(""),b.join("")}}},a.Chart=a,a}},{}],28:[function(a,b,c){"use strict";b.exports=function(a){var b=a.helpers;a.layoutService={defaults:{},addBox:function(a,b){a.boxes||(a.boxes=[]),a.boxes.push(b)},removeBox:function(a,b){a.boxes&&a.boxes.splice(a.boxes.indexOf(b),1)},update:function(a,c,d){function u(a){var b,c=a.isHorizontal();c?(b=a.update(a.options.fullWidth?l:r,q),s-=b.height):(b=a.update(p,o),r-=b.width),t.push({horizontal:c,minSize:b,box:a})}function z(a){var c=b.findNextWhere(t,function(b){return b.box===a});if(c)if(a.isHorizontal()){var d={left:v,right:w,top:0,bottom:0};a.update(a.options.fullWidth?l:r,m/2,d)}else a.update(c.minSize.width,s)}function A(a){var c=b.findNextWhere(t,function(b){return b.box===a}),d={left:0,right:0,top:x,bottom:y};c&&a.update(c.minSize.width,s,d)}function F(a){a.isHorizontal()?(a.left=a.options.fullWidth?e:v,a.right=a.options.fullWidth?c-e:v+r,a.top=E,a.bottom=E+a.height,E=a.bottom):(a.left=D,a.right=D+a.width,a.top=x,a.bottom=x+s,D=a.right)}if(a){var e=0,f=0,g=b.where(a.boxes,function(a){return"left"===a.options.position}),h=b.where(a.boxes,function(a){return"right"===a.options.position}),i=b.where(a.boxes,function(a){return"top"===a.options.position}),j=b.where(a.boxes,function(a){return"bottom"===a.options.position}),k=b.where(a.boxes,function(a){return"chartArea"===a.options.position});i.sort(function(a,b){return(b.options.fullWidth?1:0)-(a.options.fullWidth?1:0)}),j.sort(function(a,b){return(a.options.fullWidth?1:0)-(b.options.fullWidth?1:0)});var l=c-2*e,m=d-2*f,n=l/2,o=m/2,p=(c-n)/(g.length+h.length),q=(d-o)/(i.length+j.length),r=l,s=m,t=[];b.each(g.concat(h,i,j),u);var v=e,w=e,x=f,y=f;b.each(g.concat(h),z),b.each(g,function(a){v+=a.width}),b.each(h,function(a){w+=a.width}),b.each(i.concat(j),z),b.each(i,function(a){x+=a.height}),b.each(j,function(a){y+=a.height}),b.each(g.concat(h),A),v=e,w=e,x=f,y=f,b.each(g,function(a){v+=a.width}),b.each(h,function(a){w+=a.width}),b.each(i,function(a){x+=a.height}),b.each(j,function(a){y+=a.height});var B=d-x-y,C=c-v-w;C===r&&B===s||(b.each(g,function(a){a.height=B}),b.each(h,function(a){a.height=B}),b.each(i,function(a){a.options.fullWidth||(a.width=C)}),b.each(j,function(a){a.options.fullWidth||(a.width=C)}),s=B,r=C);var D=e,E=f;b.each(g.concat(i),F),D+=r,E+=s,b.each(h,F),b.each(j,F),a.chartArea={left:v,top:x,right:v+r,bottom:x+s},b.each(k,function(b){b.left=a.chartArea.left,b.top=a.chartArea.top,b.right=a.chartArea.right,b.bottom=a.chartArea.bottom,b.update(r,s)})}}}}},{}],29:[function(a,b,c){"use strict";b.exports=function(a){var b=a.helpers,c=b.noop;a.defaults.global.legend={display:!0,position:"top",fullWidth:!0,reverse:!1,onClick:function(a,b){var c=b.datasetIndex,d=this.chart,e=d.getDatasetMeta(c);e.hidden=null===e.hidden?!d.data.datasets[c].hidden:null,d.update()},labels:{boxWidth:40,padding:10,generateLabels:function(a){var c=a.data;return b.isArray(c.datasets)?c.datasets.map(function(c,d){return{text:c.label,fillStyle:b.isArray(c.backgroundColor)?c.backgroundColor[0]:c.backgroundColor,hidden:!a.isDatasetVisible(d),lineCap:c.borderCapStyle,lineDash:c.borderDash,lineDashOffset:c.borderDashOffset,lineJoin:c.borderJoinStyle,lineWidth:c.borderWidth,strokeStyle:c.borderColor,pointStyle:c.pointStyle,datasetIndex:d}},this):[]}}},a.Legend=a.Element.extend({initialize:function(a){b.extend(this,a),this.legendHitBoxes=[],this.doughnutMode=!1},beforeUpdate:c,update:function(a,b,c){var d=this;return d.beforeUpdate(),d.maxWidth=a,d.maxHeight=b,d.margins=c,d.beforeSetDimensions(),d.setDimensions(),d.afterSetDimensions(),d.beforeBuildLabels(),d.buildLabels(),d.afterBuildLabels(),d.beforeFit(),d.fit(),d.afterFit(),d.afterUpdate(),d.minSize},afterUpdate:c,beforeSetDimensions:c,setDimensions:function(){var a=this;a.isHorizontal()?(a.width=a.maxWidth,a.left=0,a.right=a.width):(a.height=a.maxHeight,a.top=0,a.bottom=a.height),a.paddingLeft=0,a.paddingTop=0,a.paddingRight=0,a.paddingBottom=0,a.minSize={width:0,height:0}},afterSetDimensions:c,beforeBuildLabels:c,buildLabels:function(){var a=this;a.legendItems=a.options.labels.generateLabels.call(a,a.chart),a.options.reverse&&a.legendItems.reverse()},afterBuildLabels:c,beforeFit:c,fit:function(){var c=this,d=c.options,e=d.labels,f=d.display,g=c.ctx,h=a.defaults.global,i=b.getValueOrDefault,j=i(e.fontSize,h.defaultFontSize),k=i(e.fontStyle,h.defaultFontStyle),l=i(e.fontFamily,h.defaultFontFamily),m=b.fontString(j,k,l),n=c.legendHitBoxes=[],o=c.minSize,p=c.isHorizontal();if(p?(o.width=c.maxWidth,o.height=f?10:0):(o.width=f?10:0,o.height=c.maxHeight),f)if(g.font=m,p){var q=c.lineWidths=[0],r=c.legendItems.length?j+e.padding:0;g.textAlign="left",g.textBaseline="top",b.each(c.legendItems,function(a,b){var d=e.usePointStyle?j*Math.sqrt(2):e.boxWidth,f=d+j/2+g.measureText(a.text).width;q[q.length-1]+f+e.padding>=c.width&&(r+=j+e.padding,q[q.length]=c.left),n[b]={left:0,top:0,width:f,height:j},q[q.length-1]+=f+e.padding}),o.height+=r}else{var s=e.padding,t=c.columnWidths=[],u=e.padding,v=0,w=0,x=j+s;b.each(c.legendItems,function(a,b){var c=e.usePointStyle?2*e.boxWidth:e.boxWidth,d=c+j/2+g.measureText(a.text).width;w+x>o.height&&(u+=v+e.padding,t.push(v),v=0,w=0),v=Math.max(v,d),w+=x,n[b]={left:0,top:0,width:d,height:j}}),u+=v,t.push(v),o.width+=u}c.width=o.width,c.height=o.height},afterFit:c,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){var c=this,d=c.options,e=d.labels,f=a.defaults.global,g=f.elements.line,h=c.width,i=c.lineWidths;if(d.display){var k,j=c.ctx,l=b.getValueOrDefault,m=l(e.fontColor,f.defaultFontColor),n=l(e.fontSize,f.defaultFontSize),o=l(e.fontStyle,f.defaultFontStyle),p=l(e.fontFamily,f.defaultFontFamily),q=b.fontString(n,o,p);j.textAlign="left",j.textBaseline="top",j.lineWidth=.5,j.strokeStyle=m,j.fillStyle=m,j.font=q;var r=e.boxWidth,s=c.legendHitBoxes,t=function(b,c,e){if(!(isNaN(r)||r<=0)){if(j.save(),j.fillStyle=l(e.fillStyle,f.defaultColor),j.lineCap=l(e.lineCap,g.borderCapStyle),j.lineDashOffset=l(e.lineDashOffset,g.borderDashOffset),j.lineJoin=l(e.lineJoin,g.borderJoinStyle),j.lineWidth=l(e.lineWidth,g.borderWidth),j.strokeStyle=l(e.strokeStyle,f.defaultColor),j.setLineDash&&j.setLineDash(l(e.lineDash,g.borderDash)),d.labels&&d.labels.usePointStyle){var h=n*Math.SQRT2/2,i=h/Math.SQRT2,k=b+i,m=c+i;a.canvasHelpers.drawPoint(j,e.pointStyle,h,k,m)}else j.strokeRect(b,c,r,n),j.fillRect(b,c,r,n);j.restore()}},u=function(a,b,c,d){j.fillText(c.text,r+n/2+a,b),c.hidden&&(j.beginPath(),j.lineWidth=2,j.moveTo(r+n/2+a,b+n/2),j.lineTo(r+n/2+a+d,b+n/2),j.stroke())},v=c.isHorizontal();k=v?{x:c.left+(h-i[0])/2,y:c.top+e.padding,line:0}:{x:c.left+e.padding,y:c.top+e.padding,line:0};var w=n+e.padding;b.each(c.legendItems,function(a,b){var d=j.measureText(a.text).width,f=e.usePointStyle?n+n/2+d:r+n/2+d,g=k.x,l=k.y;v?g+f>=h&&(l=k.y+=w,k.line++,g=k.x=c.left+(h-i[k.line])/2):l+w>c.bottom&&(g=k.x=g+c.columnWidths[k.line]+e.padding,l=k.y=c.top,k.line++),t(g,l,a),s[b].left=g,s[b].top=l,u(g,l,a,d),v?k.x+=f+e.padding:k.y+=w})}},handleEvent:function(a){var c=this,d=b.getRelativePosition(a,c.chart.chart),e=d.x,f=d.y,g=c.options;if(e>=c.left&&e<=c.right&&f>=c.top&&f<=c.bottom)for(var h=c.legendHitBoxes,i=0;i=j.left&&e<=j.left+j.width&&f>=j.top&&f<=j.top+j.height){g.onClick&&g.onClick.call(c,a,c.legendItems[i]);break}}}}),a.plugins.register({beforeInit:function(b){var c=b.options,d=c.legend;d&&(b.legend=new a.Legend({ctx:b.chart.ctx,options:d,chart:b}),a.layoutService.addBox(b,b.legend))}})}},{}],30:[function(a,b,c){"use strict";b.exports=function(a){var b=a.helpers.noop;a.plugins={_plugins:[],register:function(a){var b=this._plugins;[].concat(a).forEach(function(a){b.indexOf(a)===-1&&b.push(a)})},unregister:function(a){var b=this._plugins;[].concat(a).forEach(function(a){var c=b.indexOf(a);c!==-1&&b.splice(c,1)})},clear:function(){this._plugins=[]},count:function(){return this._plugins.length},getAll:function(){return this._plugins},notify:function(a,b){var e,f,c=this._plugins,d=c.length;for(e=0;er&&c.labelRotationc.yLabelWidth&&(c.paddingLeft=m+g/2),c.paddingRight=g/2,q*n>c.maxHeight){c.labelRotation--;break}c.labelRotation++,o=p*n}}c.margins&&(c.paddingLeft=Math.max(c.paddingLeft-c.margins.left,0),c.paddingRight=Math.max(c.paddingRight-c.margins.right,0))},afterCalculateTickRotation:function(){b.callCallback(this.options.afterCalculateTickRotation,[this])},beforeFit:function(){b.callCallback(this.options.beforeFit,[this])},fit:function(){var c=this,d=c.minSize={width:0,height:0},e=c.options,f=a.defaults.global,g=e.ticks,h=e.scaleLabel,i=e.display,j=c.isHorizontal(),k=b.getValueOrDefault(g.fontSize,f.defaultFontSize),l=b.getValueOrDefault(g.fontStyle,f.defaultFontStyle),m=b.getValueOrDefault(g.fontFamily,f.defaultFontFamily),n=b.fontString(k,l,m),o=b.getValueOrDefault(h.fontSize,f.defaultFontSize),p=e.gridLines.tickMarkLength;if(j?d.width=c.isFullWidth()?c.maxWidth-c.margins.left-c.margins.right:c.maxWidth:d.width=i?p:0,j?d.height=i?p:0:d.height=c.maxHeight,h.display&&i&&(j?d.height+=1.5*o:d.width+=1.5*o),g.display&&i){c.longestTextCache||(c.longestTextCache={});var q=b.longestText(c.ctx,n,c.ticks,c.longestTextCache),r=b.numberOfLabelLines(c.ticks),s=.5*k;if(j){c.longestLabelWidth=q;var t=Math.sin(b.toRadians(c.labelRotation))*c.longestLabelWidth+k*r+s*r;d.height=Math.min(c.maxHeight,d.height+t),c.ctx.font=n;var u=c.ctx.measureText(c.ticks[0]).width,v=c.ctx.measureText(c.ticks[c.ticks.length-1]).width,w=Math.cos(b.toRadians(c.labelRotation)),x=Math.sin(b.toRadians(c.labelRotation));c.paddingLeft=0!==c.labelRotation?w*u+3:u/2+3,c.paddingRight=0!==c.labelRotation?x*(k/2)+3:v/2+3}else{var y=c.maxWidth-d.width,z=g.mirror;z?q=0:q+=c.options.ticks.padding,q0&&c>0?b:0)},draw:function(c){var d=this,e=d.options;if(e.display){var l,o,f=d.ctx,g=a.defaults.global,h=e.ticks,i=e.gridLines,j=e.scaleLabel,k=0!==d.labelRotation,m=h.autoSkip,n=d.isHorizontal();h.maxTicksLimit&&(o=h.maxTicksLimit);var p=b.getValueOrDefault(h.fontColor,g.defaultFontColor),q=b.getValueOrDefault(h.fontSize,g.defaultFontSize),r=b.getValueOrDefault(h.fontStyle,g.defaultFontStyle),s=b.getValueOrDefault(h.fontFamily,g.defaultFontFamily),t=b.fontString(q,r,s),u=i.tickMarkLength,v=b.getValueOrDefault(j.fontColor,g.defaultFontColor),w=b.getValueOrDefault(j.fontSize,g.defaultFontSize),x=b.getValueOrDefault(j.fontStyle,g.defaultFontStyle),y=b.getValueOrDefault(j.fontFamily,g.defaultFontFamily),z=b.fontString(w,x,y),A=b.toRadians(d.labelRotation),B=Math.cos(A),C=d.longestLabelWidth*B;f.fillStyle=p;var D=[];if(n){if(l=!1,k&&(C/=2),(C+h.autoSkipPadding)*d.ticks.length>d.width-(d.paddingLeft+d.paddingRight)&&(l=1+Math.floor((C+h.autoSkipPadding)*d.ticks.length/(d.width-(d.paddingLeft+d.paddingRight)))),o&&d.ticks.length>o)for(;!l||d.ticks.length/(l||1)>o;)l||(l=1),l+=1;m||(l=!1)}var E="right"===e.position?d.left:d.right-u,F="right"===e.position?d.left+u:d.right,G="bottom"===e.position?d.top:d.bottom-u,H="bottom"===e.position?d.top+u:d.bottom;if(b.each(d.ticks,function(a,f){if(void 0!==a&&null!==a){var g=d.ticks.length===f+1,j=l>1&&f%l>0||f%l===0&&f+l>=d.ticks.length;if((!j||g)&&void 0!==a&&null!==a){var m,o;f===("undefined"!=typeof d.zeroLineIndex?d.zeroLineIndex:0)?(m=i.zeroLineWidth,o=i.zeroLineColor):(m=b.getValueAtIndexOrDefault(i.lineWidth,f),o=b.getValueAtIndexOrDefault(i.color,f));var p,q,r,s,t,v,w,x,y,z,B,C="middle";if(n){k||(C="top"===e.position?"bottom":"top"),B=k?"right":"center";var I=d.getPixelForTick(f)+b.aliasPixel(m);y=d.getPixelForTick(f,i.offsetGridLines)+h.labelOffset,z=k?d.top+12:"top"===e.position?d.bottom-u:d.top+u,p=r=t=w=I,q=G,s=H,v=c.top,x=c.bottom}else{"left"===e.position?h.mirror?(y=d.right+h.padding,B="left"):(y=d.right-h.padding,B="right"):h.mirror?(y=d.left-h.padding,B="right"):(y=d.left+h.padding,B="left");var J=d.getPixelForTick(f);J+=b.aliasPixel(m),z=d.getPixelForTick(f,i.offsetGridLines),p=E,r=F,t=c.left,w=c.right,q=s=v=x=J}D.push({tx1:p,ty1:q,tx2:r,ty2:s,x1:t,y1:v,x2:w,y2:x,labelX:y,labelY:z,glWidth:m,glColor:o,rotation:-1*A,label:a,textBaseline:C,textAlign:B})}}}),b.each(D,function(a){if(i.display&&(f.lineWidth=a.glWidth,f.strokeStyle=a.glColor,f.beginPath(),i.drawTicks&&(f.moveTo(a.tx1,a.ty1),f.lineTo(a.tx2,a.ty2)),i.drawOnChartArea&&(f.moveTo(a.x1,a.y1),f.lineTo(a.x2,a.y2)),f.stroke()),h.display){f.save(),f.translate(a.labelX,a.labelY),f.rotate(a.rotation),f.font=t,f.textBaseline=a.textBaseline,f.textAlign=a.textAlign;var c=a.label;if(b.isArray(c))for(var d=0,e=0;d0){var f=a[0];f.xLabel?c=f.xLabel:e>0&&f.index1&&b.each(o,function(a){m.push(f.callbacks.labelColor.call(c,a,j))}),b.extend(g,{title:c.getTitle(o,i),beforeBody:c.getBeforeBody(o,i),body:c.getBody(o,i),afterBody:c.getAfterBody(o,i),footer:c.getFooter(o,i),x:Math.round(n.x),y:Math.round(n.y),caretPadding:b.getValueOrDefault(n.padding,2),labelColors:m});var p=c.getTooltipSize(g);c.determineAlignment(p),b.extend(g,c.getBackgroundPoint(g,p))}else c._model.opacity=0;return a&&f.custom&&f.custom.call(c,g),c},getTooltipSize:function(a){var c=this._chart.ctx,d={height:2*a.yPadding,width:0},e=a.body,f=e.reduce(function(a,b){return a+b.before.length+b.lines.length+b.after.length},0);f+=a.beforeBody.length+a.afterBody.length;var g=a.title.length,h=a.footer.length,i=a.titleFontSize,j=a.bodyFontSize,k=a.footerFontSize;d.height+=g*i,d.height+=(g-1)*a.titleSpacing,d.height+=g?a.titleMarginBottom:0,d.height+=f*j,d.height+=f?(f-1)*a.bodySpacing:0,d.height+=h?a.footerMarginTop:0,d.height+=h*k,d.height+=h?(h-1)*a.footerSpacing:0;var l=0,m=function(a){d.width=Math.max(d.width,c.measureText(a).width+l)};return c.font=b.fontString(i,a._titleFontStyle,a._titleFontFamily),b.each(a.title,m),c.font=b.fontString(j,a._bodyFontStyle,a._bodyFontFamily),b.each(a.beforeBody.concat(a.afterBody),m),l=e.length>1?j+2:0,b.each(e,function(a){b.each(a.before,m),b.each(a.lines,m),b.each(a.after,m)}),l=0,c.font=b.fontString(k,a._footerFontStyle,a._footerFontFamily),b.each(a.footer,m),d.width+=2*a.xPadding,d},determineAlignment:function(a){var b=this,c=b._model,d=b._chart,e=b._chartInstance.chartArea;c.yd.height-a.height&&(c.yAlign="bottom");var f,g,h,i,j,k=(e.left+e.right)/2,l=(e.top+e.bottom)/2;"center"===c.yAlign?(f=function(a){return a<=k},g=function(a){return a>k}):(f=function(b){return b<=a.width/2},g=function(b){return b>=d.width-a.width/2}),h=function(b){return b+a.width>d.width},i=function(b){return b-a.width<0},j=function(a){return a<=l?"top":"bottom"},f(c.x)?(c.xAlign="left",h(c.x)&&(c.xAlign="center",c.yAlign=j(c.y))):g(c.x)&&(c.xAlign="right",i(c.x)&&(c.xAlign="center",c.yAlign=j(c.y)))},getBackgroundPoint:function(a,b){var c={x:a.x,y:a.y},d=a.caretSize,e=a.caretPadding,f=a.cornerRadius,g=a.xAlign,h=a.yAlign,i=d+e,j=f+e;return"right"===g?c.x-=b.width:"center"===g&&(c.x-=b.width/2),"top"===h?c.y+=i:"bottom"===h?c.y-=b.height+i:c.y-=b.height/2,"center"===h?"left"===g?c.x+=i:"right"===g&&(c.x-=i):"left"===g?c.x-=j:"right"===g&&(c.x+=j),c},drawCaret:function(a,c,d){var g,h,i,j,k,l,e=this._view,f=this._chart.ctx,m=e.caretSize,n=e.cornerRadius,o=e.xAlign,p=e.yAlign,q=a.x,r=a.y,s=c.width,t=c.height;"center"===p?("left"===o?(g=q,h=g-m,i=g):(g=q+s,h=g+m,i=g),k=r+t/2,j=k-m,l=k+m):("left"===o?(g=q+n,h=g+m,i=h+m):"right"===o?(g=q+s-n,h=g-m,i=h-m):(h=q+s/2,g=h-m,i=h+m),"top"===p?(j=r,k=j-m,l=j):(j=r+t,k=j+m,l=j));var u=b.color(e.backgroundColor);f.fillStyle=u.alpha(d*u.alpha()).rgbString(), +f.beginPath(),f.moveTo(g,j),f.lineTo(h,k),f.lineTo(i,l),f.closePath(),f.fill()},drawTitle:function(a,c,d,e){var f=c.title;if(f.length){d.textAlign=c._titleAlign,d.textBaseline="top";var g=c.titleFontSize,h=c.titleSpacing,i=b.color(c.titleFontColor);d.fillStyle=i.alpha(e*i.alpha()).rgbString(),d.font=b.fontString(g,c._titleFontStyle,c._titleFontFamily);var j,k;for(j=0,k=f.length;j1;k=m?f+2:0,b.each(h,function(g,h){b.each(g.before,l),b.each(g.lines,function(g){m&&(d.fillStyle=b.color(c.legendColorBackground).alpha(e).rgbaString(),d.fillRect(a.x,a.y,f,f),d.strokeStyle=b.color(c.labelColors[h].borderColor).alpha(e).rgbaString(),d.strokeRect(a.x,a.y,f,f),d.fillStyle=b.color(c.labelColors[h].backgroundColor).alpha(e).rgbaString(),d.fillRect(a.x+1,a.y+1,f-2,f-2),d.fillStyle=j),l(g)}),b.each(g.after,l)}),k=0,b.each(c.afterBody,l),a.y-=g},drawFooter:function(a,c,d,e){var f=c.footer;if(f.length){a.y+=c.footerMarginTop,d.textAlign=c._footerAlign,d.textBaseline="top";var g=b.color(c.footerFontColor);d.fillStyle=g.alpha(e*g.alpha()).rgbString(),d.font=b.fontString(c.footerFontSize,c._footerFontStyle,c._footerFontFamily),b.each(f,function(b){d.fillText(b,a.x,a.y),a.y+=c.footerFontSize+c.footerSpacing})}},draw:function(){var a=this._chart.ctx,c=this._view;if(0!==c.opacity){var d=this.getTooltipSize(c),e={x:c.x,y:c.y},f=Math.abs(c.opacity<.001)?0:c.opacity;if(this._options.enabled){var g=b.color(c.backgroundColor);a.fillStyle=g.alpha(f*g.alpha()).rgbString(),b.drawRoundedRectangle(a,e.x,e.y,d.width,d.height,c.cornerRadius),a.fill(),this.drawCaret(e,d,f),e.x+=c.xPadding,e.y+=c.yPadding,this.drawTitle(e,c,a,f),this.drawBody(e,c,a,f),this.drawFooter(e,c,a,f)}}}})}},{}],35:[function(a,b,c){"use strict";b.exports=function(a){var b=a.helpers,c=a.defaults.global;c.elements.arc={backgroundColor:c.defaultColor,borderColor:"#fff",borderWidth:2},a.elements.Arc=a.Element.extend({inLabelRange:function(a){var b=this._view;return!!b&&Math.pow(a-b.x,2)i;)f-=2*Math.PI;for(;f=h&&f<=i,k=g>=d.innerRadius&&g<=d.outerRadius;return j&&k}return!1},tooltipPosition:function(){var a=this._view,b=a.startAngle+(a.endAngle-a.startAngle)/2,c=(a.outerRadius-a.innerRadius)/2+a.innerRadius;return{x:a.x+Math.cos(b)*c,y:a.y+Math.sin(b)*c}},draw:function(){var a=this._chart.ctx,b=this._view,c=b.startAngle,d=b.endAngle;a.beginPath(),a.arc(b.x,b.y,b.outerRadius,c,d),a.arc(b.x,b.y,b.innerRadius,d,c,!0),a.closePath(),a.strokeStyle=b.borderColor,a.lineWidth=b.borderWidth,a.fillStyle=b.backgroundColor,a.fill(),a.lineJoin="bevel",b.borderWidth&&a.stroke()}})}},{}],36:[function(a,b,c){"use strict";b.exports=function(a){var b=a.helpers,c=a.defaults.global;a.defaults.global.elements.line={tension:.4,backgroundColor:c.defaultColor,borderWidth:3,borderColor:c.defaultColor,borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",capBezierPoints:!0,fill:!0},a.elements.Line=a.Element.extend({draw:function(){function i(a,b){var c=b._view;b._view.steppedLine===!0?(h.lineTo(b._view.x,a._view.y),h.lineTo(b._view.x,b._view.y)):0===b._view.tension?h.lineTo(c.x,c.y):h.bezierCurveTo(a._view.controlPointNextX,a._view.controlPointNextY,c.controlPointPreviousX,c.controlPointPreviousY,c.x,c.y)}var a=this,d=a._view,e=d.spanGaps,f=d.scaleZero,g=a._loop,h=a._chart.ctx;h.save();var j=a._children.slice(),k=-1;g&&j.length&&j.push(j[0]);var l,m,n,o;if(j.length&&d.fill){for(h.beginPath(),l=0;l=c.x-c.width/2&&a<=c.x+c.width/2&&b>=c.y&&b<=c.base:a>=c.x-c.width/2&&a<=c.x+c.width/2&&b>=c.base&&b<=c.y)},inLabelRange:function(a){var b=this._view;return!!b&&(a>=b.x-b.width/2&&a<=b.x+b.width/2)},tooltipPosition:function(){var a=this._view;return{x:a.x,y:a.y}}})}},{}],39:[function(a,b,c){"use strict";b.exports=function(a){var b=a.helpers,c={position:"bottom"},d=a.Scale.extend({getLabels:function(){var a=this.chart.data;return(this.isHorizontal()?a.xLabels:a.yLabels)||a.labels},determineDataLimits:function(){var a=this,c=a.getLabels();a.minIndex=0,a.maxIndex=c.length-1;var d;void 0!==a.options.ticks.min&&(d=b.indexOf(c,a.options.ticks.min),a.minIndex=d!==-1?d:a.minIndex),void 0!==a.options.ticks.max&&(d=b.indexOf(c,a.options.ticks.max),a.maxIndex=d!==-1?d:a.maxIndex),a.min=c[a.minIndex],a.max=c[a.maxIndex]},buildTicks:function(){var a=this,b=a.getLabels();a.ticks=0===a.minIndex&&a.maxIndex===b.length-1?b:b.slice(a.minIndex,a.maxIndex+1)},getLabelForIndex:function(a){return this.ticks[a]},getPixelForValue:function(a,b,c,d){var e=this,f=Math.max(e.maxIndex+1-e.minIndex-(e.options.gridLines.offsetGridLines?0:1),1);if(void 0!==a){var g=e.getLabels(),h=g.indexOf(a);b=h!==-1?h:b}if(e.isHorizontal()){var i=e.width-(e.paddingLeft+e.paddingRight),j=i/f,k=j*(b-e.minIndex)+e.paddingLeft;return e.options.gridLines.offsetGridLines&&d&&(k+=j/2),e.left+Math.round(k)}var l=e.height-(e.paddingTop+e.paddingBottom),m=l/f,n=m*(b-e.minIndex)+e.paddingTop;return e.options.gridLines.offsetGridLines&&d&&(n+=m/2),e.top+Math.round(n)},getPixelForTick:function(a,b){return this.getPixelForValue(this.ticks[a],a+this.minIndex,null,b)},getValueForPixel:function(a){var c,b=this,d=Math.max(b.ticks.length-(b.options.gridLines.offsetGridLines?0:1),1),e=b.isHorizontal(),f=e?b.width-(b.paddingLeft+b.paddingRight):b.height-(b.paddingTop+b.paddingBottom),g=f/d;return a-=e?b.left:b.top,b.options.gridLines.offsetGridLines&&(a-=g/2),a-=e?b.paddingLeft:b.paddingTop,c=a<=0?0:Math.round(a/g)},getBasePixel:function(){return this.bottom}});a.scaleService.registerScaleType("category",d,c)}},{}],40:[function(a,b,c){"use strict";b.exports=function(a){var b=a.helpers,c={position:"left",ticks:{callback:function(a,c,d){var e=d.length>3?d[2]-d[1]:d[1]-d[0];Math.abs(e)>1&&a!==Math.floor(a)&&(e=a-Math.floor(a));var f=b.log10(Math.abs(e)),g="";if(0!==a){var h=-1*Math.floor(f);h=Math.max(Math.min(h,20),0),g=a.toFixed(h)}else g="0";return g}}},d=a.LinearScaleBase.extend({determineDataLimits:function(){function h(b){return g?b.xAxisID===a.id:b.yAxisID===a.id}var a=this,c=a.options,d=a.chart,e=d.data,f=e.datasets,g=a.isHorizontal();if(a.min=null,a.max=null,c.stacked){var i={},j=!1,k=!1;b.each(f,function(e,f){var g=d.getDatasetMeta(f);void 0===i[g.type]&&(i[g.type]={positiveValues:[],negativeValues:[]});var l=i[g.type].positiveValues,m=i[g.type].negativeValues;d.isDatasetVisible(f)&&h(g)&&b.each(e.data,function(b,d){var e=+a.getRightValue(b);isNaN(e)||g.data[d].hidden||(l[d]=l[d]||0,m[d]=m[d]||0,c.relativePoints?l[d]=100:e<0?(k=!0,m[d]+=e):(j=!0,l[d]+=e))})}),b.each(i,function(c){var d=c.positiveValues.concat(c.negativeValues),e=b.min(d),f=b.max(d);a.min=null===a.min?e:Math.min(a.min,e),a.max=null===a.max?f:Math.max(a.max,f)})}else b.each(f,function(c,e){var f=d.getDatasetMeta(e);d.isDatasetVisible(e)&&h(f)&&b.each(c.data,function(b,c){var d=+a.getRightValue(b);isNaN(d)||f.data[c].hidden||(null===a.min?a.min=d:da.max&&(a.max=d))})});this.handleTickRangeOptions()},getTickLimit:function(){var c,d=this,e=d.options.ticks;if(d.isHorizontal())c=Math.min(e.maxTicksLimit?e.maxTicksLimit:11,Math.ceil(d.width/50));else{var f=b.getValueOrDefault(e.fontSize,a.defaults.global.defaultFontSize);c=Math.min(e.maxTicksLimit?e.maxTicksLimit:11,Math.ceil(d.height/(2*f)))}return c},handleDirectionalChanges:function(){this.isHorizontal()||this.ticks.reverse()},getLabelForIndex:function(a,b){return+this.getRightValue(this.chart.data.datasets[b].data[a])},getPixelForValue:function(a){var g,h,b=this,c=b.paddingLeft,d=b.paddingBottom,e=b.start,f=+b.getRightValue(a),i=b.end-e;return b.isHorizontal()?(h=b.width-(c+b.paddingRight),g=b.left+h/i*(f-e),Math.round(g+c)):(h=b.height-(b.paddingTop+d),g=b.bottom-d-h/i*(f-e),Math.round(g))},getValueForPixel:function(a){var b=this,c=b.isHorizontal(),d=b.paddingLeft,e=b.paddingBottom,f=c?b.width-(d+b.paddingRight):b.height-(b.paddingTop+e),g=(c?a-b.left-d:b.bottom-e-a)/f;return b.start+(b.end-b.start)*g},getPixelForTick:function(a){return this.getPixelForValue(this.ticksAsNumbers[a])}});a.scaleService.registerScaleType("linear",d,c)}},{}],41:[function(a,b,c){"use strict";b.exports=function(a){var b=a.helpers,c=b.noop;a.LinearScaleBase=a.Scale.extend({handleTickRangeOptions:function(){var a=this,c=a.options,d=c.ticks;if(d.beginAtZero){var e=b.sign(a.min),f=b.sign(a.max);e<0&&f<0?a.max=0:e>0&&f>0&&(a.min=0)}void 0!==d.min?a.min=d.min:void 0!==d.suggestedMin&&(a.min=Math.min(a.min,d.suggestedMin)),void 0!==d.max?a.max=d.max:void 0!==d.suggestedMax&&(a.max=Math.max(a.max,d.suggestedMax)),a.min===a.max&&(a.max++,d.beginAtZero||a.min--)},getTickLimit:c,handleDirectionalChanges:c,buildTicks:function(){var a=this,c=a.options,d=a.ticks=[],e=c.ticks,f=b.getValueOrDefault,g=a.getTickLimit();g=Math.max(2,g);var h,i=e.fixedStepSize&&e.fixedStepSize>0||e.stepSize&&e.stepSize>0;if(i)h=f(e.fixedStepSize,e.stepSize);else{var j=b.niceNum(a.max-a.min,!1);h=b.niceNum(j/(g-1),!0)}var k=Math.floor(a.min/h)*h,l=Math.ceil(a.max/h)*h,m=(l-k)/h;m=b.almostEquals(m,Math.round(m),h/1e3)?Math.round(m):Math.ceil(m),d.push(void 0!==e.min?e.min:k);for(var n=1;na.max&&(a.max=d))})});a.min=h(d.min,a.min),a.max=h(d.max,a.max),a.min===a.max&&(0!==a.min&&null!==a.min?(a.min=Math.pow(10,Math.floor(b.log10(a.min))-1),a.max=Math.pow(10,Math.floor(b.log10(a.max))+1)):(a.min=1,a.max=10))},buildTicks:function(){for(var a=this,c=a.options,d=c.ticks,e=b.getValueOrDefault,f=a.ticks=[],g=e(d.min,Math.pow(10,Math.floor(b.log10(a.min))));ga.max&&(a.max=d))})}}),a.handleTickRangeOptions()},getTickLimit:function(){var a=this.options.ticks,d=b.getValueOrDefault(a.fontSize,c.defaultFontSize);return Math.min(a.maxTicksLimit?a.maxTicksLimit:11,Math.ceil(this.drawingArea/(1.5*d)))},convertTicksToLabels:function(){var b=this;a.LinearScaleBase.prototype.convertTicksToLabels.call(b),b.pointLabels=b.chart.data.labels.map(b.options.pointLabels.callback,b)},getLabelForIndex:function(a,b){return+this.getRightValue(this.chart.data.datasets[b].data[a])},fit:function(){var i,j,k,l,n,o,q,r,s,t,u,v,a=this.options.pointLabels,d=b.getValueOrDefault(a.fontSize,c.defaultFontSize),e=b.getValueOrDefault(a.fontStyle,c.defaultFontStyle),f=b.getValueOrDefault(a.fontFamily,c.defaultFontFamily),g=b.fontString(d,e,f),h=b.min([this.height/2-d-5,this.width/2]),m=this.width,p=0;for(this.ctx.font=g,j=0;jm&&(m=i.x+l,n=j),i.x-lm&&(m=i.x+k,n=j):i.x-k0&&c>0?b:0)},draw:function(){var a=this,d=a.options,e=d.gridLines,f=d.ticks,g=d.angleLines,h=d.pointLabels,i=b.getValueOrDefault;if(d.display){var j=a.ctx,k=i(f.fontSize,c.defaultFontSize),l=i(f.fontStyle,c.defaultFontStyle),m=i(f.fontFamily,c.defaultFontFamily),n=b.fontString(k,l,m);if(b.each(a.ticks,function(g,h){if(h>0||d.reverse){var l=a.getDistanceFromCenterForValue(a.ticksAsNumbers[h]),m=a.yCenter-l;if(e.display&&0!==h)if(j.strokeStyle=b.getValueAtIndexOrDefault(e.color,h-1),j.lineWidth=b.getValueAtIndexOrDefault(e.lineWidth,h-1),d.lineArc)j.beginPath(),j.arc(a.xCenter,a.yCenter,l,0,2*Math.PI),j.closePath(),j.stroke();else{j.beginPath();for(var o=0;o=0;t--){if(g.display){var u=a.getPointPosition(t,o);j.beginPath(),j.moveTo(a.xCenter,a.yCenter),j.lineTo(u.x,u.y),j.stroke(),j.closePath()}var v=a.getPointPosition(t,o+5),w=i(h.fontColor,c.defaultFontColor);j.font=s,j.fillStyle=w;var x=a.pointLabels,y=this.getIndexAngle(t)+Math.PI/2,z=360*y/(2*Math.PI)%360;0===z||180===z?j.textAlign="center":z<180?j.textAlign="left":j.textAlign="right",90===z||270===z?j.textBaseline="middle":z>270||z<90?j.textBaseline="bottom":j.textBaseline="top",j.fillText(x[t]?x[t]:"",v.x,v.y)}}}}});a.scaleService.registerScaleType("radialLinear",e,d)}},{}],44:[function(a,b,c){"use strict";var d=a(6);d="function"==typeof d?d:window.moment,b.exports=function(a){var b=a.helpers,c={units:[{name:"millisecond",steps:[1,2,5,10,20,50,100,250,500]},{name:"second",steps:[1,2,5,10,30]},{name:"minute",steps:[1,2,5,10,30]},{name:"hour",steps:[1,2,3,6,12]},{name:"day",steps:[1,2,5]},{name:"week",maxStep:4},{name:"month",maxStep:3},{name:"quarter",maxStep:4},{name:"year",maxStep:!1}]},e={position:"bottom",time:{parser:!1,format:!1,unit:!1,round:!1,displayFormat:!1,isoWeekday:!1,displayFormats:{millisecond:"h:mm:ss.SSS a",second:"h:mm:ss a",minute:"h:mm:ss a",hour:"MMM D, hA",day:"ll",week:"ll",month:"MMM YYYY",quarter:"[Q]Q - YYYY",year:"YYYY"}},ticks:{autoSkip:!1}},f=a.Scale.extend({initialize:function(){if(!d)throw new Error("Chart.js - Moment.js could not be found! You must include it before Chart.js to use the time scale. Download at https://momentjs.com");a.Scale.prototype.initialize.call(this)},getLabelMoment:function(a,b){return"undefined"!=typeof this.labelMoments[a]?this.labelMoments[a][b]:null},getMomentStartOf:function(a){var b=this;return"week"===b.options.time.unit&&b.options.time.isoWeekday!==!1?a.clone().startOf("isoWeek").isoWeekday(b.options.time.isoWeekday):a.clone().startOf(b.tickUnit)},determineDataLimits:function(){var a=this;a.labelMoments=[];var c=[];a.chart.data.labels&&a.chart.data.labels.length>0?(b.each(a.chart.data.labels,function(b){var d=a.parseTime(b);d.isValid()&&(a.options.time.round&&d.startOf(a.options.time.round),c.push(d))},a),a.firstTick=d.min.call(a,c),a.lastTick=d.max.call(a,c)):(a.firstTick=null,a.lastTick=null),b.each(a.chart.data.datasets,function(e,f){var g=[],h=a.chart.isDatasetVisible(f);"object"==typeof e.data[0]&&null!==e.data[0]?b.each(e.data,function(b){var c=a.parseTime(a.getRightValue(b));c.isValid()&&(a.options.time.round&&c.startOf(a.options.time.round),g.push(c),h&&(a.firstTick=null!==a.firstTick?d.min(a.firstTick,c):c,a.lastTick=null!==a.lastTick?d.max(a.lastTick,c):c))},a):g=c,a.labelMoments.push(g)},a),a.options.time.min&&(a.firstTick=a.parseTime(a.options.time.min)),a.options.time.max&&(a.lastTick=a.parseTime(a.options.time.max)),a.firstTick=(a.firstTick||d()).clone(),a.lastTick=(a.lastTick||d()).clone()},buildTicks:function(){var d=this;d.ctx.save();var e=b.getValueOrDefault(d.options.ticks.fontSize,a.defaults.global.defaultFontSize),f=b.getValueOrDefault(d.options.ticks.fontStyle,a.defaults.global.defaultFontStyle),g=b.getValueOrDefault(d.options.ticks.fontFamily,a.defaults.global.defaultFontFamily),h=b.fontString(e,f,g);if(d.ctx.font=h,d.ticks=[],d.unitScale=1,d.scaleSizeInUnits=0,d.options.time.unit)d.tickUnit=d.options.time.unit||"day",d.displayFormat=d.options.time.displayFormats[d.tickUnit],d.scaleSizeInUnits=d.lastTick.diff(d.firstTick,d.tickUnit,!0),d.unitScale=b.getValueOrDefault(d.options.time.unitStepSize,1);else{var i=d.isHorizontal()?d.width-(d.paddingLeft+d.paddingRight):d.height-(d.paddingTop+d.paddingBottom),j=d.tickFormatFunction(d.firstTick,0,[]),k=d.ctx.measureText(j).width,l=Math.cos(b.toRadians(d.options.ticks.maxRotation)),m=Math.sin(b.toRadians(d.options.ticks.maxRotation));k=k*l+e*m;var n=i/k;d.tickUnit="millisecond",d.scaleSizeInUnits=d.lastTick.diff(d.firstTick,d.tickUnit,!0),d.displayFormat=d.options.time.displayFormats[d.tickUnit];for(var o=0,p=c.units[o];o=Math.ceil(d.scaleSizeInUnits/n)){d.unitScale=b.getValueOrDefault(d.options.time.unitStepSize,p.steps[q]);break}break}if(p.maxStep===!1||Math.ceil(d.scaleSizeInUnits/n)=0&&(d.lastTick=u),d.scaleSizeInUnits=d.lastTick.diff(d.firstTick,d.tickUnit,!0)}d.smallestLabelSeparation=d.width,b.each(d.chart.data.datasets,function(a,b){for(var c=1;c=0)break;w%d.unitScale===0&&d.ticks.push(x)}var y=d.ticks[d.ticks.length-1].diff(d.lastTick,d.tickUnit);0===y&&0!==d.scaleSizeInUnits||(d.options.time.max?(d.ticks.push(d.lastTick.clone()),d.scaleSizeInUnits=d.lastTick.diff(d.ticks[0],d.tickUnit,!0)):(d.ticks.push(d.lastTick.clone()),d.scaleSizeInUnits=d.lastTick.diff(d.firstTick,d.tickUnit,!0))),d.ctx.restore()},getLabelForIndex:function(a,b){var c=this,d=c.chart.data.labels&&ab&&(b=c)}),c.css("min-height",b)},a("[data-equal]").each(function(){var b=a(this),c=b.data("equal");b.find(c).equalHeights()})}(jQuery); \ No newline at end of file diff --git a/media/js/phoca/index.html b/media/js/phoca/index.html new file mode 100644 index 00000000..fa6d84e8 --- /dev/null +++ b/media/js/phoca/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/media/js/phoca/jquery.phocaattribute.js b/media/js/phoca/jquery.phocaattribute.js new file mode 100644 index 00000000..8e4715a4 --- /dev/null +++ b/media/js/phoca/jquery.phocaattribute.js @@ -0,0 +1,106 @@ +/* + * jQuery Phoca Attribute + * http://www.phoca.cz + * + * Copyright (C) 2016 Jan Pavelka www.phoca.cz + * + * Licensed under the MIT license + */ +var phAttribute = function() { + + var phO = { + + + phSelectNameId : '', /* ID Select Box */ + phSelectNameIdT : '', /* ID BOX for Color Buttons */ + phSelectNameIdB : '', /* ID of BOX for Select Box */ + phSelectNameIdC : '', /* ID of Select Box (Chosen) */ + phType : '', + phClass : '', + phClassId : '', + + Init: function(id, type) { + + phO.phSelectNameId = '#phItemAttribute' + id; + phO.phSelectNameIdT = '#phItemHiddenAttribute' + id; + phO.phSelectNameIdB = '#phItemBoxAttribute' + id; + phO.phSelectNameIdC = '#phItemAttribute' + id; + phO.phType = type; + if (phO.phType == 3) { + // Image + phO.phClass = 'phSelectBoxImage'; + } else { + // Color + phO.phClass = 'phSelectBoxButton'; + } + phO.phClassId = phO.phSelectNameIdT +' .'+ phO.phClass; + + }, + + Display: function() { + + var phSelectName = jQuery(phO.phSelectNameId).attr('name'); + var phHiddenEl = jQuery(''); + phHiddenEl.val(jQuery(phO.phSelectNameId).val()); + phHiddenEl.insertAfter(jQuery(phO.phSelectNameId)); + + + // ON START DISPLAY OR HIDE + // jQuery(phO.phSelectNameId).hide(); + // jQuery(phO.phSelectNameIdB).hide(); + // Cannot be hidden because of html5 required field and its message + // Hide select box even its chosen alternative + jQuery(phO.phSelectNameIdT).css( "display", "block"); + jQuery(phO.phSelectNameIdB).css( {"display": "visible", 'position': 'absolute', 'clip': 'rect(0,0,0,0)' }); + + // ON START TRANSFORM + jQuery(phO.phSelectNameId + ' option').each(function() { + + /* Do not display default value (empty value), can be set by clicking back from other value */ + if (jQuery(this).val() != '') { + + if(phO.phType == 3) { + // Image + var phSBtn = jQuery('
'+ jQuery(this).text() +'
'); + } else { + // Color + var phSBtn = jQuery('
'+ ' ' +'
'); + } + + + if(jQuery(this).is(':selected')) { + phSBtn.addClass('on'); + } + + jQuery(phO.phSelectNameIdT).append(phSBtn); + + } + + }); + + // ON CLICK + //jQuery(document).on('click', phO.phClassId, function(e) { + jQuery(phO.phClassId).on('click', function(e) { + + e.preventDefault();// Bootstrap modal (close and open again duplicates events) + + var isActive = jQuery(this).hasClass('on'); + + if (isActive) { + jQuery(this).removeClass('on'); + jQuery('input[name="'+ phSelectName +'"]').val(''); + jQuery(phO.phSelectNameId).val('').change();// Because of required field + } else { + jQuery(phO.phClassId).removeClass('on');//Remove when multiple + jQuery(this).addClass('on'); + jQuery('input[name="'+ phSelectName +'"]').val(jQuery(this).data('value')); + jQuery(phO.phSelectNameId).val(jQuery(this).data('value')).change();// Because of required field + } + + }); + + + } + } + return phO; +} \ No newline at end of file diff --git a/media/js/phoca/jquery.phocaswapimage.js b/media/js/phoca/jquery.phocaswapimage.js new file mode 100644 index 00000000..ac00055c --- /dev/null +++ b/media/js/phoca/jquery.phocaswapimage.js @@ -0,0 +1,79 @@ +/* + * jQuery Phoca SwapImage + * http://www.phoca.cz + * + * Copyright (C) 2016 Jan Pavelka www.phoca.cz + * + * Licensed under the MIT license + */ + var phSwapImage = function() { + + var phO = { + + phDefaultA : '', + phDefaultImg : '', + phDefaultHref : '', + phDefaultSrc : '', + phAttributesBox : '', + phCustomHref : 0, + + + Init: function(imgBox, form, select, customHref) { + + phO.phDefaultA = jQuery(imgBox +' a'); + phO.phDefaultImg = jQuery(imgBox +' a img'); + phO.phDefaultHref = phO.phDefaultA.attr('href'); + phO.phDefaultSrc = phO.phDefaultImg.attr('src'); + phO.phAttributesBox = jQuery(form +' '+ select); + phO.phCustomHref = customHref; + + }, + + Display: function() { + + + //jQuery(document).on('change', phO.phAttributesBox, function(){ + phO.phAttributesBox.on('change', function(){ + + // Set image from current selectbox (selectbox which was changed) + var phNewSrc = jQuery(this).find(':selected').data('image-option'); + // Find selected image from all attributes select boxes + var phSelectedSrc = false; + phO.phAttributesBox.each(function( index ) { + var phFoundSrc = jQuery(this).find(':selected').data('image-option'); + if(phFoundSrc) { + + phSelectedSrc = phFoundSrc; + } + }); + + var phNewHref = phNewSrc; + var phSelectedHref = phSelectedSrc; + var phDefaultHref = phO.phDefaultSrc; + + if (phO.phCustomHref) { + phNewHref = phO.phDefaultHref; + phSelectedHref = phO.phDefaultHref; + phDefaultHref = phO.phDefaultHref; + } + + if (phNewSrc) { + // New image found - change to new image + phO.phDefaultA.attr('href', phNewHref); + phO.phDefaultImg.attr('src', phNewSrc); + } else if (!phNewSrc && phSelectedSrc) { + // New image not found but there is some selected image yet (e.g. selected previously in other select box) + phO.phDefaultA.attr('href', phSelectedHref); + phO.phDefaultImg.attr('src', phSelectedSrc); + } else { + // Return back to default image (no new image, no selected image by other select box) + phO.phDefaultA.attr('href', phO.phDefaultHref); + phO.phDefaultImg.attr('src', phO.phDefaultSrc); + } + }); + + + } + } + return phO; +} \ No newline at end of file diff --git a/media/js/windowpopup.js b/media/js/windowpopup.js new file mode 100644 index 00000000..7b97b185 --- /dev/null +++ b/media/js/windowpopup.js @@ -0,0 +1,19 @@ +/* + * jQuery Phoca WindowPopup + * http://www.phoca.cz + * + * Copyright (C) 2016 Jan Pavelka www.phoca.cz + * + * Licensed under the MIT license + */ +function phWindowPopup(url, name, rW, rH) { + var w = screen.width / rW; + var h = screen.height / rH; + var params = 'width='+w+', height='+h+', resizable=yes, scrollbars=yes, menubar=no, status=no, location=no, toolbar=no'; + phWindow = window.open(url, name, params); + + if(window.focus) { + phWindow.focus(); + } + return false; +} \ No newline at end of file diff --git a/models/fields/phocacartcategory.php b/models/fields/phocacartcategory.php index 9ba475ca..ba5165d1 100644 --- a/models/fields/phocacartcategory.php +++ b/models/fields/phocacartcategory.php @@ -11,6 +11,12 @@ if (! class_exists('PhocaCartCategory')) { require_once( JPATH_ADMINISTRATOR.'/components/com_phocacart/libraries/phocacart/category/category.php'); } +if (! class_exists('PhocaCartCategoryMultiple')) { + require_once( JPATH_ADMINISTRATOR.'/components/com_phocacart/libraries/phocacart/category/categorymultiple.php'); +} + +$lang = JFactory::getLanguage(); +$lang->load('com_phocacart'); class JFormFieldPhocaCartCategory extends JFormField { @@ -52,8 +58,8 @@ protected function getInput() { $db->setQuery( $query ); $data = $db->loadObjectList(); - // TODO - check for other views than category edit - $view = JRequest::getVar( 'view' ); + // TO DO - check for other views than category edit + $view = JFactory::getApplication()->input->get( 'view' ); $catId = -1; if ($view == 'phocacartcategory') { $id = $this->form->getValue('id'); // id of current category diff --git a/models/fields/phocacartfeed.php b/models/fields/phocacartfeed.php index 0563d3df..6caa45a8 100644 --- a/models/fields/phocacartfeed.php +++ b/models/fields/phocacartfeed.php @@ -26,7 +26,7 @@ protected function getInput() { $data = $db->loadObjectList(); - // $view = JRequest::getVar( 'view' ); + // $view = JFactory::getApplication()->input->get( 'view' ); //$required = ((string) $this->element['required'] == 'true') ? TRUE : FALSE; diff --git a/models/fields/phocapaymentmethod.php b/models/fields/phocapaymentmethod.php index b73037ae..ade623d9 100644 --- a/models/fields/phocapaymentmethod.php +++ b/models/fields/phocapaymentmethod.php @@ -25,7 +25,7 @@ protected function getInput() { $s[] = 'function phLoadParams(value) {'; $s[] = ' var url = \''.$url.'\''; - $s[] = ' var phAjax = \'
'. JHtml::_( 'image', 'media/com_phocacart/images/administrator/icon-loading5.gif', ''). '   \' + \''. htmlspecialchars($text).'\' + \'
\';'; + $s[] = ' var phAjax = \'
\' + \''. htmlspecialchars($text).'\' + \'
\';'; $s[] = ' jQuery("#ph-extended-params-msg").html(phAjax);'; $s[] = ' jQuery("#ph-extended-params-msg").show();'; $s[] = ' jQuery("#ph-extended-params").show();'; diff --git a/models/fields/phocaselectfilename.php b/models/fields/phocaselectfilename.php index 860c0aec..8e968699 100644 --- a/models/fields/phocaselectfilename.php +++ b/models/fields/phocaselectfilename.php @@ -20,14 +20,84 @@ protected function getInput() { $textButton = 'COM_PHOCACART_FORM_SELECT_'.strtoupper($group['t']); $link = 'index.php?option=com_phocacart&view=phocacartmanager'.$group['c'].$managerOutput.'&field='.$this->id; - $attr = $this->element['class'] ? ' class="'.(string) $this->element['class'].'"' : ''; - $attr .= $this->element['size'] ? ' size="'.(int) $this->element['size'].'"' : ''; - $onchange = (string) $this->element['onchange']; + $onchange = (string) $this->element['onchange']; + $size = ($v = $this->element['size']) ? ' size="' . $v . '"' : ''; + $class = ($v = $this->element['class']) ? ' class="' . $v . '"' : 'class="text_area"'; + $required = ($v = $this->element['required']) ? ' required="required"' : ''; + $idA = 'phFileNameModal'; + $w = 700; + $h = 400; + + + JHtml::_('jquery.framework'); + + if ($this->element['manager'] == 'productfile') { + + // This function selects the right folder when clicking on selecting e.g. download file + // Set by the folder stored in download tab in product edit + $s = array(); + //$s[] = 'var phDownloadFolderModal'.$this->id.' = \'\';'; + $s[] = 'jQuery(document).ready(function() {'; + // Mootools + //$s[] = ' var phDownloadFolder = jQuery(\'#jform_download_folder\').val();'; + //$s[] = ' phDownloadFolderModal'.$this->id.' = "&folder=" + phDownloadFolder + "&downloadfolder=" + phDownloadFolder;'; + //$s[] = ' stringToSend = "&folder=" + phDownloadFolder + "&downloadfolder=" + phDownloadFolder;'; + //$s[] = ' alert(stringToSend);var newUri = jQuery(\'.modal_jform_download_file\').attr(\'href\') + stringToSend;'; + //$s[] = ' jQuery(\'.modal_jform_download_file\').attr("href", newUri);'; + + $s[] = ' jQuery(\'a.'.$idA.'ModalButton\').on(\'click\', function(e) {'; + $s[] = ' var src = jQuery(this).attr(\'data-src\');'; + $s[] = ' var phDownloadFolder = jQuery(\'#jform_download_folder\').val();'; + $s[] = ' src = src + "&folder=" + phDownloadFolder + "&downloadfolder=" + phDownloadFolder;'; + $s[] = ' var height = jQuery(this).attr(\'data-height\') || '.$w.';'; + $s[] = ' var width = jQuery(this).attr(\'data-width\') || '.$h.';'; + $s[] = ' jQuery("#'.$idA.' iframe").attr({\'src\':src, \'height\': height, \'width\': width});'; + $s[] = ' });'; + + $s[] = '})'; + JFactory::getDocument()->addScriptDeclaration(implode("\n", $s)); + + + $s = array(); + $s[] = ' function phocaSelectFileName_'.$this->id.'(title) {'; + $s[] = ' document.getElementById("'.$this->id.'").value = title;'; + $s[] = ' '.$onchange; + $s[] = ' jQuery(\'.modal\').modal(\'hide\');'; + //$s[] = ' SqueezeBox.close();'; + $s[] = ' }'; + JFactory::getDocument()->addScriptDeclaration(implode("\n", $s)); + } + + + + $html[] = ''; + $html[] = ' ' + . ' ' + . JText::_($textButton) . ''; + $html[] = JHtml::_( + 'bootstrap.renderModal', + $idA, + array( + //'url' => $link . '\' + (phDownloadFolderModal'.$this->id.') + \'', + 'title' => JText::_($textButton), + 'width' => $w.'px', + 'height' => $h.'px', + 'modalWidth' => '80', + 'bodyHeight' => '70', + 'footer' => '' + ), + '' + ); - JHtml::_('behavior.modal', 'a.modal_'.$this->id); + return implode("\n", $html); + + + /*JHtml::_('behavior.modal', 'a.modal_'.$this->id); if ($this->element['manager'] == 'productfile') { - PhocaCartRenderJs::renderJsAppendValueToUrl(/* TODO*/); + PhocaCartRenderJs::renderJsAppendValueToUrl(/* TO DO*//*); $s = array(); $s[] = ' function phocaSelectFileName_'.$this->id.'(title) {'; $s[] = ' document.getElementById("'.$this->id.'").value = title;'; @@ -46,7 +116,7 @@ protected function getInput() { $html[] = ''. "\n"; - return implode("\n", $html); + return implode("\n", $html);*/ } } ?> \ No newline at end of file diff --git a/models/fields/phocaselectfilenameimage.php b/models/fields/phocaselectfilenameimage.php index 94720122..0d916d58 100644 --- a/models/fields/phocaselectfilenameimage.php +++ b/models/fields/phocaselectfilenameimage.php @@ -14,17 +14,58 @@ class JFormFieldPhocaSelectFilenameImage extends JFormField public $type = 'PhocaSelectFileNameImage'; protected function getInput() { + $html = array(); $managerOutput = $this->element['manager'] ? '&manager='.(string) $this->element['manager'] : ''; $group = PhocaCartSettings::getManagerGroup((string) $this->element['manager']); $textButton = 'COM_PHOCACART_FORM_SELECT_'.strtoupper($group['t']); + $link = 'index.php?option=com_phocacart&view=phocacartmanager'.$group['c'].$managerOutput.'&field='.$this->id; + + $onchange = (string) $this->element['onchange']; + $size = ($v = $this->element['size']) ? ' size="' . $v . '"' : ''; + $class = ($v = $this->element['class']) ? ' class="' . $v . '"' : 'class="text_area"'; + $required = ($v = $this->element['required']) ? ' required="required"' : ''; + $idA = 'phFileImageNameModal'; + + JHtml::_('jquery.framework'); + + $html[] = ''; + $html[] = '' + . ' ' + . JText::_($textButton) . ''; + $html[] = JHtml::_( + 'bootstrap.renderModal', + $idA, + array( + 'url' => $link, + 'title' => JText::_($textButton), + 'width' => '700px', + 'height' => '400px', + 'modalWidth' => '80', + 'bodyHeight' => '70', + 'footer' => '' + ) + ); - $attr = $this->element['class'] ? ' class="'.(string) $this->element['class'].'"' : ''; - $attr .= $this->element['size'] ? ' size="'.(int) $this->element['size'].'"' : ''; - $onchange = (string) $this->element['onchange']; + return implode("\n", $html); + + // HIDDEN FIELDS + //readonly="readonly" + // We don't use hidden field name, we can edit it the filename form field, there are three ways of adding filename: + // - manually typed + // - selected by image select box + // - added per YouTube import + // + // The name="' . $this->name . '" is used above in standard input form + // + //$html[] = ''; - JHtml::_('behavior.modal', 'a.modal_'.$this->id); + // MOOTOOLS + /*JHtml::_('behavior.modal', 'a.modal_'.$this->id); $html[] = '
'; $html[] = ''; @@ -34,7 +75,7 @@ protected function getInput() { . JText::_($textButton).''; $html[] = '
'. "\n"; - return implode("\n", $html); + return implode("\n", $html);*/ } } ?> \ No newline at end of file diff --git a/models/fields/phocaselectitem.php b/models/fields/phocaselectitem.php index dce62c77..448bd4fd 100644 --- a/models/fields/phocaselectitem.php +++ b/models/fields/phocaselectitem.php @@ -57,6 +57,7 @@ protected function getInput() { if ((int)$id > 0) { $relatedOption = PhocaCartRelated::getRelatedItemsById((int)$id); + if(!empty($relatedOption)) { $i = 0; foreach($relatedOption as $k => $v) { diff --git a/models/forms/phocacartcountry.xml b/models/forms/phocacartcountry.xml index 08e29bab..8893d33a 100644 --- a/models/forms/phocacartcountry.xml +++ b/models/forms/phocacartcountry.xml @@ -12,6 +12,8 @@ + + diff --git a/models/forms/phocacartcurrency.xml b/models/forms/phocacartcurrency.xml index f3f248cc..0b975a3d 100644 --- a/models/forms/phocacartcurrency.xml +++ b/models/forms/phocacartcurrency.xml @@ -28,6 +28,8 @@ + + diff --git a/models/forms/phocacartitem.xml b/models/forms/phocacartitem.xml index 87f5251f..aa4c5f40 100644 --- a/models/forms/phocacartitem.xml +++ b/models/forms/phocacartitem.xml @@ -52,6 +52,7 @@ + diff --git a/models/forms/phocacartquestion.xml b/models/forms/phocacartquestion.xml new file mode 100644 index 00000000..e33f8401 --- /dev/null +++ b/models/forms/phocacartquestion.xml @@ -0,0 +1,47 @@ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + +
+ + +
diff --git a/models/forms/phocacartregion.xml b/models/forms/phocacartregion.xml index ed650850..b6ba1b3c 100644 --- a/models/forms/phocacartregion.xml +++ b/models/forms/phocacartregion.xml @@ -14,6 +14,8 @@ + + diff --git a/models/forms/phocacartwishlist.xml b/models/forms/phocacartwishlist.xml new file mode 100644 index 00000000..28097adf --- /dev/null +++ b/models/forms/phocacartwishlist.xml @@ -0,0 +1,38 @@ + +
+ +
+ + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + +
+ + +
diff --git a/models/phocacartcategories.php b/models/phocacartcategories.php index 9503548e..b52980e5 100644 --- a/models/phocacartcategories.php +++ b/models/phocacartcategories.php @@ -11,7 +11,7 @@ class PhocaCartCpModelPhocaCartCategories extends JModelList { - protected $option = 'com_phocacart'; + protected $option = 'com_phocacart'; protected $total = 0; public function __construct($config = array()) { diff --git a/models/phocacartcategory.php b/models/phocacartcategory.php index 165b6441..648bff1e 100644 --- a/models/phocacartcategory.php +++ b/models/phocacartcategory.php @@ -131,10 +131,10 @@ public function delete(&$cid = array()) { if (!$this->canDelete($table)){ $error = $this->getError(); if ($error){ - JLog::add($error, JLog::WARNING, 'jerror'); + JLog::add($error, JLog::WARNING); return false; } else { - JLog::add(JText::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'), JLog::WARNING, 'jerror'); + JLog::add(JText::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'), JLog::WARNING); return false; } } @@ -149,7 +149,7 @@ public function delete(&$cid = array()) { $db->setQuery( $query ); if (!($rows2 = $db->loadObjectList())) { - JError::raiseError( 500, $db->stderr('Load Data Problem') ); + throw new Exception( $db->stderr('Load Data Problem'), 500 ); return false; } @@ -165,13 +165,13 @@ public function delete(&$cid = array()) { } // - - - - - - - - - - - - - - - - // Images with new cid - - - - - + // Product with new cid - - - - - if (count( $cid )) { JArrayHelper::toInteger($cid); $cids = implode( ',', $cid ); // Select id's from product table, if there are some items, don't delete it. - $query = 'SELECT c.id, c.title, COUNT( s.category_id ) AS numcat' + $query = 'SELECT c.id, c.title, COUNT( s.category_id ) AS numproduct' . ' FROM #__phocacart_categories AS c' . ' LEFT JOIN #__phocacart_product_categories AS s ON s.category_id = c.id' . ' WHERE c.id IN ( '.$cids.' )' @@ -180,14 +180,15 @@ public function delete(&$cid = array()) { $db->setQuery( $query ); if (!($rows = $db->loadObjectList())) { - JError::raiseError( 500, $db->stderr('Load Data Problem') ); + throw new Exception( $db->stderr('Load Data Problem'), 500 ); return false; } + $err_img = array(); $cid = array(); foreach ($rows as $row) { - if ($row->numcat == 0) { + if ($row->numproduct == 0) { $cid[] = (int) $row->id; } else { $err_img[] = $row->title; @@ -273,7 +274,7 @@ protected function batchCopy($value, $pks, $contexts) } // Check that the user has create permission for the component - $extension = JRequest::getCmd('option'); + $extension = JFactory::getApplication()->input->get('option'); $user = JFactory::getUser(); if (!$user->authorise('core.create', $extension)) { $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE')); @@ -376,7 +377,7 @@ protected function batchMove($value, $pks, $contexts) } // Check that user has create and edit permission for the component - $extension = JRequest::getCmd('option'); + $extension = JFactory::getApplication()->input->get('option'); $user = JFactory::getUser(); if (!$user->authorise('core.create', $extension)) { $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE')); diff --git a/models/phocacartcountries.php b/models/phocacartcountries.php index 62569749..a0cdec8b 100644 --- a/models/phocacartcountries.php +++ b/models/phocacartcountries.php @@ -11,7 +11,7 @@ class PhocaCartCpModelPhocaCartCountries extends JModelList { - protected $option = 'com_phocacart'; + protected $option = 'com_phocacart'; public function __construct($config = array()) { diff --git a/models/phocacartcountry.php b/models/phocacartcountry.php index 7f0cf302..9fbcfde3 100644 --- a/models/phocacartcountry.php +++ b/models/phocacartcountry.php @@ -118,7 +118,8 @@ public function importcountries() { if ($query != '' && $query{0} != '#'){ $db->setQuery($query); if (!$db->execute()){ - JLog::add(JText::sprintf('JLIB_INSTALLER_ERROR_SQL_ERROR', $db->stderr(true)), JLog::WARNING, 'jerror'); + $app->enqueueMessage(JText::sprintf('JLIB_INSTALLER_ERROR_SQL_ERROR', $db->stderr(true)), 'error'); + JLog::add(JText::sprintf('JLIB_INSTALLER_ERROR_SQL_ERROR', $db->stderr(true)), JLog::WARNING); return false; } } diff --git a/models/phocacartcoupon.php b/models/phocacartcoupon.php index 688723e2..2d1fbc76 100644 --- a/models/phocacartcoupon.php +++ b/models/phocacartcoupon.php @@ -43,6 +43,13 @@ protected function loadFormData() { return $data; } + public function getItem($pk = null) { + if ($item = parent::getItem($pk)) { + $item->discount = PhocaCartPrice::cleanPrice($item->discount); + } + return $item; + } + protected function prepareTable($table) { jimport('joomla.filter.output'); $date = JFactory::getDate(); diff --git a/models/phocacartcoupons.php b/models/phocacartcoupons.php index 7f48cddd..6b0d14b0 100644 --- a/models/phocacartcoupons.php +++ b/models/phocacartcoupons.php @@ -10,8 +10,8 @@ jimport('joomla.application.component.modellist'); class PhocaCartCpModelPhocaCartCoupons extends JModelList -{ - protected $option = 'com_phocacart'; +{ + protected $option = 'com_phocacart'; public function __construct($config = array()) { if (empty($config['filter_fields'])) { diff --git a/models/phocacartcurrencies.php b/models/phocacartcurrencies.php index 9e884ac5..0940087c 100644 --- a/models/phocacartcurrencies.php +++ b/models/phocacartcurrencies.php @@ -11,7 +11,7 @@ class PhocaCartCpModelPhocaCartCurrencies extends JModelList { - protected $option = 'com_phocacart'; + protected $option = 'com_phocacart'; public function __construct($config = array()) { if (empty($config['filter_fields'])) { diff --git a/models/phocacartdownloads.php b/models/phocacartdownloads.php index eb81a624..aeced430 100644 --- a/models/phocacartdownloads.php +++ b/models/phocacartdownloads.php @@ -11,7 +11,7 @@ class PhocaCartCpModelPhocaCartDownloads extends JModelList { - protected $option = 'com_phocacart'; + protected $option = 'com_phocacart'; public function __construct($config = array()) { if (empty($config['filter_fields'])) { diff --git a/models/phocacarteditstatus.php b/models/phocacarteditstatus.php index c87d11d0..b031dcda 100644 --- a/models/phocacarteditstatus.php +++ b/models/phocacarteditstatus.php @@ -103,6 +103,8 @@ public function editStatus($data) { $notifyOther = 1; } + + $notify = PhocaCartOrderStatus::changeStatus((int)$data['id'], (int)$data['status_id'], '', $notifyUser, $notifyOther, (int)$data['email_send'], $data['stock_movements']); PhocaCartOrderStatus::setHistory((int)$data['id'], (int)$data['status_id'], (int)$notify, $data['comment']); diff --git a/models/phocacartfeeds.php b/models/phocacartfeeds.php index 649ceacc..9e35e348 100644 --- a/models/phocacartfeeds.php +++ b/models/phocacartfeeds.php @@ -11,7 +11,7 @@ class PhocaCartCpModelPhocaCartFeeds extends JModelList { - protected $option = 'com_phocacart'; + protected $option = 'com_phocacart'; public function __construct($config = array()) { if (empty($config['filter_fields'])) { diff --git a/models/phocacartformfield.php b/models/phocacartformfield.php index 023c7cf6..0de661ac 100644 --- a/models/phocacartformfield.php +++ b/models/phocacartformfield.php @@ -97,7 +97,7 @@ function displayItem(&$pks, $value = 1, $column = 'display_billing') { if ($table->load($pk)) { if (!$this->canEditState($table)) { unset($pks[$i]); - JError::raiseWarning(403, JText::_('JLIB_APPLICATION_ERROR_EDIT_STATE_NOT_PERMITTED')); + $this->setError(JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED')); } } } diff --git a/models/phocacartformfields.php b/models/phocacartformfields.php index b586bce3..c1b17d55 100644 --- a/models/phocacartformfields.php +++ b/models/phocacartformfields.php @@ -11,7 +11,7 @@ class PhocaCartCpModelPhocaCartFormfields extends JModelList { - protected $option = 'com_phocacart'; + protected $option = 'com_phocacart'; public function __construct($config = array()) { diff --git a/models/phocacartitem.php b/models/phocacartitem.php index 96e10f80..86cc1a5b 100644 --- a/models/phocacartitem.php +++ b/models/phocacartitem.php @@ -70,6 +70,18 @@ public function getItem($pk = null) { $registry = new JRegistry; $registry->loadString($item->metadata); $item->metadata = $registry->toArray(); + + // Make the numbers more readable + // it has no influence on saving it to db + $item->price = PhocaCartPrice::cleanPrice($item->price); + $item->price_original = PhocaCartPrice::cleanPrice($item->price_original); + $item->length = PhocaCartPrice::cleanPrice($item->length); + $item->width = PhocaCartPrice::cleanPrice($item->width); + $item->height = PhocaCartPrice::cleanPrice($item->height); + $item->weight = PhocaCartPrice::cleanPrice($item->weight); + $item->volume = PhocaCartPrice::cleanPrice($item->volume); + $item->unit_amount = PhocaCartPrice::cleanPrice($item->unit_amount); + } return $item; @@ -82,6 +94,8 @@ protected function prepareTable($table) { $table->title = htmlspecialchars_decode($table->title, ENT_QUOTES); $table->alias = JApplication::stringURLSafe($table->alias); + + if (empty($table->alias)) { $table->alias = JApplication::stringURLSafe($table->title); @@ -254,10 +268,10 @@ public function delete(&$cid = array()) { if (!$this->canDelete($table)){ $error = $this->getError(); if ($error){ - JLog::add($error, JLog::WARNING, 'jerror'); + JLog::add($error, JLog::WARNING); return false; } else { - JLog::add(JText::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'), JLog::WARNING, 'jerror'); + JLog::add(JText::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'), JLog::WARNING); return false; } } @@ -325,6 +339,12 @@ public function delete(&$cid = array()) { $this->_db->setQuery( $query ); $this->_db->execute(); + // 8. DELETE SPECIFICATIONS + $query = 'DELETE FROM #__phocacart_specifications' + . ' WHERE product_id IN ( '.$cids.' )'; + $this->_db->setQuery( $query ); + $this->_db->execute(); + } return true; } @@ -363,7 +383,7 @@ protected function batchCopy($value, $pks, $contexts) } // Check that the user has create permission for the component - $extension = JRequest::getCmd('option'); + $extension = JFactory::getApplication()->input->get('option'); $user = JFactory::getUser(); if (!$user->authorise('core.create', $extension)) { $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE')); @@ -492,7 +512,7 @@ protected function batchMove($value, $pks, $contexts) } // Check that user has create and edit permission for the component - $extension = JRequest::getCmd('option'); + $extension = JFactory::getApplication()->input->get('option'); $user = JFactory::getUser(); if (!$user->authorise('core.create', $extension)) { $this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE')); @@ -736,7 +756,8 @@ public function saveorder($pks = null, $order = null) if (empty($pks)) { - return JError::raiseWarning(500, JText::_($this->text_prefix . '_ERROR_NO_ITEMS_SELECTED')); + return $app->enqueueMessage(JText::_($this->text_prefix.'_ERROR_NO_ITEMS_SELECTED'), 'error'); + } // Update ordering values @@ -751,7 +772,7 @@ public function saveorder($pks = null, $order = null) { // Prune items that you can't change. unset($pks[$i]); - JLog::add(JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'), JLog::WARNING, 'jerror'); + JLog::add(JText::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'), JLog::WARNING); } elseif ($table->ordering != $order[$i]) { diff --git a/models/phocacartitems.php b/models/phocacartitems.php index a214b5fe..e698c0bd 100644 --- a/models/phocacartitems.php +++ b/models/phocacartitems.php @@ -13,7 +13,7 @@ class PhocaCartCpModelPhocaCartItems extends JModelList { - protected $option = 'com_phocacart'; + protected $option = 'com_phocacart'; public function __construct($config = array()) { diff --git a/models/phocacartlogs.php b/models/phocacartlogs.php index d33149f8..b5716a98 100644 --- a/models/phocacartlogs.php +++ b/models/phocacartlogs.php @@ -13,7 +13,7 @@ class PhocaCartCpModelPhocaCartLogs extends JModelList { - protected $option = 'com_phocacart'; + protected $option = 'com_phocacart'; public function __construct($config = array()) { diff --git a/models/phocacartmanager.php b/models/phocacartmanager.php index 845d92f3..8e5c34cc 100644 --- a/models/phocacartmanager.php +++ b/models/phocacartmanager.php @@ -13,7 +13,7 @@ class PhocaCartCpModelPhocaCartManager extends JModelAdmin { - protected $option = 'com_phocacart'; + protected $option = 'com_phocacart'; protected $text_prefix = 'com_phocacart'; public function getTable($type = 'PhocaCartCategory', $prefix = 'Table', $config = array()) { @@ -42,9 +42,10 @@ function getFolderState($property = null) { static $set; if (!$set) { - $folder = JRequest::getVar( 'folder', '', '', 'path' ); - $upload = JRequest::getVar( 'upload', '', '', 'int' ); - $manager = JRequest::getVar( 'manager', '', '', 'path' ); + $app = JFactory::getApplication(); + $folder = $app->input->get( 'folder', '', 'path' ); + $upload = $app->input->get( 'upload', '', 'int' ); + $manager = $app->input->get( 'manager', '', 'path' ); $this->setState('folder', $folder); $this->setState('manager', $manager); @@ -99,15 +100,15 @@ function getList() { } else { $orig_path = $path['orig_abs_ds']; } - $orig_path_server = str_replace(DS, '/', $path['orig_abs'] .'/'); + $orig_path_server = str_replace('\\', '/', $path['orig_abs'] .'/'); // Absolute Path defined by user $absolutePath = $params->get('absolute_path', ''); - $absolutePath = str_replace(DS, '/', $absolutePath); + $absolutePath = str_replace('\\', '/', $absolutePath); // Be aware - absolute path is not set for images folder and for preview and play folder - see documentation if ($absolutePath != '' && $group['f'] == 1) { - $orig_path_server = str_replace(DS, '/', JPath::clean($absolutePath .'/') );//$absolutePath ; + $orig_path_server = str_replace('\\', '/', JPath::clean($absolutePath .'/') );//$absolutePath ; } $files = array (); @@ -125,13 +126,13 @@ function getList() { //file - abc.img, file_no - folder/abc.img if ($file_list !== false) { foreach ($file_list as $file) { - if (is_file($orig_path.DS.$file) && substr($file, 0, 1) != '.' && strtolower($file) !== 'index.html') { + if (is_file($orig_path.'/'.$file) && substr($file, 0, 1) != '.' && strtolower($file) !== 'index.html') { $tmp = new JObject(); $tmp->name = basename($file); - $tmp->path_with_name = str_replace(DS, '/', JPath::clean($orig_path . DS . $file)); + $tmp->path_with_name = str_replace('\\', '/', JPath::clean($orig_path . '/' . $file)); $tmp->path_without_name_relative= $path['orig_rel_ds'] . str_replace($orig_path_server, '', $tmp->path_with_name); - $tmp->path_with_name = str_replace(DS, '/', JPath::clean($orig_path . DS . $file)); + $tmp->path_with_name = str_replace('\\', '/', JPath::clean($orig_path . '/' . $file)); $tmp->path_with_name_relative_no= str_replace($orig_path_server, '', $tmp->path_with_name); $files[] = $tmp; @@ -146,7 +147,7 @@ function getList() { { $tmp = new JObject(); $tmp->name = basename($folder); - $tmp->path_with_name = str_replace(DS, '/', JPath::clean($orig_path . DS . $folder)); + $tmp->path_with_name = str_replace('\\', '/', JPath::clean($orig_path . '/' . $folder)); $tmp->path_without_name_relative= $path['orig_rel_ds'] . str_replace($orig_path_server, '', $tmp->path_with_name); $tmp->path_with_name_relative_no= str_replace($orig_path_server, '', $tmp->path_with_name); diff --git a/models/phocacartmanufacturers.php b/models/phocacartmanufacturers.php index c5ce0305..be530404 100644 --- a/models/phocacartmanufacturers.php +++ b/models/phocacartmanufacturers.php @@ -11,7 +11,7 @@ class PhocaCartCpModelPhocaCartManufacturers extends JModelList { - protected $option = 'com_phocacart'; + protected $option = 'com_phocacart'; public function __construct($config = array()) { if (empty($config['filter_fields'])) { diff --git a/models/phocacartorder.php b/models/phocacartorder.php index f7aa6165..2ab483b6 100644 --- a/models/phocacartorder.php +++ b/models/phocacartorder.php @@ -86,7 +86,7 @@ protected function prepareTable($table) {} public function save($data) { $app = JFactory::getApplication(); - if (!JRequest::checkToken('request')) { + if (!JSession::checkToken('request')) { $app->enqueueMessage('Invalid Token', 'message'); return false; } diff --git a/models/phocacartorders.php b/models/phocacartorders.php index f811d090..488f65d5 100644 --- a/models/phocacartorders.php +++ b/models/phocacartorders.php @@ -3,7 +3,7 @@ * @package Joomla.Framework * @copyright Copyright (C) 2005 - 2010 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt - * + * * @component Phoca Component * @copyright Copyright (C) Jan Pavelka www.phoca.cz * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License version 2 or later; @@ -13,7 +13,7 @@ class PhocaCartCpModelPhocaCartOrders extends JModelList { - protected $option = 'com_phocacart'; + protected $option = 'com_phocacart'; public function __construct($config = array()) { diff --git a/models/phocacartparama.php b/models/phocacartparama.php index 6328e081..e473526f 100644 --- a/models/phocacartparama.php +++ b/models/phocacartparama.php @@ -81,7 +81,7 @@ protected function preprocessForm(JForm $form, $data, $group = 'pcp') { // Try 1.5 format: /plugins/folder/element/element.xml $formFile = JPath::clean($client->path.'/plugins/'.$folder.'/'.$element.'.xml'); if (!file_exists($formFile)) { - throw new Exception(JText::sprintf('JError_File_not_found', $element.'.xml')); + throw new Exception(JText::sprintf('COM_PHOCACART_ERROR_FILE_NOT_FOUND', $element.'.xml')); return false; } } @@ -95,13 +95,13 @@ protected function preprocessForm(JForm $form, $data, $group = 'pcp') { if (file_exists($formFile)) { // Get the plugin form. if (!$form->loadFile($formFile, false, '//form')) { - throw new Exception(JText::_('JERROR_LOADFILE_FAILED')); + throw new Exception(JText::_('COM_PHOCACART_ERROR_LOADFILE_FAILED')); } } // Attempt to load the xml file. if (!$xml = simplexml_load_file($formFile)) { - throw new Exception(JText::_('JERROR_LOADFILE_FAILED')); + throw new Exception(JText::_('COM_PHOCACART_ERROR_LOADFILE_FAILED')); } // Get the help data from the XML file if present. diff --git a/models/phocacartpayments.php b/models/phocacartpayments.php index 73280a10..e7bea0e9 100644 --- a/models/phocacartpayments.php +++ b/models/phocacartpayments.php @@ -11,7 +11,7 @@ class PhocaCartCpModelPhocaCartPayments extends JModelList { - protected $option = 'com_phocacart'; + protected $option = 'com_phocacart'; public function __construct($config = array()) { if (empty($config['filter_fields'])) { diff --git a/models/phocacartquestion.php b/models/phocacartquestion.php new file mode 100644 index 00000000..68dea519 --- /dev/null +++ b/models/phocacartquestion.php @@ -0,0 +1,105 @@ +loadForm('com_phocacart.phocacartquestion', 'phocacartquestion', array('control' => 'jform', 'load_data' => $loadData)); + if (empty($form)) { + return false; + } + return $form; + } + + protected function loadFormData() + { + // Check the session for previously entered form data. + $data = JFactory::getApplication()->getUserState('com_phocacart.edit.phocacartquestion.data', array()); + + if (empty($data)) { + $data = $this->getItem(); + } + + return $data; + } + + protected function prepareTable($table) + { + jimport('joomla.filter.output'); + $date = JFactory::getDate(); + $user = JFactory::getUser(); + + $table->title = htmlspecialchars_decode($table->title, ENT_QUOTES); + $table->alias = JApplication::stringURLSafe($table->alias); + + if (empty($table->alias)) { + $table->alias = JApplication::stringURLSafe($table->title); + } + + if (empty($table->id)) { + // Set the values + //$table->created = $date->toSql(); + + // Set ordering to the last item if not set + if (empty($table->ordering)) { + $db = JFactory::getDbo(); + $db->setQuery('SELECT MAX(ordering) FROM #__phocacart_questions WHERE product_id = '. (int) $table->product_id); + $max = $db->loadResult(); + + $table->ordering = $max+1; + } + } + else { + // Set the values + //$table->modified = $date->toSql(); + //$table->modified_by = $user->get('id'); + } + } + + protected function getReorderConditions($table = null) + { + $condition = array(); + $condition[] = 'product_id = '. (int) $table->product_id; + return $condition; + } + /* + public function increaseOrdering($productId) { + + $ordering = 1; + $this->_db->setQuery('SELECT MAX(ordering) FROM #__phocacart_reviews WHERE product_id='.(int)$productId); + $max = $this->_db->loadResult(); + $ordering = $max + 1; + return $ordering; + }*/ +} +?> \ No newline at end of file diff --git a/models/phocacartquestions.php b/models/phocacartquestions.php new file mode 100644 index 00000000..af372e76 --- /dev/null +++ b/models/phocacartquestions.php @@ -0,0 +1,151 @@ +getUserStateFromRequest($this->context.'.filter.search', 'filter_search'); + $this->setState('filter.search', $search); + +/* $accessId = $app->getUserStateFromRequest($this->context.'.filter.access', 'filter_access', null, 'int'); + $this->setState('filter.access', $accessId);*/ + + + + $state = $app->getUserStateFromRequest($this->context.'.filter.state', 'filter_published', '', 'string'); + $this->setState('filter.state', $state); + + //$language = $app->getUserStateFromRequest($this->context.'.filter.language', 'filter_language', ''); + //$this->setState('filter.language', $language); + + // Load the parameters. + $params = JComponentHelper::getParams('com_phocacart'); + $this->setState('params', $params); + + // List state information. + parent::populateState('a.name', 'asc'); + } + + protected function getStoreId($id = '') + { + // Compile the store id. + $id .= ':'.$this->getState('filter.search'); + //$id .= ':'.$this->getState('filter.access'); + $id .= ':'.$this->getState('filter.state'); + $id .= ':'.$this->getState('filter.question_id'); + + + return parent::getStoreId($id); + } + + protected function getListQuery() { + + $db = $this->getDbo(); + $query = $db->getQuery(true); + + // Select the required fields from the table. + $query->select( + $this->getState( + 'list.select', + 'a.*' + ) + ); + $query->from('`#__phocacart_questions` AS a'); + + $query->select('p.title AS productname'); + $query->join('LEFT', '#__phocacart_products AS p ON p.id=a.product_id'); + + $query->select('c.title AS cattitle, c.id AS catid'); + $query->join('LEFT', '#__phocacart_categories AS c ON c.id=a.category_id'); + + // Join over the language + //$query->select('l.title AS language_title'); + //$query->join('LEFT', '`#__languages` AS l ON l.lang_code = a.language'); + + $query->select('ua.id AS questionuserid, ua.username AS questionusername, ua.name AS questionname'); + $query->join('LEFT', '#__users AS ua ON ua.id=a.user_id'); + + // Join over the users for the checked out user. + $query->select('uc.name AS editor'); + $query->join('LEFT', '#__users AS uc ON uc.id=a.checked_out'); + + + // Filter by access level. +/* if ($access = $this->getState('filter.access')) { + $query->where('a.access = '.(int) $access); + }*/ + + + + // Filter by published state. + $published = $this->getState('filter.state'); + if (is_numeric($published)) { + $query->where('a.published = '.(int) $published); + } + else if ($published === '') { + $query->where('(a.published IN (0, 1))'); + } + + + // Filter by search in title + $search = $this->getState('filter.search'); + if (!empty($search)) + { + if (stripos($search, 'id:') === 0) { + $query->where('a.id = '.(int) substr($search, 3)); + } + else + { + $search = $db->Quote('%'.$db->escape($search, true).'%'); + $query->where('( a.name LIKE '.$search.' OR a.message LIKE '.$search.' OR productname LIKE '.$search.')'); + } + } + + $orderCol = $this->state->get('list.ordering', 'productname'); + $orderDirn = $this->state->get('list.direction', 'asc'); + $query->order($db->escape($orderCol.' '.$orderDirn)); + + //echo nl2br(str_replace('#__', 'jos_', $query->__toString())); + + return $query; + } +} +?> \ No newline at end of file diff --git a/models/phocacartregion.php b/models/phocacartregion.php index 192eb05c..24546222 100644 --- a/models/phocacartregion.php +++ b/models/phocacartregion.php @@ -127,7 +127,7 @@ public function importregions() { if ($query != '' && $query{0} != '#'){ $db->setQuery($query); if (!$db->execute()){ - JLog::add(JText::sprintf('JLIB_INSTALLER_ERROR_SQL_ERROR', $db->stderr(true)), JLog::WARNING, 'jerror'); + JLog::add(JText::sprintf('JLIB_INSTALLER_ERROR_SQL_ERROR', $db->stderr(true)), JLog::WARNING); return false; } } diff --git a/models/phocacartregions.php b/models/phocacartregions.php index 77a3cbdf..b39e9456 100644 --- a/models/phocacartregions.php +++ b/models/phocacartregions.php @@ -11,7 +11,7 @@ class PhocaCartCpModelPhocaCartRegions extends JModelList { - protected $option = 'com_phocacart'; + protected $option = 'com_phocacart'; public function __construct($config = array()) { diff --git a/models/phocacartreviews.php b/models/phocacartreviews.php index 6e630de7..efb993c3 100644 --- a/models/phocacartreviews.php +++ b/models/phocacartreviews.php @@ -11,7 +11,7 @@ class PhocaCartCpModelPhocaCartReviews extends JModelList { - protected $option = 'com_phocacart'; + protected $option = 'com_phocacart'; public function __construct($config = array()) { diff --git a/models/phocacartshippings.php b/models/phocacartshippings.php index ab9fdecd..09a5031c 100644 --- a/models/phocacartshippings.php +++ b/models/phocacartshippings.php @@ -11,7 +11,7 @@ class PhocaCartCpModelPhocaCartShippings extends JModelList { - protected $option = 'com_phocacart'; + protected $option = 'com_phocacart'; public function __construct($config = array()) { if (empty($config['filter_fields'])) { diff --git a/models/phocacartspecifications.php b/models/phocacartspecifications.php index 009c8a3d..94523c80 100644 --- a/models/phocacartspecifications.php +++ b/models/phocacartspecifications.php @@ -11,7 +11,7 @@ class PhocaCartCpModelPhocaCartSpecifications extends JModelList { - protected $option = 'com_phocacart'; + protected $option = 'com_phocacart'; public function __construct($config = array()) { diff --git a/models/phocacartstatistics.php b/models/phocacartstatistics.php index df4fb863..b98abd30 100644 --- a/models/phocacartstatistics.php +++ b/models/phocacartstatistics.php @@ -13,7 +13,7 @@ class PhocaCartCpModelPhocaCartStatistics extends JModelList { - protected $option = 'com_phocacart'; + protected $option = 'com_phocacart'; public function __construct($config = array()) { diff --git a/models/phocacartstatuses.php b/models/phocacartstatuses.php index 0efca971..26a39219 100644 --- a/models/phocacartstatuses.php +++ b/models/phocacartstatuses.php @@ -11,7 +11,7 @@ class PhocaCartCpModelPhocaCartStatuses extends JModelList { - protected $option = 'com_phocacart'; + protected $option = 'com_phocacart'; public function __construct($config = array()) { if (empty($config['filter_fields'])) { diff --git a/models/phocacartstockstatuses.php b/models/phocacartstockstatuses.php index f5b72bec..38b679a6 100644 --- a/models/phocacartstockstatuses.php +++ b/models/phocacartstockstatuses.php @@ -11,7 +11,7 @@ class PhocaCartCpModelPhocaCartStockStatuses extends JModelList { - protected $option = 'com_phocacart'; + protected $option = 'com_phocacart'; public function __construct($config = array()) { if (empty($config['filter_fields'])) { diff --git a/models/phocacarttags.php b/models/phocacarttags.php index d464f882..1759e554 100644 --- a/models/phocacarttags.php +++ b/models/phocacarttags.php @@ -11,8 +11,8 @@ class PhocaCartCpModelPhocaCartTags extends JModelList { - protected $option = 'com_phocacart'; - + protected $option = 'com_phocacart'; + public function __construct($config = array()) { if (empty($config['filter_fields'])) { $config['filter_fields'] = array( diff --git a/models/phocacarttax.php b/models/phocacarttax.php index 7ffcf874..14f96a06 100644 --- a/models/phocacarttax.php +++ b/models/phocacarttax.php @@ -53,6 +53,13 @@ protected function loadFormData() return $data; } + public function getItem($pk = null) { + if ($item = parent::getItem($pk)) { + $item->tax_rate = PhocaCartPrice::cleanPrice($item->tax_rate); + } + return $item; + } + protected function prepareTable($table) { jimport('joomla.filter.output'); diff --git a/models/phocacartusers.php b/models/phocacartusers.php index bf3e9adf..2d1d3d3b 100644 --- a/models/phocacartusers.php +++ b/models/phocacartusers.php @@ -11,7 +11,7 @@ class PhocaCartCpModelPhocaCartUsers extends JModelList { - protected $option = 'com_phocacart'; + protected $option = 'com_phocacart'; public function __construct($config = array()) { if (empty($config['filter_fields'])) { diff --git a/models/phocacartwishlist.php b/models/phocacartwishlist.php new file mode 100644 index 00000000..2d7ea5ed --- /dev/null +++ b/models/phocacartwishlist.php @@ -0,0 +1,105 @@ +loadForm('com_phocacart.phocacartwishlist', 'phocacartwishlist', array('control' => 'jform', 'load_data' => $loadData)); + if (empty($form)) { + return false; + } + return $form; + } + + protected function loadFormData() + { + // Check the session for previously entered form data. + $data = JFactory::getApplication()->getUserState('com_phocacart.edit.phocacartwishlist.data', array()); + + if (empty($data)) { + $data = $this->getItem(); + } + + return $data; + } + + protected function prepareTable($table) + { + jimport('joomla.filter.output'); + $date = JFactory::getDate(); + $user = JFactory::getUser(); + + $table->title = htmlspecialchars_decode($table->title, ENT_QUOTES); + $table->alias = JApplication::stringURLSafe($table->alias); + + if (empty($table->alias)) { + $table->alias = JApplication::stringURLSafe($table->title); + } + + if (empty($table->id)) { + // Set the values + //$table->created = $date->toSql(); + + // Set ordering to the last item if not set + if (empty($table->ordering)) { + $db = JFactory::getDbo(); + $db->setQuery('SELECT MAX(ordering) FROM #__phocacart_wishlists WHERE user_id = '. (int) $table->user_id); + $max = $db->loadResult(); + + $table->ordering = $max+1; + } + } + else { + // Set the values + //$table->modified = $date->toSql(); + //$table->modified_by = $user->get('id'); + } + } + + protected function getReorderConditions($table = null) + { + $condition = array(); + $condition[] = 'user_id = '. (int) $table->user_id; + return $condition; + } + /* + public function increaseOrdering($productId) { + + $ordering = 1; + $this->_db->setQuery('SELECT MAX(ordering) FROM #__phocacart_reviews WHERE product_id='.(int)$productId); + $max = $this->_db->loadResult(); + $ordering = $max + 1; + return $ordering; + }*/ +} +?> \ No newline at end of file diff --git a/models/phocacartwishlists.php b/models/phocacartwishlists.php new file mode 100644 index 00000000..e3af7df5 --- /dev/null +++ b/models/phocacartwishlists.php @@ -0,0 +1,148 @@ +getUserStateFromRequest($this->context.'.filter.search', 'filter_search'); + $this->setState('filter.search', $search); + +/* $accessId = $app->getUserStateFromRequest($this->context.'.filter.access', 'filter_access', null, 'int'); + $this->setState('filter.access', $accessId);*/ + + + + $state = $app->getUserStateFromRequest($this->context.'.filter.state', 'filter_published', '', 'string'); + $this->setState('filter.state', $state); + + //$language = $app->getUserStateFromRequest($this->context.'.filter.language', 'filter_language', ''); + //$this->setState('filter.language', $language); + + // Load the parameters. + $params = JComponentHelper::getParams('com_phocacart'); + $this->setState('params', $params); + + // List state information. + parent::populateState('name', 'asc'); + } + + protected function getStoreId($id = '') + { + // Compile the store id. + $id .= ':'.$this->getState('filter.search'); + //$id .= ':'.$this->getState('filter.access'); + $id .= ':'.$this->getState('filter.state'); + $id .= ':'.$this->getState('filter.wishlist_id'); + + + return parent::getStoreId($id); + } + + protected function getListQuery() { + + $db = $this->getDbo(); + $query = $db->getQuery(true); + + // Select the required fields from the table. + $query->select( + $this->getState( + 'list.select', + 'a.*' + ) + ); + $query->from('`#__phocacart_wishlists` AS a'); + + $query->select('p.title AS productname'); + $query->join('LEFT', '#__phocacart_products AS p ON p.id=a.product_id'); + + $query->select('c.title AS cattitle, c.id AS catid'); + $query->join('LEFT', '#__phocacart_categories AS c ON c.id=a.category_id'); + + // Join over the language + //$query->select('l.title AS language_title'); + //$query->join('LEFT', '`#__languages` AS l ON l.lang_code = a.language'); + + $query->select('ua.id AS userid, ua.username AS username, ua.name AS name'); + $query->join('LEFT', '#__users AS ua ON ua.id=a.user_id'); + + // Join over the users for the checked out user. + $query->select('uc.name AS editor'); + $query->join('LEFT', '#__users AS uc ON uc.id=a.checked_out'); + + + // Filter by access level. +/* if ($access = $this->getState('filter.access')) { + $query->where('a.access = '.(int) $access); + }*/ + + + + // Filter by published state. + $published = $this->getState('filter.state'); + if (is_numeric($published)) { + $query->where('a.published = '.(int) $published); + } + else if ($published === '') { + $query->where('(a.published IN (0, 1))'); + } + + + // Filter by search in title + $search = $this->getState('filter.search'); + if (!empty($search)) + { + if (stripos($search, 'id:') === 0) { + $query->where('a.id = '.(int) substr($search, 3)); + } + else + { + $search = $db->Quote('%'.$db->escape($search, true).'%'); + $query->where('( name LIKE '.$search.' OR username LIKE '.$search.' OR productname LIKE '.$search.')'); + } + } + + $orderCol = $this->state->get('list.ordering', 'username'); + $orderDirn = $this->state->get('list.direction', 'asc'); + $query->order($db->escape($orderCol.' '.$orderDirn)); + + //echo nl2br(str_replace('#__', 'jos_', $query->__toString())); + + return $query; + } +} +?> \ No newline at end of file diff --git a/other/index.html b/other/index.html new file mode 100644 index 00000000..ea9e94c1 --- /dev/null +++ b/other/index.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/other/install_xml.php b/other/install_xml.php new file mode 100644 index 00000000..84edfb19 --- /dev/null +++ b/other/install_xml.php @@ -0,0 +1,111 @@ + "COM_PHOCACART", 1 => "option=com_phocacart", 2 => "media/com_phocacart/images/administrator/images/icon-16-cart-menu.png"); + +$t = 'COM_PHOCACART_CONTROLPANEL'; +$xml_submenu[] = array (0 => $t, 1 => "option=com_phocacart", 2 => $iP.'icon-16-pc-menu-cp.png', 3 => $t, 4 => 'phocacartcp'); + +$t = 'COM_PHOCACART_PRODUCTS';$v = 'phocacartitems'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-item.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_CATEGORIES';$v = 'phocacartcategories'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-category.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_SPECIFICATIONS';$v = 'phocacartspecifications'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-specification.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_MANUFACTURERS';$v = 'phocacartmanufacturers'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-manufacturer.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_ORDERS';$v = 'phocacartorders'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-order.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_ORDER_STATUSES';$v = 'phocacartstatuses'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-orderstatus.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_STOCK_STATUSES';$v = 'phocacartstockstatuses'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-stockstatus.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_SHIPPING';$v = 'phocacartshippings'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-shipping.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_COUNTRIES';$v = 'phocacartcountries'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-country.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_REGIONS';$v = 'phocacartregions'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-region.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_PAYMENT';$v = 'phocacartpayments'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-payment.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_CURRENCIES';$v = 'phocacartcurrencies'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-currency.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_TAXES';$v = 'phocacarttaxes'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-tax.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_USERS';$v = 'phocacartusers'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-user.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_FORM_FIELDS';$v = 'phocacartformfields'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-user.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_REVIEWS';$v = 'phocacartreviews'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-review.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_COUPONS';$v = 'phocacartcoupons'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-coupon.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_DOWNLOADS';$v = 'phocacartdownloads'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-download.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_TAGS';$v = 'phocacarttags'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-tag.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_XML_FEEDS';$v = 'phocacartfeeds'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-feeds.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_WISH_LISTS';$v = 'phocacartwishlists'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-wishlists.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_QUESTIONS';$v = 'phocacartquestions'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-questions.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_STATISTICS';$v = 'phocacartstatistics'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-statistics.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_SYSTEM_LOG';$v = 'phocacartlogs'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-log.png', 3 => $t, 4 => $v); + +$t = 'COM_PHOCACART_INFO';$v = 'phocacartinfo'; +$xml_submenu[] = array (0 => $t, 1 => 'option=com_phocacart&view='.$v, 2 => $iP.'icon-16-pc-menu-info.png', 3 => $t, 4 => $v); + +$xml_install_file = ''; +$xml_uninstall_file = ''; +/*********** XML PARAMETERS AND VALUES ************/ +?> \ No newline at end of file diff --git a/phocacart.php b/phocacart.php index ec2eb748..5e37923e 100644 --- a/phocacart.php +++ b/phocacart.php @@ -9,11 +9,11 @@ defined('_JEXEC') or die(); if(!defined('DS')) define('DS', DIRECTORY_SEPARATOR); if (!JFactory::getUser()->authorise('core.manage', 'com_phocacart')) { - return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR')); + throw new Exception(JText::_('COM_PHOCACART_ERROR_ALERTNOAUTHOR'), 404); } if (! class_exists('PhocaCartLoader')) { - require_once( JPATH_ADMINISTRATOR.DS.'components'.DS.'com_phocacart'.DS.'libraries'.DS.'loader.php'); + require_once( JPATH_ADMINISTRATOR.'/components/com_phocacart/libraries/loader.php'); } jimport('joomla.filesystem.folder'); @@ -24,6 +24,7 @@ phocacartimport('phocacart.utils.exception'); phocacartimport('phocacart.utils.log'); phocacartimport('phocacart.utils.batchhelper'); +phocacartimport('phocacart.utils.extension'); phocacartimport('phocacart.date.date'); phocacartimport('phocacart.path.path'); phocacartimport('phocacart.file.file'); diff --git a/phocacart.xml b/phocacart.xml index 74830bb1..ecae3e38 100644 --- a/phocacart.xml +++ b/phocacart.xml @@ -2,12 +2,12 @@ Phoca Cart Jan Pavelka (www.phoca.cz) - 26/04/2016 + 17/10/2016 www.phoca.cz Jan Pavelka GNU/GPL - 3.0.0 RC2 + 3.0.0 RC3 Phoca Cart install/script.php @@ -77,6 +77,8 @@ COM_PHOCACART_DOWNLOADS COM_PHOCACART_TAGS COM_PHOCACART_XML_FEEDS + COM_PHOCACART_WISH_LISTS + COM_PHOCACART_QUESTIONS COM_PHOCACART_STATISTICS COM_PHOCACART_SYSTEM_LOG COM_PHOCACART_INFO diff --git a/site/controller.php b/site/controller.php index 96abd1b3..9a223292 100644 --- a/site/controller.php +++ b/site/controller.php @@ -16,7 +16,7 @@ public function display($cachable = false, $urlparams = false) { if ( ! JFactory::getApplication()->input->get('view') ) { - JRequest::setVar('view', 'categories' ); + JFactory::getApplication()->input->set('view', 'categories' ); } /*if (JFactory::getApplication()->input->get('view') && JFactory::getApplication()->input->get('view') == 'feed') { // Default view for Feed is XML diff --git a/site/controllers/account.php b/site/controllers/account.php index 43a7813b..2e24e89b 100644 --- a/site/controllers/account.php +++ b/site/controllers/account.php @@ -32,7 +32,7 @@ public function saveprofile() // PHOCAEDIT jimport('joomla.application.component.model'); - //JLoader::import('user',JPATH_SITE.DS.'components'.DS.'com_users'.DS .'models'); + //JLoader::import('user',JPATH_SITE.'/components/com_users/models'); JModelLegacy::addIncludePath(JPATH_SITE.'/components/com_users/models'); $model = JModelLegacy::getInstance( 'Profile', 'UsersModel' ); $this->data = $model->getData(); @@ -50,7 +50,7 @@ public function saveprofile() if (!$form) { - JError::raiseError(500, $model->getError()); + throw new Exception($model->getError(), 500); return false; } diff --git a/site/controllers/checkout.json.php b/site/controllers/checkout.json.php index bbe49f1b..ec25a7e4 100644 --- a/site/controllers/checkout.json.php +++ b/site/controllers/checkout.json.php @@ -13,7 +13,7 @@ class PhocaCartControllerCheckout extends JControllerForm // Set Region public function setregion() { - if (!JRequest::checkToken('request')) { + if (!JSession::checkToken('request')) { $response = array( 'status' => '0', 'error' => '
' . JText::_('JINVALID_TOKEN') . '
'); @@ -46,7 +46,7 @@ public function setregion() { // Change pricebox function changepricebox($tpl = null){ - if (!JRequest::checkToken('request')) { + if (!JSession::checkToken('request')) { $response = array( 'status' => '0', 'error' => '' . JText::_('JINVALID_TOKEN') . ''); @@ -126,7 +126,7 @@ function changepricebox($tpl = null){ $d['class'] = $class; // Original Price $d['priceitemsorig']['bruttoformat'] = ''; - if (isset($item->price_original) && $item->price_original != '') { + if (isset($item->price_original) && $item->price_original != '' && (int)$item->price_original >0) { $d['priceitemsorig']['bruttoformat'] = $price->getPriceFormat($item->price_original); } @@ -173,7 +173,7 @@ function changepricebox($tpl = null){ // Add item to cart function add($tpl = null){ - if (!JRequest::checkToken('request')) { + if (!JSession::checkToken('request')) { $response = array( 'status' => '0', 'error' => '' . JText::_('JINVALID_TOKEN') . ''); diff --git a/site/controllers/checkout.php b/site/controllers/checkout.php index c9a1a497..a2e2129c 100644 --- a/site/controllers/checkout.php +++ b/site/controllers/checkout.php @@ -11,11 +11,11 @@ class PhocaCartControllerCheckout extends JControllerForm { /* - * Add product to cart + * Add product to cart */ public function add() { - JRequest::checkToken() or jexit( 'Invalid Token' ); + JSession::checkToken() or jexit( 'Invalid Token' ); $app = JFactory::getApplication(); $item = array(); $item['id'] = $this->input->get( 'id', 0, 'int' ); @@ -41,7 +41,7 @@ public function add() { * Change currency */ public function currency() { - JRequest::checkToken() or jexit( 'Invalid Token' ); + JSession::checkToken() or jexit( 'Invalid Token' ); $app = JFactory::getApplication(); $item = array(); $item['id'] = $this->input->get( 'id', 0, 'int' ); @@ -61,7 +61,7 @@ public function currency() { public function saveaddress() { - JRequest::checkToken() or jexit( 'Invalid Token' ); + JSession::checkToken() or jexit( 'Invalid Token' ); $app = JFactory::getApplication(); $item = array(); $item['return'] = $this->input->get( 'return', '', 'string' ); @@ -195,7 +195,7 @@ public function saveaddress() { public function saveshipping() { - JRequest::checkToken() or jexit( 'Invalid Token' ); + JSession::checkToken() or jexit( 'Invalid Token' ); $app = JFactory::getApplication(); $item = array(); $item['return'] = $this->input->get( 'return', '', 'string' ); @@ -241,7 +241,7 @@ public function saveshipping() { public function savepayment() { - JRequest::checkToken() or jexit( 'Invalid Token' ); + JSession::checkToken() or jexit( 'Invalid Token' ); $app = JFactory::getApplication(); $item = array(); $item['return'] = $this->input->get( 'return', '', 'string' ); @@ -309,7 +309,7 @@ public function savepayment() { */ public function update() { - JRequest::checkToken() or jexit( 'Invalid Token' ); + JSession::checkToken() or jexit( 'Invalid Token' ); $app = JFactory::getApplication(); $item = array(); $item['id'] = $this->input->get( 'id', 0, 'int' ); @@ -345,7 +345,7 @@ public function update() { /* public function saveshipping() { - JRequest::checkToken() or jexit( 'Invalid Token' ); + JSession::checkToken() or jexit( 'Invalid Token' ); $app = JFactory::getApplication(); $item = array(); $item['return'] = $this->input->get( 'return', '', 'string' ); @@ -375,7 +375,7 @@ public function saveshipping() { public function order() { - JRequest::checkToken() or jexit( 'Invalid Token' ); + JSession::checkToken() or jexit( 'Invalid Token' ); $app = JFactory::getApplication(); $item = array(); $item['return'] = $this->input->get( 'return', '', 'string' ); @@ -412,7 +412,7 @@ public function order() { if ($action == 4 || $action == 3) { // Ordered OK, but now we proceed to payment $session->set('infomessage', $action, 'phocaCart'); - $app->redirect(JRoute::_(PhocaCartRoute::getPaymentRoute())); + $app->redirect(JRoute::_(PhocaCartRoute::getPaymentRoute(), false)); return true; // This message should stay // when order - the message is created @@ -426,7 +426,7 @@ public function order() { //$app->enqueueMessage($msg, 'message'); $session->set('infomessage', $action, 'phocaCart'); - $app->redirect(JRoute::_(PhocaCartRoute::getInfoRoute())); + $app->redirect(JRoute::_(PhocaCartRoute::getInfoRoute(), false)); return true; } } @@ -436,7 +436,7 @@ public function order() { public function setguest() { - JRequest::checkToken() or jexit( 'Invalid Token' ); + JSession::checkToken() or jexit( 'Invalid Token' ); $app = JFactory::getApplication(); $item = array(); $item['id'] = $this->input->get( 'id', 0, 'int' ); @@ -465,7 +465,7 @@ public function setguest() { /* public function compareadd() { - JRequest::checkToken() or jexit( 'Invalid Token' ); + JSession::checkToken() or jexit( 'Invalid Token' ); $app = JFactory::getApplication(); $item = array(); $item['id'] = $this->input->get( 'id', 0, 'int' ); @@ -484,7 +484,7 @@ public function compareadd() { public function compareremove() { - JRequest::checkToken() or jexit( 'Invalid Token' ); + JSession::checkToken() or jexit( 'Invalid Token' ); $app = JFactory::getApplication(); $item = array(); $item['id'] = $this->input->get( 'id', 0, 'int' ); diff --git a/site/controllers/comparison.json.php b/site/controllers/comparison.json.php index f06546b4..3d1b3b0a 100644 --- a/site/controllers/comparison.json.php +++ b/site/controllers/comparison.json.php @@ -13,7 +13,7 @@ class PhocaCartControllerComparison extends JControllerForm public function add() { - if (!JRequest::checkToken('request')) { + if (!JSession::checkToken('request')) { $response = array( 'status' => '0', 'error' => '' . JText::_('JINVALID_TOKEN') . ''); @@ -21,7 +21,6 @@ public function add() { return; } - $app = JFactory::getApplication(); $item = array(); $item['id'] = $this->input->get( 'id', 0, 'int' ); @@ -85,7 +84,7 @@ public function add() { public function remove() { - if (!JRequest::checkToken('request')) { + if (!JSession::checkToken('request')) { $response = array( 'status' => '0', 'error' => '' . JText::_('JINVALID_TOKEN') . ''); diff --git a/site/controllers/comparison.php b/site/controllers/comparison.php index 747b51a4..531ec53a 100644 --- a/site/controllers/comparison.php +++ b/site/controllers/comparison.php @@ -11,9 +11,9 @@ class PhocaCartControllerComparison extends JControllerForm { - public function add() { + public function add() { - JRequest::checkToken() or jexit( 'Invalid Token' ); + JSession::checkToken() or jexit( 'Invalid Token' ); $app = JFactory::getApplication(); $item = array(); $item['id'] = $this->input->get( 'id', 0, 'int' ); @@ -33,7 +33,7 @@ public function add() { public function remove() { - JRequest::checkToken() or jexit( 'Invalid Token' ); + JSession::checkToken() or jexit( 'Invalid Token' ); $app = JFactory::getApplication(); $item = array(); $item['id'] = $this->input->get( 'id', 0, 'int' ); diff --git a/site/controllers/download.php b/site/controllers/download.php index b18fa026..b8d0de26 100644 --- a/site/controllers/download.php +++ b/site/controllers/download.php @@ -12,7 +12,7 @@ class PhocaCartControllerDownload extends JControllerForm { public function download() { - JRequest::checkToken() or jexit( 'Invalid Token' ); + JSession::checkToken() or jexit( 'Invalid Token' ); $app = JFactory::getApplication(); $item = array(); $item['id'] = $this->input->get( 'id', 0, 'int' ); diff --git a/site/controllers/item.php b/site/controllers/item.php index b797a55c..9c81b0d0 100644 --- a/site/controllers/item.php +++ b/site/controllers/item.php @@ -10,9 +10,9 @@ class PhocaCartControllerItem extends JControllerForm { - public function review() { + public function review() { - JRequest::checkToken() or jexit( 'Invalid Token' ); + JSession::checkToken() or jexit( 'Invalid Token' ); $paramsC = JComponentHelper::getParams('com_phocacart'); $approve_review = $paramsC->get( 'approve_review',0 ); $app = JFactory::getApplication(); diff --git a/site/controllers/question.php b/site/controllers/question.php new file mode 100644 index 00000000..7e8ce32b --- /dev/null +++ b/site/controllers/question.php @@ -0,0 +1,314 @@ +get('enable_ask_question', 0); + + if ($enable_ask_question == 0) { + throw new Exception(JText::_('COM_PHOCACART_ASK_QUESTION_DISABLED'), 500); + return false; + } + + $namespace = 'phccrt' . $params->get('session_suffix'); + $data = $this->input->post->get('jform', array(), 'array'); + + // Additional data + if(isset($_SERVER['REMOTE_ADDR']) && $_SERVER['REMOTE_ADDR'] != getenv('SERVER_ADDR')) { + $data['ip'] = $_SERVER['REMOTE_ADDR']; + } else { + $data['ip'] = getenv('HTTP_X_FORWARDED_FOR'); + } + if (!$data['ip']) { + $data['ip'] = $_SERVER['REMOTE_ADDR']; + } + + // Only because of information in LOG + $productId = ''; + if (isset($data['product_id']) && (int)$data['product_id'] > 0) { + $productId = (int)$data['product_id']; + } + + // *** SECURITY + // Default session test always enabled! + $valid = $session->get('form_id', NULL, 'phocacart'); + $session->clear('form_id', 'phocacart'); + if (!$valid){ + $app->setUserState('com_phocacart.question.data', ''); + $session->clear('time', 'phccrt'.$params->get('session_suffix')); + + PhocaCartLog::add(1, 'Ask a Question - Not valid session', $productId, 'IP: '. $data['ip'].', User ID: '.$user->id . ', User Name: '.$user->unsername); + //jexit(JText::_('COM_PHOCACART_POSSIBLE_SPAM_DETECTED')); + throw new Exception(JText::_('COM_PHOCACART_POSSIBLE_SPAM_DETECTED'), 500); + return false; + } + + $model = $this->getModel('question'); + + // *** SECURITY + // Hidden Field + if ($params->get('enable_hidden_field_question', 0) == 1) { + $params->set('hidden_field_id', $session->get('hidden_field_id', 'fieldnotvalid', $namespace)); + $params->set('hidden_field_name', $session->get('hidden_field_name', 'fieldnotvalid', $namespace)); + $hiddenField = $session->get('hidden_field_name', 'fieldnotvalid', $namespace); + + $session->clear('hidden_field_id', $namespace); + $session->clear('hidden_field_name', $namespace); + $session->clear('hidden_field_class', $namespace); + + if ($params->get('hidden_field_id') == 'fieldnotvalid') { + $app->setUserState('com_phocacart.question.data', ''); + $session->clear('time', 'phccrt'.$params->get('session_suffix')); + + PhocaCartLog::add(1, 'Ask a Question - Hidden Field Error', $productId, 'IP: '. $data['ip'].', User ID: '.$user->id . ', User Name: '.$user->unsername); + throw new Exception(JText::_('COM_PHOCACART_POSSIBLE_SPAM_DETECTED'), 500); + return false; + } + + // Hidden field was filled + if (isset($data[$hiddenField]) && $data[$hiddenField] != '') { + $app->setUserState('com_phocacart.question.data', ''); + $session->clear('time', 'phccrt'.$params->get('session_suffix')); + + PhocaCartLog::add(1, 'Ask a Question - Hidden Field Filled', $productId, 'IP: '. $data['ip'].', User ID: '.$user->id . ', User Name: '.$user->unsername); + throw new Exception(JText::_('COM_PHOCACART_POSSIBLE_SPAM_DETECTED'), 500); + return false; + } + + } + + // *** SECURITY + // Check for a valid session cookie + if($session->getState() != 'active'){ + // Save the data in the session. + $app->setUserState('com_phocacart_cart.data', $data); + $message = JText::_( 'COM_PHOCACART_SESSION_INVALID' ); + $app->enqueueMessage($message, 'error'); + + PhocaCartLog::add(1, 'Ask a Question - Session not active', $productId, 'IP: '. $data['ip'].', User ID: '.$user->id . ', User Name: '.$user->unsername.', Message: '.$message); + $app->redirect(JRoute::_($uri)); + return false; + } + + // *** SECURITY + // Task + $task = $this->input->get('task'); + + if ($task == 'phocacart.submit') { + $task = 'submit'; + } + if (($this->input->get('view') != 'question') || ($this->input->get('option') != 'com_phocacart') || ($task != 'submit')) { + $app->setUserState('com_phocacart.question.data', ''); + $session->clear('time', 'phccrt'.$params->get('session_suffix')); + + PhocaCartLog::add(1, 'Ask a Question - No Phoca Cart part', $productId, 'IP: '. $data['ip'].', User ID: '.$user->id . ', User Name: '.$user->unsername); + throw new Exception(JText::_('COM_PHOCACART_POSSIBLE_SPAM_DETECTED'), 500); + return false; + } + + // *** SECURITY + // Check Time + if((int)$params->get('enable_time_check_question', 0) > 0) { + $time = $session->get('time', null, 'phccrt'.$params->get('session_suffix')); + $delta = time() - $time; + + if($params->get('enable_time_check_question', 0) && $delta <= (int)$params->get('enable_time_check_question', 0)) { + + $app->setUserState('com_phocacart.question.data', $data); + $message = JText::_( 'COM_PHOCACART_SUBMIT_TOO_FAST' ); + $app->enqueueMessage($message, 'error'); + + PhocaCartLog::add(1, 'Ask a Question - Submit too fast', $productId, 'IP: '. $data['ip'].', User ID: '.$user->id . ', User Name: '.$user->unsername.', Message: '.$message . ', Time: '. $delta . ' sec.'); + $app->redirect(JRoute::_($uri)); + return false; + } + } + + // ***SECURITY + // IP Ban + if ($params->get('ip_ban', '') != '') { + + $isSpam = PhocaCartSecurity::checkIpAddress($data['ip'], $params->get('ip_ban')); + + if ($isSpam) { + //$app->setUserState('com_phocacart.question.data', $data); // Save the data in the session. + //$message = JText::_( 'COM_PHOCACART_POSSIBLE_SPAM_DETECTED' ); + //$app->enqueueMessage($message, 'error'); + //$app->redirect(JRoute::_($uri)); + + $app->setUserState('com_phocacart.question.data', ''); + $session->clear('time', 'phccrt'.$params->get('session_suffix')); + + PhocaCartLog::add(1, 'Ask a Question - IP Ban', $productId, 'IP: '. $data['ip'].', User ID: '.$user->id . ', User Name: '.$user->unsername); + throw new Exception(JText::_('COM_PHOCACART_POSSIBLE_SPAM_DETECTED'), 500); + return false; + } + } + + // *** SECURITY + // Validate the posted data. + $form = $model->getForm(); + if (!$form) { + $app->setUserState('com_phocacart.question.data', ''); + $session->clear('time', 'phccrt'.$params->get('session_suffix')); + + PhocaCartLog::add(1, 'Ask a Question - Model not loaded', $productId, 'IP: '. $data['ip'].', User ID: '.$user->id . ', User Name: '.$user->unsername.', Message: '.$model->getError()); + throw new Exception($model->getError(), 500); + return false; + } + + // *** SECURITY + // VALIDATE - continue with validation in case of problem + $continueValidate = true; + + // SECURITY + // Captcha - is validated in RULES of FORM FIELD - Exception for validate fields + $captchaId = 1;//Possible parameters in Options for different captchas (reCaptcha = 1) + switch ($captchaId) { + case 1: // reCaptcha uses virtual field, so we cannot check the field set in form + $data['phq_captcha'] = 'OK'; + break; + } + + $validate = $model->validate($form, $data); + + if ($validate === false) { + $errors = $model->getErrors(); + + + // Get (possible) attack issues + for ($i = 0, $n = count($errors); $i < $n && $i < 5; $i++) { + if (($errors[$i] instanceof JException) && ($errors[$i]->get('Level') == E_ERROR)) { + $app->setUserState('com_phocacart.question.data', ''); + $session->clear('time', 'phccrt'.$params->get('session_suffix')); + + PhocaCartLog::add(1, 'Ask a Question - Validate errors', $productId, 'IP: '. $data['ip'].', User ID: '.$user->id . ', User Name: '.$user->unsername); + throw new Exception(JText::_('COM_PHOCACART_POSSIBLE_SPAM_DETECTED'), 500); + return false; + } else { + + $app->enqueueMessage($errors[$i]->getMessage(), 'warning'); + $continueValidate = false; + } + } + } + + // *** SECURITY + // Forbidden Word Filter + $fwfa = explode( ',', trim( $params->get('forbidden_word_filter', '') ) ); + $fwwfa = explode( ',', trim( $params->get('forbidden_whole_word_filter', '') ) ); + + foreach ($fwfa as $item) { + if (trim($item) != '') { + + if (isset($data['message']) && stripos($data['message'], trim($item)) !== false) { + $continueValidate = false; + PhocaCartLog::add(1, 'Ask a Question - Forbidden Word Filder - Message', $productId, 'Word: '.$item.', IP: '. $data['ip'].', User ID: '.$user->id); + $app->enqueueMessage(JText::_('COM_PHOCACART_POSSIBLE_SPAM_DETECTED' ), 'warning'); + } + if (isset($data['name']) && stripos($data['name'], trim($item)) !== false) { + $continueValidate = false; + PhocaCartLog::add(1, 'Ask a Question - Forbidden Word Filder - Name', $productId, 'Word: '.$item.', IP: '. $data['ip'].', User ID: '.$user->id); + $app->enqueueMessage(JText::_('COM_PHOCACART_POSSIBLE_SPAM_DETECTED' ), 'warning'); + } + if (isset($data['phone']) && stripos($data['phone'], trim($item)) !== false) { + $continueValidate = false; + PhocaCartLog::add(1, 'Ask a Question - Forbidden Word Filder - Phone', $productId, 'Word: '.$item.', IP: '. $data['ip'].', User ID: '.$user->id); + $app->enqueueMessage(JText::_('COM_PHOCACART_POSSIBLE_SPAM_DETECTED' ), 'warning'); + } + if (isset($data['email']) && stripos($data['email'], trim($item)) !== false) { + $continueValidate = false; + PhocaCartLog::add(1, 'Ask a Question - Forbidden Word Filder - Email', $productId, 'Word: '.$item.', IP: '. $data['ip'].', User ID: '.$user->id); + $app->enqueueMessage(JText::_('COM_PHOCACART_POSSIBLE_SPAM_DETECTED' ), 'warning'); + } + } + } + + foreach ($fwwfa as $item) { + if ($item != '') { + $itemBase = trim($item); + $item = "/(^|[^a-zA-Z0-9_]){1}(".preg_quote(($item),"/").")($|[^a-zA-Z0-9_]){1}/i"; + + + if (isset($data['message']) && preg_match( $item, $data['message']) == 1) { + $continueValidate = false; + PhocaCartLog::add(1, 'Ask a Question - Forbidden Whole Word Filder - Message', $productId, 'Word: '.$itemBase.', IP: '. $data['ip'].', User ID: '.$user->id); + $app->enqueueMessage(JText::_('COM_PHOCACART_POSSIBLE_SPAM_DETECTED' ), 'warning'); + } + if (isset($data['name']) && preg_match( $item, $data['name']) == 1) { + $continueValidate = false; + PhocaCartLog::add(1, 'Ask a Question - Forbidden Whole Word Filder - Name', $productId, 'Word: '.$itemBase.', IP: '. $data['ip'].', User ID: '.$user->id); + $app->enqueueMessage(JText::_('COM_PHOCACART_POSSIBLE_SPAM_DETECTED' ), 'warning'); + } + if (isset($data['phone']) && preg_match( $item, $data['phone']) == 1) { + $continueValidate = false; + PhocaCartLog::add(1, 'Ask a Question - Forbidden Whole Word Filder - Phone', $productId, 'Word: '.$itemBase.', IP: '. $data['ip'].', User ID: '.$user->id); + $app->enqueueMessage(JText::_('COM_PHOCACART_POSSIBLE_SPAM_DETECTED' ), 'warning'); + } + if (isset($data['email']) && preg_match( $item, $data['email']) == 1) { + $continueValidate = false; + PhocaCartLog::add(1, 'Ask a Question - Forbidden Whole Word Filder - Email', $productId, 'Word: '.$itemBase.', IP: '. $data['ip'].', User ID: '.$user->id); + $app->enqueueMessage(JText::_('COM_PHOCACART_POSSIBLE_SPAM_DETECTED' ), 'warning'); + } + } + } + + + // remove captcha from data after check + $data['phq_captcha'] = ''; + + if ($continueValidate == false) { + // Save the data in the session. + $app->setUserState('com_phocacart.question.data', $data); + // Log added before + $app->redirect(JRoute::_($uri)); + return false; + } + + + // CHECKS DONE - store entry + $msg = ''; + if ($model->store($data)) { + + $msg = JText::_( 'COM_PHOCACART_THANK_YOU_FOR_LEAVING_INFORMATION_ASKING_QUESTION' ); + } else { + $app->setUserState('com_phocacart.question.data', ''); + $session->clear('time', 'phccrt'.$params->get('session_suffix')); + + PhocaCartLog::add(1, 'Ask a Question - Model store error', $productId, 'IP: '. $data['ip'].', User ID: '.$user->id . ', User Name: '.$user->unsername.', Message: '.$model->getError()); + + throw new Exception($model->getError(), 500); + return false; + } + + + + // Flush the data from the session + $app->setUserState('com_phocacart.question.data', ''); + //$session->clear('time', 'phccrt'.$params->get('session_suffix')); + $app->setUserState('com_phocacart.question.data', 'success_post_saved'); + $app->enqueueMessage($msg, 'success'); + $this->setRedirect($uri->toString()); + + return true; + } +} +?> diff --git a/site/controllers/response.php b/site/controllers/response.php index 76f39539..12ad8c9c 100644 --- a/site/controllers/response.php +++ b/site/controllers/response.php @@ -20,7 +20,7 @@ public function paymentrecieve() { $session = JFactory::getSession(); $session->set('proceedpayment', array(), 'phocaCart'); - //JRequest::checkToken() or jexit( 'Invalid Token' ); + //JSession::checkToken() or jexit( 'Invalid Token' ); $return = PhocaCartRoute::getInfoRoute(); //$app->enqueueMessage(JText::_('COM_PHOCACART_PAYMENT_RECIEVED'), 'message'); //$session->set('infomessage', 3, 'phocaCart'); @@ -36,7 +36,7 @@ public function paymentcancel() { $app = JFactory::getApplication(); $session = JFactory::getSession(); $session->set('proceedpayment', array(), 'phocaCart'); - //JRequest::checkToken() or jexit( 'Invalid Token' ); + //JSession::checkToken() or jexit( 'Invalid Token' ); $return = PhocaCartRoute::getInfoRoute(); $session->set('infomessage', 5, 'phocaCart'); //$app->enqueueMessage(JText::_('COM_PHOCACART_PAYMENT_CANCELED'), 'info'); diff --git a/site/controllers/wishlist.json.php b/site/controllers/wishlist.json.php new file mode 100644 index 00000000..d75eaf49 --- /dev/null +++ b/site/controllers/wishlist.json.php @@ -0,0 +1,160 @@ + '0', + 'error' => '' . JText::_('JINVALID_TOKEN') . ''); + echo json_encode($response); + return; + } + + + $app = JFactory::getApplication(); + $item = array(); + $item['id'] = $this->input->get( 'id', 0, 'int' ); + $item['catid'] = $this->input->get( 'catid', 0, 'int' ); + $item['return'] = $this->input->get( 'return', '', 'string' ); + $item['wishlistview'] = $this->input->get( 'wishlistview', 0, 'int' ); + + $wishlist = new PhocaCartWishList(); + $added = $wishlist->addItem((int)$item['id'], (int)$item['catid']); + //$catid = PhocaCartProduct::getCategoryByProductId((int)$item['id']); + + $o = $o2 = ''; + // Content of the wishlist list + ob_start(); + echo $wishlist->renderList(); + $o = ob_get_contents(); + ob_end_clean(); + + // Render the layout + $d = ''; + $layoutW = new JLayoutFile('popup_add_to_wishlist', $basePath = JPATH_ROOT .'/components/com_phocacart/layouts'); + + $d['link_wishlist'] = JRoute::_(PhocaCartRoute::getWishListRoute((int)$item['id']), (int)$item['catid']); + $d['link_continue'] = ''; + // We need to know if module is displayed on wishlist site + // If yes and one item will be deleted per AJAX, we need to refresh wishlist site + // If now and one item will be deleted per AJAX, everything is OK, nothing needs to be refreshed + $d['wishlist_view'] = (int)$item['wishlistview']; + + if ($added) { + $d['info_msg'] = JText::_('COM_PHOCACART_PRODUCT_ADDED_TO_WISH_LIST'); + } else { + $d['info_msg'] = JText::_('COM_PHOCACART_PRODUCT_NOT_ADDED_TO_WISH_LIST'); + + $m = $app->getMessageQueue(); + $mO = ''; + if (!empty($m)) { + $mO .= '
    '; + foreach($m as $k => $v) { + $mO .= '
  • ' . $v['message'] . '
    • '; + } + $mO .= '
'; + } + $d['info_msg_additional'] = $mO; + } + + // Popup with info - Continue,Proceed to wishlist list + ob_start(); + echo $layoutW->render($d); + $o2 = ob_get_contents(); + ob_end_clean(); + + $response = array( + 'status' => '1', + 'item' => $o, + 'popup' => $o2); + + echo json_encode($response); + return; + } + + public function remove() { + + if (!JSession::checkToken('request')) { + $response = array( + 'status' => '0', + 'error' => '' . JText::_('JINVALID_TOKEN') . ''); + echo json_encode($response); + return; + } + + $app = JFactory::getApplication(); + $item = array(); + $item['id'] = $this->input->get( 'id', 0, 'int' ); + $item['catid'] = $this->input->get( 'catid', 0, 'int' ); + $item['return'] = $this->input->get( 'return', '', 'string' ); + $item['wishlistview'] = $this->input->get( 'wishlistview', 0, 'int' ); + + $wishlist = new PhocaCartWishlist(); + $added = $wishlist->removeItem((int)$item['id']); + //$catid = PhocaCartProduct::getCategoryByProductId((int)$item['id']); + + $o = $o2 = ''; + // Content of the wishlist list + ob_start(); + echo $wishlist->renderList(); + $o = ob_get_contents(); + ob_end_clean(); + + // Render the layout + $d = ''; + $layoutW = new JLayoutFile('popup_remove_from_wishlist', $basePath = JPATH_ROOT .'/components/com_phocacart/layouts'); + + $d['link_wishlist'] = JRoute::_(PhocaCartRoute::getWishListRoute((int)$item['id']), (int)$item['catid']); + $d['link_continue'] = ''; + // We need to know if module is displayed on wishlist site + // If yes and one item will be deleted per AJAX, we need to refresh wishlist site + // If now and one item will be deleted per AJAX, everything is OK, nothing needs to be refreshed + $d['wishlist_view'] = (int)$item['wishlistview']; + + + + if ($added) { + $d['info_msg'] = JText::_('COM_PHOCACART_PRODUCT_REMOVED_FROM_WISH_LIST'); + } else { + $d['info_msg'] = JText::_('COM_PHOCACART_PRODUCT_NOT_REMOVED_FROM_WISH_LIST'); + + $m = $app->getMessageQueue(); + $mO = ''; + if (!empty($m)) { + $mO .= '
    '; + foreach($m as $k => $v) { + $mO .= '
  • ' . $v['message'] . '
    • '; + } + $mO .= '
'; + } + $d['info_msg_additional'] = $mO; + } + + // Popup with info - Continue,Proceed to wishlist list + ob_start(); + echo $layoutW->render($d); + $o2 = ob_get_contents(); + ob_end_clean(); + + $response = array( + 'status' => '1', + 'item' => $o, + 'popup' => $o2); + + echo json_encode($response); + return; + } + +} +?> \ No newline at end of file diff --git a/site/controllers/wishlist.php b/site/controllers/wishlist.php new file mode 100644 index 00000000..2f63e453 --- /dev/null +++ b/site/controllers/wishlist.php @@ -0,0 +1,54 @@ +input->get( 'id', 0, 'int' ); + $item['catid'] = $this->input->get( 'catid', 0, 'int' ); + $item['return'] = $this->input->get( 'return', '', 'string' ); + + $wishlist = new PhocaCartWishList(); + $added = $wishlist->addItem((int)$item['id'], (int)$item['catid']); + if ($added) { + $app->enqueueMessage(JText::_('COM_PHOCACART_PRODUCT_ADDED_TO_WISH_LIST'), 'message'); + } else { + $app->enqueueMessage(JText::_('COM_PHOCACART_PRODUCT_NOT_ADDED_TO_WISH_LIST'), 'error'); + } + //$app->redirect(JRoute::_('index.php?option=com_phocacart&view=checkout')); + $app->redirect(base64_decode($item['return'])); + } + + public function remove() { + + JSession::checkToken() or jexit( 'Invalid Token' ); + $app = JFactory::getApplication(); + $item = array(); + $item['id'] = $this->input->get( 'id', 0, 'int' ); + $item['return'] = $this->input->get( 'return', '', 'string' ); + + $wishlist = new PhocaCartWishList(); + $added = $wishlist->removeItem((int)$item['id']); + if ($added) { + $app->enqueueMessage(JText::_('COM_PHOCACART_PRODUCT_REMOVED_FROM_WISH_LIST'), 'message'); + } else { + $app->enqueueMessage(JText::_('COM_PHOCACART_PRODUCT_NOT_REMOVED_FROM_WISH_LIST'), 'error'); + } + //$app->redirect(JRoute::_('index.php?option=com_phocacart&view=checkout')); + $app->redirect(base64_decode($item['return'])); + } + +} +?> \ No newline at end of file diff --git a/site/helpers/route.php b/site/helpers/route.php index 9a849746..9df50e52 100644 --- a/site/helpers/route.php +++ b/site/helpers/route.php @@ -6,7 +6,7 @@ * @copyright Copyright (C) Jan Pavelka www.phoca.cz * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL */ -defined('_JEXEC') or die('Restricted access'); +defined('_JEXEC') or die; jimport('joomla.application.component.helper'); class PhocaMapsHelperRoute diff --git a/site/layouts/button_add_to_cart_item.php b/site/layouts/button_add_to_cart_item.php index eab2f9ef..231e1df5 100644 --- a/site/layouts/button_add_to_cart_item.php +++ b/site/layouts/button_add_to_cart_item.php @@ -20,9 +20,13 @@ -
- - */ ?> +
+ */ ?>
\ No newline at end of file diff --git a/site/layouts/button_add_to_cart_list.php b/site/layouts/button_add_to_cart_list.php index 30a008c4..91518442 100644 --- a/site/layouts/button_add_to_cart_list.php +++ b/site/layouts/button_add_to_cart_list.php @@ -10,8 +10,12 @@ $d = $displayData; // One of the attributes is required, cannot add to cart if ($d['attrrequired'] == 1) { ?> -
- +
@@ -22,8 +26,12 @@ -
- +
diff --git a/site/layouts/button_ask_question.php b/site/layouts/button_ask_question.php new file mode 100644 index 00000000..61fd2487 --- /dev/null +++ b/site/layouts/button_ask_question.php @@ -0,0 +1,24 @@ + + +
+ +
+ + +
+ +
+ + diff --git a/site/layouts/button_buy_now_paddle.php b/site/layouts/button_buy_now_paddle.php index de47a7da..6514d4d3 100644 --- a/site/layouts/button_buy_now_paddle.php +++ b/site/layouts/button_buy_now_paddle.php @@ -13,5 +13,5 @@ ?>
- +
diff --git a/site/layouts/button_category_view.php b/site/layouts/button_category_view.php new file mode 100644 index 00000000..9dba0c12 --- /dev/null +++ b/site/layouts/button_category_view.php @@ -0,0 +1,24 @@ + +
+ +
\ No newline at end of file diff --git a/site/layouts/button_product_view.php b/site/layouts/button_product_view.php index 0b7d6ac3..43732719 100644 --- a/site/layouts/button_product_view.php +++ b/site/layouts/button_product_view.php @@ -10,5 +10,14 @@ $d = $displayData; ?>
- +
\ No newline at end of file diff --git a/site/layouts/button_quickview.php b/site/layouts/button_quickview.php new file mode 100644 index 00000000..6ac4c5a6 --- /dev/null +++ b/site/layouts/button_quickview.php @@ -0,0 +1,24 @@ + +
+ + + + + +
+
+ +
+
+ +
\ No newline at end of file diff --git a/site/layouts/button_wishlist.php b/site/layouts/button_wishlist.php new file mode 100644 index 00000000..a0e1b1a8 --- /dev/null +++ b/site/layouts/button_wishlist.php @@ -0,0 +1,29 @@ + +
+ + + + + + +
+
+ 0) { ?> + + + + +
+
+ +
\ No newline at end of file diff --git a/site/layouts/form_filter_checkbox.php b/site/layouts/form_filter_checkbox.php index e5025ce2..2bd8a01a 100644 --- a/site/layouts/form_filter_checkbox.php +++ b/site/layouts/form_filter_checkbox.php @@ -23,7 +23,7 @@
$v) { - + $checked = ''; $value = htmlspecialchars($v->alias); if (isset($d['nrinalias']) && $d['nrinalias'] == 1) { diff --git a/site/layouts/form_filter_color.php b/site/layouts/form_filter_color.php new file mode 100644 index 00000000..acbe664b --- /dev/null +++ b/site/layouts/form_filter_color.php @@ -0,0 +1,54 @@ + +
+ + +
+
+ $v) { + + $checked = ''; + $checkedInt = 0; + $value = htmlspecialchars($v->alias); + if (isset($d['nrinalias']) && $d['nrinalias'] == 1) { + $value = (int)$v->id .'-'. htmlspecialchars($v->alias); + } + + if (in_array($value, $d['getparams'])) { + $checked = 'checked'; + $checkedInt = 0; + } else { + $checkedInt = 1; + } + + $class = ''; + if ($checked) { + $class = 'on'; + } + + if (isset($v->color) && $v->color != '') { + echo ' '; + } + } + ?> +
+
+
\ No newline at end of file diff --git a/site/layouts/form_filter_image.php b/site/layouts/form_filter_image.php new file mode 100644 index 00000000..7689b2bf --- /dev/null +++ b/site/layouts/form_filter_image.php @@ -0,0 +1,59 @@ + +
+ + +
+
+ $v) { + + $checked = ''; + $checkedInt = 0; + $value = htmlspecialchars($v->alias); + if (isset($d['nrinalias']) && $d['nrinalias'] == 1) { + $value = (int)$v->id .'-'. htmlspecialchars($v->alias); + } + + if (in_array($value, $d['getparams'])) { + $checked = 'checked'; + $checkedInt = 0; + } else { + $checkedInt = 1; + } + + $class = ''; + if ($checked) { + $class = 'on'; + } + + if (isset($v->image_small) && $v->image_small != '') { + + $linkI = JURI::base(true).'/'.$d['pathitem']['orig_rel'].'/'.$v->image_small; + + echo '' + .''.$v->title.'' + .''; + } + } + ?> +
+
+
\ No newline at end of file diff --git a/site/layouts/form_filter_text.php b/site/layouts/form_filter_text.php index 7efaad0f..79a8e2e7 100644 --- a/site/layouts/form_filter_text.php +++ b/site/layouts/form_filter_text.php @@ -14,7 +14,6 @@ $d['param2name'] = str_replace('-', '', $d['param2']); } - if (isset($d['param2']) && $d['param2'] != '') { // We have second parameter, so in first we define that the javascript should wait with redirect $jsSet = 'phChangeFilter(\''.$d['param'].'\', jQuery(\'#'. $d['id'].' input[name="'.$d['paramname'].'"]\').val(), 1, \'text\', 1, 1);'; diff --git a/site/layouts/form_question.php b/site/layouts/form_question.php new file mode 100644 index 00000000..bf4bd99f --- /dev/null +++ b/site/layouts/form_question.php @@ -0,0 +1,34 @@ + +
+ +
+
+ +
+ +
+
+ + + +
+
+
+ + +
+
\ No newline at end of file diff --git a/site/layouts/list_compare.php b/site/layouts/list_compare.php index 3a6c06e4..083127c7 100644 --- a/site/layouts/list_compare.php +++ b/site/layouts/list_compare.php @@ -30,9 +30,9 @@
0) { ?> -
+
-
+
@@ -43,4 +43,4 @@ } } ?> -
+
diff --git a/site/layouts/list_wishlist.php b/site/layouts/list_wishlist.php new file mode 100644 index 00000000..7973ec7b --- /dev/null +++ b/site/layouts/list_wishlist.php @@ -0,0 +1,46 @@ + $v) { + // Try to find the best menu link + if (isset($v->catid2) && (int)$v->catid2 > 0 && isset($v->catalias2) && $v->catalias2 != '') { + $linkProduct = JRoute::_(PhocaCartRoute::getItemRoute($v->id, $v->catid2, $v->alias, $v->catalias2)); + } else { + $linkProduct = JRoute::_(PhocaCartRoute::getItemRoute($v->id, $v->catid, $v->alias, $v->catalias)); + } + +?> +
+
title; ?>
+
+
+ + + + + +
+ 0) { ?> +
+ +
+ +
+ +
+
+
+ +
diff --git a/site/layouts/popup_add_to_wishlist.php b/site/layouts/popup_add_to_wishlist.php new file mode 100644 index 00000000..a5a8c8ba --- /dev/null +++ b/site/layouts/popup_add_to_wishlist.php @@ -0,0 +1,44 @@ + + + + + \ No newline at end of file diff --git a/site/layouts/popup_quickview.php b/site/layouts/popup_quickview.php new file mode 100644 index 00000000..d37912f6 --- /dev/null +++ b/site/layouts/popup_quickview.php @@ -0,0 +1,25 @@ + + +
\ No newline at end of file diff --git a/site/layouts/popup_remove_from_wishlist.php b/site/layouts/popup_remove_from_wishlist.php new file mode 100644 index 00000000..a2523f76 --- /dev/null +++ b/site/layouts/popup_remove_from_wishlist.php @@ -0,0 +1,45 @@ + + + + + \ No newline at end of file diff --git a/site/models/category.php b/site/models/category.php index 4cd6fd7a..5c93d61b 100644 --- a/site/models/category.php +++ b/site/models/category.php @@ -11,6 +11,7 @@ class PhocaCartModelCategory extends JModelLegacy { + protected $item = null; protected $item_ordering = null; protected $category = null; @@ -33,8 +34,8 @@ public function __construct() { $this->setState('limitstart', $app->input->get('limitstart', 0, 'int')); $this->setState('limitstart', ($this->getState('limit') != 0 ? (floor($this->getState('limitstart') / $this->getState('limit')) * $this->getState('limit')) : 0)); $this->setState('filter.language',$app->getLanguageFilter()); - $this->setState('filter_order', JRequest::getCmd('filter_order', 'ordering')); - $this->setState('filter_order_dir', JRequest::getCmd('filter_order_Dir', 'ASC')); + $this->setState('filter_order', JFactory::getApplication()->input->get('filter_order', 'ordering')); + $this->setState('filter_order_dir', JFactory::getApplication()->input->get('filter_order_Dir', 'ASC')); $this->setState('itemordering', $app->getUserStateFromRequest('com_phocacart.itemordering', 'itemordering', $item_ordering, 'int')); } @@ -91,6 +92,16 @@ protected function getItemListQuery($categoryId, $count = 0) { $user = JFactory::getUser(); $userLevels = implode (',', $user->getAuthorisedViewLevels()); $params = $app->getParams(); + + $p['switch_image_category_items'] = $params->get( 'switch_image_category_items', 0 ); + $leftImages = ''; + $selImages = ''; + if ($p['switch_image_category_items'] == 1) { + $leftImages = ' LEFT JOIN #__phocacart_product_images AS im ON a.id = im.product_id'; + $selImages = ' im.image as additional_image,'; + } + + $wheres = array(); if ((int)$categoryId > 0) { $wheres[] = " c.id = ".(int)$categoryId; @@ -118,7 +129,7 @@ protected function getItemListQuery($categoryId, $count = 0) { . ' GROUP BY a.id'; } else { - $q = ' SELECT a.id, a.title, a.image, a.alias, a.description, a.catid, c.id AS categoryid, c.title AS categorytitle, c.alias AS categoryalias, a.price, a.price_original, t.tax_rate as taxrate, t.calculation_type as taxcalculationtype, t.title as taxtitle, a.date, a.sales, a.featured, a.external_id, a.unit_amount, a.unit_unit, a.external_link, a.external_text, ' + $q = ' SELECT a.id, a.title, a.image, a.alias, a.description, c.id AS catid, c.title AS cattitle, c.alias AS catalias, a.price, a.price_original, t.tax_rate as taxrate, t.calculation_type as taxcalculationtype, t.title as taxtitle, a.date, a.sales, a.featured, a.external_id, a.unit_amount, a.unit_unit, a.external_link, a.external_text,'. $selImages . ' AVG(r.rating) AS rating,' . ' at.required AS attribute_required' . ' FROM #__phocacart_products AS a' @@ -128,6 +139,7 @@ protected function getItemListQuery($categoryId, $count = 0) { . ' LEFT JOIN #__phocacart_taxes AS t ON t.id = a.tax_id' . ' LEFT JOIN #__phocacart_reviews AS r ON a.id = r.product_id AND r.id > 0' . ' LEFT JOIN #__phocacart_attributes AS at ON a.id = at.product_id AND at.id > 0 AND at.required = 1' + . $leftImages . ' WHERE ' . implode( ' AND ', $wheres ) . ' GROUP BY a.id' . ' ORDER BY '.$itemOrdering; diff --git a/site/models/fields/phocacaptcha.php b/site/models/fields/phocacaptcha.php new file mode 100644 index 00000000..c95a6785 --- /dev/null +++ b/site/models/fields/phocacaptcha.php @@ -0,0 +1,37 @@ +get('session_suffix', $string); + $captchaCnt = $session->get('captcha_cnt', 0, $namespace) + 1; + + $id = $session->get('captcha_id', '', $namespace); + + switch ($id){ + default: + case 1: + $retval = PhocaCartRecaptcha::render(); + break; + } + + return $retval; + } + + +} +?> diff --git a/site/models/forms/question.xml b/site/models/forms/question.xml new file mode 100644 index 00000000..d14b0091 --- /dev/null +++ b/site/models/forms/question.xml @@ -0,0 +1,61 @@ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + +
+ +
+ +
+ +
diff --git a/site/models/item.php b/site/models/item.php index 5a06ccc9..bb8bb503 100644 --- a/site/models/item.php +++ b/site/models/item.php @@ -109,7 +109,7 @@ private function getItemQuery( $itemId, $catId ) { $wheres[] = ' cc.language IN ('.$this->_db->Quote(JFactory::getLanguage()->getTag()).','.$this->_db->Quote('*').')'; } - $query = ' SELECT i.id, i.title, i.alias, i.description, i.ordering, i.metadesc, i.metakey, i.image, i.description, i.description_long, i.price, i.price_original, i.stockstatus_a_id, i.stockstatus_n_id, i.min_quantity, i.stock, i.date, i.sales, i.featured, i.external_id, i.unit_amount, i.unit_unit, i.video, i.external_link, i.external_text, cc.id AS catid, cc.title AS cattitle, cc.alias AS catalias, t.tax_rate as taxrate, t.title as taxtitle, t.calculation_type as taxcalculationtype, m.id as manufacturerid, m.title as manufacturertitle' + $query = ' SELECT i.id, i.title, i.alias, i.description, i.ordering, i.metadesc, i.metakey, i.image, i.description, i.description_long, i.price, i.price_original, i.stockstatus_a_id, i.stockstatus_n_id, i.min_quantity, i.min_multiple_quantity, i.stock, i.date, i.sales, i.featured, i.external_id, i.unit_amount, i.unit_unit, i.video, i.external_link, i.external_text, cc.id AS catid, cc.title AS cattitle, cc.alias AS catalias, t.tax_rate as taxrate, t.title as taxtitle, t.calculation_type as taxcalculationtype, m.id as manufacturerid, m.title as manufacturertitle' .' FROM #__phocacart_products AS i' .' LEFT JOIN #__phocacart_product_categories AS pc ON pc.product_id = i.id' .' LEFT JOIN #__phocacart_categories AS cc ON cc.id = pc.category_id' diff --git a/site/models/items.php b/site/models/items.php index aa383685..e0a78767 100644 --- a/site/models/items.php +++ b/site/models/items.php @@ -33,8 +33,8 @@ public function __construct() { $this->setState('limitstart', $app->input->get('limitstart', 0, 'int')); $this->setState('limitstart', ($this->getState('limit') != 0 ? (floor($this->getState('limitstart') / $this->getState('limit')) * $this->getState('limit')) : 0)); $this->setState('filter.language',$app->getLanguageFilter()); - $this->setState('filter_order', JRequest::getCmd('filter_order', 'ordering')); - $this->setState('filter_order_dir', JRequest::getCmd('filter_order_Dir', 'ASC')); + $this->setState('filter_order', $app->input->get('filter_order', 'ordering')); + $this->setState('filter_order_dir', $app->input->get('filter_order_Dir', 'ASC')); $this->setState('itemordering', $app->getUserStateFromRequest('com_phocacart.itemordering', 'itemordering', $item_ordering, 'int')); @@ -111,6 +111,8 @@ protected function getItemListQuery($count = 0) { $wheres = array(); $lefts = array(); + $p['switch_image_category_items'] = $params->get( 'switch_image_category_items', 0 ); + $wheres[] = ' a.published = 1'; $wheres[] = ' c.published = 1'; if ($this->getState('filter.language')) { @@ -184,6 +186,14 @@ protected function getItemListQuery($count = 0) { $lefts[] = $s['left']; } + // Additional Images + $leftImages = ''; + $selImages = ''; + if ($p['switch_image_category_items'] == 1) { + $leftImages = ' LEFT JOIN #__phocacart_product_images AS im ON a.id = im.product_id'; + $selImages = ' im.image as additional_image,'; + } + // Remove empty values: $wheres = array_filter($wheres); @@ -212,11 +222,12 @@ protected function getItemListQuery($count = 0) { //$lefts[] = ' LEFT JOIN #__phocacart_attributes AS at ON a.id = at.product_id AND at.id > 0 AND at.required = 1'; $lefts[] = ' LEFT JOIN #__phocacart_attributes AS at ON a.id = at.product_id AND at.id > 0'; - $q = ' SELECT a.id, a.title, a.image, a.alias, a.unit_amount, a.unit_unit, a.description, c.id AS catid, c.title AS cattitle, c.alias AS catalias, a.price, a.price_original, t.tax_rate as taxrate, t.calculation_type as taxcalculationtype, t.title as taxtitle, a.date, a.sales, a.featured, a.external_id, a.external_link, a.external_text, ' + $q = ' SELECT a.id, a.title, a.image, a.alias, a.unit_amount, a.unit_unit, a.description, c.id AS catid, c.title AS cattitle, c.alias AS catalias, a.price, a.price_original, t.tax_rate as taxrate, t.calculation_type as taxcalculationtype, t.title as taxtitle, a.date, a.sales, a.featured, a.external_id, a.external_link, a.external_text,'. $selImages . ' AVG(r.rating) AS rating,' . ' at.required AS attribute_required' . ' FROM #__phocacart_products AS a' . implode( ' ', $lefts ) + . $leftImages . ' WHERE ' . implode( ' AND ', $wheres ) . ' GROUP BY a.id' . ' ORDER BY '.$itemOrdering; diff --git a/site/models/orders.php b/site/models/orders.php index e666d972..d2cca8d1 100644 --- a/site/models/orders.php +++ b/site/models/orders.php @@ -28,8 +28,8 @@ public function __construct() { $this->setState('limitstart', $app->input->get('limitstart', 0, 'int')); $this->setState('limitstart', ($this->getState('limit') != 0 ? (floor($this->getState('limitstart') / $this->getState('limit')) * $this->getState('limit')) : 0)); $this->setState('filter.language',$app->getLanguageFilter()); - $this->setState('filter_order', JRequest::getCmd('filter_order', 'ordering')); - $this->setState('filter_order_dir', JRequest::getCmd('filter_order_Dir', 'ASC')); + $this->setState('filter_order', JFactory::getApplication()->input->get('filter_order', 'ordering')); + $this->setState('filter_order_dir', JFactory::getApplication()->input->get('filter_order_Dir', 'ASC')); } diff --git a/site/models/question.php b/site/models/question.php new file mode 100644 index 00000000..fecb4671 --- /dev/null +++ b/site/models/question.php @@ -0,0 +1,144 @@ +setState('filter.language',$app->getLanguageFilter()); + } + + public function getForm($data = array(), $loadData = true) + { + // Get the form. + $form = $this->loadForm('com_phocacart.question', 'question', array('control' => 'jform', 'load_data' => true)); + if (empty($form)) { + return false; + } + + $app = JFactory::getApplication(); + $params = $app->getParams(); + + // Set required or not && disable if not available + if(!$params->get('display_name_form', 2)){ + $form->removeField('name'); + } else if ($params->get('display_name_form', 2) == 2){ + $form->setFieldAttribute('name', 'required', 'true'); + } + + if(!$params->get('display_email_form', 2)){ + $form->removeField('email'); + } else if ($params->get('display_email_form', 2) == 2){ + $form->setFieldAttribute('email', 'required', 'true'); + } + + if(!$params->get('display_phone_form', 2)){ + $form->removeField('phone'); + } else if ($params->get('display_phone_form', 2) == 2){ + $form->setFieldAttribute('phone', 'required', 'true'); + } + + if(!$params->get('display_message_form', 2)){ + $form->removeField('message'); + } else if ($params->get('display_message_form', 2) == 2){ + $form->setFieldAttribute('message', 'required', 'true'); + } + + if (!$params->get('enable_hidden_field_question', 0)){ + $form->removeField('hidden_field'); + } else { + + $form->setFieldAttribute('hidden_field', 'id', $params->get('hidden_field_id')); + $form->setFieldAttribute('hidden_field', 'class', $params->get('hidden_field_class')); + $form->setFieldAttribute('hidden_field', 'name', $params->get('hidden_field_name')); + + } + + if (!$params->get('enable_captcha_question', 2)) { + $form->removeField('phq_captcha'); + } else { + $form->setFieldAttribute('phq_captcha', 'type', 'phocacaptcha'); + $form->setFieldAttribute('phq_captcha', 'captcha_id', $params->get('captcha_id')); + $form->setFieldAttribute('phq_captcha', 'validate', 'phocacartcaptcha'); + } + + return $form; + } + + protected function loadFormData() { + $data = (array) JFactory::getApplication()->getUserState('com_phocacart.question.data', array()); + return $data; + } + + function store(&$data) { + + JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); + + $uri = JFactory::getURI(); + $app = JFactory::getApplication(); + $params = JComponentHelper::getParams('com_phocacart') ; + + // Maximum of character, they will be saved in database + $data['message'] = substr($data['message'], 0, $params->get('max_char_question', 3000)); + $data['date'] = gmdate('Y-m-d H:i:s'); // Create the timestamp for the date + + $row = $this->getTable('PhocaCartQuestion'); + + // Bind the form fields to the table + if (!$row->bind($data)) { + $this->setError($this->_db->getErrorMsg()); + return false; + } + + // Make sure the table is valid + if (!$row->check()) { + $this->setError($this->_db->getErrorMsg()); + return false; + } + + // Store the Phoca guestbook table to the database + if (!$row->store()) { + $this->setError($this->_db->getErrorMsg()); + return false; + } + + // Everything OK - send email + if ($params->get('send_email_question', 0) > 0) { + + $data['product'] = array(); + $data['category'] = array(); + $productId = 0; + if(isset($data['product_id']) && (int)$data['product_id'] > 0) { + if(isset($data['category_id']) && (int)$data['category_id'] > 0) { + $data['product'] = PhocaCartProduct::getProduct($data['product_id'], $data['category_id']); + $data['category'] = PhocaCartCategory::getCategoryById($data['category_id']); + } else { + $data['product'] = PhocaCartProduct::getProduct($data['product_id']); + } + $productId = $data['product']; + } + + + $send = PhocaCartEmail::sendQuestionMail($params->get('send_email_question'), $data, JFactory::getURI()->toString(), $params); + + if (!$send) { + $user = JFactory::getUser(); + PhocaCartLog::add(1, 'Ask a Question - Problems with sending email', $productId, 'IP: '. $data['ip'].', User ID: '.$user->id); + } + } + + $data['id'] = $row->id; + + return true; + } +} +?> \ No newline at end of file diff --git a/site/models/rules/phocacartcaptcha.php b/site/models/rules/phocacartcaptcha.php new file mode 100644 index 00000000..1ea238a6 --- /dev/null +++ b/site/models/rules/phocacartcaptcha.php @@ -0,0 +1,39 @@ +get('session_suffix'); + + // Possible parameters in Options for different captchas + $captchaId = 1; + + switch($captchaId) { + case 1: + default: + if (!PhocaCartRecaptcha::isValid()) { + + // What happens when the CAPTCHA was entered incorrectly + return new JException(JText::_('COM_PHOCACART_WRONG_CAPTCHA' ), "105", E_USER_ERROR, $info, false); + } + + return true; + break; + } + return false; + } +} diff --git a/site/models/rules/phocacartemail.php b/site/models/rules/phocacartemail.php new file mode 100644 index 00000000..bbace303 --- /dev/null +++ b/site/models/rules/phocacartemail.php @@ -0,0 +1,39 @@ +get('banned_email'); + foreach(explode(';', $banned) as $item){ + if (trim($item) != '') + if (JString::stristr($item, $value) !== false){ + return new JException(JText::_('COM_PHOCACART_BAD_EMAIL' ), "105", E_USER_ERROR, $info, false); + } + } + + return true; + } +} diff --git a/site/models/rules/phocacarthidden.php b/site/models/rules/phocacarthidden.php new file mode 100644 index 00000000..94304869 --- /dev/null +++ b/site/models/rules/phocacarthidden.php @@ -0,0 +1,28 @@ + diff --git a/site/phocacart.php b/site/phocacart.php index 6ff754dd..6be58cb4 100644 --- a/site/phocacart.php +++ b/site/phocacart.php @@ -18,6 +18,8 @@ phocacartimport('phocacart.utils.settings'); phocacartimport('phocacart.utils.utils'); phocacartimport('phocacart.utils.log'); +phocacartimport('phocacart.security.security'); +phocacartimport('phocacart.utils.extension'); phocacartimport('phocacart.category.category'); phocacartimport('phocacart.category.categorymultiple'); phocacartimport('phocacart.date.date'); @@ -56,26 +58,16 @@ phocacartimport('phocacart.order.orderview'); phocacartimport('phocacart.order.orderrender'); phocacartimport('phocacart.compare.compare'); +phocacartimport('phocacart.wishlist.wishlist'); phocacartimport('phocacart.download.download'); phocacartimport('phocacart.render.renderfront'); phocacartimport('phocacart.email.email'); phocacartimport('phocacart.search.search'); phocacartimport('phocacart.feed.feed'); phocacartimport('phocacart.render.rendermedia'); +phocacartimport('phocacart.captcha.recaptcha'); + -/* -if($controller = JRequest::getWord('controller')) { - $path = JPATH_COMPONENT.DS.'controllers'.DS.$controller.'.php'; - if (file_exists($path)) { - require_once $path; - } else { - $controller = ''; - } -} -$classname = 'PhocaCartController'.ucfirst($controller); -$controller = new $classname( ); -$controller->execute( JFactory::getApplication()->input->get('task') ); -$controller->redirect();*/ $controller = JControllerLegacy::getInstance('PhocaCart'); $controller->execute(JFactory::getApplication()->input->get('task')); diff --git a/site/router.php b/site/router.php index 6374a6af..cea80eab 100644 --- a/site/router.php +++ b/site/router.php @@ -8,7 +8,6 @@ */ defined('_JEXEC') or die; - if (! class_exists('PhocaCartLoader')) { require_once( JPATH_ADMINISTRATOR.'/components/com_phocacart/libraries/loader.php'); } @@ -18,9 +17,10 @@ class PhocaCartRouter extends JComponentRouterBase { public function build(&$query) { - $viewsNoId = array('categories', 'checkout', 'comparison', 'download', 'terms', 'account', 'orders', 'payment', 'info', 'items'); - $viewsId = array('category', 'item', 'items', 'feed'); - $viewsAll = array_merge($viewsNoId, $viewsId); + $viewsNoId = array('categories', 'checkout', 'comparison', 'download', 'terms', 'account', 'orders', 'payment', 'info', 'items', 'wishlist'); + $viewsId = array('category', 'item', 'items', 'feed'); + $viewsNotOwnId = array('question'); + $viewsAll = array_merge($viewsNoId, $viewsId, $viewsNotOwnId); $segments = array(); @@ -75,19 +75,15 @@ public function build(&$query) { if (($menuItem instanceof stdClass) && $menuItem->query['view'] == $query['view'] && isset($query['view']) && in_array($query['view'], $viewsNoId) - ) - { - + ) { unset($query['view']); - if (isset($query['catid'])) - { + if (isset($query['catid'])){ unset($query['catid']); } - if (isset($query['layout'])) - { + if (isset($query['layout'])){ unset($query['layout']); } @@ -95,15 +91,16 @@ public function build(&$query) { return $segments; } - - if ($view == 'category' || $view == 'item') - { - if (!$menuItemGiven) - { + + if ($view == 'category' || $view == 'item'){ + if (!$menuItemGiven){ $segments[] = $view; } + unset($query['view']); + + if ($view == 'item') { @@ -127,11 +124,10 @@ public function build(&$query) { else { // We should have these two set for this view. If we don't, it is an error + return $segments; } - } - else - { + } else { if (isset($query['id'])) { $catid = $query['id']; @@ -156,6 +152,7 @@ public function build(&$query) { //$category = $categories->get($catid); $category = PhocaCartCategory::getCategoryById($catid); + if (!$category) { // We couldn't find the category we were given. Bail. @@ -207,6 +204,24 @@ public function build(&$query) { unset($query['id']); unset($query['catid']); } + + if ($view == 'question') { + if (!$menuItemGiven){ + $segments[] = $view; + } + if (isset($query['view'])) { + $segments[] = $query['view']; + unset($query['view']); + } + if (isset($query['catid'])) { + $segments[] = $query['catid']; + unset($query['catid']); + } + if (isset($query['id'])) { + $segments[] = $query['id']; + unset($query['id']); + } + } if (!isset($query['id'])) { // Check if a id was specified. if (isset($query['view']) && in_array($query['view'], $viewsNoId)) { @@ -227,8 +242,6 @@ public function build(&$query) { - - /* * If the layout is specified and it is the same as the layout in the menu item, we * unset it so it doesn't go into the query string. @@ -263,8 +276,12 @@ public function build(&$query) { public function parse(&$segments) { - $viewsNoId = array('categories', 'checkout', 'comparison', 'download', 'terms', 'account', 'orders', 'payment', 'info', 'items'); - $viewsId = array('category', 'item', 'items', 'feed'); + $viewsNoId = array('categories', 'checkout', 'comparison', 'download', 'terms', 'account', 'orders', 'payment', 'info', 'items', 'wishlist'); + $viewsId = array('category', 'item', 'items', 'feed'); + $viewsNotOwnId = array('question'); + $viewsAll = array_merge($viewsNoId, $viewsId, $viewsNotOwnId); + + // question - can be an ID page (id of product) but without ID page - direct link $total = count($segments); $vars = array(); @@ -287,8 +304,7 @@ public function parse(&$segments) { * Standard routing for items. If we don't pick up an Itemid then we get the view from the segments * the first segment is the view and the last segment is the id of the item or category. */ - if (!isset($item)) - { + if (!isset($item)) { $vars['view'] = $segments[0]; // Called if no menu item created @@ -303,6 +319,12 @@ public function parse(&$segments) { $vars['view'] = $segments[0]; return $vars; } + + // Question can include ID/CATID but can be without ID/CATID + if(isset($segments[0]) && in_array($segments[0], $viewsNotOwnId)) { + $vars['view'] = $segments[0]; + return $vars; + } } /* @@ -311,8 +333,7 @@ public function parse(&$segments) { * then we assume it is a category. If they don't we assume it is an item */ - if ($count == 1) - { + if ($count == 1) { // We check to see if an alias is given. If not, we assume it is an item if (strpos($segments[0], ':') === false) { @@ -337,20 +358,21 @@ public function parse(&$segments) { } else { - // TODO specify catid - load from libraries + // TO DO specify catid - load from libraries $query = $db->getQuery(true) ->select($db->quoteName(array('alias', 'catid'))) ->from($db->quoteName('#__phocacart_products')) ->where($db->quoteName('id') . ' = ' . (int) $id); $db->setQuery($query); - $item = $db->loadObject(); + $item1 = $db->loadObject(); - if ($item) + + if ($item1) { - if ($item->alias == $alias) + if ($item1->alias == $alias) { $vars['view'] = 'item'; - $vars['catid'] = (int) $item->catid; + $vars['catid'] = (int) $item1->catid; $vars['id'] = (int) $id; return $vars; @@ -365,21 +387,34 @@ public function parse(&$segments) { * last segment has a number prepended, it is an item, otherwise, it is a category. */ - if (!$advanced) - { - $cat_id = (int) $segments[0]; - - $item_id = (int) $segments[$count - 1]; - + if (!$advanced) { + + if ($count == 3) { + // Question + $view = $segments[0]; + $cat_id = (int)$segments[$count - 2]; + $item_id = (int)$segments[$count - 1]; + } else { + // Item + $view = ''; + $cat_id = (int)$segments[0]; + $item_id = (int)$segments[$count - 1]; + } + + if ($cat_id > 0) { - if ($item_id > 0) - { - $vars['view'] = 'item'; + if ($item_id > 0) { + if ($view != '') { + $vars['view'] = $view; + } else { + $vars['view'] = 'item'; + } + $vars['catid'] = $cat_id; $vars['id'] = $item_id; - } - else - { + + + } else { $vars['view'] = 'category'; $vars['id'] = $cat_id; } @@ -393,17 +428,34 @@ public function parse(&$segments) { } } + return $vars; } - +/* // We get the category id from the menu item and search from there - $id = $item->query['id']; + if (isset($item->query['id'])) { + $id = $item->query['id']; + } else { + + if ($count == 3) { + // Question + + $id = (int)$segments[$count - 2]; + + } else { + // Item + $id = (int)$segments[0]; + } + } + + + + $category = PhocaCartCategory::getCategoryById($id); if (!$category) { - JError::raiseError(404, JText::_('COM_PHOCACART_ERROR_PARENT_CATEGORY_NOT_FOUND')); - + throw new Exception(JText::_('COM_PHOCACART_ERROR_PARENT_CATEGORY_NOT_FOUND'), 404); return $vars; } @@ -411,9 +463,8 @@ public function parse(&$segments) { $vars['catid'] = $id; $vars['id'] = $id; $found = 0; - - foreach ($segments as $segment) - { + + foreach ($segments as $segment) { $segment = str_replace(':', '-', $segment); foreach ($categories as $category) @@ -425,6 +476,7 @@ public function parse(&$segments) { $vars['view'] = 'category'; $categories = PhocaCartCategory::getChildren($category->id); $found = 1; + break; } } @@ -446,13 +498,13 @@ public function parse(&$segments) { { $cid = $segment; } - + $vars['id'] = $cid; $vars['view'] = 'item'; } $found = 0; - } + }*/ diff --git a/site/views/account/tmpl/default.php b/site/views/account/tmpl/default.php index cf91df4a..32196cfe 100644 --- a/site/views/account/tmpl/default.php +++ b/site/views/account/tmpl/default.php @@ -9,11 +9,10 @@ defined('_JEXEC') or die(); echo '