From defad00f416e2a35b19dfe16a6220a8f29441873 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Tue, 27 May 2008 20:56:34 +0000 Subject: [PATCH] a few things i forgot when getting rid of old commerce stuff --- docs/upgrades/upgrade_7.5.10-7.5.11.pl | 6 +++++ lib/WebGUI/AdminConsole.pm | 24 +++--------------- www/extras/adminConsole/productManager.gif | Bin 2342 -> 0 bytes .../adminConsole/{commerce.gif => shop.gif} | Bin .../adminConsole/small/productManager.gif | Bin 1086 -> 0 bytes .../small/{commerce.gif => shop.gif} | Bin .../adminConsole/small/subscriptions.gif | Bin 680 -> 0 bytes www/extras/adminConsole/subscriptions.gif | Bin 2454 -> 0 bytes 8 files changed, 9 insertions(+), 21 deletions(-) delete mode 100644 www/extras/adminConsole/productManager.gif rename www/extras/adminConsole/{commerce.gif => shop.gif} (100%) delete mode 100644 www/extras/adminConsole/small/productManager.gif rename www/extras/adminConsole/small/{commerce.gif => shop.gif} (100%) delete mode 100644 www/extras/adminConsole/small/subscriptions.gif delete mode 100644 www/extras/adminConsole/subscriptions.gif diff --git a/docs/upgrades/upgrade_7.5.10-7.5.11.pl b/docs/upgrades/upgrade_7.5.10-7.5.11.pl index a42872301..7b3b6abb8 100644 --- a/docs/upgrades/upgrade_7.5.10-7.5.11.pl +++ b/docs/upgrades/upgrade_7.5.10-7.5.11.pl @@ -1039,6 +1039,12 @@ sub removeOldCommerceCode { unlink '../../lib/WebGUI/Help/Subscription.pm'; unlink '../../lib/WebGUI/i18n/English/Subscription.pm'; + unlink '../../www/extras/adminConsole/subscriptions.gif'; + unlink '../../www/extras/adminConsole/small/subscriptions.gif'; + unlink '../../www/extras/adminConsole/productManager.gif'; + unlink '../../www/extras/adminConsole/small/productManager.gif'; + + #Disable the Product macro in the config file. You can't use the convenience method #deleteFromHash since the macro name is in the value, not the key. my %macros = %{ $config->get('macros') }; diff --git a/lib/WebGUI/AdminConsole.pm b/lib/WebGUI/AdminConsole.pm index 8e2906f97..33558f1df 100644 --- a/lib/WebGUI/AdminConsole.pm +++ b/lib/WebGUI/AdminConsole.pm @@ -392,32 +392,14 @@ sub getAdminFunction { op => "viewActiveSessions", class => 'WebGUI::Operation::ActiveSessions', }, - "commerce" => { + "shop" => { title => { id => "shop", namespace => "Shop", }, - icon => "commerce.gif", + icon => "shop.gif", url => $self->session->url->page("shop=admin"), - group => "3", - }, - "subscriptions" => { - title => { - id => "manage subscriptions", - namespace => "Subscription", - }, - icon => "subscriptions.gif", - op => "listSubscriptions", - class => 'WebGUI::Operation::Subscription', - }, - "productManager" => { - title => { - id => "manage products", - namespace => "ProductManager", - }, - icon => "productManager.gif", - op => "listProducts", - class => 'WebGUI::Operation::ProductManager', + group => $session->setting->get('groupIdAdminCommerce'), }, "cache" => { title => { diff --git a/www/extras/adminConsole/productManager.gif b/www/extras/adminConsole/productManager.gif deleted file mode 100644 index bf8aef02c96ecf432389b966a6510374cdff2077..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2342 zcmV+>3EB2XNk%w1VK4wN0QXq{rF0`REhu|kEX0yOpNChaP=SdDW!?d8?u+Q!7D zYDhjZta>TMsBML5ErMb&fny}UpnROt%E;;Qbsqqlu1uM zCXQefx0Fo4jytA$GImoEiew|Zm`;*zErV!1k8L)si&D9oRkV&nrG!AWk3^7U8=-F= zxRFK0lR$u69)o5mk#9HK%B8%URex0y!IVqq|GuMtI=Gfjq<=ZetaHtoM7o<+5D^@? zmQ0RuLxEi&r-DSThC{B4L(sU0x|UI)d_anAG`EmNx|&s-eMq;IO2@5rqJ>1=&8w<; zC!m5sw2eT4SQUI-AcbWqxP~*ji8q>fHkN84pLscna5boZI`Qh;vVbnQianu(L#2R1 zrGiSqkUh1KM!t_f$g6Ss`1HG(P>5|Ym2x@R$DzTIL7jd)xtLI%fIf#^8M&ELVofc! zkwz>hCAN}By^J}UZY7#}H+ESpy_{FMoLI1aES!Bix|d9YV<^gj#bT? zM2BlKhiEp8YBP^*GJ04Tw31Kw_3vjlDt=%wj%g@_V=u{@Pn&l; zc3?o0ay*oKMdH=Cq!G<=Mcul}){iH>Q0!#gsz3 zom&6@{{R30A^8LW003D4EC2ui05AYB000R80J8`jNU)&6g9sBU6v!eOwGj=l?N|Y$ zioJIT5YVWQh{eK>1`&AZ!$i@REn)KI1LCG-4j?bAJX6qO$C-*Y@FDoKu_MSt$qw{c z1jpo-d?{D9bOR(uj!RGtNj21@$&w|8uAzxBqJ_1ajSMCrpka|vIKWPwJgE{0OE*q0 zJ-t*+YE`RC=q&lgi`Op`eF=t>;lM%JMSbAFI&}(E7)XjDD=I=6O_(rldgKsxsnVLN zSM~DsyMfohW$qwMLFWLm2E~w0K>}w49Xca8aOmOlX^sRC$IJ*f!-|!mO2we8fdXX~ zoxlPQl$b(YgNC!PUcAVs0M`!`D1Q9^P(faWr1NzojhQ!(NP8l;_uxLpci;gCsvVRN zH|PKyE81GACp0L{3DQUdo)ak4;m0hdMOOj@cF1xCGlclZ#w6P{ zKnnw&FrXp>aAbA3IH_LNMkfyIAQKTq^M4`%>fgGYrAwi^BNFn0{QRg_A z;F(7r`jDW-8d*m7%^uNYVkkL%2*L>)W;Rg30A94B!vj1pvcNQh?6N=`jC7z%8qUaL zK|2=E62%P7{JDgEb!0-qtEq_ppn)JUu))R)3Owos6*>s8Kr8{2vCacvECUoG< z1-1k*2r)OzAcPi`tSV3+QZ&i{LcW{Y-6k$vr#&oORG!yWK-2Un|{h(;xTKPcLO3e6H0fL%ep|LcD#+Kn~Ci zFa%F4&iLNv_KmgV5>qZg7?%r_x#8YI5DDI&JI?dT4y#@I&`gAp!$7EL-ummFH%@Zs zv_A}VylfAB`tAbtZumYTln}`|G`q{9yHL!bg3M~_<=gB|C%fDXjLj!n?R0zP0zAT-E9APgiF1^kx? zL|8r9wZa%R5I_L`I$#cV)Po*ku!IZ&C@m&HVt`q|;q#Kffdux@3rN5kJ=S4~8mPe% zN9e`}C~<*Y_@D+Gu*9>X<%*Kz}C zWLlKD4`0YanDToRKccYBD0njp0~o+J!%5C^4j=@ov_dikg2M^8(-p2rf-E#aJ`7YN z1Ng+JI`+B$Pf_@@006}R1_~fhfg+;}wI~N9ZfFj0Bw-a0RmME=W`GgIqYD_t=o=8x zg$5wvqb&$&16t4k1(;SONc4gmUSSMU*w7t_KniR|%>YsB#m#!ri%xWcr#|he z0YX-$GLdK!N|*$R266`qjN++Ir2r|`fj7lj^{QCSYScJk08R|dR!N-%Qz<}JvXX)n z6riV8*UHwLhD=sAdgFt{pVAX2ESUDc}B!rlz0ii^NA1|kCw zc%Th!&;b(kGl!Cn^bKz)MJa4@hMT~k5sipL94_(>eCQ+r8To^1D?o#Agd-6kiLGpB MOWWE55+oo1JLzmAO#lD@ diff --git a/www/extras/adminConsole/commerce.gif b/www/extras/adminConsole/shop.gif similarity index 100% rename from www/extras/adminConsole/commerce.gif rename to www/extras/adminConsole/shop.gif diff --git a/www/extras/adminConsole/small/productManager.gif b/www/extras/adminConsole/small/productManager.gif deleted file mode 100644 index 68364310648225a888518c9bd9df74a1353cb1ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1086 zcmZ?wbhEHb6krfw_-@CrtH*K2?1*EFqr`#+n~p95<)dp+3d( zz`}&*w-4=@;(cO<$FW7RTPFFmWm-PHxqr`^u5;Vlcg+glP;anpvgecQdyAq>7uVV! zm>2u#>duvu(&yCJ{rUZCb(7uVa>E-(=WXq@=}uRlU2VI#T<7!KM{`PyHurn)m>F_z zN9Vi}t+{m$Z5d{bspi=s#_MJl9-rZHW^?1*ddIab4%;Sqte%>)dP>fTsSf+*$7Tc> z6-1isniI9H+kQix&bk`SwbSz(Q#7`9*>q-GZkytp8Em|NcG#R^&2u}uX6LKS%uzhE zxoK;!>;8rDzkhtWymvxFvUyLo)}6Df&u(iuyREG^*K&KS@ysH<#nna+Z=If3@3gQd z_Ttg?%O|9)n^~}9PUN0Gr|n&~CDEpHiZssc=vdq8xNDmK=?yiz=SD56vD-N#V8`sp zS;YoBW`!M}>0K3X){tT`r%=5mL4MQR^6fK2>Z2uRRax(uAG>>Y$n~Rh&+qJ7Jw0#h zWUq!4v&og#Gs`Vb&hj}v!?PmJv>{%4_q^!$FK%pTFt~Pb#@_jHvx@X@9A9|l;PkEp z$-T3}o66x;m%_4B~O`1By7ig@#t4L1M(|7REop!k!8k%7UEK?h_xC{HkO{AZ~B zF~iMCXr_eqoF0jZ%Uo2X?G6=u5?OOqQB$!l_26d}(JgwXR=Fs*BwwH9*5h}*Vql)c zv%+jC|8%FmJcHfe)Eq<@SVTfL6gV_72N|&i?qEAMm0?TP&0V#LCy(4QUi40A!!^c< zik2F3F{c*4j9SM~&YmL}q}3-M#=pkIpg`A|K~?I3$m~W=2{yw9zubMxln+c~;goO) zU~D`%Pc-+-3P;r(XD*GB4%dzY%GWlyckjDmVsCGror@^Go+DZ; n;(C9iEtj1>yopKI?&d1TBRBcu&Sr!>x^TE#OzQ*_6N5DXtgFh2a66%!NenO7E=npxxRl%5om zQBfV;F(tjVC%b!c>g2igot?$KlPf39NT0W+V(!xNMQf^7@2J>yW}h7ICKKUh)@t*; zbf(049`IMa7N>J3+4M@L=cPKI-tLN3-NpMRm7kwn)I4q0>^ZY1&0pBDXvNGW%jT@x zxM6bB>ZSdQmrh-=V%dW2d$w=i(!1-}?gJazPu!Yy=4QwF$NiU{OuzDU$)S^L&R^er z_HW&Tnm7al);^!)!mhQR?8f3h$#Fa$B^fSd!069)Ew4M8vvz^xnr zV*_b-c4ielH>iNWmzO?+teUDjnD6fu80e|NsHoxt=DK@&Yl-lRa7rsEIfDc|y@ez! z_=MP4808&+Tpw?B33G8XbtXwEIV1m|ASVwoQ*$vMUmGqNb?*jOpn4-Q33FpMTVFdt zQE#9LCIfMnLth2AV=bwzjr*wpRK^AQu@K zXOV diff --git a/www/extras/adminConsole/subscriptions.gif b/www/extras/adminConsole/subscriptions.gif deleted file mode 100644 index f0c2a4ba805ac9d0b872f7cb41b19936d52b06a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2454 zcmV;H32F96Nk%w1VK4wN0QWcmdd1l6?CgCDW_jM3z1ovPjH?v}N@quc6wx5tI7wyDL+lGEkvZZ9b(CT*v-gU;g3xU#&e%R!Mbuc>4PKM^aU4V_P;jIj!F8=l{NTo~OUQy|Uo#)Mq)W(%f^V zvbwprU6`ikgi67{zRQGS#>K>%nU+~*X^xJLeS(3yxVC78jl1UY=zBe7iLg@f?$@Y2!H+S%Empq{Bj7+YIbxZ2~F z#LsKC$&}gaXsy1swzb~g-O-?dw@@Od-0P~TsrB{slGf;=qM`l${I#^Qn%wWJ*e(*ex3#6DqnX#}o}8MAiixZk3yGeh-8~hwvaq`B`;A^ji^9>{ zX+cCvO3CK#u&=FFO+(Pn&0TVK92XVFIu)&~tF71Kfx*)M|Nq%-QGKMXgo=s0y0>?V zjepACtgESt)aj(7qUF7!6A1>5Q8F+rDmg<$!6y%Hl%9#o+_BBnT~bYvk&x);=A4_D z$;rs+>FBc7;Ejxnd%x1WySl2~>oYMghtK2H7Y&WS%&5G-i;RkgiHF?W+pyp57ZDEN z;NQOD?4suQ`1kj$sHddg@9fO3(dh1ph=!}(>-+xy{QLW;)#9gqXpr0R`1trSH8z4i zFOrXqb%%*?X%{c`z2WQSCP^vdPFd2^kVwGf!@C zg%c;TD(246u_nMoP>$$W74^^oh6)v{o((DT)F8DdTFeMZR?d}FJ;*wIJ9J2eITfw6 zbQOrLTrW9wk`P(2pa`d;+P-yoCqRIKNe1RV`O)Q`EjOVeN7i&x536;9Cm9pC0cg-^ zy;PZj9BPIZEy;}8GDB3)3Q?jeP5M%YT32ITG(leTWJ{?!?v6A%GKiMc6$g@w;$yg+ zNtwn7VWPqRh`0o#R zKmg$f8DhvXPc}Zt!iyMW_(6|0j&veI1xy6NgBO}` z^n^PBgp$k~GBD_e7@#n4hckxkA;CB@)F1%>VgM1|3Q~Z`0~#4{6pt|~zJbI54UoZ$ zEDTVv2p)zY^MC@su=0x$@>oz5E3GggLJ9e7L_{QC^|GWN{D1-_1#H0a!6-^p!woBy ztx%L@2Z+$gIn7A4MlI!Nfy*`^G{Dc3z%alD1(ZN=10X%ra~3O(IO4$ydz2u81|>|A zfLsva63H4|H1k3%7w`fA2B|RrFoqMZ@DqnG@L-Xp9v%ea4rS^Ob^ys$>O$RY~RV1We>kN}MX zm&~yQ6<^d4!^-@`lEoG`+w)KxTO^|n60t;|&5f=;QbaE}*xWown*as4j-~?en!RCITiO(Ix6F&&Y0;0hJCs5)JKl4T` zhL*2AH~|kog8&5o{MCoH&7luH7{MsApaT}(;vv28gcWcx2vbNP3^>Gt1YBW(N4TeF2C7e+Zc9=j5+K~lML?IqTD8hO+vH?c4;R?9e=p$M%j9KVH5aJ+# z5jasaa-;(cvruU}kl@lIlpzv%I7u1mV2>-TuNb7@Kno@?3p=F4eki!aERs45Dv%-? zk%+<(!l46-qQnzw7(^|~fQvR{Apu$)#snTQg{`WT3JJ)^|9=mIH7afEhIfeIXGM*>LEh+AOdrE5)uDrWE$ArwIl1UP~sjP(XZxPt(&B|sN2 zkqAt4T%i$H=tUhOF&7+^qYGUaL~04phA8~t4R0vJ8{%4vUBtr*n7D;TdMl6x*n_e5 zNbM1J!QCU&A|9&11S*Ok1lv$|AZ{>&6>i}UMR-CLsz5~))X)V+)L{bzI`2VdkPKYt Upcj!S!}0n-OZ^%+A^`yaJBV0=U;qFB