From 1ac1ca4955ef6e8f8647ddaeaf2086a5d497d91e Mon Sep 17 00:00:00 2001 From: Gena Date: Mon, 27 Jul 2015 19:23:59 +0600 Subject: [PATCH] auto --- batiskaf/settings.py | 18 +++++++++++++--- batiskaf/templates/jinja2/kkb.jinja | 4 ++++ batiskaf/urls.py | 4 +++- kkb_keys/cert.cer | 3 +++ kkb_keys/cert.der | Bin 0 -> 904 bytes kkb_keys/cert.jks | Bin 0 -> 2610 bytes kkb_keys/cert.pfx | Bin 0 -> 2073 bytes kkb_keys/cert.pk8 | Bin 0 -> 633 bytes kkb_keys/cert.prv | 17 +++++++++++++++ kkb_keys/cert.pub | 21 +++++++++++++++++++ kkb_keys/config.txt | 8 +++++++ kkb_keys/kkbca.cer | Bin 0 -> 910 bytes kkb_keys/kkbsign.cfg | 10 +++++++++ store/views.py | 14 +++++++++++-- tmp/eml/20150727-192204-4444393088.eml | 11 ++++++++++ tmp/eml/20150727-192204-4444440896.eml | 28 +++++++++++++++++++++++++ 16 files changed, 132 insertions(+), 6 deletions(-) create mode 100644 batiskaf/templates/jinja2/kkb.jinja create mode 100755 kkb_keys/cert.cer create mode 100755 kkb_keys/cert.der create mode 100755 kkb_keys/cert.jks create mode 100755 kkb_keys/cert.pfx create mode 100755 kkb_keys/cert.pk8 create mode 100755 kkb_keys/cert.prv create mode 100755 kkb_keys/cert.pub create mode 100755 kkb_keys/config.txt create mode 100755 kkb_keys/kkbca.cer create mode 100755 kkb_keys/kkbsign.cfg create mode 100644 tmp/eml/20150727-192204-4444393088.eml create mode 100644 tmp/eml/20150727-192204-4444440896.eml diff --git a/batiskaf/settings.py b/batiskaf/settings.py index 344d1ec..7d21c83 100644 --- a/batiskaf/settings.py +++ b/batiskaf/settings.py @@ -63,6 +63,7 @@ INSTALLED_APPS = ( 'rest_framework', 'easy_thumbnails', 'bootstrapform_jinja', + 'kkb', 'batiskaf', 'main', 'accounts', @@ -112,7 +113,6 @@ else: } } - EMAIL_USE_TLS = True EMAIL_HOST = 'smtp.yandex.ru' EMAIL_HOST_USER = 'admin@batiskaf-kz.kz' @@ -160,7 +160,7 @@ TEMPLATES = [ 'BACKEND': 'django.template.backends.jinja2.Jinja2', 'DIRS': [ os.path.join(BASE_DIR, "batiskaf/templates/jinja2"), - #os.path.join(BASE_DIR, "batiskaf/templates/jinja2/bootstrapform"), + # os.path.join(BASE_DIR, "batiskaf/templates/jinja2/bootstrapform"), ], 'OPTIONS': { 'environment': 'batiskaf.jinja2.environment', @@ -260,4 +260,16 @@ THUMBNAIL_PROCESSORS = ( 'easy_thumbnails.processors.background', ) -PROFILE_TEMP_PASSWORD = 'dE6Hyo9heWck5yiM2dIs' \ No newline at end of file +PROFILE_TEMP_PASSWORD = 'dE6Hyo9heWck5yiM2dIs' + +MERCHANT_CERTIFICATE_ID = "c183d5b8" # ; Серийный номер сертификата Cert Serial Number +MERCHANT_NAME = "BATISKAF-KZ.KZ" # ; Название магазина (продавца) Shop/merchant Name +PRIVATE_KEY_FN = os.path.join(BASE_DIR, 'kkb_keys', + 'cert.prv') # "../paysys/cert.prv" # ; Путь к закрытому ключу Private cert path +PRIVATE_KEY_PASS = "1q2w3e4r" # ; Пароль к закрытому ключу Private cert password +# XML_TEMPLATE_FN = "../paysys/template.xml" # ; Путь к XML шаблону XML template path +# XML_COMMAND_TEMPLATE_FN = "../paysys/command_template.xml" # ; Путь к XML шаблону для команд (возврат/подтверждение) +PUBLIC_KEY_FN = os.path.join(BASE_DIR, 'kkb_keys', + 'kkbca.cer') # "../paysys/kkbca.pem" # ; Путь к открытому ключу Public cert path +MERCHANT_ID = "92210431" # ; Терминал ИД в банковской Системе + diff --git a/batiskaf/templates/jinja2/kkb.jinja b/batiskaf/templates/jinja2/kkb.jinja new file mode 100644 index 0000000..b2f3211 --- /dev/null +++ b/batiskaf/templates/jinja2/kkb.jinja @@ -0,0 +1,4 @@ +
+ + +
diff --git a/batiskaf/urls.py b/batiskaf/urls.py index b691a51..28ca8d1 100644 --- a/batiskaf/urls.py +++ b/batiskaf/urls.py @@ -3,7 +3,7 @@ from django.contrib import admin from django.http import HttpResponse from api.views import call_order from news.views import NewsSitemap -from store.views import order_view, order_print, ProductSitemap, CategorySitemap +from store.views import order_view, order_print, ProductSitemap, CategorySitemap, order_kkb from main.views import * from rest_framework import routers # from api.urls import router @@ -88,6 +88,8 @@ urlpatterns = patterns( url(r'^order_order/$', 'api.views.order_order'), url(r'^order/(?P.+)/print/$', order_print, name='store_order_print'), + url(r'^order/(?P.+)/kkb/$', order_kkb, + name='store_order_kkb'), url(r'^order/(?P.+)/$', order_view, name='store_order_view'), diff --git a/kkb_keys/cert.cer b/kkb_keys/cert.cer new file mode 100755 index 0000000..0009a7a --- /dev/null +++ b/kkb_keys/cert.cer @@ -0,0 +1,3 @@ +-----BEGIN CERTIFICATE----- +MIIDhDCCAmygAwIBAgIFAMGD1bgwDQYJKoZIhvcNAQEEBQAwUzELMAkGA1UEBhMCS1oxDDAKBgNVBAoTA0tLQjELMAkGA1UECxMCQ0ExDzANBgNVBAMTBktLQiBDQTEYMBYGCSqGSIb3DQEJARYJY2FAa2tiLmt6MB4XDTE1MDcyMTEyNDAwMVoXDTIwMDcxOTEyNDAwMVowfzELMAkGA1UEBhMCS1oxDzANBgNVBAcTBkFsbWF0eTEXMBUGA1UEChMOQkFUSVNLQUYtS1ouS1oxCzAJBgNVBAsTAkFUMRcwFQYDVQQDEw5CQVRJU0tBRi1LWi5LWjEgMB4GCSqGSIb3DQEJARYRcG9saW5raW5tQG1haWwucnUwgZ4wDQYJKoZIhvcNAQEBBQADgYwAMIGIAoGAYh21Ilsqz6gZVdY2fMw3tzSZLPp8ZP+eUPaBx0nrVD4XTqXRjVFWa5EehEOMaLVlpdR/95oLDBNxPVDKNxfnREDMSSaXTgL7T5658wHdVDznZvkivgEV9qdHghd/zFmE4l42N2ZW7c8VcZOqGiv8xw+aWsyfZAeP4bhnJbsJ3E0CAwEAAaOBtzCBtDAdBgNVHQ4EFgQUCJOy2op1pGgl7Qfv1CcgJZvZwYYwHwYDVR0jBBgwFoAU712nYyivxvN+d0LbneCElQZ9clMwDAYDVR0TBAUwAwEBADAOBgNVHQ8BAf8EBAMCBPAwNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL3d3dy5ra2Iua3ovY2VydHJvb3Qva2tiY2EuY3JsMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDBDANBgkqhkiG9w0BAQQFAAOCAQEAQjgSsxnk7iJHMeFvjPR+q5srO64TpeHrV95due2645QqFdRRwfvvrnvP4yDTZ6XgjldbSb8C2uNbJR+k7iY7sfcW7x56uTz+1uurpGGTw2Sm8rRc8wYJ2Mx5HoOhGs3ZyUUGfzFUejDJnO8GT5d0ArpAqJlC9/kVD/ziqAx6mdxCM0rxg99FrUn4JMiUt6ASmIJG4c+AvS0/AZPTgz1h7S3hK9MhGh9WUd4qp0kGmzKDsgg7hB8T8m1ZF1FQ0Gwn0Lh+HhBllFzehyxTafH5Xp7YXKPS0NE5ELZJpMo1SfVlwPdHWRVFDR/RoCIeI2fp9kj2S/Fe7VZSMXuiuGQsYw== +-----END CERTIFICATE----- diff --git a/kkb_keys/cert.der b/kkb_keys/cert.der new file mode 100755 index 0000000000000000000000000000000000000000..819eba3243ba483e0b322a0b498ba63d56061a43 GIT binary patch literal 904 zcmXqLVs0^LV#-;-%*4pV#L956`RWb>UN%mxHjlRNyo`)2tPBRhhTI06Y|No7Y{E?5 zQHDGQTp$jYFtfL}6HJO*n914EkRPZOD8($y29#0&3P>1;!Oh}i6yr=zbjZ$5(#x(g zkQ3)MG&L|cGBh+YF)%QU66ZBCFfcc?gmMk)VJ1T?g__JR%;uPrn^;n5C~hDMaRr}~ zV~A(4x1*b`ca$E`c~G|k9po4SQ^hQdu1di`4%uOX1^GFddD)qHxemFBnK^nzr3Q`j zki&tIm4Ugjhryt+gQ>A0Np`DJwAT3*lA+hkYR;H%H<_vPt0v|Dynt_w$30(%*opfs zz1SNVmOW9f#knVAYwFS~_1|Z4^9UE(2Anb%f9~RN##3#&AJcFDc{@Kd-VL#Np7v8| zAEW5EtlNr-i*eFIqTxm6Z0MU3E9-9bYD9Mh3>k zjoS?xw;0F*LqV30MT|v+WAdh3U8PGhRNu0{zoM?7I{W6qHUoK(v@#1Y9vVd6$1YFS zSbywuUAfckxer>Vvegy^8}NV>2(z#nFf%eT81R93{EUqMSy-5vSUwn-g81?*dImZM zS_?E5sI{qNl#~=$>Fbx5m+L`dQa?GhsH7-AzeFF%PfpZJF3N#8N|i;-K!lA$n~jl` zm7SRh&SF6hS77>LZUWluWFfR!^2s|Tcf*JIJzwfp&(^kHC%p9G>+pNAJKyelJVi_N zO5nlY@7GnIf2?phed&X~@MzEdOt&6KtI98Vr)ItJyV!fVs+~6fuDxEpBysZLlx3f` z#C&Gsym6*du6d!<*_$U_+3F2LstiufdC%rQy@Y9(!-|~^6YwCgT?vbLd eyz&P0(JbdmufrZWKm literal 0 HcmV?d00001 diff --git a/kkb_keys/cert.jks b/kkb_keys/cert.jks new file mode 100755 index 0000000000000000000000000000000000000000..26178e7c05c3ca02482d8d142b2afebdc1855064 GIT binary patch literal 2610 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 wpKhi+4!bf|&DnRLA<&wOyla{z#U0YdD(ng9R* literal 0 HcmV?d00001 diff --git a/kkb_keys/cert.pk8 b/kkb_keys/cert.pk8 new file mode 100755 index 0000000000000000000000000000000000000000..c9ff00aca5fbd66f7f0b9caa40c6982c994ecf99 GIT binary patch literal 633 zcmV-<0*3uCf&z5{0RS)!1_>&LNQUpUoe6KTLJ+90)c>H9kn7`D$l4H zRn|6q%s00*nJoHzWdEK}_JPMq>r_4$PNmU}QC4e_9)v@TXtiaf)PMJy3k(x+Jy6Ow z7w1Gk%t6d-@j>wHyR0srJy zWlWIQfPk`iDV;R!98G0i;8SGdPyK3?tB<1s5+SIV^;-;eDh>tYq)hB zgm0EUEb^}j;*U21G>_lA;3QnY>0hf$##@l4?p1_Rkt<->`8P{WN+ zd43;b21WKvFUPeZNBw`IB|a>xk(fZfTLM7%*cW!ksP1n53*=v%!#1G5nQgkfs z$O!^KKKIHPJ3xBVx<657C(AA4{a3Gs6mcu!bK#d!jHG9QJ|q+YDLed%b(%acu8%X8 TIMvfXJ!lVY=19_L z$cghBm>3!uS{ND_n;Doz0lAhyt~r!z(AW$!8e%KdXm(*X$DG{6l1f7v11X3zguQ~D z6}%Ixvh#CuQ;SN9lM?f?4TTK^L9*P!Tpp>3DgJ3`naQb!A_hVb=W)9RI7TW2M+S$u z`Wi|ZNFckBJGCIO66VUr`N)C6$jZRn*vnwh*vZt`$Z+6xdal=>8%)ov15LK_v-Hh% z{(Z4sVDY_`AulFu`};H^KeqPR!iFxp176QcEohL z3*D}Zd9Z%-jD0Vk=`t}hGB7S~+-}gg#XuJ5FIheoF&2^E8>dEYeJ?9;yIe3RZn@Ro zdsA)M4dg-6$}GUxXb^cHyF6KA{jtw=- zGcx{XVPR%s`CwoQ;>)w>8R!^jEznq?)~1qCQc_^0uU}qXt_O)v{bXR!7v<-d=mYu5 ziF(OJIS@ywvWOXouyJU!F|x9-#v_$ zhisH3vTr=BIL~unMbOH(YFAopW;q``6M1SCXJfhYrRDcnPp^r%d7@>`ybKN}H{;7` z`jH}4eD-oHCKtF$rDn$!x2!+l;nn*~Je;R~>(g3|D;mzncu%rF70PQivY7cI;mnH7 zp*JTTek!vzVo}7o750(pT+1G|CrF0O;Mo1d$70T%Qrn6xjApe5&q{TcsUBeKUt;0A z@6(--9gTg~_KUwLvT=J=Ge}RnnjU=bLH++t4qmtGHhnw)@WCU&68E+5Ct3WIJL8xB wD%4C@^QX + +Смотреть в админке +------------------------------------------------------------------------------- diff --git a/tmp/eml/20150727-192204-4444440896.eml b/tmp/eml/20150727-192204-4444440896.eml new file mode 100644 index 0000000..ae1c1b0 --- /dev/null +++ b/tmp/eml/20150727-192204-4444440896.eml @@ -0,0 +1,28 @@ +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +Subject: =?utf-8?b?0KDQvtCx0L7RgiBCYXRpc2thZi1rei5reg==?= +From: admin@batiskaf-kz.kz +To: asdfasdf@sadf.com +Date: Mon, 27 Jul 2015 13:22:04 -0000 +Message-ID: <20150727132204.59049.39888@macbook-pro.local> + +Привет, gre! + +Поздравляем, вы успешно оформили заказ. + +Для того, чтобы его было удобнее отслеживать, мы создали для вас аккаунт в нашем интернет-магазине. + +Вы можете войти в него, используя свой номер телефона +7: + +http://batiskaf-kz.kz/account/ + + +Это автоматическое сообщение. Отвечать на него не нужно! + +С Уважением, +Администрация Batiskaf-kz.kz +-- +Skype: batiskaf_kz +Тел: +7 (777) 163-14-34 или +7 (775) 859-12-17 +-------------------------------------------------------------------------------