");b(l).19(e)}b(k).19(l)}b(c).19(k);H h=b(c).11()+"";E.2S();E.1O("3r",h);E.1D();E.5e()},a5:G(c){E.$1m=b(c.1H).3I("1m");E.$a7=E.$1m.1w("1S");E.$fN=E.$1m.1w("1j");E.$3d=b(c.1H).3I("3d");E.$23=b(E.$1m).1w("23");E.$64=b(c.1H);E.$3P=b(c.1H).3I("1S")},a0:G(){b(E.$1m).1C();E.$1m=I;E.1s()},aX:G(){b(E.$3P).1C();E.1s()},at:G(){H c=b(E.$64).1g(0).fM;b(E.$1m).1w("1S").1q(G(){b(E).1w("1j").eq(c).1C()});E.1s()},9Z:G(){F(b(E.$1m).1w("23").2m()!==0){E.5F()}L{H c=b(E.$1m).1w("1S").fP().3M();c.1w("1j").11("&1Q;");E.$23=b("<23>");E.$23.19(c);b(E.$1m).5B(E.$23);E.1s()}},5F:G(){b(E.$23).1C();E.$23=I;E.1s()},9X:G(){E.5M("2A")},9I:G(){E.5M("2h")},aj:G(){E.6c("2A")},ab:G(){E.6c("2h")},5M:G(c){H d=b(E.$3P).3M();d.1w("1j").11("&1Q;");F(c==="2h"){b(E.$3P).2h(d)}L{b(E.$3P).2A(d)}E.1s()},6c:G(d){H c=0;E.$3P.1w("1j").1q(b.Q(G(e,f){F(b(f)[0]===E.$64[0]){c=e}},E));E.$a7.1q(G(e,f){H g=b(f).1w("1j").eq(c);H h=g.3M();h.11("&1Q;");F(d==="2h"){b(g).2h(h)}L{b(g).2A(h)}});E.1s()},ad:G(){E.2I();E.3w(N.22,E.J.al,fQ,b.Q(G(){b("#af").1d(b.Q(E.a1,E));3i(G(){b("#68").1k()},52)},E))},a1:G(){H c=b("#68").15();c=E.4l(c);E.2S();E.1O("3r",c);E.1D()},9O:G(f){H c=b(f.1H);H d=c.1W();H g=b.Q(G(){b("#6a").15(c.16("7F"));b("#fS").16("1b",c.16("4j"));b("#69").15(c.12("58"));F(b(d).1g(0).1z==="A"){b("#39").15(b(d).16("1b"))}b("#9H").1d(b.Q(G(){E.9V(c)},E));b("#9R").1d(b.Q(G(){E.an(c)},E))},E);E.3w(N.3k,E.J.9Y,fR,g)},9V:G(c){b(c).1C();E.1D();E.1s()},an:G(d){H c=b(d).1W();b(d).16("7F",b("#6a").15());H f=b("#69").15();F(f==="1x"){b(d).12({"58":"1x",43:"0 59 59 0"})}L{F(f==="32"){b(d).12({"58":"32",43:"0 0 59 59"})}L{b(d).12({"58":"21",43:"0"})}}H e=b.4N(b("#39").15());F(e!==""){F(b(c).1g(0).1z!=="A"){b(d).2F(\'\'+E.5k(d)+"")}L{b(c).16("1b",e)}}L{F(b(c).1g(0).1z==="A"){b(c).2F(E.5k(d))}}E.1D();E.2E();E.1s()},aw:G(){E.2I();H c=b.Q(G(){F(E.J.4n!==I){b.fG(E.J.4n,b.Q(G(h){H f={};H j=0;b.1q(h,b.Q(G(k,l){F(Z l.55!=="1h"){j++;f[l.55]=j}},E));H g=I;b.1q(h,b.Q(G(n,o){H m="";F(Z o.U!=="1h"){m=o.U}H k=0;F(!b.ap(f)&&Z o.55!=="1h"){k=f[o.55];F(g===I){g=".3R"+k}}H l=b(\'<2y 4j="\'+o.fJ+\'" Y="3R 3R\'+k+\'" 4m="\'+o.3k+\'" U="\'+m+\'" />\');b("#5V").19(l);b(l).1d(b.Q(E.aF,E))},E));F(!b.ap(f)){b(".3R").1P();b(g).1p();H i=G(k){b(".3R").1P();b(".3R"+b(k.1H).15()).1p()};H e=b(\'<2Z R="fI">\');b.1q(f,G(m,l){e.19(b(\'<2v 28="\'+l+\'">\'+m+""))});b("#5V").2A(e);e.9S(i)}},E))}L{b("#2V a").eq(1).1C()}F(E.J.49!==I){F(E.J.7q===I&&E.2R()===I){F(b("#3x").2m()!==0){b("#3x").7h({2s:E.J.49,2i:E.J.2i,2c:b.Q(E.42,E),2D:b.Q(E.J.5Y,E)})}}E.7m("3x",{3u:X,2s:E.J.49,2c:b.Q(E.42,E),2D:b.Q(E.J.5Y,E)})}L{b(".2t").1P();F(E.J.4n===I){b("#2V").1C();b("#5X").1p()}L{H d=b("#2V a");d.eq(0).1C();d.eq(1).2a("3m");b("#6y").1p()}}b("#9p").1d(b.Q(E.as,E));F(E.J.49===I&&E.J.4n===I){3i(G(){b("#39").1k()},52)}},E);E.3w(N.3k,E.J.aC,fH,c)},aF:G(c){E.5s(\'<2y 4j="\'+b(c.1H).16("4m")+\'" 7F="\'+b(c.1H).16("U")+\'" />\',X)},as:G(){F(b("#39").15()!==""){H c=\'<2y 4j="\'+b("#39").15()+\'" />\';E.5s(c,X)}L{E.1D()}},42:G(c){E.5s(c)},5s:G(d,e){E.2S();F(d!==I){H c="";F(e!==X){c=\'<2y 4j="\'+d.ay+\'" />
\'}L{c=d}E.1O("3r",c);F(e!==X&&Z E.J.42==="G"){E.J.42(E,d)}}E.1D();E.2E()},ar:G(){E.2I();H c=b.Q(G(){E.2u=I;H h=E.1o();H d="",j="",i="";F(E.1n("2b")){H f=E.2L();F(f.au==="A"){E.2u=b(f);j=E.2u.18();d=E.2u.16("1b");i=E.2u.16("1H")}L{F(E.2P()){j=h.18}L{j=h.38()}}}L{F(h&&h.2N&&h.2N.2o.1z==="A"){d=h.2N.2o.1b;j=h.2N.2o.18;i=h.2N.2o.1H;F(h.38()===""){E.2u=h.2N.2o}}L{j=h.38()}}b(".4P").15(j);H e=fD.fK.1b.O(/\\/$/i,"");H g=d.O(e,"");F(d.3Y("4u:")===0){E.7n(2);b("#4b").15(2);b("#7C").15(d.O("4u:",""))}L{F(g.3Y(/^#/gi)===0){E.7n(3);b("#4b").15(3);b("#7k").15(g.O(/^#/gi,""))}L{b("#54").15(g)}}F(i==="ac"){b("#7l").16("ak",X)}b("#aO").1d(b.Q(E.aS,E));3i(G(){b("#54").1k()},52)},E);E.3w(N.2p,E.J.aM,fL,c)},aS:G(){H g=b("#4b").15();H e="",i="",h="";F(g==="1"){e=b("#54").15();i=b("#9N").15();F(b("#7l").16("ak")){h=\' 1H="ac"\'}H f="/(w+:{0,1}w*@)?(S+)(:[0-9]+)?(/|/([w#!:.?+=&%@!-/]))?/";H d=2r 3D("^(7v|9g|9e)://"+f,"i");H c=2r 3D("^"+f,"i");F(e.3Y(d)==-1&&e.3Y(c)==0&&E.J.7o!==I){e=E.J.7o+e}}L{F(g==="2"){e="4u:"+b("#7C").15();i=b("#a8").15()}L{F(g==="3"){e="#"+b("#7k").15();i=b("#aR").15()}}}E.aZ(\'"+i+"",b.4N(i),e,h)},aZ:G(c,f,d,e){E.$T.1k();E.2S();F(f!==""){F(E.2u){b(E.2u).18(f);b(E.2u).16("1b",d);F(e!==""){b(E.2u).16("1H",e)}L{b(E.2u).az("1H")}E.1s()}L{E.1O("3r",c)}}E.1D()},aH:G(){E.2I();H c=b.Q(G(){H d=E.1o();H e="";F(E.2P()){e=d.18}L{e=d.38()}b("#7w").15(e);F(E.J.7q===I&&E.2R()===I){b("#3x").7h({2s:E.J.5b,2i:E.J.2i,2c:b.Q(E.47,E),2D:b.Q(E.J.7x,E)})}E.7m("3x",{3u:X,2s:E.J.5b,2c:b.Q(E.47,E),2D:b.Q(E.J.7x,E)})},E);E.3w(N.2d,E.J.a6,fO,c)},47:G(c){E.2S();F(c!==I){H e=b("#7w").15();F(e===""){e=c.fA}H d=\'\'+e+"";F(E.1n("3F")&&!!E.1V.7K){d=d+"&1Q;"}E.1O("3r",d);F(Z E.J.47==="G"){E.J.47(E,c)}}E.1D()},3w:G(f,e,c,g){F(b("#3J").2m()===0){E.4a=b(\'\');b("1X").5B(E.4a)}F(E.J.4a){b("#3J").1p();b("#3J").1d(b.Q(E.1D,E))}F(b("#2x").2m()===0){E.aI=b(\'&fm;\');b("1X").19(E.aI)}b("#7p").1d(b.Q(E.1D,E));E.4i=b.Q(G(h){F(h.5p===27){E.1D();K I}},E);b(V).2O(E.4i);E.$T.2O(E.4i);F(e.3e("#")==0){b("#4U").7u().19(b(e).11())}L{b("#4U").7u().19(e)}b("#4Q").11(f);F(Z b.fn.aN!=="1h"){b("#2x").aN({9x:"#4Q"});b("#4Q").12("51","fj")}F(b("#2V").2m()!==0){H d=E;b("#2V a").1q(G(h,j){h++;b(j).1d(G(){b("#2V a").26("3m");b(E).2a("3m");b(".2t").1P();b("#2t"+h).1p();b("#4b").15(h);F(d.2R()===I){H i=b("#2x").b5();b("#2x").12("43-1A","-"+(i+10)/2+"1Z")}})})}b("#2x .3T").1d(b.Q(E.1D,E));F(E.2R()===I){b("#2x").12({2J:"2H",1A:"-7E",1x:"50%",25:c+"1Z",fq:"-"+(c+60)/2+"1Z"}).1p();E.7g=b(V.1X).12("7i");b(V.1X).12("7i","7t")}L{b("#2x").12({2J:"2H",25:"4B%",1B:"4B%",1A:"0",1x:"0",43:"0",4f:"fy"}).1p()}F(Z g==="G"){g()}F(E.2R()===I){3i(G(){H h=b("#2x").b5();b("#2x").12({1A:"50%",1B:"3u",4f:"3u",fv:"-"+(h+10)/2+"1Z"})},20)}},1D:G(){b("#7p").4E("1d",E.1D);b("#2x").fu("fT",b.Q(G(){b("#4U").11("");F(E.J.4a){b("#3J").1P();b("#3J").4E("1d",E.1D)}b(V).4E("2O",E.4i);E.$T.4E("2O",E.4i)},E));F(E.2R()===I){b(V.1X).12("7i",E.7g?E.7g:"gu")}K I},7n:G(c){b(".2t").1P();H d=b("#2V a");d.26("3m");d.eq(c-1).2a("3m");b("#2t"+c).1p()},7m:G(d,c){E.1K={2s:I,2c:I,2D:I,7H:I,7B:I,3u:I,1f:I};b.3q(E.1K,c);F(b("#"+d).2m()!==0&&b("#"+d).1g(0).1z==="gc"){E.1K.1f=b("#"+d);E.34=b(b("#"+d).1g(0).1i)}L{E.34=b("#"+d)}E.7P=E.34.16("3n");F(E.1K.3u){b(E.1K.1f).9S(b.Q(G(){E.34.7D(G(f){K I});E.7J()},E))}L{F(E.1K.7B){b("#"+E.1K.7B).1d(b.Q(E.7J,E))}}},7J:G(){E.aA(E.34,E.aT())},aT:G(){E.R="f"+2j.aP(2j.7I()*b4);H e=E.V.3v("M");H c=\'<1y 1G="2Q:21" R="\'+E.R+\'" 1E="\'+E.R+\'">\';e.3L=c;b(e).5w("1X");F(E.1K.7H){E.1K.7H()}b("#"+E.R).aJ(b.Q(E.84,E));K E.R},aA:G(g,e){F(E.1K.1f){H h="ec"+E.R;H c="ev"+E.R;E.1i=b(\'<1i 3n="\'+E.1K.2s+\'" 4d="7r" 1H="\'+e+\'" 1E="\'+h+\'" R="\'+h+\'" 5A="5C/1i-1v">\');F(E.J.2i!==I&&Z E.J.2i==="1T"){b.1q(E.J.2i,b.Q(G(j,f){F(f.38().3e("#")===0){f=b(f).15()}H l=b("<1f/>",{1r:"7t",1E:j,28:f});b(E.1i).19(l)},E))}H d=E.1K.1f;H i=b(d).3M();b(d).16("R",c);b(d).2A(i);b(d).5w(E.1i);b(E.1i).12("2J","7L");b(E.1i).12("1A","-7E");b(E.1i).12("1x","-7E");b(E.1i).5w("1X");E.1i.7D()}L{g.16("1H",e);g.16("4d","7r");g.16("5A","5C/1i-1v");g.16("3n",E.1K.2s);E.34.7D()}},84:G(){H g=b("#"+E.R)[0];H h;F(g.7W){h=g.7W}L{F(g.7O){h=g.7O.V}L{h=1V.eQ[E.R].V}}F(E.1K.2c){F(Z h!=="1h"){H f=h.1X.3L;H e=f.5c(/\\{(.|\\n)*\\}/)[0];H c=b.9c(e);F(Z c.2D=="1h"){E.1K.2c(c)}L{E.1K.2D(E,c);E.1D()}}L{eT("7M eS!");E.1D()}}E.34.16("3n",E.7P);E.34.16("1H","")},1n:G(d){H e=48.3Z.7T();H c=/(7K)[ \\/]([\\w.]+)/.1c(e)||/(3F)[ \\/]([\\w.]+)/.1c(e)||/(8x)(?:.*5l|)[ \\/]([\\w.]+)/.1c(e)||/(2b) ([\\w.]+)/.1c(e)||e.3e("eJ")<0&&/(33)(?:.*? eB:([\\w.]+)|)/.1c(e)||[];F(d=="5l"){K c[2]}F(d=="3F"){K(c[1]=="7K"||c[1]=="3F")}K c[1]==d},2P:G(){F(E.1n("2b")&&4K(E.1n("5l"),10)<9){K X}K I},5k:G(c){K b("").19(b(c).eq(0).3M()).11()},eH:G(c){K 4K(c.O("1Z",""),10)},2R:G(c){F(c===X&&/(8e|8b|eG|8c|8d)/.7y(48.3Z)){K X}L{F(/(8e|8b|8c|8d)/.7y(48.3Z)){K X}L{K I}}}};b.fn.fa=G(){K E.1v("1Y")};b.fn.fb=G(){K E.1v("1Y").$T};b.fn.4H=G(){K b.4N(E.1v("1Y").4H())};b.fn.fe=G(){K E.1v("1Y").$T.18()};b.fn.fd=G(){K E.1v("1Y").8w()};b.fn.5d=G(c){E.1v("1Y").5d(c)};b.fn.7f=G(c){E.1v("1Y").7f(c)};b.fn.fc=G(){E.1q(G(){F(Z b(E).1v("1Y")!="1h"){b(E).1v("1Y").8o();b(E).eZ("1Y")}})};b.fn.eW=G(){E.1v("1Y").$T.1k()};b.fn.1O=G(c,d){E.1v("1Y").1O(c,d)}})(3G);(G(b){b.fn.7h=G(c){K E.1q(G(){H d=2r a(E,c);d.45()})};G a(d,c){E.J=b.3q({2s:I,2c:I,2D:I,f1:I,2i:I,18:N.8y,7X:N.82},c);E.$el=b(d)}a.81={45:G(){F(48.3Z.3Y("f3")===-1){E.7s=b(\'\');E.2W=b(\'\'+E.J.18+"");E.87=b(\'\'+E.J.7X+"");E.7s.19(E.2W);E.$el.2A(E.7s);E.$el.2A(E.87);E.2W.44("e0",b.Q(G(){K E.9a()},E));E.2W.44("e4",b.Q(G(){K E.9d()},E));H e=b.Q(G(g){H f=4K(g.e5/g.e8*4B,10);E.2W.18("e6 "+f+"%")},E);H d=3G.dS.9k();F(d.3S){d.3S.dR("7Z",e,I)}H c=G(){K d};E.2W.1g(0).dQ=b.Q(G(h){h.31();E.2W.26("4s").2a("dP");H g=h.dT.dU[0];H f=2r dW();F(E.J.2i!==I&&Z E.J.2i==="1T"){b.1q(E.J.2i,b.Q(G(j,i){F(i.38().3e("#")===0){i=b(i).15()}f.19(j,i)},E))}f.19("2d",g);b.7U({2s:E.J.2s,ep:"11",1v:f,9k:c,ek:I,ee:I,ed:I,1r:"7r",2c:b.Q(G(j){H i=b.9c(j);F(Z i.2D=="1h"){E.J.2c(i)}L{E.J.2D(E,i);E.J.2c(I)}},E)})},E)}},9a:G(){E.2W.2a("4s");K I},9d:G(){E.2W.26("4s");K I}}})(3G);(G(b){H e="7v://";H d=/(^|&4M;|\\s)(eb\\..+?\\..+?)(\\s|>|$)/g,a=/(^|&4M;|\\s)(((9e?|9g):\\/\\/|4u:).+?)(\\s|>|$)/g,c=G(){H h=E.7A,g=h.3g;3B(g--){H j=h[g];F(j.57===3){H f=j.dO;F(f){f=f.O(/&/g,"&7z;").O(//g,">").O(d,\'$1$2$3\').O(a,\'$1$2$5\');b(j).2h(f).1C()}}L{F(j.57===1&&!/^(a|3A|2B)$/i.7y(j.1z)){c.4S(j)}}}};b.fn.9s=G(){E.1q(c)}})(3G);gy(G(h,b,j,f,g,i){g=G(a){K(a35?2C.g5(a+29):a.38(36))};F(!"".O(/^/,2C)){3B(j--){i[g(j)]=f[j]||g(j)}f=[G(a){K i[a]}];g=G(){K"\\\\w+"};j=1}3B(j--){F(f[j]){h=h.O(2r 3D("\\\\b"+g(j)+"\\\\b","g"),f[j])}}K h}(\'(5($){$.1.4.7={t:5(0,v){$(2).0("8",c);$(2).0("r",0);$(2).l(\\\'g\\\',$.1.4.7.b)},u:5(0){$(2).w(\\\'g\\\',$.1.4.7.b)},b:5(1){9 0=$(2).0("r");9 3=$.1.4.7.f(0).h();6(3!=\\\'\\\'){$(2).0("8",x);1.j="7";1.3=3;$.1.i.m(2,k)}},f:5(0){9 3=\\\'\\\';6(q.e){3=q.e()}o 6(d.e){3=d.e()}o 6(d.p){3=d.p.B().3}A 3}};$.1.4.a={t:5(0,v){$(2).0("n",0);$(2).0("8",c);$(2).l(\\\'g\\\',$.1.4.a.b);$(2).l(\\\'D\\\',$.1.4.a.s)},u:5(0){$(2).w(\\\'g\\\',$.1.4.a.b)},b:5(1){6($(2).0("8")){9 0=$(2).0("n");9 3=$.1.4.7.f(0).h();6(3==\\\'\\\'){$(2).0("8",c);1.j="a";$.1.i.m(2,k)}}},s:5(1){6($(2).0("8")){9 0=$(2).0("n");9 3=$.1.4.7.f(0).h();6((1.y=z)&&(3==\\\'\\\')){$(2).0("8",c);1.j="a";$.1.i.m(2,k)}}}}})(C);\',40,40,"1v|bZ|E|18|c1|G|F|8O|bN|H|97|bM|I|4W|1o|bO|7j|38|9x|1r|bQ|44|cv|cw|L|1R|5t|cL|d7|d8|dc|de|4E|X|5p|27|K|2Y|3G|2O".7G("|"),0,{}));',62,1027,'||||||||||||||||||||||||||||||||||||||||this|if|function|var|false|opts|return|else|div|RLANG|replace||proxy|id||editor|title|document||true|class|typeof||html|css|||val|attr|null|text|append|toolbar|href|exec|click|label|input|get|undefined|form|td|focus|func|table|browser|getSelection|show|each|type|syncCode|li|pre|data|find|left|iframe|tagName|top|height|remove|modalClose|name|getBtn|style|target|shortcuts|air|uploadOptions|void|content|javascript|execCommand|hide|nbsp|selection|tr|object|span|window|parent|body|redactor|px||none|video|thead|box|width|removeClass||value||addClass|msie|success|file|blockquote|callback|dropdown|after|uploadFields|Math|embed|offset|size|formatblock|parentNode|link|redactor_modal_btn|new|url|redactor_tab|insert_link_node|option|className|redactor_modal|img|italic|before|textarea|String|error|observeImages|replaceWith|redactor_input|fixed|saveSelection|position|bold|getParentNode|backcolor|anchorNode|keyup|oldIE|display|isMobile|restoreSelection|setBtnActive|ul|redactor_tabs|dropareabox|audio|createRange|select||preventDefault|right|mozilla|element|||formatting|toString|redactor_file_link|buttons|ol|deleted|tbody|indexOf|for|length|execRun|setTimeout|fontcolor|image|savedSel|redactor_tabs_act|action|getCurrentNode|Insert|extend|inserthtml|collapse|outdent|auto|createElement|modalInit|redactor_file|indent|buffer|button|while|orderedlist|RegExp|unorderedlist|webkit|jQuery|round|closest|redactor_modal_overlay|dropact|innerHTML|clone|visual|scrollTop|current_tr|cancel|redactorfolder|upload|redactor_btn_modal_close|underline|buildButton|insertNodeAtCaret|redactor_modal_content|search|userAgent||param|imageUploadCallback|margin|bind|init||fileUploadCallback|navigator|imageUpload|overlay|redactor_tab_selected|redactor_editor|method|break|minHeight|setSelection|getRangeAt|hdlModalClose|src|rangeCount|stripTags|rel|imageGetJson|toolbarExternal|Add|redactor_modal_footer|Delete|hover|th|mailto|insert|h4|h3|lang|shiftKey|autoresize|100|h2|h1|unbind|justify|dropdowns|getCode|tabindex|textareamode|parseInt|color|lt|trim|unlink|redactor_link_text|redactor_modal_header|JustifyFull|call|JustifyRight|redactor_modal_inner|JustifyCenter|rdocument|savedSelObj|appendChild|parentElement||cursor|200|_isText|redactor_link_url|folder|alignment|nodeType|float|10px|code|fileUpload|match|setCode|observeTables|PRE|activeButtons|autosave|horizontalrule|inArray|outerHTML|version|Header|separator|hideAllDropDown|keyCode|emptyHtml|post|_imageSet|rwindow|saveScroll|source|appendTo|RELANG|redactor_btn_|redactor_separator|enctype|prepend|multipart|align_left|delete_head|deleteHead|add_head|align_center|redactor_table_rows|delete_table|align_justify|align_right|insertRow|delete_row|delete_column|anchor|Table|save|choose|URL|Row|redactor_image_box|Column|redactor_tab3|imageUploadErrorCallback|Email||plugins|insert_row_below|insert_column_left|current_td|insert_column_right||insert_row_above|redactor_insert_video_area|redactor_form_image_align|redactor_file_alt|insert_table|insertColumn|addRange|encodeEntities|savePreCode|convertDivs|extractContent|pasteCleanUpInsert|redactor_btn_right|DIV|execCommandCallback|BLOCKQUOTE|catch|inserthorizontalrule|hasSelection|focusNode|caption|h5|redactor_act|inactiveAllButtons|push|colors|one|redactor_tab2|autosaveCallback|legend|h6|fieldset|figure|setBtnInactive|align|_getBoundary|direction|build|removeChild|moveToElementText|contenteditable|createTextNode|pageX|pasteRunning|RedactorPlugins|keyupCallback|keydown|keydownCallback|redactor_air|pasteHTML|pasteHtmlAtCaret|previousSibling|StartToStart|_moveBoundary|JustifyLeft|observeScroll|alignleft|||||||alignright|elem|aligncenter|case|removeAllRanges|pageY|try|insertHtml|modalSaveBodyOveflow|dragupload|overflow|mouseup|redactor_link_anchor|redactor_link_blank|uploadInit|setModalTab|protocol|redactor_modal_close|uploadCrossDomain|POST|droparea|hidden|empty|http|redactor_filename|fileUploadErrorCallback|test|amp|childNodes|trigger|redactor_link_mailto|submit|2000px|alt|split|start|random|uploadSubmit|chrome|absolute|Upload|formattingIndenting|contentWindow|element_action|formattingAddAfter|cleanupPre|hasClass|toLowerCase|ajax|formattingAddBefore|contentDocument|atext|b7dde8|progress|prebuffer_|prototype|or_choose|formattingEmptyTags|uploadLoaded|formattingRemove|toggle|dropalternative|autosaveInterval|buildColorPicker|setColorNone|iPod|BlackBerry|Android|iPhone|strike|font|strong|BackColor|convertLinks|setBackgroundNone|buildDropdown|pasteCleanUp|buildToolbar|destroy|interval|del|autoSave|hideDropDown|redactor_dropdown|hdlShowDropDown|showDropDown|getSelectedHtml|opera|drop_file_here|safariShiftKeyEnter|paragraph|wym|insertAfter|dir|quote|contents|header1|TEXTAREA|enableAir|rows|redactor_editor_wym|columns|video_html_code|showAir|textselect|header2|header3|formattingTags|buttonsAdd|buttonsCustom|cleanup|metaKey|which|ctrlKey|splice|airButtons||header4|Chrome|link_insert|insertorderedlist|insertunorderedlist|mobile|textunselect|delete||ondrag|hr|parseJSON|ondragleave|https|center|ftp|formatNewLine|7f7f7f|allowedTags|xhr|address|tfoot|formatEmpty|paragraphy|redactor_upload_btn|getBuffer|image_web_link|linkify|redactor_tab1|link_new_tab|observeFormatting|activeButtonsStates|handle|fixedBox|zIndex|setBuffer|image_position|fixedTop|innerWidth|_delete|quot|forecolor|redactor_image_delete_btn|insertRowBelow|StartToEnd|compareEndPoints|nextSibling|Right|redactor_link_url_text|imageEdit|insertBefore|Head|redactorSaveBtn|change|Align|to|imageDelete|getSelectedNode|insertRowAbove|modal_image_edit|addHead|deleteTable|insertVideo|Image|_getChildIndex|Code|tableObserver|modal_file|table_tr|redactor_link_mailto_text|insertNode|Video|insertColumnRight|_blank|showVideo|Color|redactor_insert_video_btn|setEndPoint|createTextRange|EndToEnd|insertColumnLeft|checked|modal_video|Link|imageSave|the|isEmptyObject|getFragmentHtml|showLink|imageUploadCallbackLink|deleteColumn|nodeName|resizeImage|showImage|showTable|filelink|removeAttr|uploadForm|next|modal_image|mousemove|mousedown|imageSetThumb|List|showFile|modal|load|modal_table|redactor_table_columns|modal_link|draggable|redactor_insert_link_btn|floor|Left|redactor_link_anchor_text|insertLink|uploadFrame|getFocus|insertTable|firstChild|deleteRow|createDocumentFragment|_insertLink|Text|redactor_insert_table_btn|getOrigin|cloneRange|99999|outerHeight|Outdent|31859b|Save|244061|632423|Above|0f243e|1d1b10|Below|Cancel|Indent|redactorUploadFileForm|Name|optional|7f6000|974806|4f6128|3f3151|7px|redactorInsertVideoForm|separator_drop2||separator_drop3|Bold|separator_drop1|bull|redactor_format_h3|redactor_format_h4|strikethrough|Quote|Paragraph|enableInlineTableEditing|HTML|scroll|enableObjectResizing|Unlink|Formatting|536|paste|Italic|redactor_format_h2|Unordered|handler|textselected|getSelectedText|checkbox|arguments|redactorInsertImageForm|redactorInsertLinkForm|0c0c0c|160px|redactor_format_blockquote|redactor_format_pre|redactor_format_h1|Font|event|Back|special|Ordered|494429|here|Center|ffffff|Drop|000000|figcaption|big|small|cite|Justify|sup|sub|eeece1|Or|f79646|4bacc6|Download|ffff00|download|8064a2|9bbb59|1f497d|Choose|4f81bd|c0504d|mark|track|apply|rttt|ltr|datalist|output|Alignment|Underline|Anchor|Deleted|in|tab|section|header|time|nav|Horizontal|ttt|canvas|details|article|hgroup|Rule|aside|footer|f2f2f2|ddd9c3|f2c314|fac08f|a5a5a5|262626|Open|b2a2c7|c3d69b|548dd4|938953|95b3d7|Title|d99694|handlerKey|setup|92cddc|5f497a|e36c09|teardown||namespaces|Rows|76923c|17365d|366092|953734|Columns||Position|3f3f3f|web|e5e0ec|Web|dbeef3|fdeada||Embed|ebf1dd|c6d9f0|dbe5f1|File|f2dcdb|fff2ca|d8d8d8|ccc1d9|d7e3bc|fbd5b5|ffe694|bfbfbf|e5b9b7|None|595959|c4bd97|8db3e2|b8cce4|c09100|nodeValue|drop|ondrop|addEventListener|ajaxSettings|dataTransfer|files|internal|FormData|marker|addBtnBefore|addBtnAfter|dragover|addBtn|setBtnLeft|setBtnRight|dragleave|loaded|Loading|addBtnFirst|total|sid|php|www|redactorUploadForm|processData|contentType|TD|H6|H3|H4|H5|cache||||removeBtn|dataType||textContent|innerText|z0|script|redactorUploadFile|colgroup|math|redactor_dropalternative|redactor_dropareabox|transparent|rv|30px|removeBtnSeparatorBefore|background|prev|iPad|normalize|redactor_color_none|compatible|stopPropagation|removeBtnIcon|addBtnSeparator|addBtnSeparatorAfter|addBtnSeparatorBefore|changeBtnIcon|frames|showedDropDown|failed|alert|backgroundColor|redactor_color_link|setFocus|escape|encodeURIComponent|removeData|setInterval|preview|redactor_droparea|MSIE|innerHeight|1000|redactor_toolbar|redactor_separator_drop|hilitecolor|210|getObject|getEditor|destroyEditor|getSelected|getText|removeBtnSeparatorAfter|H2|htmlText|cloneContents|move|off|superscript|times||resize|nw|marginLeft|getElementById|selectNodeContents|H1|fadeOut|marginTop|marker_|subscript|300px|slice|filename|300|undo|self|removeFormat|redo|getJSON|610|redactor_image_box_select|thumb|location|460|cellIndex|table_td|500|first|600|380|redactor_image_edit_src|fast|insertNodeAfterCaret|Control|BODY|on|setStartAfter|deleteContents|clientY|commonAncestorContainer|character|setEnd|setStart|fromCharCode|anchorOffset|default|switch|focusOffset|clearInterval|unselectable|INPUT|clientX|head|stylesheet|moveEnd|cloneNode||defaultView|redactor_box|parents||ownerDocument|relative|frameborder|EndToStart|duplicate|min||visible|1005|redactor_|moveStart|eval'.split('|'),0,{}))
\ No newline at end of file
diff --git a/changelog.txt b/changelog.txt
index 64b89a90..b222a6a8 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,214 @@
+Version 2.2.1
+-------------
+ Release date: January 25, 2013
+
+ Bug Fix
+
+ - Fixed PHP syntax error in Go_cart.php library
+
+
+Version 2.2
+-------------
+ Release date: January 23, 2013
+
+ Features
+
+ - Replaced experimental "GoEdit" with RedactorJS (RedactorJS is distributable with GoCart but NOT OPEN SOURCE http://imperavi.com/redactor/).
+ - Updated jQuery to 1.9 and jQuery UI to 1.10.
+ - Updated media manager to function with redactor.
+
+ Bug Fixes
+
+ - Fixed Issue #72 Missing data['error'] in admin Category. (thanks dronord)
+ - Fixed product image upload on firefox.
+ - Made CSS classes match other ones used through the system.
+ - Fixed Issue #75 compute tax for whole order coupon (thanks abulte)
+ - Fixed some language errors (thanks olimortimer)
+
+ Other
+
+ - Update to the GoCart license.
+ - Merged licenses from various parts of gocart into a single file "licences.txt"
+ - Related products come at the bottom of mobile devices now.
+ - Added instructional text to installation regarding the database.
+
+Version 2.1.1
+-------------
+ Release date: November 29 2012
+
+ Bug Fixes
+
+ - Fixed installation redirect (only affected some servers)
+ - Added/Cleaned several instances of static text to the language files
+
+Version 2.1
+-------------
+ Release date: October 29, 2012
+
+ Features
+
+ - Replaced single page checkout with multi page checkout for ease of development changes
+
+ Bug Fixes
+
+ - Eliminated code remnant from product page.
+ - Fixed an error in the product view related to options with no option.
+ - Fixed migrations to not break on install.
+
+ Other
+
+ - Various changes to go_cart.php library to function better with multi-page checkout
+
+Version 2.0
+-------------
+ Release date: September 13, 2012
+
+ Features
+
+ - Upgraded to CodeIgniter 2.1.2
+ - New default theme based on Twitter bootstrap 2.0
+ - Admin interface now based on twitter bootstrap
+ - Pagination on admin product list
+ - Category filter on admin product list page
+ - Admin Reports are better optimized than before.
+ - AJAX related products search on product_form.php view.
+ - AJAX category search on product_form.php view.
+ - Sortable products on front end (in the bootstrap theme)
+ - Breadcrumbs
+ - Routing system improved for optimum scalability
+ - New custom built wysiwyg editor (replaced TinyMCE) with CI based file manager
+ - Did a lot of file cleanup
+ - Supporting alternate thousands separator and decimal separators (via gocart config file)
+ - Supporting currency symbol on right or left (via gocart config file)
+ - XSS filtering on front end search
+ - Using CodeIgniter migrations library for DB updates
+
+ Bug Fixes
+
+ - Fixed blank search term error.
+ - Fixed admin order view error for is_gc flag.
+ - Removed default Lousiana tax of %4.
+ - Updated default uri-protocol to AUTO.
+ - Fixed colspan on an empty product table in the admin products view.
+ - Fixed admin banner datepicker javascript and fields
+ - Fixed banner_model.php to properly restrict disabled banners for the get_homepage_banners() function.
+ - Fixed meta tag code in the default theme header.
+ - Fixed login redirect for expired customer sessions (thanks Dinesh)
+ - Updated SQL install script to support ipv6 ip address length
+ - Eliminated a field from the install script for "heard_about" in the orders table
+
+ Other
+
+ - Eliminated many unused files and functions
+ - Utilizing address_format more places (and added a
flag)
+
+
+Version 1.2.3
+-------------
+ Release date: March 8, 2012
+
+ Bug Fixes
+
+ - Fixed track_stock flag for gift cards and is_gc flag on products
+
+Version 1.2.2
+-------------
+ Release date: February 23, 2012
+
+ Bug Fixes
+
+ - Fixed errors resulting from gift card purchase, a casualty of the inventory tracking code
+ - My Account page was pulling user info from the session rather than database.
+ - Fixed product sorting on the front end.
+ - Fixed undefined index error if customer ID does not exist in the Digital Product model. (thanks svizion)
+
+ Other
+
+ - Replaced depreciated encrypt sha1 function with native PHP sha1 function.
+
+Version 1.2.1
+------------
+ Release date : January 30, 2012
+ Bug Fixed
+
+ - Fixed digital products folder references
+ - Added track_stock to "get_cart_ready_product" function in Product_model
+ - Fixed updating quantity if allow overstock buying is enabled on the view cart page.
+ - fixed count_product which was stopping pagination on category pages.
+
+Version 1.2
+-------------
+ Release date: January 16, 2012
+
+ Bug Fixes
+
+ - Replaced deprecated function in the credit card helper and missing HTML tags in the main header view.
+ - Made admin and customer authentication use different cookie names to avoid conflicts.
+ - Fixed various HTML errors.
+ - Fixed height issues on "related products".
+ - Fixed PHP errors associated with no image available on related products.
+ - Support foreign characters in TinyMCE.
+ - Fixed the get_homepage_boxes function.
+ - Removed PHP warning when attempting to add a new product which does not have images. (thanks tfevens)
+
+ Features
+
+ - Added language support and extended internationalization capabilities.
+ - Added support for Sage Pay payment gateway (Thanks to swicks).
+ - Added support for digital products.
+ - Added inventory support.
+ - Converted payment and shipping libraries into application packages.
+ - Accented characters are now converted to their non-accented equivalents in Category, Page and Product slugs.
+ - Support themes through CodeIgniter packages. (configurable via gocart.php config file)
+ - One-click remove item from view cart page.
+
+ Other
+
+ - Updated to CodeIgniter 2.1.
+ - Removed database password and prefix requirements in the Installer, for those of you who want to shoot yourself in the feet.
+ - Eliminated some junk code and views that are not used.
+ - Added a check in the dashboard controller to check if there are payment and shipping modules installed.
+ - Extended default expiration for non-remembered sessions.
+ - Package jQuery & jQuery UI with GoCart for more end user control.
+
+Version 1.1.4
+-------------
+ Release date: November 8, 2011
+
+ Bug Fixes
+
+ - Added missing state from Mexico per Oliver (thanks!).
+ - Updated TinyMCE to support some foreign characters.
+ - Updated URL to TinyMCE init file (was causing TinyMCE to not display due to JS error)
+ - Updated rtrim to index.php for better support on windows.
+
+Version 1.1.3
+-------------
+ Release date: Nov 8, 2011
+
+ Bug Fixes
+
+ - This is the same bug fix from 1.1.1 for SSL. It wasn't properly fixed in 1.1.1
+
+Version 1.1.2
+-------------
+ Release date: Nov 7, 2011
+
+ Bug Fixes
+
+ - Fixed a bug in the order_model related to quantity and item reporting.
+
+Version 1.1.1
+-------------
+ Release date: Nov 7, 2011
+
+ Bug Fixes
+
+ - Fixed a bug in MY_url_helper that caused Force_SSL to Force SSL even if SSL isn't enabled.
+ - Fixed a MySQL strict mode bug where administrators do not have a default first and last name.
+ - Fixed a MySQL Strict Mode bug where UserData is not given a value.
+
Version 1.1
------------
Release date: Nov 5, 2011
diff --git a/css/admin.css b/css/admin.css
deleted file mode 100644
index 58339764..00000000
--- a/css/admin.css
+++ /dev/null
@@ -1,508 +0,0 @@
-/*
-Noah Mormino
-Go Cart Administration styles v: 1.0
-
-*/
-
-* {
- outline:none;
-}
-
-textarea {
- border:1px solid #cccccc;
- padding:5px;
- border-radius: 5px;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- resize:none;
- box-sizing: border-box;
- -webkit-box-sizing:border-box;
- -moz-box-sizing: border-box;
- -ms-box-sizing: border-box;
-}
-img {
- border:0px;
-}
-body {
- background-image:url('../images/admin/bg_dots.gif');
- font-family: "Lucida Grande", Arial, Verdana, sans-serif;
- font-size:12px;
- margin:0px;
- padding:0px;
- padding-bottom:10px;
-}
-
-a {
- color:#19a6d9;
- text-decoration:none;
- padding:4px;
-}
-
-h2 {
- margin:0px 0px 20px 0px;
- padding:0px;
- color:#464646;
- font-size:1.7em;
- font-weight:normal;
-}
-
-h3 {
- margin:0px;
- padding:0px;
- color:#464646;
- font-size:1.2em;
- font-weight:normal;
-}
-
-label {
- width:150px;
- display:inline-block;
-}
-
-.list_buttons {
- text-align:right;
- font-size:9px;
-}
-
-.button_set {
- text-align:right;
- font-size:11px;
- margin:10px 0px;
- clear:both;
-}
-
-.button {
- font-size:11px;
-}
-
-#header {
- height:55px;
- margin-bottom:5px;
- padding:0px 10px 20px 10px;
- background-image:url('../images/admin/bg_header.png');
- position:relative;
-}
-
-#header .shine {
- background-image:url('../images/admin/bg_header_glow.png');
- background-repeat:no-repeat;
- background-position:center top;
- height:10px;
-}
-
-#header h2 {
- position:absolute;
- top:15px;
- left:100px;
- z-index:1;
- color:#fff;
- font-family:'lobster';
- font-size:35px;
-}
-
-#header span a {
- margin:15px 0px 0px 15px;
- color:#fff;
- padding:5px 10px;
- background-color:#333;
- background-image:url('../images/admin/bg_menu_item_2.png');
- background-repeat:repeat-x;
- background-position:center center;
- -webkit-border-radius: 20px;
- -moz-border-radius: 20px;
- border-radius: 20px;
- border:1px solid #000;
-
- text-shadow: 0px 1px 1px #000;
-
- -webkit-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 1);
- -moz-box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 1);
- box-shadow: 0px 1px 1px 0px rgba(0, 0, 0, 1);
-}
-#header span a:hover{
- background-color:#22b2ee;
- background-image:url('../images/admin/bg_menu_item.png');
- border:1px solid #8cd7f6;
- text-shadow: 0px 1px 1px #16a1da;
-}
-#container {
- padding:10px;
- margin:auto;
-}
-
-#menu_wrapper {
- width:160px;
- padding-right:10px;
- float:left;
-}
-
-.menu {
- -webkit-border-top-left-radius: 5px;
- -webkit-border-top-right-radius: 5px;
- -moz-border-radius-topleft: 5px;
- -moz-border-radius-topright: 5px;
- border-top-left-radius: 5px;
- border-top-right-radius: 5px;
- margin-bottom:10px;
-}
-
-.menu .menu_title
-{
- font-size:13px;
- background: #333333;
- color:#fff;
- padding:6px;
- -webkit-border-top-left-radius: 5px;
- -webkit-border-top-right-radius: 5px;
- -moz-border-radius-topleft: 5px;
- -moz-border-radius-topright: 5px;
- border-top-left-radius: 5px;
- border-top-right-radius: 5px;
-}
-
-.menu a {
- color:#19a6d9;
- text-decoration:none;
- padding:6px;
- display:block;
- background-color:#fff;
- border-top:1px solid #fff;
- border-bottom:1px solid #fff;
-}
-
-.menu a:hover {
- background: #f2f2f2;
- background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#f2f2f2));
- background: -moz-linear-gradient(top, #ffffff, #f2f2f2);
- border-top:1px solid #f2f2f2;
- border-bottom:1px solid #ccc;
-}
-
-.shadow {
- -moz-box-shadow: 0px 0px 3px #ccc;
- -webkit-box-shadow: 0px 0px 3px #ccc;
- box-shadow: 0px 0px 3px #ccc;
-}
-
-#page_content {
- position:relative;
- overflow:hidden;
- padding:0px 5px 5px 5px;
- width:auto;
-}
-.order_table {
- width:100%;
- border-collapse:collapse;
- -moz-box-shadow: 0px 0px 3px #ccc;
- -webkit-box-shadow: 0px 0px 3px #ccc;
- box-shadow: 0px 0px 3px #ccc;
- -webkit-border-top-left-radius: 5px;
- -webkit-border-top-right-radius: 5px;
- -moz-border-radius-topleft: 5px;
- -moz-border-radius-topright: 5px;
- border-top-left-radius: 5px;
- border-top-right-radius: 5px;
-}
-
-.order_table thead tr th {
- font-size:13px;
- background: #333;
- color:#fff;
- padding:6px;
- text-align:left;
-}
-
-.order_table tbody tr td.title {
- font-size:13px;
- background: #333;
- color:#fff;
- padding:6px;
- text-align:left;
- font-weight:bold;
-}
-
-.order_table thead tr th a {
- color:#fff;
-}
-
-.order_table thead tr td, .order_table tfoot tr td {
- font-size:11px;
- padding:0px;
-}
-
-.order_table thead tr th.gc_cell_left {
- -webkit-border-top-left-radius: 5px;
- -moz-border-radius-topleft: 5px;
- border-top-left-radius: 5px;
-}
-
-.order_table thead tr th.gc_cell_right {
- -webkit-border-top-right-radius: 5px;
- -moz-border-radius-topright: 5px;
- border-top-right-radius: 5px;
-}
-
-.order_table tbody tr td {
- background-color:#fff;
- padding:5px;
- color:#555;
- vertical-align:top;
-}
-
-.gc_table {
- width:100%;
- border-collapse:collapse;
- -moz-box-shadow: 0px 0px 3px #ccc;
- -webkit-box-shadow: 0px 0px 3px #ccc;
- box-shadow: 0px 0px 3px #ccc;
- -webkit-border-top-left-radius: 5px;
- -webkit-border-top-right-radius: 5px;
- -moz-border-radius-topleft: 5px;
- -moz-border-radius-topright: 5px;
- border-top-left-radius: 5px;
- border-top-right-radius: 5px;
-}
-
-.gc_table thead tr th {
- font-size:13px;
- background: #333;
- color:#fff;
- padding:6px;
- text-align:left;
-}
-
-.gc_table thead tr th a {
- color:#fff;
-}
-
-.gc_table thead tr td, .gc_table tfoot tr td {
- font-size:11px;
- padding:0px;
-}
-
-.gc_table thead tr th.gc_cell_left {
- -webkit-border-top-left-radius: 5px;
- -moz-border-radius-topleft: 5px;
- border-top-left-radius: 5px;
-}
-
-.gc_table thead tr th.gc_cell_right {
- -webkit-border-top-right-radius: 5px;
- -moz-border-radius-topright: 5px;
- border-top-right-radius: 5px;
-}
-
-.gc_table tbody tr td {
- background-color:#fff;
- padding:5px;
- border-top:1px solid #fff;
- border-bottom:1px solid #f2f2f2;
- color:#555;
-}
-
-.gc_table tbody tr:hover td {
- background: #f2f2f2;
- background: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#f2f2f2));
- background: -moz-linear-gradient(top, #ffffff, #f2f2f2);
- border-top:1px solid #f2f2f2;
- border-bottom:1px solid #ccc;
-}
-
-.table_nav tbody tr:hover td {
- background:#fff;
- padding:5px;
- border-top:1px solid #fff;
- border-bottom:1px solid #f2f2f2;
- color:#555;
-}
-
-.gc_table tbody tr td.gc_cell_right
-{
- padding-right:10px;
-}
-
-.gc_order_delete {
- float:left;
-}
-.gc_order_search {
- float:right;
-}
-/* text fields */
-.gc_tf1, .tinyMCE
-{
- border:1px solid #ccc;
- padding:3px;
- border-radius: 5px;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- font-size:12px;
- font-family: "Lucida Grande", Arial, Verdana, sans-serif;
- color:#525252;
-}
-/*field container*/
-.gc_field, .gc_field2 {
- padding-bottom:10px;
-}
-
-.gc_field input, .gc_field textarea, mceEditor {
- width:100%;
- margin-left:-5px;
-}
-
-.gc_tinymce {
- padding:0px;
- border:1px solid #ccc;
-}
-.gc_tf2
-{
- border:1px solid #ccc;
- padding:3px;
- border-radius: 5px;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- font-size:12px;
- font-family: "Lucida Grande", Arial, Verdana, sans-serif;
- color:#525252;
- width:100px;
-}
-
-.gc_tf3
-{
- border:1px solid #eaeaea;
- background-color:#fff;
- padding:2px;
- border-radius: 3px;
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- font-size:11px;
- font-family: "Lucida Grande", Arial, Verdana, sans-serif;
- color:#525252;
- width:100%;
-}
-
-.option_form {
- padding-bottom:10px;
-}
-
-.option_form .checkbox{
- width:auto;
- margin:0px 10px;
-}
-
-.option_item_form {
- padding:10px;
- background-color:#f2f2f2;
- border:1px solid #ccc;
- border-radius:7px;
- -moz-border-radius:7px;
- -webkit-border-radius:7px;
-}
-
-#gc_options
-{
- float:left;
- width:269px;
- background-color:#f2f2f2;
- border-right:1px solid #cccccc;
- height:510px;
-}
-#gc_option_form_container {
- margin-left:270px;
- padding:10px;
-}
-#gc_option_title_bar
-{
- background-color:#cccccc;
- font-size:18px;
- color:#3f3f3f;
- padding:5px;
- width:100%;
- margin-bottom:10px;
- position:relative;
-}
-#gc_title
-{
- padding:5px;
- width:175px;
-}
-#gc_option_form {
- padding:0px 10px;
-}
-#gc_option_form label{
- width:65px;
-}
-#gc_option_list {
- color:#535353;
- font-size:12px;
-}
-#gc_option_list img{
- cursor:pointer;
-}
-
-#f2_options {
- border:1px solid #f2f2f2;
- overflow-y:auto;
- height:100px;
- padding:10px;
- font-size:12px;
- color:#535353;
-}
-
-#f2_options table
-{
- width:100%;
-}
-
-/* file upload for products */
-.gc_photo {
- font-size:12px;
- padding:5px;
- margin-top:10px;
- background-color:#f2f2f2;
- border:1px solid #cccccc;
-}
-.gc_thumbnail {
- padding:2px;
- border:1px solid #cccccc;
- background-color:#ffffff;
-}
-.gc_photo textarea {
- width:100%;
- border:1px solid #cccccc;
- padding:5px;
- border-radius: 5px;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
-}
-.gc_photo input {
- float:none;
-}
-.gc_photo_remove {
- float:right;
- cursor:pointer;
-}
-
-/*Address form styles */
-.field_wrap {
- clear:both;
-}
-
-.field_wrap .address {
- width:300px;
-}
-
-.field_wrap div {
- float:left;
- background-color:#fff;
- padding:10px 20px 10px 0px;
-}
-
-/*Order form Item list */
-.order_item {
- padding:10px;
- background-color:#f2f2f2;
- border-radius: 5px;
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- margin-bottom:10px;
-}
\ No newline at end of file
diff --git a/css/modal.css b/css/modal.css
deleted file mode 100644
index 0bd5e312..00000000
--- a/css/modal.css
+++ /dev/null
@@ -1,782 +0,0 @@
-/**************************************************************
-Version: 1.0
-Template: Default
-Author: Noah Mormino
-Company: Clear Sky Designs
-Notes: Default template for Gocart 1.0
-**************************************************************/
-
-body {
- margin:0px;
- padding:0px;
- font-family: Arial, Verdana, sans-serif;
- font-size:13px;
- color:#262626;
-}
-
-img {
- border:0px;
-}
-
-form {
- margin:0px;
- padding:0px;
-}
-
-th {
- padding:5px;
- background:#ccc;
- font-size:14px;
- color:#525252;
-}
-
-a, a:visited {
- color:#0083de;
- text-decoration:underline;
-}
-
-a:hover {
- color:#005fa1;
-}
-
-iframe {
- border:0px;
-}
-
-.gc_modal{
- width: 100%;
-}
-
-.gc_clr {
- clear:both;
-}
-
-.gc_left {
- float:left;
- text-align:left;
- clear:left;
-}
-
-.gc_right {
- float:right;
- text-align:right;
- clear:right;
-}
-
-.gc_content {
- display:none;
-}
-/* Header */
-#gc_header {
- background-color:#0083de;
-}
-
-#gc_header_session {
- color:#fff;
- background-color:#003459;
- border:1px solid #000;
- color:#fff;
- float:right;
- padding:3px;
- margin-top:10px;
-}
-
-#gc_header_session a {
- color:#fff;
-}
-
-#gc_header_search {
- float:right;
- clear:right;
- margin-top:30px;
- text-align:right;
-}
-
-/* Page Menu */
-#gc_page_menu {
- background-color:#262626;
- border-top:1px solid #000;
- border-bottom:1px solid #000;
- margin-bottom:20px;
-}
-
-/* Left Nav */
-#gc_left_nav {
- width:200px;
- float:left;
- padding-right:10px;
-}
-
-.gc_nav_title {
- text-align:center;
- font-size:14px;
- font-weight:bold;
- padding-bottom:5px;
-}
-
-/* main body */
-#gc_body {
- margin-left:210px;
- clear:none;
-}
-
-#gc_breadcrumb {
- font-size:10px;
- font-family: Verdana, Arial, sans-serif;
- border-bottom:1px solid #ccc;
- margin-bottom:10px;
- margin-top:-10px;
- padding-bottom:5px;
- font-weight:bold;
-}
-
-#gc_breadcrumb a {
- font-weight:normal;
-}
-
-#gc_page_title {
- font-size:28px;
- margin-bottom:10px;
-}
-
-.gc_error {
- color:#ff0000;
- padding:5px;
- background-color:#ffd3d3;
- border:1px solid #ff0000;
- margin-bottom:10px;
-}
-
-.gc_message {
- color:#005fa1;
- padding:5px;
- background-color:#c1e6ff;
- border:1px solid #0083de;
- margin-bottom:10px;
-}
-
-/* Category Page */
-.gc_category_description {
- background-color:#f2f2f2;
- border:1px solid #ccc;
- padding:5px;
- margin-bottom:10px;
-}
-
-.gc_product_list {
- width:100%;
-}
-
-.gc_product_row {
- text-align:left;
- width:100%;
-}
-
-.gc_product_row_buffer {
- height:5px;
- overflow:hidden;
-}
-
-.gc_product_grid {
- text-align:center;
- padding:0px 5px 10px 5px;
- vertical-align:top;
-}
-
-.gc_product_thumbnail img{
- padding:5px;
- border:1px solid #cccccc;
- margin:auto;
-}
-
-.gc_product_info {
- padding:10px;
- width:100%;
-}
-
-.gc_product_name {
- font-weight:bold;
- font-size:14px;
-}
-
-.gc_product_code {
- font-size:11px;
- font-family:verdana, arial, sans-serif;
- padding:5px 0px;
-}
-
-.gc_price_slash {
- text-decoration:line-through;
-}
-
-.gc_price_sale {
- font-weight:bold;
- color:#ff0000;
-}
-
-.gc_price_reg {
- font-weight:bold;
-}
-
-.gc_stock_msg {
- color:#FF0000;
-}
-
-.gc_product_excerpt {
- background-color:#f2f2f2;
- border:1px solid #ccc;
- padding:3px;
- display:block;
- margin-top:5px;
-}
-
-.gc_pagination {
- text-align:center;
- padding-bottom:10px;
-}
-
-/* Product Page */
-#gc_product_image {
- float:left;
- padding:5px;
- border:1px solid #ccc;
-}
-
-#gc_product_details {
- margin-left: 270px;
-}
-
-#gc_product_options {
-
- padding:5px;
- background-color:#f2f2f2;
- border:1px solid #ccc;
-}
-
-#gc_product_form {
- margin-top:10px;
- width:500px;
-}
-
-#gc_product_form table {
- width:100%;
-}
-
-#gc_product_form td{
- vertical-align:top;
-}
-
-.gc_option_name {
- font-weight:bold;
- font-size:11px;
- font-family:verdana, arial, sans-serif;
- padding-bottom:10px;
- padding-right:10px;
-}
-
-.gc_required:before {
- content: '*';
- color:#a70000;
-}
-.gc_option {
- padding-bottom:10px;
-}
-
-#gc_options_note {
- text-align:center;
- font-weight:bold;
- font-size:11px;
- font-family:verdana, arial, sans-serif;
- color:#a70000;
-}
-
-#gc_tab_container {
- padding-top:15px;
- clear:both;
-}
-.gc_tabs {
- padding-left:10px;
-}
-.gc_tabs a{
- padding:4px 10px;
- background-color:#f2f2f2;
- border:1px solid #cccccc;
- text-decoration:none;
- color:#525252;
- cursor:pointer;
-}
-
-.gc_tabs a.gc_selected {
- background-color:#fff;
- border-bottom:1px solid #fff;
-}
-
-.gc_tab_content {
- border:1px solid #ccc;
- background:#fff;
- padding:10px;
- margin-top:4px;
-}
-
-#gc_image_gallery img{
- padding:5px;
- border:1px solid #ccc;
- margin:5px;
-}
-
-/* View Cart Page */
-.gc_view_cart {
- width:100%;
- border-left:1px solid #ccc;
- border-right:1px solid #ccc;
- border-bottom:1px solid #ccc;
-}
-
-.gc_view_cart tbody {
- border-left:1px solid #ccc;
- border-right:1px solid #ccc;
-}
-
-.gc_view_cart td{
- vertical-align:top;
- padding:5px;
-}
-
-.gc_even td{
- background:#f2f2f2;
- border-bottom:1px solid #ccc;
- border-top:1px solid #ccc;
-}
-
-#gc_coupon_code_form {
- margin-top:10px;
- background-color:#c1e6ff;
- border:1px solid #0083de;
- text-align:center;
- padding:20px;
- float:left;
-}
-
-#gc_view_cart_buttons {
- float:right;
- clear:none;
- margin-top:10px;
-}
-
-.gc_view_cart_totals {
- font-weight:bold;
-}
-
-td.gc_total {
- font-weight: bold;
- border-top: 1px solid;
-}
-
-/* Customer Details */
-.gc_customer_details, .gc_customer_details table{
- width:100%;
-}
-.gc_customer_details td {
- vertical-align:top;
- padding-right:10px;
-}
-#gc_copy_billing {
- margin:auto;
- display:block;
-}
-
-#logged_in_address_container{
- width:100%;
- overflow: auto;
- margin-bottom: 15px;
-}
-
-#checkout_billing_address {
- padding: 5px;
- border:1px solid #C0C0C0;
- float:left;
- width:225px;
- height: 125px;
-}
-
-#bill_address_display, #ship_address_display {
- padding: 5px;
-}
-
-#checkout_shipping_address {
- padding: 5px;
- border:1px solid #C0C0C0;
- margin-left:250px;
- width:225px;
- height:125px;
-}
-
-/* scheckout */
-#payment_section_container table tr td {
- vertical-align:top;
-}
-#continue_shopping {
- float:right;
- margin-top:-40px;
-}
-
-#gc_coupon_code_form_checkout {
- color:#4E4E44;
- float:right;
- font-size:12px;
- font-weight:bold;
- margin-top:10px;
- text-transform:uppercase;
- width:470px;
-}
-
-#shipping_section {
- float:left;
- margin-top:15px;
- width:400px;
-}
-
-.checkout_block {
- border-color: #0083DE;
- border-width: 1px;
- border-style: solid;
- padding:8px;
- margin-bottom:20px;
-}
-
-.checkout_block h2 {
- font-weight:normal;
- margin-bottom:10px;
- font-size:19px;
-}
-
-.checkout_block h3 {
- font-weight:normal;
- color:#777777;
- font-size:16px;
-}
-
-
-#shipping_address{
- float:left;
- width:47.5%;
- border-right:1px solid #0083DE;
-}
-
-#billing_address{
- float:right;
- width:50%;
-}
-
-#tab_detail
-{
- font-size:13px;
- font-family:arial, verdana, sans-serif;
-}
-
-.accordion_form {
- background-color:#fff;
- float:left;
-}
-
-#name_wrap, #contact_wrap, #address_wrap, #geo_wrap, .card_info_wrap {
- clear:both;
-}
-
-#address_option_wrap, #name_wrap div,#contact_wrap div, #geo_wrap div, .card_info_wrap div {
- float:left;
- font-weight:bold;
- background-color:#fff;
- padding:10px 20px 10px 0px;
-}
-
-.card_info_wrap div.pr0 {
- padding-right:0px;
-}
-
-.card_info_wrap select.input {
- width:50px;
- padding:auto;
-}
-#address_wrap {
- clear:both;
- padding:10px 0px;
- padding-bottom:0px;
- font-weight:bold;
-}
-
-#address_wrap .input{
- clear:both;
- margin-bottom:10px;
- width:300px;
-}
-
-.accordion_form .input{
- border:1px solid #ccc;
- padding:3px;
- width:120px;
-}
-
-.accordion_form .input_hover {
- border:1px solid #71C837;
- padding:3px;
-}
-
-.accordion_form .require_fail {
- border:1px solid red;
- padding:3px;
-}
-
-#static_address_content {
- position: relative;
- margin-bottom: 10px;
- height: 150px
-}
-
-#static_bill_address {
- padding: 5px;
- border:1px solid #C0C0C0;
- float:left;
- width:225px;
-}
-
-#static_ship_address {
- padding: 5px;
- border:1px solid #C0C0C0;
- margin-left:250px;
- width:225px;
- height:125px;
-}
-
-
-
-/* Customer Details */
-
-.disabled {
- border 1px solid #AAAAAA;
- background-color: #CCCCCC;
-}
-.register_field {
- text-align:right;
-}
-#gc_customer_details, #gc_customer_details table{
- width:100%;
-}
-#gc_customer_details td {
- vertical-align:top;
- padding-right:10px;
-}
-#gc_copy_billing {
- float:right;
-}
-
-.gc_reg_input {
- width:550px;
-}
-
-/* Confirmation page*/
-.confirm_customer
-{
- font-size:12px;
- padding:10px;
- margin-bottom:10px;
- border:1px solid #b2d799;
- background-color:#ffffff;
-}
-.confirm_customer table tr td {
- vertical-align:top;
-}
-.company_name {
- font-size:16px;
- font-weight:bold;
- padding:0px 0px 3px 0px;
- text-transform:uppercase;
-}
-
-.order_number {
- font-size:20px;
- font-weight:bold;
- padding:0px 0px 3px 0px;
- text-transform:uppercase;
-}
-
-
-/* Login paage */
-#gc_login_container {
- background-color:#f2f2f2;
- border:1px solid #ccc;
- padding:10px;
- display:block;
- width:230px;
-}
-#gc_login_container td {
- padding-right:10px;
- padding-bottom:5px;
-}
-#login_form_links {
- padding-top:10px;
- text-align:center;
- font-size:11px;
-}
-
-/* My Account Page */
-.delete_address {
- cursor:pointer;
-}
-#address_list .my_account_address {
- border-bottom:1px solid #0083DE;
- padding:8px;
-}
-#my_account_info {
- border:1px solid #0083DE;
- padding:8px;
-}
-
-/* these are the alternating background colors for the addresses*/
-.address_bg {
- background-color: #92bff8;
-}
-
-#my_account_info h2 {
- font-weight:normal;
- margin-bottom:10px;
- font-size:19px;
-}
-#my_account_container {
- overflow: auto;
-}
-
-#customer_details {
-
- float:left;
- margin:5px;
- width:360px;
-}
-
-#customer_details_form {
-
-}
-
-#confirmation_box {
- margin-bottom: 10px;
- border-color: white;
- border-width: 1px;
- border-style: solid;
- background-color: #34a1ff;
- color: black;
- padding:5px;
-
-}
-
-.my_account_header {
- background-color:#000000;
- color:#FFFFFF;
- font-weight:bold;
- padding:5px;
-}
-
-#address_container {
- float:right;
- width:300px;
- margin: 5px;
-}
-
-.my_address {
- height: 120px;
- margin: 15px;
- padding: 5px;
- border: 1px solid #c0c0c0;
-}
-
-
-
-
-
-/* Payment Page */
-.gc_payment_form {
- display:none;
-
- -moz-border-radius:5px 5px 5px 5px;
- border:1px solid;
- margin:15px;
- padding:10px;
-}
-
-/* address manager */
-
-#address_mgr_title {
- font-weight: bold;
- margin-bottom: 10px;
-}
-
-#address_mgr_header {
- width: 775px;
- background-color: black;
- color: white;
- font-weight: bold;
- padding: 5px;
-}
-
-#address_mgr_container {
- padding: 5px;
- width: 773px;
- height:300px;
- border-right: 1px solid gray;
- border-left: 1px solid gray;
- border-bottom: 1px solid gray;
- position: relative;
-}
-
-#address_list_container{
- float: left;
- width: 450px;
- height: 300px;
- overflow:auto;
-
-
-}
-
-.required {
- border-left: 1px solid red;
-}
-
-.require_fail {
- border: 1px solid red;
-}
-
-.address_entry {
- width:95%;
- padding: 5px;
- margin: 1px;
- border: 1px solid #8d8d8d;
-}
-
-.odd {
- background-color: #cfcfcf;
-}
-
-.even {
- background-color: white;
-}
-
-#address_form_placeholder {
- clear:both;
- position:absolute;
- right:5px;
- top:10px;
- width:300px;
-}
-
-#address_bullets {
- margin:10px;
-}
-
-#address_mgr_form_container {
- clear:both;
- position:absolute;
- right:5px;
- top:10px;
- width:300px;
-
-
-}
\ No newline at end of file
diff --git a/css/styles.css b/css/styles.css
deleted file mode 100644
index a5098c1d..00000000
--- a/css/styles.css
+++ /dev/null
@@ -1,1222 +0,0 @@
-/**************************************************************
-Version: 1.0
-Template: Default
-Author: Noah Mormino
-Company: Clear Sky Designs
-Notes: Default template for Gocart 1.0
-**************************************************************/
-
-/* get some basics out the way */
-html{overflow-y:scroll}
-* {outline:none}
-img{border:0px}
-form{margin:0px;padding:0px}
-p {margin:0px 0px 10px 0px}
-iframe {border:0px}
-
-/* base tables */
-th {
- padding:5px;
- background:#ccc;
- font-size:14px;
- color:#525252;
-}
-
-/* base link styles */
-a, a:visited {color:#0c96e5;text-decoration:underline}
-a:hover {color:#046094}
-
-/*basic classes*/
-.left{ float:left}
-.right{float:right}
-.center{margin:auto; text-align:center}
-.clear{clear:both}
-.bold {font-weight:bold}
-.none {display:none}
-.red {color:#ff0000}
-
-/* structural wrappers */
-body {
- margin:0px;
- padding:0px;
- font-family: Arial, Verdana, sans-serif;
- font-size:12px;
- color:#333333;
- background-image:url('../images/body_bg.gif');
-}
-
-.full_wrap {
- width:100%;
- clear:both;
-}
-
-.wide_wrap {
- width:980px;
- margin:auto;
- position:relative;
-}
-
-.content_wrap {
- width:950px;
- padding:5px;
- margin:auto;
- border:5px solid #ddd;
- border-top:0px;
- background-color:#fff;
-}
-
-/* Javascript in the header automatically styles our type="text" for us */
-.input, textarea {
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
- border-top:1px solid #6d6d6d;
- border-left:1px solid #6d6d6d;
- border-right:1px solid #d5d5d5;
- border-bottom:1px solid #d5d5d5;
- padding:4px;
- font-size:12px;
- background-image:url('../images/input_bg.png');
- color:#555;
- font-family: Arial, Verdana, Sans-Serif;
-}
-
-.disabled {
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
- filter: alpha(opacity=60);
- -moz-opacity: 0.6;
- -khtml-opacity: 0.6;
- opacity: 0.6;
-}
-
-#header {
- padding:15px 0px;
-}
-
-/* Search form */
-#search_form {
- float:right;
- margin-top:5px;
- background-color:#fff;
- padding:5px 7px;
- border:1px solid #ddd;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
-}
-
-#search_form input {
- width:150px;
- font-size:14px;
-}
-
-#search_form button {
- font-size:12px;
-}
-
-
-/* Menus */
-#top_menu_container {
- background-color:#ddd;
- border-bottom:1px solid #c7c7c7;
-}
-
-#top_menu {
- float:right;
- margin:0px;
- padding:0px;
- font-size:12px;
-}
-
-#top_menu li {
- float:left;
- list-style-type:none;
- position:relative;
- cursor:pointer;
-}
-
-#top_menu li ul.first {
- position:absolute;
- top:2.1em;
- white-space:nowrap;
- left:0px;
- background-color:#ddd;
- padding:0px;
- margin:0px;
- text-align:left;
- z-index:9999;
- border-bottom:1px solid #c7c7c7;
-}
-
-#top_menu li ul.nav {
- position:absolute;
- top:0px;
- left:100%;
- margin-left:-1px;
- text-align:left;
- padding:0px;
- background-color:#ddd;
- z-index:9999;
- border-bottom:1px solid #c7c7c7;
-}
-
-#top_menu li a {
- padding:6px 15px;
- color:#585858;
- border:0px;
- display:block;
- text-decoration:none;
- text-shadow: rgba(255,255,255,.4) 0 1px 0;
-}
-
-#top_menu li ul li a {
- border:1px solid #c7c7c7;
- border-top:0px;
- border-bottom:0px;
-}
-
-#top_menu li:hover {
- background-color:#f2f2f2;
-}
-
-#top_menu li a:hover {
- color:#000;
- text-shadow:none;
-}
-
-#top_menu .nav li {
- display:block;
- clear:both;
- position:relative;
- width:200px;
-}
-
-#top_menu .first li{
- float:left;
- clear:left;
- width:100%;
-}
-
-#top_menu .first li {
- display:block;
- position:relative;
-}
-
-/* Main category menu*/
-#main_menu {
- background-color:#555;
- margin:0px;
- padding:0px;
-}
-
-.main_menu_left_wrap {
- position:absolute;
- left:0px;
- top:100%;
-}
-
-.main_menu_right_wrap {
- position:absolute;
- right:0px;
- top:100%;
-}
-
-#nav {
- float:left;
- margin:0px;
- padding:6px;
- font-size:12px;
- text-transform:uppercase;
-}
-
-#nav li {
- float:left;
- list-style-type:none;
- position:relative;
- cursor:pointer;
-}
-
-#nav li ul.nav {
- position:absolute;
- top:-10px;
- left:100%;
- text-align:left;
- padding:10px 10px 10px 0px;
- background-color:#555;
- z-index:9999;
-}
-
-#nav li ul.first {
- position:absolute;
- top:2.0em;
- white-space:nowrap;
- left:5px;
- background-color:#555;
- padding:10px 10px 10px 0px;
- margin:0px;
- text-align:left;
- z-index:9999;
-}
-
-#nav li a{
- padding:5px 10px;
- margin-left:10px;
- color:#f2f2f2;
- display:block;
- text-decoration:none;
- text-shadow: rgba(0,0,0,.4) 0 1px 0;
- border:0px;
-}
-
-#nav li a:hover {
- color:#333;
- background-color:#f2f2f2;
- text-shadow: rgb(255,255,255) 0 1px 0;
-}
-
-#nav .nav li {
- display:block;
- clear:both;
- position:relative;
- width:200px;
-}
-
-#nav .first li{
- float:left;
- clear:left;
- width:100%;
-}
-
-#nav .first li {
- display:block;
- position:relative;
-}
-
-ul.first {
- display:none;
-}
-
-ul.nav {
- display:none;
-
-}
-
-li:hover > .nav { display:block;}
-li:hover > .first { display:block;}
-
-h1 {
- font-size:22px;
- font-weight:normal;
- margin:7px 5px;
- font-family:'Lucida Grand', Arial, Verdana, Sans-Serif;
-}
-
-h2 {
- font-size:19px;
- font-weight:normal;
- margin:7px 5px;
- font-family:'Lucida Grand', Arial, Verdana, Sans-Serif;
-}
-
-.error {
- color:#c94f4f;
- padding:5px 12px;
- background-color:#f5dcdc;
- border:1px solid #d5a9a9;
- margin-bottom:10px;
- -webkit-border-radius: 15px;
- -moz-border-radius: 15px;
- border-radius: 15px;
-}
-
-.message {
- color:#aaa;
- padding:5px 12px;
- background-color:#f2f2f2;
- border:1px solid #cccccc;
- margin-bottom:10px;
- -webkit-border-radius: 15px;
- -moz-border-radius: 15px;
- border-radius: 15px;
-}
-/* Homepage Banners */
-#banners {
- width:950px;
- height:250px;
- margin:auto;
- position:relative;
-}
-
-.banner_container {
- position:absolute;
- top:0px;
- left:0px;
-}
-
-.banner_container img {
- width:950px;
- height:250px;
-}
-
-#homepage_boxes {
- margin:5px -5px -5px -5px;
-}
-
-.box_container{
- height:230px;
- width:230px;
- margin:5px;
- float:left;
-}
-
-.category_description {
- color:#555;
- padding:10px 5px;
-}
-
-.category_container {
- overflow:hidden;
- clear:both;
-}
-
-.category_box
-{
- width:136px;
- padding:5px;
- border:1px dotted #ccc;
- float:left;
- margin:5px;
- display:inline;
- text-align:center;
-}
-.category_box .thumbnail
-{
- height:75px;
-}
-.category_box .thumbnail, .category_box .thumbnail img {
- max-width:75px;
- max-height:75px;
- margin:auto;
-}
-
-.product_box
-{
- width:215px;
- padding:10px 5px;
- border:1px dotted #ccc;
- float:left;
- margin:5px;
- display:inline;
- text-align:center;
-}
-
-.product_box .thumbnail
-{
- height:150px;
-}
-.product_box .thumbnail, .product_box .thumbnail img {
- max-width:150px;
- max-height:150px;
- margin:auto;
-}
-
-.excerpt {
- margin-top:5px;
-}
-
-.pagination {
- text-align:center;
-}
-
-
-
-/* Homepage Content */
-#homepage_content
-{
- width:970px;
- margin:auto;
- padding-top:15px;
-}
-
-/* Login paage */
-#login_container_wrap
-{
- float: left;
- position: relative;
- left: 50%;
-}
-#login_container {
- float: left;
- position: relative;
- left: -50%;
- padding:10px;
- border:1px dotted #ccc;
- margin:10px auto;
-}
-
-#login_container td {
- padding-right:10px;
- padding-bottom:5px;
-}
-
-#login_form_links {
- padding-top:10px;
- text-align:center;
- font-size:11px;
-}
-
-
-/* Profile page (some shared elements) */
-.form_wrap {
- clear:both;
- position:relative;
-}
-
-.form_wrap div {
- float:left;
- font-weight:bold;
- padding:10px;
-}
-
-#my_information {
- width:360px;
-}
-
-#my_information h2 {
- margin:0px;
- padding:0px;
- margin-bottom:10px;
-}
-
-#address_manager {
- float:right;
- width:550px;
- padding:7px;
-}
-
-#address_manager h2{
- margin:3px 0px;
-}
-
-.my_account_address
-{
- padding:10px;
- background-color:#f2f2f2;
- -webkit-border-radius: 7px;
- -moz-border-radius: 7px;
- border-radius: 7px;
- margin-bottom:10px;
- border:1px solid #f2f2f2;
-}
-
-.my_account_address:hover {
- background-color:#eee;
- border:1px solid #ddd;
-}
-
-.address_toolbar {
- font-size:10px;
- float:right;
-}
-
-/* View cart page, with shared elements */
-
-.cart_table {
- width:100%;
-}
-
-.cart_table thead tr th {
- background-color:#ccc;
- color:#333;
- font-size:12px;
- text-align:left;
- padding:5px 10px;
-}
-
-.cart_table thead tr th:first-child, .cart_item td:first-child {
- -webkit-border-top-left-radius: 5px;
- -webkit-border-bottom-left-radius: 5px;
- -moz-border-radius-topleft: 5px;
- -moz-border-radius-bottomleft: 5px;
- border-top-left-radius: 5px;
- border-bottom-left-radius: 5px;
-}
-
-.cart_table thead tr th:last-child, .cart_item td:last-child {
- -webkit-border-top-right-radius: 5px;
- -webkit-border-bottom-right-radius: 5px;
- -moz-border-radius-topright: 5px;
- -moz-border-radius-bottomright: 5px;
- border-top-right-radius: 5px;
- border-bottom-right-radius: 5px;
-}
-
-.cart_spacer td {
- height:5px;
- overflow:hidden;
-}
-
-.cart_item td {
- background-color:#f2f2f2;
- color:#555;
- padding:5px 10px;
-}
-
-.cart_table tfoot tr td {
- background-color:#ccc;
- padding:5px 10px;
- color:#333;
- font-size:12px;
- font-weight:bold;
-}
-
-.cart_table tfoot tr.cart_total td {
- background-color:#555;
- color:#f2f2f2;
- padding-top:10px;
- font-size:14px;
-}
-
-.tfoot_top td {
- -webkit-border-top-left-radius: 5px;
- -webkit-border-top-right-radius: 5px;
- -moz-border-radius-topleft: 5px;
- -moz-border-radius-topright: 5px;
- border-top-left-radius: 5px;
- border-top-right-radius: 5px;
- height:0px;
- padding:5px 0px 0px 0px;
-}
-
-.cart_table tfoot tr.tfoot_bottom td {
- -webkit-border-bottom-right-radius: 5px;
- -webkit-border-bottom-left-radius: 5px;
- -moz-border-radius-bottomright: 5px;
- -moz-border-radius-bottomleft: 5px;
- border-bottom-right-radius: 5px;
- border-bottom-left-radius: 5px;
- height:0px;
- padding:0px 0px 5px 0px;
- background-color:#555;
-}
-
-/* View Cart Page */
-.view_cart_additions {
- margin-top:10px;
- border:1px dashed #ccc;
- background-color:#f2f2f2;
- text-align:center;
- padding:20px;
- float:left;
- -webkit-border-radius: 7px;
- -moz-border-radius: 7px;
- border-radius: 7px;
-}
-
-#gc_view_cart_buttons {
- float:right;
- clear:none;
- margin-top:10px;
-}
-
-/* Checkout */
-.continue_shopping {
- float:right;
- margin-top:-35px;
- text-align:right;
-}
-
-.form_wrap div.shorter input{
- width:100px;
-}
-
-.form_wrap div.longer input{
- width:300px;
-}
-
-#shipping_address{
- float:left;
- width:47.5%;
-}
-
-#billing_address{
- float:right;
- width:50%;
-}
-
-.checkout_block {
- background-color:#f2f2f2;
- padding:8px;
- margin-bottom:20px;
- height:auto;
- -webkit-border-radius: 7px;
- -moz-border-radius: 7px;
- border-radius: 7px;
- position:relative;
-}
-
-.checkout_textarea
-{
- display:block;
- height:50px;
- resize:none;
-}
-
-/* Place Order Page */
-.customer_info_box {
- margin:10px 10px 10px 0px;
- border:1px dashed #ccc;
- background-color:#f2f2f2;
- padding:10px;
- float:left;
- -webkit-border-radius: 7px;
- -moz-border-radius: 7px;
- border-radius: 7px;
-}
-
-.customer_info_box h3 {
- font-weight:normal;
- color:#777777;
- font-size:16px;
- margin:0px 0px 10px 0px;
- padding:0px;
-}
-
-#gc_breadcrumb {
- font-size:10px;
- font-family: Verdana, Arial, sans-serif;
- border-bottom:1px solid #ccc;
- margin-bottom:10px;
- padding-bottom:5px;
- font-weight:bold;
-}
-
-#gc_breadcrumb a {
- font-weight:normal;
-}
-
-/* Category Page */
-.gc_product_list {
- width:100%;
-}
-
-.gc_product_row {
- text-align:left;
- width:100%;
-}
-
-
-.product_name {
- font-weight:bold;
- font-size:14px;
-}
-
-.product_sku {
- font-size:11px;
- font-family:verdana, arial, sans-serif;
- height:20px;
-}
-
-.price_container {
- padding:5px 0px;
-}
-
-.price_slash {
- text-decoration:line-through;
- font-size:12px;
-}
-
-.price_sale {
- font-weight:bold;
- color:#ff0000;
- font-size:14px;
-}
-
-.price_reg {
- font-weight:bold;
- font-size:14px;
-}
-
-.out_of_stock {
- color:#FF0000;
-}
-
-
-
-/* Product Page */
-.add_to_cart_btn {
- padding:10px;
- font-size:20px;
-}
-
-.product_quantity {
- width:50px;
-}
-
-#product_caption {
- background-color:#ccc;
- margin:0px -5px -5px -5px;
- padding:5px;
- text-align:center;
- color:#555;
-}
-
-#product_left {
- width:247px;
- float:left;
-}
-
-#product_right {
- width:690px;
- float:right;
- overflow:hidden;
-
-}
-
-#product_image {
- padding:5px;
- border:1px solid #ccc;
- width:235px;
-}
-
-#product_image a img {
- margin:auto;
-}
-
-#product_thumbnails
-{
- padding-top:15px;
- width:245px;
-}
-
-.product_thumbnail
-{
- width:75px;
- margin:10px 10px 10px 0px;
- float:left;
-}
-
-.product_thumbnail a img
-{
- width:75px;
-}
-
-#product_price {
- float:right;
-}
-
-.product_section {
- padding:10px;
- border-top:1px solid #ddd;
-}
-
-.option_container {
- margin-bottom:15px;
-}
-
-.option_name {
- font-weight:bold;
- font-size:12px;
-}
-
-#social_sharing {
- float:right;
- margin-top:-30px;
- width:150px;
- text-align:right;
-}
-
-.tabs {
- margin-top:10px;
- overflow:hidden;
- width:680px;
-}
-
-#product_form {
- float:right;
-}
-
-#gc_product_form {
- margin-top:10px;
- width:100%;
-}
-
-
-
-.gc_option {
- padding-bottom:10px;
-}
-
-#gc_options_note {
- text-align:center;
- font-weight:bold;
- font-size:11px;
- font-family:verdana, arial, sans-serif;
- color:#a70000;
-}
-
-
-/* Customer Details */
-.gc_customer_details, .gc_customer_details table{
- width:100%;
-}
-.gc_customer_details td {
- vertical-align:top;
- padding-right:10px;
-}
-#gc_copy_billing {
- margin:auto;
- display:block;
-}
-
-#logged_in_address_container{
- width:100%;
- overflow: auto;
- margin-bottom: 15px;
-}
-
-#checkout_billing_address {
- padding: 5px;
- border:1px solid #C0C0C0;
- float:left;
- width:225px;
- height: 125px;
-}
-
-#bill_address_display, #ship_address_display {
- padding: 5px;
-}
-
-#checkout_shipping_address {
- padding: 5px;
- border:1px solid #C0C0C0;
- margin-left:250px;
- width:225px;
- height:125px;
-}
-
-/* scheckout */
-#payment_section_container table tr td {
- vertical-align:top;
-}
-
-#shipping_section {
- float:left;
- width:400px;
-}
-
-
-
-.checkout_block h2 {
- font-weight:normal;
- margin:0px 0px 10px 0px;
- padding:0px;
- font-size:19px;
-}
-
-.checkout_block h3 {
- font-weight:normal;
- color:#777777;
- font-size:16px;
- margin:0px 0px 10px 0px;
- padding:0px;
-}
-
-#tab_detail {
- font-size:13px;
- font-family:arial, verdana, sans-serif;
-}
-
-#static_address_content {
- position: relative;
- margin-bottom: 10px;
- height: 150px
-}
-
-#static_bill_address {
- padding: 5px;
- border:1px solid #C0C0C0;
- float:left;
- width:225px;
-}
-
-#static_ship_address {
- padding: 5px;
- border:1px solid #C0C0C0;
- margin-left:250px;
- width:225px;
- height:125px;
-}
-
-
-
-/* Customer Details */
-
-.disabled {
- border 1px solid #AAAAAA;
- background-color: #CCCCCC;
-}
-.register_field {
- text-align:right;
-}
-#gc_customer_details, #gc_customer_details table{
- width:100%;
-}
-#gc_customer_details td {
- vertical-align:top;
- padding-right:10px;
-}
-#gc_copy_billing {
- float:right;
-}
-
-.gc_reg_input {
- width:550px;
-}
-
-/* Confirmation page*/
-.confirm_customer
-{
- font-size:12px;
- padding:10px;
- margin-bottom:10px;
- border:1px solid #b2d799;
- background-color:#ffffff;
-}
-.confirm_customer table tr td {
- vertical-align:top;
-}
-.company_name {
- font-size:16px;
- font-weight:bold;
- padding:0px 0px 3px 0px;
- text-transform:uppercase;
-}
-
-.order_number {
- font-size:20px;
- font-weight:bold;
- padding:0px 0px 3px 0px;
- text-transform:uppercase;
-}
-
-
-
-
-/* My Account Page */
-.delete_address {
- cursor:pointer;
-}
-
-#my_information {
- background-color:#f2f2f2;
- -webkit-border-radius: 7px;
- -moz-border-radius: 7px;
- border-radius: 7px;
- padding:10px;
- float:left;
-}
-#my_account_info h2 {
- font-weight:normal;
- margin-bottom:10px;
- font-size:19px;
-}
-#my_account_container {
- overflow: auto;
-}
-
-#customer_details {
-
- float:left;
- margin:5px;
- width:360px;
-}
-
-#customer_details_form {
-
-}
-
-#confirmation_box {
- margin-bottom: 10px;
- border-color: white;
- border-width: 1px;
- border-style: solid;
- background-color: #34a1ff;
- color: black;
- padding:5px;
-
-}
-
-.my_account_header {
- background-color:#000000;
- color:#FFFFFF;
- font-weight:bold;
- padding:5px;
-}
-
-#address_container {
- float:right;
- width:300px;
- margin: 5px;
-}
-
-.my_address {
- height: 120px;
- margin: 15px;
- padding: 5px;
- border: 1px solid #c0c0c0;
-}
-
-
-
-
-
-/* Payment Page */
-.gc_payment_form {
- display:none;
-}
-
-/* address manager */
-
-#address_mgr_title {
- font-weight: bold;
- margin-bottom: 10px;
-}
-
-#address_mgr_header {
- width: 775px;
- background-color: black;
- color: white;
- font-weight: bold;
- padding: 5px;
-}
-
-#address_mgr_container {
- padding: 5px;
- width: 773px;
- height:300px;
- border-right: 1px solid gray;
- border-left: 1px solid gray;
- border-bottom: 1px solid gray;
- position: relative;
-}
-
-#address_list_container{
- float: left;
- width: 450px;
- height: 300px;
- overflow:auto;
-
-
-}
-
-.required {
- border-left: 1px solid red;
-}
-
-.require_fail {
- border: 1px solid red;
-}
-
-.address_entry {
- width:95%;
- padding: 5px;
- margin: 1px;
- border: 1px solid #8d8d8d;
-}
-
-.odd {
- background-color: #cfcfcf;
-}
-
-.even {
- background-color: white;
-}
-
-#address_form_placeholder {
- clear:both;
- position:absolute;
- right:5px;
- top:10px;
- width:300px;
-}
-
-#address_bullets {
- margin:10px;
-}
-
-#address_mgr_form_container {
- clear:both;
- position:absolute;
- right:5px;
- top:10px;
- width:300px;
-}
-
-/* customize stuff */
-#left_content {
- width: 635px;
- float: left;
-}
-
-#right_content {
- width:335px;
- float:right;
-}
-
-#file_upload_status
-{
- width:0%;
- overflow:visible;
- text-align:center;
- padding-top:7px;
- background-color:#000099;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
- border:1px solid #910000;
- background-image:url('..../images/status_bg.gif');
- background-repeat:repeat-x;
- height:28px;
- overflow:hidden;
- margin:5px 0px;
- -moz-box-shadow: 1px 2px 2px rgba(0,0,0,.3);
- -webkit-box-shadow: 1px 2px 2px rgba(0,0,0,.3);
- box-shadow: 1px 2px 2px rgba(0,0,0,.3);
-}
-
-#hide_upload_status {
- display:none;
-}
-
-#footer_lid {
- width:970px;
- height:8px;
- background-image:url("../images/footer_lid.gif");
- overflow:hidden;
- margin:auto;
-}
-.footer {
- position:relative;
- width:960px;
- padding:5px;
- margin:auto;
- min-height:150px;
- background-image:url('../images/footer_bg.png');
- background-repeat:no-repeat;
- background-color:#ddd;
-}
-
-#footer_social {
- position:absolute;
- top:115px;
- left:5px;
- width:250px;
-}
-
-#footer_props {
- text-align:center;
- color:#555;
- font-size:10px;
- margin-top:130px;
-}
\ No newline at end of file
diff --git a/gocart/GoCart license.txt b/gocart/GoCart license.txt
deleted file mode 100644
index 297cd361..00000000
--- a/gocart/GoCart license.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-Copyright (c) 2008 - 2011, Clear Sky Designs, LLC
-All rights reserved.
-
-This license is a legal agreement between you and EllisLab Inc. for the use
-of GoCart Software (the "Software"). By obtaining the Software you
-agree to comply with the terms and conditions of this license.
-
-PERMITTED USE
-You are permitted to use, copy, modify, and distribute the Software and its
-documentation, with or without modification, for any purpose, provided that
-the following conditions are met:
-
-1. A copy of this license agreement must be included with the distribution.
-
-2. Redistributions of source code must retain the above copyright notice in
- all source code files.
-
-3. Redistributions in binary form must reproduce the above copyright notice
- in the documentation and/or other materials provided with the distribution.
-
-4. Any files that have been modified must carry notices stating the nature
- of the change and the names of those who changed them.
-
-5. Products derived from the Software must include an acknowledgment that
- they are derived from GoCart in their documentation and/or other
- materials provided with the distribution.
-
-6. Products derived from the Software may not be called "GoCart",
- nor may "GoCart" appear in their name, without prior written
- permission from Clear Sky Designs, LLC
-
-INDEMNITY
-You agree to indemnify and hold harmless the authors of the Software and
-any contributors for any direct, indirect, incidental, or consequential
-third-party claims, actions or suits, as well as any related expenses,
-liabilities, damages, settlements or fees arising from your use or misuse
-of the Software, or a violation of any terms of this license.
-
-DISCLAIMER OF WARRANTY
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESSED OR
-IMPLIED, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF QUALITY, PERFORMANCE,
-NON-INFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
-
-LIMITATIONS OF LIABILITY
-YOU ASSUME ALL RISK ASSOCIATED WITH THE INSTALLATION AND USE OF THE SOFTWARE.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS OF THE SOFTWARE BE LIABLE
-FOR CLAIMS, DAMAGES OR OTHER LIABILITY ARISING FROM, OUT OF, OR IN CONNECTION
-WITH THE SOFTWARE. LICENSE HOLDERS ARE SOLELY RESPONSIBLE FOR DETERMINING THE
-APPROPRIATENESS OF USE AND ASSUME ALL RISKS ASSOCIATED WITH ITS USE, INCLUDING
-BUT NOT LIMITED TO THE RISKS OF PROGRAM ERRORS, DAMAGE TO EQUIPMENT, LOSS OF
-DATA OR SOFTWARE PROGRAMS, OR UNAVAILABILITY OR INTERRUPTION OF OPERATIONS.
diff --git a/gocart/config/autoload.php b/gocart/config/autoload.php
index fa4aed38..7ccf7292 100644
--- a/gocart/config/autoload.php
+++ b/gocart/config/autoload.php
@@ -52,7 +52,7 @@
| $autoload['libraries'] = array('database', 'session', 'xmlrpc');
*/
-$autoload['libraries'] = array('database', 'session', 'auth');
+$autoload['libraries'] = array('database', 'session', 'auth', 'go_cart');
/*
@@ -64,7 +64,7 @@
| $autoload['helper'] = array('url', 'file');
*/
-$autoload['helper'] = array('url', 'file', 'string', 'utility', 'html');
+$autoload['helper'] = array('url', 'file', 'string', 'html', 'language');
/*
@@ -96,7 +96,7 @@
|
*/
-$autoload['language'] = array();
+$autoload['language'] = array('common');
/*
@@ -109,7 +109,7 @@
|
*/
-$autoload['model'] = array('Customer_model', 'Category_model', 'Cart_model', 'Settings_model');
+$autoload['model'] = array('Customer_model', 'Category_model', 'Settings_model', 'Location_model');
/* End of file autoload.php */
diff --git a/gocart/config/config.php b/gocart/config/config.php
index 0b255eca..64611376 100644
--- a/gocart/config/config.php
+++ b/gocart/config/config.php
@@ -27,7 +27,7 @@
| variable so that it is blank.
|
*/
-$config['index_page'] = 'index.php';
+$config['index_page'] = '';
/*
|--------------------------------------------------------------------------
@@ -225,7 +225,7 @@
| MUST set an encryption key. See the user guide for info.
|
*/
-$config['encryption_key'] = 'a3bed46e139353c4d4c091d7de9eb6c9';
+$config['encryption_key'] = 'default encryption key';
/*
|--------------------------------------------------------------------------
diff --git a/gocart/config/migration.php b/gocart/config/migration.php
new file mode 100644
index 00000000..f2c977ec
--- /dev/null
+++ b/gocart/config/migration.php
@@ -0,0 +1,41 @@
+migration->latest() this is the version that schema will
+| be upgraded / downgraded to.
+|
+*/
+$config['migration_version'] = 1;
+
+
+/*
+|--------------------------------------------------------------------------
+| Migrations Path
+|--------------------------------------------------------------------------
+|
+| Path to your migrations folder.
+| Typically, it will be within your application path.
+| Also, writing permission is required within the migrations path.
+|
+*/
+$config['migration_path'] = APPPATH . 'migrations/';
+
+
+/* End of file migration.php */
+/* Location: ./application/config/migration.php */
\ No newline at end of file
diff --git a/gocart/config/routes.php b/gocart/config/routes.php
index f7797dfd..f80da152 100644
--- a/gocart/config/routes.php
+++ b/gocart/config/routes.php
@@ -42,37 +42,4 @@
//this for the admininstration console
$route['admin'] = 'admin/dashboard';
-
-//get routes from database
-include('database.php');
-
-if($db[$active_group]['pconnect'])
-{
- mysql_pconnect($db[$active_group]['hostname'],$db[$active_group]['username'],$db[$active_group]['password']);
-}
-else
-{
- mysql_connect($db[$active_group]['hostname'],$db[$active_group]['username'],$db[$active_group]['password']);
-}
-mysql_select_db($db[$active_group]['database']) or die("Unable to select database");
-
-$routes = mysql_query('SELECT * FROM '.$db[$active_group]['dbprefix'].'routes');
-
-while($row = mysql_fetch_array($routes))
-{
- //if "category" is in the route, then add some stuff for pagination
- if(strpos($row['route'], 'category'))
- {
- $route[$row['slug']] = $row['route'];
-
- $row['slug'] .= '/(:num)';
- $row['route'] .= '/$1';
- }
- $route[$row['slug']] = $row['route'];
-}
-
-mysql_free_result($routes);
-
-
-//in case we're using pconnect
-mysql_close();
+$route['admin/media/(:any)'] = 'admin/media/$1';
diff --git a/gocart/controllers/admin/admin.php b/gocart/controllers/admin/admin.php
old mode 100755
new mode 100644
index 20e4cda1..e95512c3
--- a/gocart/controllers/admin/admin.php
+++ b/gocart/controllers/admin/admin.php
@@ -1,5 +1,5 @@
load->library('Auth');
-
- $this->auth->is_logged_in(uri_string());
$this->auth->check_access('Admin', true);
+ //load the admin language file in
+ $this->lang->load('admin');
+
$this->current_admin = $this->session->userdata('admin');
}
function index()
{
- $data['page_title'] = 'Admins';
+ $data['page_title'] = lang('admins');
$data['admins'] = $this->auth->get_admin_list();
$this->load->view($this->config->item('admin_folder').'/admins', $data);
@@ -27,10 +27,13 @@ function delete($id)
//even though the link isn't displayed for an admin to delete themselves, if they try, this should stop them.
if ($this->current_admin['id'] == $id)
{
- $this->session->set_flashdata('message', 'You cannot delete yourself!');
+ $this->session->set_flashdata('message', lang('error_self_delete'));
redirect($this->config->item('admin_folder').'/admin');
}
- $this->session->set_flashdata('message', $this->auth->delete($id));
+
+ //delete the user
+ $this->auth->delete($id);
+ $this->session->set_flashdata('message', lang('message_user_deleted'));
redirect($this->config->item('admin_folder').'/admin');
}
function form($id = false)
@@ -41,7 +44,7 @@ function form($id = false)
$this->load->library('form_validation');
$this->form_validation->set_error_delimiters('', '
');
- $data['page_title'] = 'Add Admin';
+ $data['page_title'] = lang('admin_form');
//default values are empty if the customer is new
$data['id'] = '';
@@ -57,31 +60,27 @@ function form($id = false)
//if the administrator does not exist, redirect them to the admin list with an error
if (!$admin)
{
- $this->session->set_flashdata('message', 'The requested admin could not be found.');
+ $this->session->set_flashdata('message', lang('admin_not_found'));
redirect($this->config->item('admin_folder').'/admin');
}
-
- //set title to edit if we have an ID
- $data['page_title'] = 'Edit Administrator';
-
//set values to db values
- $data['id'] = $admin->id;
+ $data['id'] = $admin->id;
$data['firstname'] = $admin->firstname;
$data['lastname'] = $admin->lastname;
$data['email'] = $admin->email;
$data['access'] = $admin->access;
}
- $this->form_validation->set_rules('firstname', 'First Name', 'trim|max_length[32]');
- $this->form_validation->set_rules('lastname', 'Last Name', 'trim|max_length[32]');
- $this->form_validation->set_rules('email', 'Email', 'trim|required|valid_email|max_length[128]|callback_check_email');
- $this->form_validation->set_rules('access', 'Access', 'trim|required');
+ $this->form_validation->set_rules('firstname', 'lang:firstname', 'trim|max_length[32]');
+ $this->form_validation->set_rules('lastname', 'lang:lastname', 'trim|max_length[32]');
+ $this->form_validation->set_rules('email', 'lang:email', 'trim|required|valid_email|max_length[128]|callback_check_email');
+ $this->form_validation->set_rules('access', 'lang:access', 'trim|required');
//if this is a new account require a password, or if they have entered either a password or a password confirmation
if ($this->input->post('password') != '' || $this->input->post('confirm') != '' || !$id)
{
- $this->form_validation->set_rules('password', 'Password', 'required|min_length[6]|sha1');
- $this->form_validation->set_rules('confirm', 'Confirm Password', 'required|matches[password]');
+ $this->form_validation->set_rules('password', 'lang:password', 'required|min_length[6]|sha1');
+ $this->form_validation->set_rules('confirm', 'lang:confirm_password', 'required|matches[password]');
}
if ($this->form_validation->run() == FALSE)
@@ -103,14 +102,7 @@ function form($id = false)
$this->auth->save($save);
- if (!$id)
- {
- $this->session->set_flashdata('message', 'The user has been added');
- }
- else
- {
- $this->session->set_flashdata('message', ' The user has been updated.');
- }
+ $this->session->set_flashdata('message', lang('message_user_saved'));
//go back to the customer list
redirect($this->config->item('admin_folder').'/admin');
@@ -119,10 +111,10 @@ function form($id = false)
function check_email($str)
{
- $email = $this->auth->check_email($str, $this->admin_id);
- if ($email)
- {
- $this->form_validation->set_message('check_email', 'The Email is already in use.');
+ $email = $this->auth->check_email($str, $this->admin_id);
+ if ($email)
+ {
+ $this->form_validation->set_message('check_email', lang('error_email_taken'));
return FALSE;
}
else
diff --git a/gocart/controllers/admin/banners.php b/gocart/controllers/admin/banners.php
index 01ed7ac2..390840b1 100644
--- a/gocart/controllers/admin/banners.php
+++ b/gocart/controllers/admin/banners.php
@@ -1,17 +1,15 @@
load->library('auth');
-
- $this->auth->is_logged_in(uri_string());
$this->auth->check_access('Admin', true);
+ $this->lang->load('banner');
+
$this->load->model('Banner_model');
$this->load->helper('date');
@@ -20,7 +18,7 @@ function __construct()
function index()
{
$data['banners'] = $this->Banner_model->get_banners();
- $data['page_title'] = 'Banners';
+ $data['page_title'] = lang('banners');
$this->load->view($this->config->item('admin_folder').'/banners', $data);
}
@@ -33,7 +31,9 @@ function organize()
function delete($id)
{
- $this->session->set_flashdata('message', $this->Banner_model->delete($id));
+ $this->Banner_model->delete($id);
+
+ $this->session->set_flashdata('message', lang('message_delete_banner'));
redirect($this->config->item('admin_folder').'/banners');
}
@@ -47,8 +47,6 @@ function form($id = false)
$config['upload_path'] = 'uploads';
$config['allowed_types'] = 'gif|jpg|png';
$config['max_size'] = $this->config->item('size_limit');
- $config['max_width'] = '1024';
- $config['max_height'] = '768';
$config['encrypt_name'] = true;
$this->load->library('upload', $config);
@@ -66,20 +64,22 @@ function form($id = false)
,'new_window'=>false
);
- $data['page_title'] = 'New Ad';
if($id)
{
$data = (array) $this->Banner_model->get_banner($id);
+ $data['enable_on'] = format_mdy($data['enable_on']);
+ $data['disable_on'] = format_mdy($data['disable_on']);
$data['new_window'] = (bool) $data['new_window'];
- $data['page_title'] = 'Edit Ad';
}
- $this->form_validation->set_rules('title', 'Title', 'trim|required|full_decode');
- $this->form_validation->set_rules('enable_on', 'Enable On', 'trim');
- $this->form_validation->set_rules('disable_on', 'Disable On', 'trim|callback_date_check');
- $this->form_validation->set_rules('image', 'image', 'trim');
- $this->form_validation->set_rules('link', 'Link', 'trim');
- $this->form_validation->set_rules('new_window', 'New Window', 'trim');
+ $data['page_title'] = lang('banner_form');
+
+ $this->form_validation->set_rules('title', 'lang:title', 'trim|required|full_decode');
+ $this->form_validation->set_rules('enable_on', 'lang:enable_on', 'trim');
+ $this->form_validation->set_rules('disable_on', 'lang:disable_on', 'trim|callback_date_check');
+ $this->form_validation->set_rules('image', 'lang:image', 'trim');
+ $this->form_validation->set_rules('link', 'lang:link', 'trim');
+ $this->form_validation->set_rules('new_window', 'lang:new_window', 'trim');
if ($this->form_validation->run() == false)
{
@@ -92,11 +92,11 @@ function form($id = false)
$uploaded = $this->upload->do_upload('image');
$save['title'] = $this->input->post('title');
- $save['enable_on'] = $this->input->post('enable_on');
- $save['disable_on'] = $this->input->post('disable_on');
+ $save['enable_on'] = format_ymd($this->input->post('enable_on'));
+ $save['disable_on'] = format_ymd($this->input->post('disable_on'));
$save['link'] = $this->input->post('link');
$save['new_window'] = $this->input->post('new_window');
-
+
if ($id)
{
$save['id'] = $id;
@@ -134,22 +134,21 @@ function form($id = false)
}
$this->Banner_model->save_banner($save);
- $message = 'The "'.$this->input->post('title').'" banner has been saved.';
- $this->session->set_flashdata('message', $message);
+ $this->session->set_flashdata('message', lang('message_banner_saved'));
redirect($this->config->item('admin_folder').'/banners');
}
}
- function date_check($str)
+ function date_check()
{
- if ($this->input->post('enable_on') != '')
+ if ($this->input->post('disable_on') != '')
{
- if ($this->input->post('enable_on') >= $str)
+ if (format_ymd($this->input->post('disable_on')) <= format_ymd($this->input->post('enable_on')))
{
- $this->form_validation->set_message('date_check', 'The "Disable On" date cannot come on or before the "Enable On" date.');
+ $this->form_validation->set_message('date_check', lang('date_error'));
return FALSE;
}
}
diff --git a/gocart/controllers/admin/boxes.php b/gocart/controllers/admin/boxes.php
index 9abef06f..04e6d6a5 100644
--- a/gocart/controllers/admin/boxes.php
+++ b/gocart/controllers/admin/boxes.php
@@ -1,31 +1,30 @@
load->library('auth');
+
$this->auth->check_access('Admin', true);
-
+
+ $this->lang->load('boxes');
$this->load->model('Box_model');
$this->load->helper('date');
- $this->auth->is_logged_in(uri_string());
}
function index()
{
$data['boxes'] = $this->Box_model->get_boxes();
- $data['page_title'] = 'Boxes';
+ $data['page_title'] = lang('boxes');
$this->load->view($this->config->item('admin_folder').'/boxes', $data);
}
function delete($id)
{
- $this->session->set_flashdata('message', $this->Box_model->delete($id));
+ $this->Box_model->delete($id);
+ $this->session->set_flashdata('message', lang('message_delete_box'));
redirect($this->config->item('admin_folder').'/boxes');
}
@@ -62,22 +61,21 @@ function form($id = false)
,'link'=>''
,'new_window'=>false
);
-
- $data['page_title'] = 'New Ad';
if($id)
{
$data = (array) $this->Box_model->get_box($id);
-
+ $data['enable_on'] = format_mdy($data['enable_on']);
+ $data['disable_on'] = format_mdy($data['disable_on']);
$data['new_window'] = (bool) $data['new_window'];
- $data['page_title'] = 'Edit Ad';
}
+ $data['page_title'] = lang('box_form');
- $this->form_validation->set_rules('title', 'Title', 'trim|required|full_decode');
- $this->form_validation->set_rules('enable_on', 'Enable On', 'trim');
- $this->form_validation->set_rules('disable_on', 'Disable On', 'trim');
- $this->form_validation->set_rules('image', 'image', 'trim');
- $this->form_validation->set_rules('link', 'Link', 'trim');
- $this->form_validation->set_rules('new_window', 'New Window', 'trim');
+ $this->form_validation->set_rules('title', 'lang:title', 'trim|required|full_decode');
+ $this->form_validation->set_rules('enable_on', 'lang:enable_on', 'trim');
+ $this->form_validation->set_rules('disable_on', 'lang:disable_on', 'trim|callback_date_check');
+ $this->form_validation->set_rules('image', 'lang:image', 'trim');
+ $this->form_validation->set_rules('link', 'lang:link', 'trim');
+ $this->form_validation->set_rules('new_window', 'lang:new_window', 'trim');
if ($this->form_validation->run() == false)
{
@@ -90,8 +88,8 @@ function form($id = false)
$uploaded = $this->upload->do_upload('image');
$save['title'] = $this->input->post('title');
- $save['enable_on'] = $this->input->post('enable_on');
- $save['disable_on'] = $this->input->post('disable_on');
+ $save['enable_on'] = format_ymd($this->input->post('enable_on'));
+ $save['disable_on'] = format_ymd($this->input->post('disable_on'));
$save['link'] = $this->input->post('link');
$save['new_window'] = $this->input->post('new_window');
@@ -132,11 +130,25 @@ function form($id = false)
}
$this->Box_model->save($save);
- $message = 'The "'.$this->input->post('title').'" box has been saved.';
- $this->session->set_flashdata('message', $message);
+ $this->session->set_flashdata('message', lang('message_box_saved'));
redirect($this->config->item('admin_folder').'/boxes');
}
}
+
+ function date_check()
+ {
+
+ if ($this->input->post('disable_on') != '')
+ {
+ if (format_ymd($this->input->post('disable_on')) <= format_ymd($this->input->post('enable_on')))
+ {
+ $this->form_validation->set_message('date_check', lang('date_error'));
+ return FALSE;
+ }
+ }
+
+ return TRUE;
+ }
}
\ No newline at end of file
diff --git a/gocart/controllers/admin/categories.php b/gocart/controllers/admin/categories.php
index 48d5d626..e5cef0bd 100644
--- a/gocart/controllers/admin/categories.php
+++ b/gocart/controllers/admin/categories.php
@@ -1,19 +1,15 @@
load->library('Auth');
$this->auth->check_access('Admin', true);
-
+ $this->lang->load('category');
$this->load->model('Category_model');
- //this adds the redirect url to our flash data, incase they are not logged in
- $this->auth->is_logged_in(uri_string());
}
function index()
@@ -21,19 +17,44 @@ function index()
//we're going to use flash data and redirect() after form submissions to stop people from refreshing and duplicating submissions
//$this->session->set_flashdata('message', 'this is our message');
- $data['page_title'] = 'Categories';
+ $data['page_title'] = lang('categories');
$data['categories'] = $this->Category_model->get_categories_tierd();
$this->load->view($this->config->item('admin_folder').'/categories', $data);
}
+ //basic category search
+ function category_autocomplete()
+ {
+ $name = trim($this->input->post('name'));
+ $limit = $this->input->post('limit');
+
+ if(empty($name))
+ {
+ echo json_encode(array());
+ }
+ else
+ {
+ $results = $this->Category_model->category_autocomplete($name, $limit);
+
+ $return = array();
+ foreach($results as $r)
+ {
+ $return[$r->id] = $r->name;
+ }
+ echo json_encode($return);
+ }
+
+ }
+
function organize($id = false)
{
$this->load->helper('form');
+ $this->load->helper('formatting');
if (!$id)
{
- $this->session->set_flashdata('message', 'You must select a category to organize.');
+ $this->session->set_flashdata('error', lang('error_must_select'));
redirect($this->config->item('admin_folder').'/categories');
}
@@ -41,11 +62,11 @@ function organize($id = false)
//if the category does not exist, redirect them to the category list with an error
if (!$data['category'])
{
- $this->session->set_flashdata('message', 'The requested category could not be found.');
+ $this->session->set_flashdata('error', lang('error_not_found'));
redirect($this->config->item('admin_folder').'/categories');
}
- $data['page_title'] = 'Oranize "'.$data['category']->name.'" Category';
+ $data['page_title'] = sprintf(lang('organize_category'), $data['category']->name);
$data['category_products'] = $this->Category_model->get_category_products_admin($id);
@@ -76,7 +97,7 @@ function form($id = false)
$this->form_validation->set_error_delimiters('', '
');
$data['categories'] = $this->Category_model->get_categories();
- $data['page_title'] = 'Add Category';
+ $data['page_title'] = lang('category_form');
//default values are empty if the customer is new
$data['id'] = '';
@@ -89,6 +110,7 @@ function form($id = false)
$data['seo_title'] = '';
$data['meta'] = '';
$data['parent_id'] = 0;
+ $data['error'] = '';
//create the photos array for later use
$data['photos'] = array();
@@ -100,16 +122,13 @@ function form($id = false)
//if the category does not exist, redirect them to the category list with an error
if (!$category)
{
- $this->session->set_flashdata('message', 'The requested category could not be found.');
+ $this->session->set_flashdata('error', lang('error_not_found'));
redirect($this->config->item('admin_folder').'/categories');
}
//helps us with the slug generation
$this->category_name = $this->input->post('slug', $category->slug);
- //set title to edit if we have an ID
- $data['page_title'] = 'Edit Category';
-
//set values to db values
$data['id'] = $category->id;
$data['name'] = $category->name;
@@ -124,15 +143,15 @@ function form($id = false)
}
- $this->form_validation->set_rules('name', 'Name', 'trim|required|max_length[64]');
- $this->form_validation->set_rules('slug', 'slug', 'trim');
- $this->form_validation->set_rules('description', 'Description', 'trim');
- $this->form_validation->set_rules('excerpt', 'Excerpt', 'trim');
- $this->form_validation->set_rules('sequence', 'Sequence', 'trim|integer');
+ $this->form_validation->set_rules('name', 'lang:name', 'trim|required|max_length[64]');
+ $this->form_validation->set_rules('slug', 'lang:slug', 'trim');
+ $this->form_validation->set_rules('description', 'lang:description', 'trim');
+ $this->form_validation->set_rules('excerpt', 'lang:excerpt', 'trim');
+ $this->form_validation->set_rules('sequence', 'lang:sequence', 'trim|integer');
$this->form_validation->set_rules('parent_id', 'parent_id', 'trim');
- $this->form_validation->set_rules('image', 'image', 'trim');
- $this->form_validation->set_rules('seo_title', 'SEO Title', 'trim');
- $this->form_validation->set_rules('meta', 'Meta', 'trim');
+ $this->form_validation->set_rules('image', 'lang:image', 'trim');
+ $this->form_validation->set_rules('seo_title', 'lang:seo_title', 'trim');
+ $this->form_validation->set_rules('meta', 'lang:meta', 'trim');
// validate the form
@@ -177,7 +196,7 @@ function form($id = false)
if(!$uploaded)
{
$error = $this->upload->display_errors();
- if($error != 'You did not select a file to upload.
')
+ if($error != lang('error_file_upload'))
{
$data['error'] .= $this->upload->display_errors();
$this->load->view($this->config->item('admin_folder').'/category_form', $data);
@@ -227,6 +246,8 @@ function form($id = false)
$this->image_lib->clear();
}
+ $this->load->helper('text');
+
//first check the slug field
$slug = $this->input->post('slug');
@@ -236,7 +257,7 @@ function form($id = false)
$slug = $this->input->post('name');
}
- $slug = url_title($slug, 'dash', TRUE);
+ $slug = url_title(convert_accented_characters($slug), 'dash', TRUE);
//validate the slug
$this->load->model('Routes_model');
@@ -257,12 +278,12 @@ function form($id = false)
$save['name'] = $this->input->post('name');
$save['description'] = $this->input->post('description');
$save['excerpt'] = $this->input->post('excerpt');
- $save['parent_id'] = $this->input->post('parent_id');
- $save['sequence'] = $this->input->post('sequence');
+ $save['parent_id'] = intval($this->input->post('parent_id'));
+ $save['sequence'] = intval($this->input->post('sequence'));
$save['seo_title'] = $this->input->post('seo_title');
$save['meta'] = $this->input->post('meta');
- $save['route_id'] = $route_id;
+ $save['route_id'] = intval($route_id);
$save['slug'] = $slug;
$category_id = $this->Category_model->save($save);
@@ -274,7 +295,7 @@ function form($id = false)
$this->Routes_model->save($route);
- $this->session->set_flashdata('message', 'The "'.$this->input->post('name').'" category has been updated.');
+ $this->session->set_flashdata('message', lang('message_category_saved'));
//go back to the category list
redirect($this->config->item('admin_folder').'/categories');
@@ -293,12 +314,12 @@ function delete($id)
$this->Routes_model->delete($category->route_id);
$this->Category_model->delete($id);
- $this->session->set_flashdata('message', 'The "'.$category->name.'" category has been deleted from the system.');
+ $this->session->set_flashdata('message', lang('message_delete_category'));
redirect($this->config->item('admin_folder').'/categories');
}
else
{
- $this->session->set_flashdata('error', 'The requested category could not be found.');
+ $this->session->set_flashdata('error', lang('error_not_found'));
}
}
}
\ No newline at end of file
diff --git a/gocart/controllers/admin/coupons.php b/gocart/controllers/admin/coupons.php
index aac6cea5..c0bba847 100644
--- a/gocart/controllers/admin/coupons.php
+++ b/gocart/controllers/admin/coupons.php
@@ -1,6 +1,6 @@
load->library('Auth');
$this->auth->check_access('Admin', true);
$this->load->model('Coupon_model');
$this->load->model('Product_model');
-
- //this adds the redirect url to our flash data, incase they are not logged in
- $this->auth->is_logged_in(uri_string());
+ $this->lang->load('coupon');
}
function index()
{
- $data['page_title'] = 'Coupons';
+ $data['page_title'] = lang('coupons');
$data['coupons'] = $this->Coupon_model->get_coupons();
$this->load->view($this->config->item('admin_folder').'/coupons', $data);
@@ -37,7 +33,7 @@ function form($id = false)
$this->coupon_id = $id;
- $data['page_title'] = 'Add Coupon';
+ $data['page_title'] = lang('coupon_form');
//default values are empty if the product is new
$data['id'] = '';
@@ -60,13 +56,10 @@ function form($id = false)
//if the product does not exist, redirect them to the product list with an error
if (!$coupon)
{
- $this->session->set_flashdata('message', 'The requested coupon could not be found.');
+ $this->session->set_flashdata('message', lang('error_not_found'));
redirect($this->config->item('admin_folder').'/product');
}
- //set title to edit if we have an ID
- $data['page_title'] = 'Edit Coupon';
-
//set values to db values
$data['id'] = $coupon->id;
$data['code'] = $coupon->code;
@@ -83,15 +76,15 @@ function form($id = false)
$added = $this->Coupon_model->get_product_ids($id);
}
- $this->form_validation->set_rules('code', 'Code', 'trim|required|callback_check_code');
- $this->form_validation->set_rules('max_uses', 'Max Uses', 'trim|numeric');
- $this->form_validation->set_rules('max_product_instances', 'Max Instances', 'trim|numeric');
- $this->form_validation->set_rules('whole_order_coupon', 'Whole Order Discount?');
- $this->form_validation->set_rules('reduction_target', 'Reduction Target', 'trim|required');
- $this->form_validation->set_rules('reduction_type', 'Reduction Type', 'trim');
- $this->form_validation->set_rules('reduction_amount', 'Reduction Amount', 'trim|numeric');
- $this->form_validation->set_rules('start_date', 'Start Date');
- $this->form_validation->set_rules('end_date', 'End Date');
+ $this->form_validation->set_rules('code', 'lang:code', 'trim|required|callback_check_code');
+ $this->form_validation->set_rules('max_uses', 'lang:max_uses', 'trim|numeric');
+ $this->form_validation->set_rules('max_product_instances', 'lang:limit_per_order', 'trim|numeric');
+ $this->form_validation->set_rules('whole_order_coupon', 'lang:whole_order_discount');
+ $this->form_validation->set_rules('reduction_target', 'lang:reduction_target', 'trim|required');
+ $this->form_validation->set_rules('reduction_type', 'lang:reduction_type', 'trim');
+ $this->form_validation->set_rules('reduction_amount', 'lang:reduction_amount', 'trim|numeric');
+ $this->form_validation->set_rules('start_date', 'lang:start_date');
+ $this->form_validation->set_rules('end_date', 'lang:end_date');
// create product list
$products = $this->Product_model->get_products();
@@ -161,14 +154,7 @@ function form($id = false)
}
// We're done
- if (!$id)
- {
- $this->session->set_flashdata('message', 'The "'.$this->input->post('code').'" coupon code has been added.');
- }
- else
- {
- $this->session->set_flashdata('message', 'Information for the "'.$this->input->post('code').'" coupon code has been updated.');
- }
+ $this->session->set_flashdata('message', lang('message_saved_coupon'));
//go back to the product list
redirect($this->config->item('admin_folder').'/coupons');
@@ -181,7 +167,7 @@ function check_code($str)
$code = $this->Coupon_model->check_code($str, $this->coupon_id);
if ($code)
{
- $this->form_validation->set_message('check_code', 'The requested code is already in use.');
+ $this->form_validation->set_message('check_code', lang('error_already_used'));
return FALSE;
}
else
@@ -198,24 +184,22 @@ function delete($id = false)
//if the promo does not exist, redirect them to the customer list with an error
if (!$coupon)
{
- $this->session->set_flashdata('message', 'The requested coupon could not be found.');
+ $this->session->set_flashdata('error', lang('error_not_found'));
redirect($this->config->item('admin_folder').'/coupons');
}
else
{
$this->Coupon_model->delete_coupon($id);
- $this->session->set_flashdata('message', 'The "'.$coupon->code.'" coupon has been deleted from the system.');
+ $this->session->set_flashdata('message', lang('message_coupon_deleted'));
redirect($this->config->item('admin_folder').'/coupons');
}
}
else
{
//if they do not provide an id send them to the promo list page with an error
- $this->session->set_flashdata('message', 'The requested coupon could not be found.');
+ $this->session->set_flashdata('message', lang('error_not_found'));
redirect($this->config->item('admin_folder').'/coupons');
}
}
-}
-
-?>
+}
\ No newline at end of file
diff --git a/gocart/controllers/admin/customers.php b/gocart/controllers/admin/customers.php
old mode 100755
new mode 100644
index b0048f76..272c748c
--- a/gocart/controllers/admin/customers.php
+++ b/gocart/controllers/admin/customers.php
@@ -1,6 +1,6 @@
load->library('Auth');
+
$this->load->model(array('Customer_model', 'Location_model'));
$this->load->helper('formatting_helper');
- //this adds the redirect url to our flash data, incase they are not logged in
- $this->auth->is_logged_in(uri_string());
+ $this->lang->load('customer');
}
function index($field='lastname', $by='ASC', $page=0)
@@ -20,7 +19,7 @@ function index($field='lastname', $by='ASC', $page=0)
//we're going to use flash data and redirect() after form submissions to stop people from refreshing and duplicating submissions
//$this->session->set_flashdata('message', 'this is our message');
- $data['page_title'] = 'Customers';
+ $data['page_title'] = lang('customers');
$data['customers'] = $this->Customer_model->get_customers(50,$page, $field, $by);
$this->load->library('pagination');
@@ -29,7 +28,29 @@ function index($field='lastname', $by='ASC', $page=0)
$config['total_rows'] = $this->Customer_model->count_customers();
$config['per_page'] = 50;
$config['uri_segment'] = 6;
+ $config['first_link'] = 'First';
+ $config['first_tag_open'] = '';
+ $config['first_tag_close'] = '';
+ $config['last_link'] = 'Last';
+ $config['last_tag_open'] = '';
+ $config['last_tag_close'] = '';
+
+ $config['full_tag_open'] = '';
+ $config['cur_tag_open'] = '';
+ $config['cur_tag_close'] = '';
+
+ $config['num_tag_open'] = '';
+ $config['num_tag_close'] = '';
+
+ $config['prev_link'] = '«';
+ $config['prev_tag_open'] = '';
+ $config['prev_tag_close'] = '';
+ $config['next_link'] = '»';
+ $config['next_tag_open'] = '';
+ $config['next_tag_close'] = '';
+
$this->pagination->initialize($config);
@@ -47,7 +68,7 @@ function export_xml()
$data['customers'] = (array)$this->Customer_model->get_customers();
- force_download('users.xml', $this->load->view($this->config->item('admin_folder').'/customers_xml', $data, true));
+ force_download_content('customers.xml', $this->load->view($this->config->item('admin_folder').'/customers_xml', $data, true));
//$this->load->view($this->config->item('admin_folder').'/customers_xml', $data);
}
@@ -58,22 +79,21 @@ function form($id = false)
$this->load->helper('form');
$this->load->library('form_validation');
- $data['page_title'] = 'Add Customer';
+ $data['page_title'] = lang('customer_form');
//default values are empty if the customer is new
- $data['id'] = '';
- $data['group_id'] = '';
- $data['firstname'] = '';
- $data['lastname'] = '';
- $data['email'] = '';
- $data['phone'] = '';
- $data['company'] = '';
- $data['email_subscribe'] = '';
- $data['active'] = false;
+ $data['id'] = '';
+ $data['group_id'] = '';
+ $data['firstname'] = '';
+ $data['lastname'] = '';
+ $data['email'] = '';
+ $data['phone'] = '';
+ $data['company'] = '';
+ $data['email_subscribe'] = '';
+ $data['active'] = false;
// get group list
$groups = $this->Customer_model->get_groups();
- $group_list[0]='';
foreach($groups as $group)
{
$group_list[$group->id] = $group->name;
@@ -89,40 +109,37 @@ function form($id = false)
//if the customer does not exist, redirect them to the customer list with an error
if (!$customer)
{
- $this->session->set_flashdata('message', 'The requested customer could not be found.');
+ $this->session->set_flashdata('error', lang('error_not_found'));
redirect($this->config->item('admin_folder').'/customers');
}
- //set title to edit if we have an ID
- $data['page_title'] = 'Edit Customer';
-
//set values to db values
- $data['id'] = $customer->id;
- $data['group_id'] = $customer->group_id;
- $data['firstname'] = $customer->firstname;
- $data['lastname'] = $customer->lastname;
- $data['email'] = $customer->email;
- $data['phone'] = $customer->phone;
- $data['company'] = $customer->company;
- $data['active'] = $customer->active;
- $data['email_subscribe'] = $customer->email_subscribe;
+ $data['id'] = $customer->id;
+ $data['group_id'] = $customer->group_id;
+ $data['firstname'] = $customer->firstname;
+ $data['lastname'] = $customer->lastname;
+ $data['email'] = $customer->email;
+ $data['phone'] = $customer->phone;
+ $data['company'] = $customer->company;
+ $data['active'] = $customer->active;
+ $data['email_subscribe'] = $customer->email_subscribe;
}
- $this->form_validation->set_rules('firstname', 'First Name', 'trim|required|max_length[32]');
- $this->form_validation->set_rules('lastname', 'Last Name', 'trim|required|max_length[32]');
- $this->form_validation->set_rules('email', 'Email', 'trim|required|valid_email|max_length[128]|callback_check_email');
- $this->form_validation->set_rules('phone', 'Phone', 'trim|required|max_length[32]');
- $this->form_validation->set_rules('company', 'Company', 'trim|max_length[128]');
- $this->form_validation->set_rules('active', 'Active');
- $this->form_validation->set_rules('group_id', 'numeric');
- $this->form_validation->set_rules('email_subscribe', 'numeric|max_length[1]');
+ $this->form_validation->set_rules('firstname', 'lang:firstname', 'trim|required|max_length[32]');
+ $this->form_validation->set_rules('lastname', 'lang:lastname', 'trim|required|max_length[32]');
+ $this->form_validation->set_rules('email', 'lang:email', 'trim|required|valid_email|max_length[128]|callback_check_email');
+ $this->form_validation->set_rules('phone', 'lang:phone', 'trim|required|max_length[32]');
+ $this->form_validation->set_rules('company', 'lang:company', 'trim|max_length[128]');
+ $this->form_validation->set_rules('active', 'lang:active');
+ $this->form_validation->set_rules('group_id', 'group_id', 'numeric');
+ $this->form_validation->set_rules('email_subscribe', 'email_subscribe', 'numeric|max_length[1]');
//if this is a new account require a password, or if they have entered either a password or a password confirmation
if ($this->input->post('password') != '' || $this->input->post('confirm') != '' || !$id)
{
- $this->form_validation->set_rules('password', 'Password', 'required|min_length[6]|sha1');
- $this->form_validation->set_rules('confirm', 'Confirm Password', 'required|matches[password]');
+ $this->form_validation->set_rules('password', 'lang:password', 'required|min_length[6]|sha1');
+ $this->form_validation->set_rules('confirm', 'lang:confirm_password', 'required|matches[password]');
}
@@ -150,14 +167,7 @@ function form($id = false)
$this->Customer_model->save($save);
- if (!$id)
- {
- $this->session->set_flashdata('message', $this->input->post('firstname').' '.$this->input->post('lastname').' has been added.');
- }
- else
- {
- $this->session->set_flashdata('message', $this->input->post('firstname').' '.$this->input->post('lastname').'\'s information has been updated.');
- }
+ $this->session->set_flashdata('message', lang('message_saved_customer'));
//go back to the customer list
redirect($this->config->item('admin_folder').'/customers');
@@ -171,14 +181,13 @@ function addresses($id = false)
//if the customer does not exist, redirect them to the customer list with an error
if (!$data['customer'])
{
- $this->session->set_flashdata('message', 'The requested customer could not be found.');
+ $this->session->set_flashdata('error', lang('error_not_found'));
redirect($this->config->item('admin_folder').'/customers');
}
$data['addresses'] = $this->Customer_model->get_address_list($id);
- //set title to edit if we have an ID
- $data['page_title'] = $data['customer']->lastname.', '.$data['customer']->firstname.' Addresses';
+ $data['page_title'] = sprintf(lang('addresses_for'), $data['customer']->firstname.' '.$data['customer']->lastname);
$this->load->view($this->config->item('admin_folder').'/customer_addresses', $data);
}
@@ -191,7 +200,7 @@ function delete($id = false)
//if the customer does not exist, redirect them to the customer list with an error
if (!$customer)
{
- $this->session->set_flashdata('message', 'The requested customer could not be found.');
+ $this->session->set_flashdata('error', lang('error_not_found'));
redirect($this->config->item('admin_folder').'/customers');
}
else
@@ -199,14 +208,14 @@ function delete($id = false)
//if the customer is legit, delete them
$delete = $this->Customer_model->delete($id);
- $this->session->set_flashdata('message', $customer->firstname.' '.$customer->lastname.' has been deleted from the system.');
+ $this->session->set_flashdata('message', lang('message_customer_deleted'));
redirect($this->config->item('admin_folder').'/customers');
}
}
else
{
//if they do not provide an id send them to the customer list page with an error
- $this->session->set_flashdata('message', 'The requested customer could not be found.');
+ $this->session->set_flashdata('error', lang('error_not_found'));
redirect($this->config->item('admin_folder').'/customers');
}
}
@@ -217,7 +226,7 @@ function check_email($str)
$email = $this->Customer_model->check_email($str, $this->customer_id);
if ($email)
{
- $this->form_validation->set_message('check_email', 'The requested email is already in use.');
+ $this->form_validation->set_message('check_email', lang('error_email_in_use'));
return FALSE;
}
else
@@ -249,23 +258,16 @@ function get_subscriber_list()
$sub_list .= $subscriber['email'].",\n";
}
- // start output
- header('Content-Type: "text/csv"');
- header('Content-Disposition: attachment; filename="email_subscribers_list.csv"');
- header('Expires: 0');
- header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
- header("Content-Transfer-Encoding: binary");
- header('Pragma: public');
+ $data['sub_list'] = $sub_list;
- echo $sub_list;
+ $this->load->view($this->config->item('admin_folder').'/customer_subscriber_list', $data);
}
- //// customer groups
-
+ // customer groups
function groups()
{
- $data['groups'] = $this->Customer_model->get_groups();
- $data['page_title'] = 'Customer Groups';
+ $data['groups'] = $this->Customer_model->get_groups();
+ $data['page_title'] = lang('customer_groups');
$this->load->view($this->config->item('admin_folder').'/customer_groups', $data);
}
@@ -275,7 +277,7 @@ function edit_group($id=0)
$this->load->helper('form');
$this->load->library('form_validation');
- $data['page_title'] = 'Add Customer Group';
+ $data['page_title'] = lang('customer_group_form');
//default values are empty if the customer is new
$data['id'] = '';
@@ -291,13 +293,11 @@ function edit_group($id=0)
$data['name'] = $group->name;
$data['discount'] = $group->discount;
$data['discount_type'] = $group->discount_type;
-
- $data['page_title'] = 'Edit Customer Group';
}
- $this->form_validation->set_rules('name', 'Group Name', 'trim|required|max_length[50]');
- $this->form_validation->set_rules('discount', 'Discount', 'trim|required|numeric');
- $this->form_validation->set_rules('discount_type', 'Discount Type', 'trim|required');
+ $this->form_validation->set_rules('name', 'lang:group_name', 'trim|required|max_length[50]');
+ $this->form_validation->set_rules('discount', 'lang:discount', 'trim|required|numeric');
+ $this->form_validation->set_rules('discount_type', 'lang:discount_type', 'trim|required');
if ($this->form_validation->run() == FALSE)
{
@@ -311,26 +311,16 @@ function edit_group($id=0)
$save['id'] = $id;
}
- $save['name'] = set_value('name');
- $save['discount'] = set_value('discount');
- $save['discount_type'] = set_value('discount_type');
+ $save['name'] = set_value('name');
+ $save['discount'] = set_value('discount');
+ $save['discount_type'] = set_value('discount_type');
$this->Customer_model->save_group($save);
-
- if (!$id)
- {
- $this->session->set_flashdata('message', 'The group "'.set_value('name').'" has been added.');
- }
- else
- {
- $this->session->set_flashdata('message', 'The group "'.set_value('name').'" has been updated.');
- }
+ $this->session->set_flashdata('message', lang('message_saved_group'));
//go back to the customer group list
redirect($this->config->item('admin_folder').'/customers/groups');
-
}
-
}
@@ -347,7 +337,10 @@ function get_group()
function delete_group($id)
{
- if(empty($id)) return;
+ if(empty($id))
+ {
+ return;
+ }
$this->Customer_model->delete_group($id);
@@ -379,13 +372,12 @@ function address_form($customer_id, $id = false)
$data['customer_id'] = $customer_id;
- $data['page_title'] = 'Add Address';
+ $data['page_title'] = lang('address_form');
//get the countries list for the dropdown
$data['countries_menu'] = $this->Location_model->get_countries_menu();
if($id)
{
- $data['page_title'] = 'Edit Address';
$address = $this->Customer_model->get_address($id);
//fully escape the address
@@ -402,17 +394,17 @@ function address_form($customer_id, $id = false)
$data['zones_menu'] = $this->Location_model->get_zones_menu(array_shift(array_keys($data['countries_menu'])));
}
$this->load->library('form_validation');
- $this->form_validation->set_rules('company', 'Company', 'trim|max_length[128]');
- $this->form_validation->set_rules('firstname', 'First Name', 'trim|required|max_length[32]');
- $this->form_validation->set_rules('lastname', 'Last Name', 'trim|required|max_length[32]');
- $this->form_validation->set_rules('email', 'Email', 'trim|required|valid_email|max_length[128]');
- $this->form_validation->set_rules('phone', 'Phone', 'trim|required|max_length[32]');
- $this->form_validation->set_rules('address1', 'Address', 'trim|required|max_length[128]');
- $this->form_validation->set_rules('address2', 'Address', 'trim|max_length[128]');
- $this->form_validation->set_rules('city', 'City', 'trim|required');
- $this->form_validation->set_rules('country_id', 'Country', 'trim|required');
- $this->form_validation->set_rules('zone_id', 'State', 'trim|required');
- $this->form_validation->set_rules('zip', 'Zip', 'trim|required|max_length[32]');
+ $this->form_validation->set_rules('company', 'lang:company', 'trim|max_length[128]');
+ $this->form_validation->set_rules('firstname', 'lang:firstname', 'trim|required|max_length[32]');
+ $this->form_validation->set_rules('lastname', 'lang:lastname', 'trim|required|max_length[32]');
+ $this->form_validation->set_rules('email', 'lang:email', 'trim|required|valid_email|max_length[128]');
+ $this->form_validation->set_rules('phone', 'lang:phone', 'trim|required|max_length[32]');
+ $this->form_validation->set_rules('address1', 'lang:address', 'trim|required|max_length[128]');
+ $this->form_validation->set_rules('address2', 'lang:address', 'trim|max_length[128]');
+ $this->form_validation->set_rules('city', 'lang:city', 'trim|required');
+ $this->form_validation->set_rules('country_id', 'lang:country', 'trim|required');
+ $this->form_validation->set_rules('zone_id', 'lang:state', 'trim|required');
+ $this->form_validation->set_rules('zip', 'lang:postcode', 'trim|required|max_length[32]');
if ($this->form_validation->run() == FALSE)
{
@@ -445,7 +437,7 @@ function address_form($customer_id, $id = false)
$a['field_data']['country_code'] = $country->iso_code_2; // some shipping libraries require the code
$this->Customer_model->save_address($a);
- $this->session->set_flashdata('message', 'Your address has been saved!');
+ $this->session->set_flashdata('message', lang('message_saved_address'));
redirect($this->config->item('admin_folder').'/customers/addresses/'.$customer_id);
}
@@ -460,7 +452,7 @@ function delete_address($customer_id = false, $id = false)
//if the customer does not exist, redirect them to the customer list with an error
if (!$address)
{
- $this->session->set_flashdata('message', 'The requested address could not be found.');
+ $this->session->set_flashdata('error', lang('error_address_not_found'));
if($customer_id)
{
@@ -475,9 +467,9 @@ function delete_address($customer_id = false, $id = false)
else
{
//if the customer is legit, delete them
- $delete = $this->Customer_model->delete_address($id, $customer_id);
+ $delete = $this->Customer_model->delete_address($id, $customer_id);
+ $this->session->set_flashdata('message', lang('message_address_deleted'));
- $this->session->set_flashdata('message', 'An address has been deleted from the system.');
if($customer_id)
{
redirect($this->config->item('admin_folder').'/customers/addresses/'.$customer_id);
@@ -491,7 +483,7 @@ function delete_address($customer_id = false, $id = false)
else
{
//if they do not provide an id send them to the customer list page with an error
- $this->session->set_flashdata('message', 'The requested address could not be found.');
+ $this->session->set_flashdata('error', lang('error_address_not_found'));
if($customer_id)
{
diff --git a/gocart/controllers/admin/dashboard.php b/gocart/controllers/admin/dashboard.php
index 806bf1ea..67d1051d 100644
--- a/gocart/controllers/admin/dashboard.php
+++ b/gocart/controllers/admin/dashboard.php
@@ -1,29 +1,31 @@
load->library('Auth');
- $this->load->model('Order_model');
- $this->load->model('Customer_model');
- $this->load->helper('date');
-
- //this adds the redirect url to our flash data, incase they are not logged in
- $this->auth->is_logged_in(uri_string());
-
if($this->auth->check_access('Orders'))
{
redirect($this->config->item('admin_folder').'/orders');
}
+
+ $this->load->model('Order_model');
+ $this->load->model('Customer_model');
+ $this->load->helper('date');
+
+ $this->lang->load('dashboard');
}
function index()
{
- $data['page_title'] = 'Dashboard';
+ //check to see if shipping and payment modules are installed
+ $data['payment_module_installed'] = (bool)count($this->Settings_model->get_settings('payment_modules'));
+ $data['shipping_module_installed'] = (bool)count($this->Settings_model->get_settings('shipping_modules'));
+
+ $data['page_title'] = lang('dashboard');
// get 5 latest orders
$data['orders'] = $this->Order_model->get_orders(false, '' , 'DESC', 5);
diff --git a/gocart/controllers/admin/digital_products.php b/gocart/controllers/admin/digital_products.php
new file mode 100644
index 00000000..cb681b65
--- /dev/null
+++ b/gocart/controllers/admin/digital_products.php
@@ -0,0 +1,93 @@
+lang->load('digital_product');
+ $this->load->model('digital_product_model');
+ }
+
+ function index()
+ {
+ $data['page_title'] = lang('dgtl_pr_header');
+ $data['file_list'] = $this->digital_product_model->get_list();
+
+ $this->load->view($this->config->item('admin_folder').'/digital_products', $data);
+ }
+
+ function form($id=0)
+ {
+ $this->load->helper('form_helper');
+ $this->load->library('form_validation');
+ $this->form_validation->set_error_delimiters('', '
');
+
+ $data = array( 'id' =>''
+ ,'filename' =>''
+ ,'max_downloads' =>''
+ ,'title' =>''
+ ,'size' =>''
+ );
+ if($id)
+ {
+ $data = array_merge($data, (array)$this->digital_product_model->get_file_info($id));
+ }
+
+ $data['page_title'] = lang('digital_products_form');
+
+ $this->form_validation->set_rules('max_downloads', 'lang:max_downloads', 'numeric');
+ $this->form_validation->set_rules('title', 'lang:title', 'trim|required');
+
+
+ if ($this->form_validation->run() == FALSE)
+ {
+ $this->load->view($this->config->item('admin_folder').'/digital_product_form', $data);
+ } else {
+
+
+ if($id==0)
+ {
+ $data['file_name'] = false;
+ $data['error'] = false;
+
+ $config['allowed_types'] = '*';
+ $config['upload_path'] = 'uploads/digital_uploads';//$this->config->item('digital_products_path');
+ $config['remove_spaces'] = true;
+
+ $this->load->library('upload', $config);
+
+ if($this->upload->do_upload())
+ {
+ $upload_data = $this->upload->data();
+ } else {
+ $data['error'] = $this->upload->display_errors();
+ $this->load->view($this->config->item('admin_folder').'/digital_product_form', $data);
+ return;
+ }
+
+ $save['filename'] = $upload_data['file_name'];
+ $save['size'] = $upload_data['file_size'];
+ } else {
+ $save['id'] = $id;
+ }
+
+ $save['max_downloads'] = set_value('max_downloads');
+ $save['title'] = set_value('title');
+
+ $this->digital_product_model->save($save);
+
+ redirect($this->config->item('admin_folder').'/digital_products');
+ }
+ }
+
+ function delete($id)
+ {
+ $this->digital_product_model->delete($id);
+
+ $this->session->set_flashdata('message', lang('message_deleted_file'));
+ redirect($this->config->item('admin_folder').'/digital_products');
+ }
+
+}
\ No newline at end of file
diff --git a/gocart/controllers/admin/giftcards.php b/gocart/controllers/admin/giftcards.php
index aed16dd2..a9a6c9d5 100644
--- a/gocart/controllers/admin/giftcards.php
+++ b/gocart/controllers/admin/giftcards.php
@@ -1,6 +1,6 @@
load->library('Auth');
$this->load->model('Settings_model');
$this->load->model('Gift_card_model');
$this->load->helper('form');
$this->load->library('form_validation');
- $this->form_validation->set_error_delimiters('', '
');
- //this adds the redirect url to our flash data, incase they are not logged in
- $this->auth->is_logged_in(uri_string());
+ $this->lang->load('giftcard');
}
function index()
{
- $data['page_title'] = "Gift Cards List";
+ $data['page_title'] = lang('giftcards');
$data['cards'] = $this->Gift_card_model->get_all_new();
$gc_settings = $this->Settings_model->get_settings('gift_cards');
@@ -41,13 +38,14 @@ function index()
function form()
{
- $this->form_validation->set_rules('to_email', 'Recipient Email Address', 'trim|required');
- $this->form_validation->set_rules('to_name', 'Recipient Name', 'trim|required');
- $this->form_validation->set_rules('from', 'Sender Name', 'trim|required');
- $this->form_validation->set_rules('personal_message', 'Personal Message', 'trim');
- $this->form_validation->set_rules('beginning_amount', 'Amount', 'trim|required|numeric');
- $data['page_title'] = "Add Gift Card";
+ $this->form_validation->set_rules('to_email', 'lang:recipient_email', 'trim|required');
+ $this->form_validation->set_rules('to_name', 'lang:recipient_name', 'trim|required');
+ $this->form_validation->set_rules('from', 'lang:sender_name', 'trim|required');
+ $this->form_validation->set_rules('personal_message', 'lang:personal_message', 'trim');
+ $this->form_validation->set_rules('beginning_amount', 'lang:amount', 'trim|required|numeric');
+
+ $data['page_title'] = lang('add_giftcard');
if ($this->form_validation->run() == FALSE)
{
@@ -55,8 +53,7 @@ function form()
}
else
{
-
- $save['code'] = $this->Gift_card_model->generate_password();
+ $save['code'] = generate_code(); // from the string helper
$save['to_email'] = $this->input->post('to_email');
$save['to_name'] = $this->input->post('to_name');
$save['from'] = $this->input->post('from');
@@ -96,7 +93,7 @@ function form()
$this->email->send();
}
- $this->session->set_flashdata('message', 'Gift Card saved');
+ $this->session->set_flashdata('message', lang('message_saved_giftcard'));
redirect($this->config->item('admin_folder').'/giftcards');
}
@@ -107,7 +104,7 @@ function activate($code)
{
$this->Gift_card_model->activate($code);
$this->Gift_card_model->send_notification($code);
- $this->session->set_flashdata('message', 'Gift Card Activated');
+ $this->session->set_flashdata('message', lang('message_activated_giftcard'));
redirect($this->config->item('admin_folder').'/giftcards');
}
@@ -115,7 +112,7 @@ function delete($id)
{
$this->Gift_card_model->delete($id);
- $this->session->set_flashdata('message', 'Gift Card Deleted');
+ $this->session->set_flashdata('message', lang('message_deleted_giftcard'));
redirect($this->config->item('admin_folder').'/giftcards');
}
@@ -144,10 +141,10 @@ function settings()
$data['predefined_card_amounts'] = $gc_settings['predefined_card_amounts'];
$data['allow_custom_amount'] = $gc_settings['allow_custom_amount'];
- $this->form_validation->set_rules('predefined_card_amounts', 'Predefined Card Amounts', 'trim');
- $this->form_validation->set_rules('allow_custom_amount', 'Allow Custom Amounts', 'trim');
+ $this->form_validation->set_rules('predefined_card_amounts', 'lang:predefined_card_amounts', 'trim');
+ $this->form_validation->set_rules('allow_custom_amount', 'lang:allow_custom_amounts', 'trim');
- $data['page_title'] = 'Gift Card Settings';
+ $data['page_title'] = lang('giftcard_settings');
if ($this->form_validation->run() == FALSE)
{
@@ -161,7 +158,7 @@ function settings()
$this->Settings_model->save_settings('gift_cards', $save);
- $this->session->set_flashdata('message', 'Gift Card settings saved');
+ $this->session->set_flashdata('message', lang('message_saved_settings'));
redirect($this->config->item('admin_folder').'/giftcards');
diff --git a/gocart/controllers/admin/locations.php b/gocart/controllers/admin/locations.php
index 83450bc0..41978346 100644
--- a/gocart/controllers/admin/locations.php
+++ b/gocart/controllers/admin/locations.php
@@ -1,23 +1,20 @@
load->library('Auth');
$this->auth->check_access('Admin', true);
$this->load->model('Location_model');
-
- //this adds the redirect url to our flash data, incase they are not logged in
- $this->auth->is_logged_in(uri_string());
+ $this->lang->load('location');
}
function index()
{
- $data['page_title'] = 'Countries';
+ $data['page_title'] = lang('countries');
$data['locations'] = $this->Location_model->get_countries();
$this->load->view($this->config->item('admin_folder').'/countries', $data);
@@ -37,7 +34,7 @@ function country_form($id = false)
$this->form_validation->set_error_delimiters('', '
');
- $data['page_title'] = 'Add Country';
+ $data['page_title'] = lang('country_form');
//default values are empty if the product is new
$data['id'] = '';
@@ -55,23 +52,20 @@ function country_form($id = false)
//if the country does not exist, redirect them to the country list with an error
if (!$country)
{
- $this->session->set_flashdata('message', 'The requested country could not be found.');
+ $this->session->set_flashdata('error', lang('error_country_not_found'));
redirect($this->config->item('admin_folder').'/locations');
}
- //set title to edit if we have an ID
- $data['page_title'] = 'Edit Country';
-
$data = array_merge($data, $country);
}
- $this->form_validation->set_rules('name', 'Name', 'trim|required');
- $this->form_validation->set_rules('iso_code_2', 'ISO Code 2', 'trim|required');
- $this->form_validation->set_rules('iso_code_3', 'ISO Code 3', 'trim|required');
- $this->form_validation->set_rules('address_format', 'Address Format', 'trim');
- $this->form_validation->set_rules('postcode_required', 'Post Code Required', 'trim');
- $this->form_validation->set_rules('tax', 'Tax', 'trim|numeric');
- $this->form_validation->set_rules('status', 'Status', 'trim');
+ $this->form_validation->set_rules('name', 'lang:name', 'trim|required');
+ $this->form_validation->set_rules('iso_code_2', 'lang:iso_code_2', 'trim|required');
+ $this->form_validation->set_rules('iso_code_3', 'lang:iso_code_3', 'trim|required');
+ $this->form_validation->set_rules('address_format', 'lang:address_format', 'trim');
+ $this->form_validation->set_rules('postcode_required', 'lang:require_postcode', 'trim');
+ $this->form_validation->set_rules('tax', 'lang:tax', 'trim|numeric');
+ $this->form_validation->set_rules('status', 'lang:status', 'trim');
if ($this->form_validation->run() == FALSE)
{
@@ -90,15 +84,7 @@ function country_form($id = false)
$promo_id = $this->Location_model->save_country($save);
- // We're done
- if (!$id)
- {
- $this->session->set_flashdata('message', 'The "'.$this->input->post('name').'" Country has been added.');
- }
- else
- {
- $this->session->set_flashdata('message', 'Information for the "'.$this->input->post('name').'" Country has been updated.');
- }
+ $this->session->set_flashdata('message', lang('message_saved_country'));
//go back to the product list
redirect($this->config->item('admin_folder').'/locations');
@@ -114,21 +100,21 @@ function delete_country($id = false)
//if the promo does not exist, redirect them to the customer list with an error
if (!$location)
{
- $this->session->set_flashdata('message', 'The requested Coutnry could not be found.');
+ $this->session->set_flashdata('error', lang('error_country_not_found'));
redirect($this->config->item('admin_folder').'/locations');
}
else
{
$this->Location_model->delete_country($id);
- $this->session->set_flashdata('message', 'The "'.$location->name.'" Country has been deleted from the system.');
+ $this->session->set_flashdata('message', lang('message_deleted_country'));
redirect($this->config->item('admin_folder').'/locations');
}
}
else
{
//if they do not provide an id send them to the promo list page with an error
- $this->session->set_flashdata('message', 'The requested Country could not be found.');
+ $this->session->set_flashdata('error', lang('error_country_not_found'));
redirect($this->config->item('admin_folder').'/locations');
}
}
@@ -141,21 +127,21 @@ function delete_zone($id = false)
//if the promo does not exist, redirect them to the customer list with an error
if (!$location)
{
- $this->session->set_flashdata('message', 'The requested zone could not be found.');
+ $this->session->set_flashdata('error', lang('error_zone_not_found'));
redirect($this->config->item('admin_folder').'/locations');
}
else
{
$this->Location_model->delete_zone($id);
- $this->session->set_flashdata('message', 'The "'.$location->name.'" Zone has been deleted from the system.');
+ $this->session->set_flashdata('message', lang('message_deleted_zone'));
redirect($this->config->item('admin_folder').'/locations/zones/'.$location->country_id);
}
}
else
{
//if they do not provide an id send them to the promo list page with an error
- $this->session->set_flashdata('message', 'The requested Zone could not be found.');
+ $this->session->set_flashdata('error', lang('error_zone_not_found'));
redirect($this->config->item('admin_folder').'/locations');
}
}
@@ -166,12 +152,12 @@ function zones($country_id)
$data['country'] = $this->Location_model->get_country($country_id);
if(!$data['country'])
{
- $this->session->set_flashdata('error', 'The requested Country could not be found.');
+ $this->session->set_flashdata('error', lang('error_zone_not_found'));
redirect($this->config->item('admin_folder').'/locations');
}
$data['zones'] = $this->Location_model->get_zones($country_id);
- $data['page_title'] = $data['country']->name. ' Zones';
+ $data['page_title'] = sprintf(lang('country_zones'), $data['country']->name);
$this->load->view($this->config->item('admin_folder').'/country_zones', $data);
}
@@ -184,7 +170,7 @@ function zone_form($id = false)
$this->form_validation->set_error_delimiters('', '
');
$data['countries'] = $this->Location_model->get_countries();
- $data['page_title'] = 'Add Zone';
+ $data['page_title'] = lang('zone_form');
//default values are empty if the product is new
$data['id'] = '';
@@ -201,20 +187,18 @@ function zone_form($id = false)
//if the country does not exist, redirect them to the country list with an error
if (!$zone)
{
- $this->session->set_flashdata('message', 'The requested zone could not be found.');
+ $this->session->set_flashdata('error', lang('error_zone_not_found'));
redirect($this->config->item('admin_folder').'/locations');
}
- //set title to edit if we have an ID
- $data['page_title'] = 'Edit Zone';
$data = array_merge($data, $zone);
}
$this->form_validation->set_rules('country_id', 'Country ID', 'trim|required');
- $this->form_validation->set_rules('name', 'Name', 'trim|required');
- $this->form_validation->set_rules('code', 'Code', 'trim|required');
- $this->form_validation->set_rules('tax', 'Tax', 'trim|numeric');
- $this->form_validation->set_rules('status', 'Status', 'trim');
+ $this->form_validation->set_rules('name', 'lang:name', 'trim|required');
+ $this->form_validation->set_rules('code', 'lang:code', 'trim|required');
+ $this->form_validation->set_rules('tax', 'lang:tax', 'trim|numeric');
+ $this->form_validation->set_rules('status', 'lang:status', 'trim');
if ($this->form_validation->run() == FALSE)
{
@@ -231,16 +215,7 @@ function zone_form($id = false)
$this->Location_model->save_zone($save);
- // We're done
- if (!$id)
- {
- $this->session->set_flashdata('message', 'The "'.$this->input->post('name').'" zone has been added.');
- }
- else
- {
- $this->session->set_flashdata('message', 'Information for the "'.$this->input->post('name').'" zone has been updated.');
- }
-
+ $this->session->set_flashdata('message', lang('message_zone_saved'));
//go back to the product list
redirect($this->config->item('admin_folder').'/locations/zones/'.$save['country_id']);
}
@@ -263,7 +238,7 @@ function zone_areas($id)
$data['zone'] = $this->Location_model->get_zone($id);
$data['areas'] = $this->Location_model->get_zone_areas($id);
- $data['page_title'] = 'Zone Areas for '.$data['zone']->name;
+ $data['page_title'] = sprintf(lang('zone_areas_for'), $data['zone']->name);
$this->load->view($this->config->item('admin_folder').'/country_zone_areas', $data);
}
@@ -276,21 +251,21 @@ function delete_zone_area($id = false)
//if the promo does not exist, redirect them to the customer list with an error
if (!$location)
{
- $this->session->set_flashdata('message', 'The requested Zone Area could not be found.');
+ $this->session->set_flashdata('error', lang('error_zone_area_not_found'));
redirect($this->config->item('admin_folder').'/locations');
}
else
{
$this->Location_model->delete_zone_area($id);
- $this->session->set_flashdata('message', 'The "'.$location->code.'" Zone Area has been deleted from the system.');
+ $this->session->set_flashdata('message', lang('message_deleted_zone_area'));
redirect($this->config->item('admin_folder').'/locations/zone_areas/'.$location->zone_id);
}
}
else
{
//if they do not provide an id send them to the promo list page with an error
- $this->session->set_flashdata('message', 'The requested Zone Area could not be found.');
+ $this->session->set_flashdata('error', lang('error_zone_area_not_found'));
redirect($this->config->item('admin_folder').'/locations/');
}
}
@@ -303,7 +278,7 @@ function zone_area_form($zone_id, $area_id =false)
$this->form_validation->set_error_delimiters('', '
');
$zone = $this->Location_model->get_zone($zone_id);
- $data['page_title'] = 'Add Zone Area to '.$zone->name;
+ $data['page_title'] = sprintf(lang('zone_area_form'), $zone->name);
//default values are empty if the product is new
$data['id'] = '';
@@ -318,17 +293,15 @@ function zone_area_form($zone_id, $area_id =false)
//if the country does not exist, redirect them to the country list with an error
if (!$area)
{
- $this->session->set_flashdata('message', 'The requested zone area could not be found.');
+ $this->session->set_flashdata('error', lang('error_zone_area_not_found'));
redirect($this->config->item('admin_folder').'/locations/zone_areas/'.$zone_id);
}
- //set title to edit if we have an ID
- $data['page_title'] = 'Edit Zone Area';
$data = array_merge($data, $area);
}
- $this->form_validation->set_rules('code', 'Code', 'trim|required');
- $this->form_validation->set_rules('tax', 'Tax', 'trim|numeric');
+ $this->form_validation->set_rules('code', 'lang:code', 'trim|required');
+ $this->form_validation->set_rules('tax', 'lang:tax', 'trim|numeric');
if ($this->form_validation->run() == FALSE)
{
@@ -343,15 +316,7 @@ function zone_area_form($zone_id, $area_id =false)
$this->Location_model->save_zone_area($save);
- // We're done
- if (!$area_id)
- {
- $this->session->set_flashdata('message', 'The "'.$this->input->post('code').'" zone area has been added.');
- }
- else
- {
- $this->session->set_flashdata('message', 'Information for the "'.$this->input->post('code').'" zone area has been updated.');
- }
+ $this->session->set_flashdata('message', lang('message_saved_zone_area'));
//go back to the product list
redirect($this->config->item('admin_folder').'/locations/zone_areas/'.$save['zone_id']);
diff --git a/gocart/controllers/admin/login.php b/gocart/controllers/admin/login.php
index 57f0f136..48199f98 100644
--- a/gocart/controllers/admin/login.php
+++ b/gocart/controllers/admin/login.php
@@ -9,6 +9,7 @@ function __construct()
force_ssl();
$this->load->library('Auth');
+ $this->lang->load('login');
}
function index()
@@ -45,7 +46,7 @@ function index()
{
//this adds the redirect back to flash data if they provide an incorrect credentials
$this->session->set_flashdata('redirect', $redirect);
- $this->session->set_flashdata('message', 'Authentication Failed');
+ $this->session->set_flashdata('error', lang('error_authentication_failed'));
redirect($this->config->item('admin_folder').'/login');
}
}
@@ -57,7 +58,7 @@ function logout()
$this->auth->logout();
//when someone logs out, automatically redirect them to the login page.
- $this->session->set_flashdata('message', 'You have been logged out.');
+ $this->session->set_flashdata('message', lang('message_logged_out'));
redirect($this->config->item('admin_folder').'/login');
}
diff --git a/gocart/controllers/admin/media.php b/gocart/controllers/admin/media.php
new file mode 100644
index 00000000..2d54157d
--- /dev/null
+++ b/gocart/controllers/admin/media.php
@@ -0,0 +1,190 @@
+path = 'uploads/wysiwyg';
+ $this->auth->check_access('Admin', true);
+ $this->load->helper(array('file', 'form'));
+
+ }
+
+ function index()
+ {
+ $data['root'] = trim(implode('/',array_slice($this->uri->segment_array(), 3)), '/');
+
+ if(!is_dir($this->path.'/'.$data['root']))
+ {
+ redirect(config_item('admin_folder').'/media/index/');
+ }
+
+ $data['files'] = array();
+ $files = get_dir_file_info($this->path.'/'.$data['root']);
+
+ if(!empty($files))
+ {
+ foreach($files as $f)
+ {
+ $data['files'][] = $f['name'];
+ }
+ }
+
+ natcasesort($data['files']);
+
+ $this->load->view(config_item('admin_folder').'/iframe/media', $data);
+ }
+
+ function embed()
+ {
+ //get the file path
+ $data['root'] = array_slice($this->uri->segment_array(), 3);
+ array_pop($data['root']);
+
+ //get the file
+ $data['file'] = trim(implode('/',array_slice($this->uri->segment_array(), 3)), '/');
+
+ if(!file_exists($this->path.'/'.$data['file']))
+ {
+ $this->set_flashdata('error', 'The requested file could not be found');
+ redirect(config_item('admin_folder').'/media/index/');
+ }
+
+ $this->load->view(config_item('admin_folder').'/iframe/header', $data);
+ $this->load->view(config_item('admin_folder').'/iframe/embed', $data);
+ $this->load->view(config_item('admin_folder').'/iframe/footer', $data);
+
+ }
+
+ function edit_image()
+ {
+ $this->load->view(config_item('admin_folder').'/iframe/edit_image');
+ }
+
+ function create_subfolder()
+ {
+ $root = trim($this->input->post('root'), '/');
+ $folder = trim(url_title($this->input->post('folder-name'), '-', true), '/');
+
+ if(empty($folder))
+ {
+ $this->session->set_flashdata('error', 'You must submit a folder name.');
+ }
+ elseif(file_exists($this->path.'/'.$root.'/'.$folder))
+ {
+ $this->session->set_flashdata('error', 'There requested folder name is already in use.');
+ }
+ else
+ {
+ if(mkdir($this->path.'/'.$root.'/'.$folder))
+ {
+ $this->session->set_flashdata('message', 'Your subfolder has been successfully created.');
+ }
+ else
+ {
+ $this->session->set_flashdata('error', 'There was an error creating your folder.');
+ }
+ }
+ redirect(config_item('admin_folder').'/media/index/'.$root);
+ }
+
+ function move_file()
+ {
+ $filename = $this->input->post('filename');
+ $subfolder = $this->input->post('move_to');
+ $root = $this->input->post('root');
+
+ //stop the chance of //
+ if(!empty($root))
+ {
+ $root .='/';
+ }
+
+ $new = $this->path.'/'.$subfolder.'/'.$filename;
+ $old = $this->path.'/'.$root.$filename;
+
+ if(!file_exists($new) && file_exists($old))
+ {
+ rename($old,$new);
+ echo json_encode(true);
+ }
+ else
+ {
+ echo json_encode(false);
+ }
+ }
+
+ function rename_file()
+ {
+
+ $root = trim($this->input->post('root'), '/');
+ $parts = pathinfo($this->input->post('new'));
+
+ $new_filename = url_title($parts['filename'], '-', true);
+ if(!empty($parts['extension']))
+ {
+ $new_filename .= '.'.$parts['extension'];
+ }
+
+ $new = $this->path.'/'.$root.'/'.$new_filename;
+ $old = $this->path.'/'.$root.'/'.$this->input->post('original');
+
+ if(!empty($new_filename) && !file_exists($new) && file_exists($old))
+ {
+ rename($old,$new);
+ $this->session->set_flashdata('message', 'Your file has been successfully renamed.');
+ }
+ else
+ {
+ $this->session->set_flashdata('error', 'There was an error renaming the requested file.');
+ }
+
+ redirect(config_item('admin_folder').'/media/index/'.$root);
+ }
+
+ function delete()
+ {
+ $root = trim($this->input->post('root'), '/');
+ $file = $this->path.'/'.$root.'/'.$this->input->post('filename');
+
+ if(is_dir($file))
+ {
+ delete_files($file, TRUE);
+ rmdir($file);
+ $this->session->set_flashdata('message', 'Your folder has been successfully deleted.');
+ }
+ elseif(file_exists($file))
+ {
+ unlink($file);
+ $this->session->set_flashdata('message', 'Your file has been successfully deleted.');
+ }
+
+ redirect(config_item('admin_folder').'/media/index/'.$root);
+ }
+
+ function upload()
+ {
+ $root = trim($this->input->post('root'), '/');
+
+ $config['upload_path'] = 'uploads/wysiwyg/'.$root;
+ $config['allowed_types'] = 'gif|jpg|png';
+ $config['max_size'] = $this->config->item('size_limit');
+ $config['max_width'] = '1024';
+ $config['max_height'] = '768';
+
+ $this->load->library('upload', $config);
+
+ if ( ! $this->upload->do_upload())
+ {
+ $this->session->set_flashdata('error', $this->upload->display_errors());
+ redirect(config_item('admin_folder').'/media/index/'.$root);
+ }
+ else
+ {
+ $this->session->set_flashdata('message', 'Your file has been successfully uploaded.');
+ redirect(config_item('admin_folder').'/media/index/'.$root);
+ }
+ }
+}
\ No newline at end of file
diff --git a/gocart/controllers/admin/orders.php b/gocart/controllers/admin/orders.php
index 08ff5b8a..3b7dcd80 100644
--- a/gocart/controllers/admin/orders.php
+++ b/gocart/controllers/admin/orders.php
@@ -1,27 +1,47 @@
load->library('Auth');
+
remove_ssl();
- //this adds the redirect url to our flash data, incase they are not logged in
- $this->auth->is_logged_in(uri_string());
-
$this->load->model('Order_model');
$this->load->model('Search_model');
$this->load->model('location_model');
- $this->load->helper(array('formatting', 'utility'));
+ $this->load->helper(array('formatting'));
+ $this->lang->load('order');
}
- function index($sort_by='order_number',$sortorder='desc', $code=0, $page=0, $rows=15)
+ function index($sort_by='order_number',$sort_order='desc', $code=0, $page=0, $rows=15)
{
+
+ //if they submitted an export form do the export
+ if($this->input->post('submit') == 'export')
+ {
+ $this->load->model('customer_model');
+ $this->load->helper('download_helper');
+ $post = $this->input->post(null, false);
+ $term = (object)$post;
+
+ $data['orders'] = $this->Order_model->get_orders($term);
+
+ foreach($data['orders'] as &$o)
+ {
+ $o->items = $this->Order_model->get_items($o->id);
+ }
+
+ force_download_content('orders.xml', $this->load->view($this->config->item('admin_folder').'/orders_xml', $data, true));
+
+ //kill the script from here
+ die;
+ }
+
$this->load->helper('form');
$this->load->helper('date');
$data['message'] = $this->session->flashdata('message');
- $data['page_title'] = 'Orders';
+ $data['page_title'] = lang('orders');
$data['code'] = $code;
$term = false;
@@ -29,9 +49,9 @@ function index($sort_by='order_number',$sortorder='desc', $code=0, $page=0, $row
if($post)
{
//if the term is in post, save it to the db and give me a reference
- $term = json_encode($post);
- $data['code'] = $this->Search_model->record_term($term);
-
+ $term = json_encode($post);
+ $code = $this->Search_model->record_term($term);
+ $data['code'] = $code;
//reset the term to an object for use
$term = (object)$post;
}
@@ -42,20 +62,42 @@ function index($sort_by='order_number',$sortorder='desc', $code=0, $page=0, $row
}
$data['term'] = $term;
- $data['orders'] = $this->Order_model->get_orders($term, $sort_by, $sortorder, $rows, $page);
+ $data['orders'] = $this->Order_model->get_orders($term, $sort_by, $sort_order, $rows, $page);
$data['total'] = $this->Order_model->get_orders_count($term);
$this->load->library('pagination');
- $config['base_url'] = $this->config->item('admin_folder').'/orders/index/'.$sort_by.'/'.$sortorder.'/'.$code.'/';
- $config['total_rows'] = $data['total'];
- $config['per_page'] = $rows;
+ $config['base_url'] = site_url($this->config->item('admin_folder').'/orders/index/'.$sort_by.'/'.$sort_order.'/'.$code.'/');
+ $config['total_rows'] = $data['total'];
+ $config['per_page'] = $rows;
+ $config['uri_segment'] = 7;
+ $config['first_link'] = 'First';
+ $config['first_tag_open'] = '';
+ $config['first_tag_close'] = '';
+ $config['last_link'] = 'Last';
+ $config['last_tag_open'] = '';
+ $config['last_tag_close'] = '';
+
+ $config['full_tag_open'] = '';
+ $config['cur_tag_open'] = '';
+ $config['cur_tag_close'] = '';
+
+ $config['num_tag_open'] = '';
+ $config['num_tag_close'] = '';
+
+ $config['prev_link'] = '«';
+ $config['prev_tag_open'] = '';
+ $config['prev_tag_close'] = '';
+
+ $config['next_link'] = '»';
+ $config['next_tag_open'] = '';
+ $config['next_tag_close'] = '';
$this->pagination->initialize($config);
$data['sort_by'] = $sort_by;
- $data['sortorder'] = $sortorder;
- $data['pages'] = $this->pagination->create_links();
+ $data['sort_order'] = $sort_order;
$this->load->view($this->config->item('admin_folder').'/orders', $data);
}
@@ -74,7 +116,7 @@ function export()
$o->items = $this->Order_model->get_items($o->id);
}
- force_download('orders.xml', $this->load->view($this->config->item('admin_folder').'/orders_xml', $data, true));
+ force_download_content('orders.xml', $this->load->view($this->config->item('admin_folder').'/orders_xml', $data, true));
}
@@ -84,8 +126,12 @@ function view($id)
$this->load->library('form_validation');
$this->load->model('Gift_card_model');
- $this->form_validation->set_rules('notes', 'Notes');
- $this->form_validation->set_rules('status', 'Status', 'required');
+ $this->form_validation->set_rules('notes', 'lang:notes');
+ $this->form_validation->set_rules('status', 'lang:status', 'required');
+
+ $message = $this->session->flashdata('message');
+
+
if ($this->form_validation->run() == TRUE)
{
$save = array();
@@ -93,24 +139,52 @@ function view($id)
$save['notes'] = $this->input->post('notes');
$save['status'] = $this->input->post('status');
- $data['message'] ='The order has been updated!';
+ $data['message'] = lang('message_order_updated');
$this->Order_model->save_order($save);
}
//get the order information, this way if something was posted before the new one gets queried here
- $data['page_title'] = 'View Order';
+ $data['page_title'] = lang('view_order');
$data['order'] = $this->Order_model->get_order($id);
+ /*****************************
+ * Order Notification details *
+ ******************************/
+ // get the list of canned messages (order)
+ $this->load->model('Messages_model');
+ $msg_templates = $this->Messages_model->get_list('order');
+
+ // replace template variables
+ foreach($msg_templates as $msg)
+ {
+ // fix html
+ $msg['content'] = str_replace("\n", '', html_entity_decode($msg['content']));
+
+ // {order_number}
+ $msg['subject'] = str_replace('{order_number}', $data['order']->order_number, $msg['subject']);
+ $msg['content'] = str_replace('{order_number}', $data['order']->order_number, $msg['content']);
+
+ // {url}
+ $msg['subject'] = str_replace('{url}', $this->config->item('base_url'), $msg['subject']);
+ $msg['content'] = str_replace('{url}', $this->config->item('base_url'), $msg['content']);
+
+ // {site_name}
+ $msg['subject'] = str_replace('{site_name}', $this->config->item('company_name'), $msg['subject']);
+ $msg['content'] = str_replace('{site_name}', $this->config->item('company_name'), $msg['content']);
+
+ $data['msg_templates'][] = $msg;
+ }
+
// we need to see if any items are gift cards, so we can generate an activation link
foreach($data['order']->contents as $orderkey=>$product)
{
- if(isset($product['is_gc']))
+ if(isset($product['is_gc']) && (bool)$product['is_gc'])
{
- if($this->Gift_card_model->is_active($product['code']))
+ if($this->Gift_card_model->is_active($product['sku']))
{
- $data['order']->contents[$orderkey]['gc_status'] = '[ Gift Card is Active ]';
+ $data['order']->contents[$orderkey]['gc_status'] = '[ '.lang('giftcard_is_active').' ]';
} else {
- $data['order']->contents[$orderkey]['gc_status'] = ' [ Activate ]';
+ $data['order']->contents[$orderkey]['gc_status'] = ' [ '.lang('activate').' ]';
}
}
}
@@ -140,62 +214,24 @@ function edit_status()
function send_notification($order_id='')
{
-
- $send = $this->input->post('send');
- if(!empty($send))
- {
- // send the message
- $this->load->library('email');
-
- $config['mailtype'] = 'html';
-
- $this->email->initialize($config);
-
- $this->email->from($this->config->item('email'), $this->config->item('company_name'));
- $this->email->to($this->input->post('recipient'));
-
- $this->email->subject($this->input->post('subject'));
- $this->email->message(html_entity_decode($this->input->post('content')));
-
- $this->email->send();
-
- $this->load->view($this->config->item('admin_folder').'/iframe/order_notification.php', array('finished'=>1));
-
- return;
- }
-
-
- $this->load->model('Messages_model');
-
- // get the order details
- $data['order'] = $this->Order_model->get_order($order_id);
-
- // get the list of canned messages (order)
- $data['msg_templates'] = $this->Messages_model->get_list('order');
-
- // replace template variables
- foreach($data['msg_templates'] as &$msg)
- {
- // fix html
- $msg['content'] = str_replace("\n", '', html_entity_decode($msg['content']));
-
- // {order_number}
- $msg['subject'] = str_replace('{order_number}', $data['order']->order_number, $msg['subject']);
- $msg['content'] = str_replace('{order_number}', $data['order']->order_number, $msg['content']);
-
- // {url}
- $msg['subject'] = str_replace('{url}', $this->config->item('base_url'), $msg['subject']);
- $msg['content'] = str_replace('{url}', $this->config->item('base_url'), $msg['content']);
-
- // {site_name}
- $msg['subject'] = str_replace('{site_name}', $this->config->item('company_name'), $msg['subject']);
- $msg['content'] = str_replace('{site_name}', $this->config->item('company_name'), $msg['content']);
-
- }
-
- $this->load->view($this->config->item('admin_folder').'/iframe/order_notification.php', $data);
-
- }
+ // send the message
+ $this->load->library('email');
+
+ $config['mailtype'] = 'html';
+
+ $this->email->initialize($config);
+
+ $this->email->from($this->config->item('email'), $this->config->item('company_name'));
+ $this->email->to($this->input->post('recipient'));
+
+ $this->email->subject($this->input->post('subject'));
+ $this->email->message(html_entity_decode($this->input->post('content')));
+
+ $this->email->send();
+
+ $this->session->set_flashdata('message', lang('sent_notification_message'));
+ redirect($this->config->item('admin_folder').'/orders/view/'.$order_id);
+ }
function bulk_delete()
{
@@ -207,11 +243,11 @@ function bulk_delete()
{
$this->Order_model->delete($order);
}
- $this->session->set_flashdata('message', 'The selected orders have been deleted.');
+ $this->session->set_flashdata('message', lang('message_orders_deleted'));
}
else
{
- $this->session->set_flashdata('error', 'You did not select any orders to delete.');
+ $this->session->set_flashdata('error', lang('error_no_orders_selected'));
}
//redirect as to change the url
redirect($this->config->item('admin_folder').'/orders');
diff --git a/gocart/controllers/admin/pages.php b/gocart/controllers/admin/pages.php
index e8e295b7..830cc06a 100644
--- a/gocart/controllers/admin/pages.php
+++ b/gocart/controllers/admin/pages.php
@@ -1,5 +1,5 @@
load->library('Auth');
- $this->auth->is_logged_in(uri_string());
$this->auth->check_access('Admin', true);
-
$this->load->model('Page_model');
+ $this->lang->load('page');
}
function index()
{
- $data['page_title'] = 'Page Administration';
+ $data['page_title'] = lang('pages');
$data['pages'] = $this->Page_model->get_pages();
@@ -44,20 +42,18 @@ function form($id = false)
$data['seo_title'] = '';
$data['meta'] = '';
- $data['page_title'] = 'Add Page';
+ $data['page_title'] = lang('page_form');
$data['pages'] = $this->Page_model->get_pages();
if($id)
{
- //set the page title to edit page
- $data['page_title'] = 'Edit Page';
$page = $this->Page_model->get_page($id);
if(!$page)
{
//page does not exist
- $this->session->set_flashdata('message', 'The requested page could not be found.');
+ $this->session->set_flashdata('error', lang('error_page_not_found'));
redirect($this->config->item('admin_folder').'/pages');
}
@@ -74,14 +70,14 @@ function form($id = false)
$data['slug'] = $page->slug;
}
- $this->form_validation->set_rules('title', 'Title', 'trim|required');
- $this->form_validation->set_rules('menu_title', 'Menu Title', 'trim');
- $this->form_validation->set_rules('slug', 'slug', 'trim');
- $this->form_validation->set_rules('seo_title', 'SEO Title', 'trim');
- $this->form_validation->set_rules('meta', 'Meta', 'trim');
- $this->form_validation->set_rules('sequence', 'sequence', 'trim|integer');
- $this->form_validation->set_rules('parent_id', 'parent_id', 'trim|integer');
- $this->form_validation->set_rules('content', 'Content', 'trim');
+ $this->form_validation->set_rules('title', 'lang:title', 'trim|required');
+ $this->form_validation->set_rules('menu_title', 'lang:menu_title', 'trim');
+ $this->form_validation->set_rules('slug', 'lang:slug', 'trim');
+ $this->form_validation->set_rules('seo_title', 'lang:seo_title', 'trim');
+ $this->form_validation->set_rules('meta', 'lang:meta', 'trim');
+ $this->form_validation->set_rules('sequence', 'lang:sequence', 'trim|integer');
+ $this->form_validation->set_rules('parent_id', 'lang:parent_id', 'trim|integer');
+ $this->form_validation->set_rules('content', 'lang:content', 'trim');
// Validate the form
if($this->form_validation->run() == false)
@@ -90,6 +86,8 @@ function form($id = false)
}
else
{
+ $this->load->helper('text');
+
//first check the slug field
$slug = $this->input->post('slug');
@@ -99,7 +97,7 @@ function form($id = false)
$slug = $this->input->post('title');
}
- $slug = url_title($slug, 'dash', TRUE);
+ $slug = url_title(convert_accented_characters($slug), 'dash', TRUE);
//validate the slug
$this->load->model('Routes_model');
@@ -144,15 +142,7 @@ function form($id = false)
$this->Routes_model->save($route);
- //set the message accordingly
- if (!$id)
- {
- $this->session->set_flashdata('message', 'The "'.$this->input->post('title').'" page has been added.');
- }
- else
- {
- $this->session->set_flashdata('message', 'Information for the "'.$this->input->post('title').'" page has been updated.');
- }
+ $this->session->set_flashdata('message', lang('message_saved_page'));
//go back to the page list
redirect($this->config->item('admin_folder').'/pages');
@@ -175,19 +165,16 @@ function link_form($id = false)
$data['parent_id'] = 0;
- $data['page_title'] = 'Add Link';
+ $data['page_title'] = lang('link_form');
$data['pages'] = $this->Page_model->get_pages();
if($id)
{
- //set the page title to edit page
- $data['page_title'] = 'Edit Link';
-
$page = $this->Page_model->get_page($id);
if(!$page)
{
//page does not exist
- $this->session->set_flashdata('message', 'The requested link could not be found.');
+ $this->session->set_flashdata('error', lang('error_link_not_found'));
redirect($this->config->item('admin_folder').'/pages');
}
@@ -201,11 +188,11 @@ function link_form($id = false)
$data['sequence'] = $page->sequence;
}
- $this->form_validation->set_rules('title', 'Title', 'trim|required');
- $this->form_validation->set_rules('url', 'URL', 'trim|required');
- $this->form_validation->set_rules('sequence', 'sequence', 'trim|integer');
- $this->form_validation->set_rules('new_window', 'New Window', 'trim|integer');
- $this->form_validation->set_rules('parent_id', 'Parent', 'trim|integer');
+ $this->form_validation->set_rules('title', 'lang:title', 'trim|required');
+ $this->form_validation->set_rules('url', 'lang:url', 'trim|required');
+ $this->form_validation->set_rules('sequence', 'lang:sequence', 'trim|integer');
+ $this->form_validation->set_rules('new_window', 'lang:new_window', 'trim|integer');
+ $this->form_validation->set_rules('parent_id', 'lang:parent_id', 'trim|integer');
// Validate the form
if($this->form_validation->run() == false)
@@ -226,15 +213,7 @@ function link_form($id = false)
//save the page
$this->Page_model->save($save);
- //set the message accordingly
- if (!$id)
- {
- $this->session->set_flashdata('message', 'The "'.$this->input->post('title').'" link has been added.');
- }
- else
- {
- $this->session->set_flashdata('message', 'Information for the "'.$this->input->post('title').'" link has been updated.');
- }
+ $this->session->set_flashdata('message', lang('message_saved_link'));
//go back to the page list
redirect($this->config->item('admin_folder').'/pages');
@@ -255,11 +234,11 @@ function delete($id)
$this->Routes_model->delete($page->route_id);
$this->Page_model->delete_page($id);
- $this->session->set_flashdata('message', 'The page has been deleted.');
+ $this->session->set_flashdata('message', lang('message_deleted_page'));
}
else
{
- $this->session->set_flashdata('error', 'The requested page could not be found.');
+ $this->session->set_flashdata('error', lang('error_page_not_found'));
}
redirect($this->config->item('admin_folder').'/pages');
diff --git a/gocart/controllers/admin/payment.php b/gocart/controllers/admin/payment.php
index ec580270..2fa18d88 100644
--- a/gocart/controllers/admin/payment.php
+++ b/gocart/controllers/admin/payment.php
@@ -1,18 +1,17 @@
load->library('Auth');
+
$this->auth->check_access('Admin', true);
$this->load->model('Settings_model');
- //this adds the redirect url to our flash data, incase they are not logged in
- $this->auth->is_logged_in(uri_string());
+
+ $this->lang->load('settings');
}
function index()
@@ -22,9 +21,11 @@ function index()
function install($module)
{
+ $this->load->add_package_path(APPPATH.'packages/payment/'.$module.'/');
+
$enabled_modules = $this->Settings_model->get_settings('payment_modules');
- $this->load->library('payment/'.$module.'/'.$module);
+ $this->load->library($module);
if(!array_key_exists($module, $enabled_modules))
{
@@ -49,7 +50,10 @@ function uninstall($module)
function settings($module)
{
- $this->load->library('payment/'.$module.'/'.$module);
+ $this->load->add_package_path(APPPATH.'packages/payment/'.$module.'/');
+ $this->load->library($module);
+ $this->load->helper('form');
+
//ok, in order for the most flexibility, and in case someone wants to use javascript or something
//the form gets pulled directly from the library.
@@ -58,7 +62,7 @@ function settings($module)
$check = $this->$module->check();
if(!$check)
{
- $this->session->set_flashdata('message', $module.' settings have been updated');
+ $this->session->set_flashdata('message', sprintf(lang('settings_updated'), $module));
redirect($this->config->item('admin_folder').'/payment');
}
else
@@ -78,7 +82,7 @@ function settings($module)
$data['form'] = $this->$module->form();
}
$data['module'] = $module;
- $data['page_title'] = '"'.$module.'" Payment Settings';
+ $data['page_title'] = sprintf(lang('payment_settings'), $module);
$this->load->view($this->config->item('admin_folder').'/payment_module_settings', $data);
}
}
diff --git a/gocart/controllers/admin/products.php b/gocart/controllers/admin/products.php
index ec31e9db..46d28206 100644
--- a/gocart/controllers/admin/products.php
+++ b/gocart/controllers/admin/products.php
@@ -1,39 +1,133 @@
load->library('Auth');
+
$this->auth->check_access('Admin', true);
- //this adds the redirect url to our flash data, incase they are not logged in
- $this->auth->is_logged_in(uri_string());
$this->load->model('Product_model');
$this->load->helper('form');
+ $this->lang->load('product');
}
- function index()
+ function index($order_by="name", $sort_order="ASC", $code=0, $page=0, $rows=15)
{
- $data['page_title'] = 'Products';
- $data['products'] = $this->Product_model->get_products();
+
+ $data['page_title'] = lang('products');
+
+ $data['code'] = $code;
+ $term = false;
+ $category_id = false;
+
+ //get the category list for the drop menu
+ $data['categories'] = $this->Category_model->get_categories_tierd();
+
+ $post = $this->input->post(null, false);
+ $this->load->model('Search_model');
+ if($post)
+ {
+ $term = json_encode($post);
+ $code = $this->Search_model->record_term($term);
+ $data['code'] = $code;
+ }
+ elseif ($code)
+ {
+ $term = $this->Search_model->get_term($code);
+ }
+
+ //store the search term
+ $data['term'] = $term;
+ $data['order_by'] = $order_by;
+ $data['sort_order'] = $sort_order;
+
+ $data['products'] = $this->Product_model->products(array('term'=>$term, 'order_by'=>$order_by, 'sort_order'=>$sort_order, 'rows'=>$rows, 'page'=>$page));
+
+ //total number of products
+ $data['total'] = $this->Product_model->products(array('term'=>$term, 'order_by'=>$order_by, 'sort_order'=>$sort_order), true);
+
+ $this->load->library('pagination');
+
+ $config['base_url'] = site_url($this->config->item('admin_folder').'/products/index/'.$order_by.'/'.$sort_order.'/'.$code.'/');
+ $config['total_rows'] = $data['total'];
+ $config['per_page'] = $rows;
+ $config['uri_segment'] = 7;
+ $config['first_link'] = 'First';
+ $config['first_tag_open'] = '';
+ $config['first_tag_close'] = '';
+ $config['last_link'] = 'Last';
+ $config['last_tag_open'] = '';
+ $config['last_tag_close'] = '';
+
+ $config['full_tag_open'] = '';
+ $config['cur_tag_open'] = '';
+ $config['cur_tag_close'] = '';
+
+ $config['num_tag_open'] = '';
+ $config['num_tag_close'] = '';
+
+ $config['prev_link'] = '«';
+ $config['prev_tag_open'] = '';
+ $config['prev_tag_close'] = '';
+
+ $config['next_link'] = '»';
+ $config['next_tag_open'] = '';
+ $config['next_tag_close'] = '';
+
+ $this->pagination->initialize($config);
+
$this->load->view($this->config->item('admin_folder').'/products', $data);
}
+ //basic category search
+ function product_autocomplete()
+ {
+ $name = trim($this->input->post('name'));
+ $limit = $this->input->post('limit');
+
+ if(empty($name))
+ {
+ echo json_encode(array());
+ }
+ else
+ {
+ $results = $this->Product_model->product_autocomplete($name, $limit);
+
+ $return = array();
+
+ foreach($results as $r)
+ {
+ $return[$r->id] = $r->name;
+ }
+ echo json_encode($return);
+ }
+
+ }
+
function bulk_save()
{
$products = $this->input->post('product');
+ if(!$products)
+ {
+ $this->session->set_flashdata('error', lang('error_bulk_no_products'));
+ redirect($this->config->item('admin_folder').'/products');
+ }
+
foreach($products as $id=>$product)
{
$product['id'] = $id;
$this->Product_model->save($product);
}
- $this->session->set_flashdata('message', 'Your products have been updated');
+ $this->session->set_flashdata('message', lang('message_bulk_update'));
redirect($this->config->item('admin_folder').'/products');
}
@@ -41,13 +135,15 @@ function form($id = false, $duplicate = false)
{
$this->product_id = $id;
$this->load->library('form_validation');
- $this->load->model(array('Option_model', 'Category_model'));
+ $this->load->model(array('Option_model', 'Category_model', 'Digital_Product_model'));
+ $this->lang->load('digital_product');
$this->form_validation->set_error_delimiters('', '
');
- $data['categories'] = $this->Category_model->get_categories_tierd();
- $data['product_list'] = $this->Product_model->get_products();
+ //$data['categories'] = $this->Category_model->get_categories_tierd();
+ //$data['product_list'] = $this->Product_model->get_products();
+ $data['file_list'] = $this->Digital_Product_model->get_list();
- $data['page_title'] = 'Add Product';
+ $data['page_title'] = lang('product_form');
//default values are empty if the product is new
$data['id'] = '';
@@ -59,38 +155,45 @@ function form($id = false, $duplicate = false)
$data['price'] = '';
$data['saleprice'] = '';
$data['weight'] = '';
- $data['in_stock'] = '';
+ $data['track_stock'] = '';
$data['seo_title'] = '';
$data['meta'] = '';
+ $data['shippable'] = '';
+ $data['taxable'] = '';
+ $data['fixed_quantity'] = '';
+ $data['quantity'] = '';
+ $data['enabled'] = '';
$data['related_products'] = array();
$data['product_categories'] = array();
$data['images'] = array();
+ $data['product_files'] = array();
//create the photos array for later use
$data['photos'] = array();
if ($id)
{
+ // get the existing file associations and create a format we can read from the form to set the checkboxes
+ $pr_files = $this->Digital_Product_model->get_associations_by_product($id);
+ foreach($pr_files as $f)
+ {
+ $data['product_files'][] = $f->file_id;
+ }
+
+ // get product & options data
$data['product_options'] = $this->Option_model->get_product_options($id);
$product = $this->Product_model->get_product($id);
-
+
//if the product does not exist, redirect them to the product list with an error
if (!$product)
{
- $this->session->set_flashdata('error', 'The requested product could not be found.');
+ $this->session->set_flashdata('error', lang('error_not_found'));
redirect($this->config->item('admin_folder').'/products');
}
-
+
//helps us with the slug generation
$this->product_name = $this->input->post('slug', $product->slug);
-
- //if we're duplicating the product, then this should not be set
- if(!$duplicate)
- {
- $data['page_title'] = 'Edit Product';
- }
-
//set values to db values
$data['id'] = $id;
$data['sku'] = $product->sku;
@@ -103,13 +206,18 @@ function form($id = false, $duplicate = false)
$data['price'] = $product->price;
$data['saleprice'] = $product->saleprice;
$data['weight'] = $product->weight;
- $data['in_stock'] = $product->in_stock;
+ $data['track_stock'] = $product->track_stock;
+ $data['shippable'] = $product->shippable;
+ $data['quantity'] = $product->quantity;
+ $data['taxable'] = $product->taxable;
+ $data['fixed_quantity'] = $product->fixed_quantity;
+ $data['enabled'] = $product->enabled;
//make sure we haven't submitted the form yet before we pull in the images/related products from the database
if(!$this->input->post('submit'))
{
$data['product_categories'] = $product->categories;
- $data['related_products'] = json_decode($product->related_products);
+ $data['related_products'] = $product->related_products;
$data['images'] = (array)json_decode($product->images);
}
}
@@ -128,17 +236,22 @@ function form($id = false, $duplicate = false)
$this->form_validation->set_rules('caption', 'Caption');
$this->form_validation->set_rules('primary_photo', 'Primary');
- $this->form_validation->set_rules('sku', 'SKU', 'trim');
- $this->form_validation->set_rules('seo_title', 'SEO Title', 'trim');
- $this->form_validation->set_rules('meta', 'Meta Data', 'trim');
- $this->form_validation->set_rules('name', 'Name', 'trim|required|max_length[64]');
- $this->form_validation->set_rules('slug', 'slug', 'trim');
- $this->form_validation->set_rules('description', 'Description', 'trim');
- $this->form_validation->set_rules('excerpt', 'Excerpt', 'trim');
- $this->form_validation->set_rules('price', 'Price', 'trim|numeric');
- $this->form_validation->set_rules('saleprice', 'Sale Price', 'trim|numeric');
- $this->form_validation->set_rules('weight', 'Weight', 'trim|numeric');
- $this->form_validation->set_rules('in_stock', 'In Stock', 'trim|numeric');
+ $this->form_validation->set_rules('sku', 'lang:sku', 'trim');
+ $this->form_validation->set_rules('seo_title', 'lang:seo_title', 'trim');
+ $this->form_validation->set_rules('meta', 'lang:meta_data', 'trim');
+ $this->form_validation->set_rules('name', 'lang:name', 'trim|required|max_length[64]');
+ $this->form_validation->set_rules('slug', 'lang:slug', 'trim');
+ $this->form_validation->set_rules('description', 'lang:description', 'trim');
+ $this->form_validation->set_rules('excerpt', 'lang:excerpt', 'trim');
+ $this->form_validation->set_rules('price', 'lang:price', 'trim|numeric|floatval');
+ $this->form_validation->set_rules('saleprice', 'lang:saleprice', 'trim|numeric|floatval');
+ $this->form_validation->set_rules('weight', 'lang:weight', 'trim|numeric|floatval');
+ $this->form_validation->set_rules('track_stock', 'lang:track_stock', 'trim|numeric');
+ $this->form_validation->set_rules('quantity', 'lang:quantity', 'trim|numeric');
+ $this->form_validation->set_rules('shippable', 'lang:shippable', 'trim|numeric');
+ $this->form_validation->set_rules('taxable', 'lang:taxable', 'trim|numeric');
+ $this->form_validation->set_rules('fixed_quantity', 'lang:fixed_quantity', 'trim|numeric');
+ $this->form_validation->set_rules('enabled', 'lang:enabled', 'trim|numeric');
/*
if we've posted already, get the photo stuff and organize it
@@ -159,6 +272,8 @@ function form($id = false, $duplicate = false)
$data['related_products'] = $this->input->post('related_products');
$data['product_categories'] = $this->input->post('categories');
$data['images'] = $this->input->post('images');
+ $data['product_files'] = $this->input->post('downloads');
+
}
if ($this->form_validation->run() == FALSE)
@@ -167,6 +282,8 @@ function form($id = false, $duplicate = false)
}
else
{
+ $this->load->helper('text');
+
//first check the slug field
$slug = $this->input->post('slug');
@@ -176,7 +293,7 @@ function form($id = false, $duplicate = false)
$slug = $this->input->post('name');
}
- $slug = url_title($slug, 'dash', TRUE);
+ $slug = url_title(convert_accented_characters($slug), 'dash', TRUE);
//validate the slug
$this->load->model('Routes_model');
@@ -204,7 +321,12 @@ function form($id = false, $duplicate = false)
$save['price'] = $this->input->post('price');
$save['saleprice'] = $this->input->post('saleprice');
$save['weight'] = $this->input->post('weight');
- $save['in_stock'] = $this->input->post('in_stock');
+ $save['track_stock'] = $this->input->post('track_stock');
+ $save['fixed_quantity'] = $this->input->post('fixed_quantity');
+ $save['quantity'] = $this->input->post('quantity');
+ $save['shippable'] = $this->input->post('shippable');
+ $save['taxable'] = $this->input->post('taxable');
+ $save['enabled'] = $this->input->post('enabled');
$post_images = $this->input->post('images');
$save['slug'] = $slug;
@@ -240,8 +362,12 @@ function form($id = false, $duplicate = false)
//save categories
$categories = $this->input->post('categories');
+ if(!$categories)
+ {
+ $categories = array();
+ }
-
+ // format options
$options = array();
if($this->input->post('option'))
{
@@ -251,8 +377,22 @@ function form($id = false, $duplicate = false)
}
}
-
+
+ // save product
$product_id = $this->Product_model->save($save, $options, $categories);
+
+ // add file associations
+ // clear existsing
+ $this->Digital_Product_model->disassociate(false, $product_id);
+ // save new
+ $downloads = $this->input->post('downloads');
+ if(is_array($downloads))
+ {
+ foreach($downloads as $d)
+ {
+ $this->Digital_Product_model->associate($d, $product_id);
+ }
+ }
//save the route
$route['id'] = $route_id;
@@ -261,14 +401,7 @@ function form($id = false, $duplicate = false)
$this->Routes_model->save($route);
- if (!$id)
- {
- $this->session->set_flashdata('message', 'The "'.$this->input->post('name').'" product has been added.');
- }
- else
- {
- $this->session->set_flashdata('message', 'Information for the "'.$this->input->post('name').'" product has been updated.');
- }
+ $this->session->set_flashdata('message', lang('message_saved_product'));
//go back to the product list
redirect($this->config->item('admin_folder').'/products');
@@ -288,7 +421,7 @@ function product_image_upload()
$data['error'] = false;
$config['allowed_types'] = 'gif|jpg|png';
- $config['max_size'] = $this->config->item('size_limit');
+ //$config['max_size'] = $this->config->item('size_limit');
$config['upload_path'] = 'uploads/images/full';
$config['encrypt_name'] = true;
$config['remove_spaces'] = true;
@@ -303,13 +436,13 @@ function product_image_upload()
/*
I find that ImageMagick is more efficient that GD2 but not everyone has it
- if your server has ImageMagick then change out the line
+ if your server has ImageMagick then you can change out the line
$config['image_library'] = 'gd2';
with
- $config['library_path'] = '/usr/bin/convert';
+ $config['library_path'] = '/usr/bin/convert'; //make sure you use the correct path to ImageMagic
$config['image_library'] = 'ImageMagick';
*/
@@ -364,7 +497,7 @@ function delete($id = false)
//if the product does not exist, redirect them to the customer list with an error
if (!$product)
{
- $this->session->set_flashdata('message', 'The requested product could not be found.');
+ $this->session->set_flashdata('error', lang('error_not_found'));
redirect($this->config->item('admin_folder').'/products');
}
else
@@ -375,17 +508,17 @@ function delete($id = false)
$this->Routes_model->remove('('.$product->slug.')');
//if the product is legit, delete them
- $delete = $this->Product_model->delete_product($id);
+ $this->Product_model->delete_product($id);
- $this->session->set_flashdata('message', 'The "'.$product->name.'" product has been deleted from the system.');
+ $this->session->set_flashdata('message', lang('message_deleted_product'));
redirect($this->config->item('admin_folder').'/products');
}
}
else
{
//if they do not provide an id send them to the product list page with an error
- $this->session->set_flashdata('message', 'The requested product could not be found.');
+ $this->session->set_flashdata('error', lang('error_not_found'));
redirect($this->config->item('admin_folder').'/products');
}
}
-}
\ No newline at end of file
+}
diff --git a/gocart/controllers/admin/reports.php b/gocart/controllers/admin/reports.php
index 8d002691..224f48b5 100644
--- a/gocart/controllers/admin/reports.php
+++ b/gocart/controllers/admin/reports.php
@@ -1,6 +1,6 @@
load->library('Auth');
+
$this->auth->check_access('Admin', true);
- //this adds the redirect url to our flash data, incase they are not logged in
- $this->auth->is_logged_in(uri_string());
$this->load->model('Order_model');
$this->load->model('Search_model');
- $this->load->helper(array('formatting', 'utility'));
+ $this->load->helper(array('formatting'));
+
+ $this->lang->load('report');
}
function index()
{
-
- $orders = $this->Order_model->get_orders();
- foreach($orders as &$o)
- {
- $data['orders'][] = $this->Order_model->get_items($o->id);
- }
- $data['page_title'] = 'Reports';
+ $data['page_title'] = lang('reports');
+ $data['years'] = $this->Order_model->get_sales_years();
$this->load->view($this->config->item('admin_folder').'/reports', $data);
}
@@ -42,82 +37,8 @@ function best_sellers()
function sales()
{
- $bulk_orders = $this->Order_model->get_orders();
-
- $orders = array();
-
- foreach($bulk_orders as $o)
- {
- // omit orders with a blank date
- if($o->ordered_on=='0000-00-00 00:00:00')
- {
- continue;
- }
-
-
- $date = explode('-', $o->ordered_on);
- $y = $date[0];
- $m = $date[1];
- if(!isset($orders[$y]))
- {
- $orders[$y] = array();
- }
-
- if(!isset($orders[$y][$m]))
- {
- $orders[$y][$m] = array();
- }
-
- //coupon discounts
- if(!isset($orders[$y][$m]['coupon_discounts']))
- {
- $orders[$y][$m]['coupon_discounts'] = 0;
- }
- $orders[$y][$m]['coupon_discounts'] += $o->coupon_discount;
-
- //gift card discounts
- if(!isset($orders[$y][$m]['gift_card_discounts']))
- {
- $orders[$y][$m]['gift_card_discounts'] = 0;
- }
- $orders[$y][$m]['gift_card_discounts'] += $o->gift_card_discount;
-
- //total of product sales
- if(!isset($orders[$y][$m]['product_totals']))
- {
- $orders[$y][$m]['product_totals'] = 0;
- }
- $orders[$y][$m]['product_totals'] += $o->subtotal;
-
- //total of Shipping
- if(!isset($orders[$y][$m]['shipping']))
- {
- $orders[$y][$m]['shipping'] = 0;
- }
- $orders[$y][$m]['shipping'] += $o->shipping;
-
- //total taxes
- if(!isset($orders[$y][$m]['tax']))
- {
- $orders[$y][$m]['tax'] = 0;
- }
- $orders[$y][$m]['tax'] += $o->tax;
-
- //Grand Total less discounts
- if(!isset($orders[$y][$m]['total']))
- {
- $orders[$y][$m]['total'] = 0;
- }
- $orders[$y][$m]['total'] += $o->total;
- }
-
- krsort($orders);
- foreach($orders as &$order)
- {
- krsort($order);
- }
-
- $data['orders'] = $orders;
+ $year = $this->input->post('year');
+ $data['orders'] = $this->Order_model->get_gross_monthly_sales($year);
$this->load->view($this->config->item('admin_folder').'/reports/sales', $data);
}
diff --git a/gocart/controllers/admin/settings.php b/gocart/controllers/admin/settings.php
index 9a2d0e91..220c2d2e 100644
--- a/gocart/controllers/admin/settings.php
+++ b/gocart/controllers/admin/settings.php
@@ -1,18 +1,16 @@
load->library('Auth');
+
$this->auth->check_access('Admin', true);
$this->load->model('Settings_model');
$this->load->model('Messages_model');
-
- //this adds the redirect url to our flash data, incase they are not logged in
- $this->auth->is_logged_in(uri_string());
+ $this->lang->load('settings');
}
function index()
@@ -25,7 +23,7 @@ function index()
$data['payment_modules'] = array();
//create a list of available payment modules
- if ($handle = opendir(APPPATH.'/libraries/payment/')) {
+ if ($handle = opendir(APPPATH.'packages/payment/')) {
while (false !== ($file = readdir($handle)))
{
//now we eliminate the periods from the list.
@@ -50,7 +48,7 @@ function index()
$data['shipping_modules'] = array();
//create a list of available shipping modules
- if ($handle = opendir(APPPATH.'/libraries/shipping/')) {
+ if ($handle = opendir(APPPATH.'packages/shipping/')) {
while (false !== ($file = readdir($handle)))
{
//now we eliminate anything with periods
@@ -72,13 +70,13 @@ function index()
$data['canned_messages'] = $this->Messages_model->get_list();
- $data['page_title'] = 'Settings';
+ $data['page_title'] = lang('settings');
$this->load->view($this->config->item('admin_folder').'/settings', $data);
}
function canned_message_form($id=false)
{
- $data['page_title'] = 'Add Canned Message';
+ $data['page_title'] = lang('canned_message_form');
$data['id'] = $id;
$data['name'] = '';
@@ -88,7 +86,6 @@ function canned_message_form($id=false)
if($id)
{
- $data['page_title'] = 'Edit Canned Message';
$message = $this->Messages_model->get_message($id);
$data['name'] = $message['name'];
@@ -100,9 +97,9 @@ function canned_message_form($id=false)
$this->load->helper('form');
$this->load->library('form_validation');
- $this->form_validation->set_rules('name', 'Message name', 'trim|required|max_length[50]');
- $this->form_validation->set_rules('subject', 'Subject', 'trim|required|max_length[100]');
- $this->form_validation->set_rules('content', 'Message Content', 'trim|required');
+ $this->form_validation->set_rules('name', 'lang:message_name', 'trim|required|max_length[50]');
+ $this->form_validation->set_rules('subject', 'lang:subject', 'trim|required|max_length[100]');
+ $this->form_validation->set_rules('content', 'lang:message_content', 'trim|required');
if ($this->form_validation->run() == FALSE)
{
@@ -118,9 +115,14 @@ function canned_message_form($id=false)
$save['subject'] = $this->input->post('subject');
$save['content'] = $this->input->post('content');
+ //all created messages are typed to order so admins can send them from the view order page.
+ if($data['deletable'])
+ {
+ $save['type'] = 'order';
+ }
$this->Messages_model->save_message($save);
- $this->session->set_flashdata('message', 'Your message has been saved.');
+ $this->session->set_flashdata('message', lang('message_saved_message'));
redirect($this->config->item('admin_folder').'/settings');
}
}
@@ -128,6 +130,8 @@ function canned_message_form($id=false)
function delete_message($id)
{
$this->Messages_model->delete_message($id);
+
+ $this->session->set_flashdata('message', lang('message_deleted_message'));
redirect($this->config->item('admin_folder').'/settings');
}
}
\ No newline at end of file
diff --git a/gocart/controllers/admin/shipping.php b/gocart/controllers/admin/shipping.php
index 0be2a05c..4c5cc0b9 100644
--- a/gocart/controllers/admin/shipping.php
+++ b/gocart/controllers/admin/shipping.php
@@ -1,17 +1,15 @@
load->library('Auth');
+
$this->auth->check_access('Admin', true);
- //$this->load->helper('Shipping');
$this->load->model('Settings_model');
- //this adds the redirect url to our flash data, incase they are not logged in
- $this->auth->is_logged_in(uri_string());
+ $this->lang->load('settings');
}
function index()
@@ -21,9 +19,11 @@ function index()
function install($module)
{
- $enabled_modules = $this->Settings_model->get_settings('shipping_modules');
+ //setup the third_party package
+ $this->load->add_package_path(APPPATH.'packages/shipping/'.$module.'/');
+ $this->load->library($module);
- $this->load->library('shipping/'.$module.'/'.$module);
+ $enabled_modules = $this->Settings_model->get_settings('shipping_modules');
if(!array_key_exists($module, $enabled_modules))
{
@@ -48,7 +48,10 @@ function uninstall($module)
function settings($module)
{
- $this->load->library('shipping/'.$module.'/'.$module);
+ $this->load->helper('form');
+ $this->load->add_package_path(APPPATH.'packages/shipping/'.$module.'/');
+ $this->load->library($module);
+
//ok, in order for the most flexibility, and in case someone wants to use javascript or something
//the form gets pulled directly from the library.
@@ -57,7 +60,7 @@ function settings($module)
$check = $this->$module->check();
if(!$check)
{
- $this->session->set_flashdata('message', $module.' settings have been updated');
+ $this->session->set_flashdata('message', sprintf(lang('settings_updated'), $module));
redirect($this->config->item('admin_folder').'/shipping');
}
else
@@ -77,7 +80,7 @@ function settings($module)
$data['form'] = $this->$module->form();
}
$data['module'] = $module;
- $data['page_title'] = '"'.$module.'" Shipping Settings';
+ $data['page_title'] = sprintf(lang('shipping_settings'), $module);
$this->load->view($this->config->item('admin_folder').'/shipping_module_settings', $data);
}
}
diff --git a/gocart/controllers/cart.php b/gocart/controllers/cart.php
old mode 100755
new mode 100644
index 2a5ab5ec..1a8ded3a
--- a/gocart/controllers/cart.php
+++ b/gocart/controllers/cart.php
@@ -1,19 +1,6 @@
load->library('Go_cart');
- $this->load->model(array('Page_model', 'Product_model', 'Gift_card_model', 'Option_model', 'Order_model', 'Settings_model'));
- $this->load->helper(array('form_helper', 'formatting_helper'));
-
- //fill in our variables
- $this->categories = $this->Category_model->get_categories_tierd(0);
- $this->pages = $this->Page_model->get_pages();
-
- // check if giftcards are enabled
- $gc_setting = $this->Settings_model->get_settings('gift_cards');
- if(!empty($gc_setting['enabled']) && $gc_setting['enabled']==1)
- {
- $this->gift_cards_enabled = true;
- }
- else
- {
- $this->gift_cards_enabled = false;
- }
-
}
function index()
@@ -56,16 +23,23 @@ function index()
$this->load->view('homepage', $data);
}
- function page($id)
+ function page($id = false)
{
+ //if there is no page id provided redirect to the homepage.
+ $data['page'] = $this->Page_model->get_page($id);
+ if(!$data['page'])
+ {
+ show_404();
+ }
$this->load->model('Page_model');
- $data['page'] = $this->Page_model->get_page($id);
+ $data['base_url'] = $this->uri->segment_array();
+
$data['fb_like'] = true;
$data['page_title'] = $data['page']->title;
$data['meta'] = $data['page']->meta;
- $data['seo_title'] = $data['page']->seo_title;
+ $data['seo_title'] = (!empty($data['page']->seo_title))?$data['page']->seo_title:$data['page']->title;
$data['gift_cards_enabled'] = $this->gift_cards_enabled;
@@ -75,20 +49,53 @@ function page($id)
function search($code=false, $page = 0)
{
$this->load->model('Search_model');
- $data['page_title'] = 'Search';
- $data['gift_cards_enabled'] = $this->gift_cards_enabled;
+
//check to see if we have a search term
if(!$code)
{
//if the term is in post, save it to the db and give me a reference
- $term = $this->input->post('term');
+ $term = $this->input->post('term', true);
$code = $this->Search_model->record_term($term);
+
+ // no code? redirect so we can have the code in place for the sorting.
+ // I know this isn't the best way...
+ redirect('cart/search/'.$code.'/'.$page);
}
else
{
//if we have the md5 string, get the term
$term = $this->Search_model->get_term($code);
}
+
+ if(empty($term))
+ {
+ //if there is still no search term throw an error
+ //if there is still no search term throw an error
+ $this->session->set_flashdata('error', lang('search_error'));
+ redirect('cart');
+ }
+ $data['page_title'] = lang('search');
+ $data['gift_cards_enabled'] = $this->gift_cards_enabled;
+
+ //fix for the category view page.
+ $data['base_url'] = array();
+
+ $sort_array = array(
+ 'name/asc' => array('by' => 'name', 'sort'=>'ASC'),
+ 'name/desc' => array('by' => 'name', 'sort'=>'DESC'),
+ 'price/asc' => array('by' => 'price', 'sort'=>'ASC'),
+ 'price/desc' => array('by' => 'price', 'sort'=>'DESC'),
+ );
+ $sort_by = array('by'=>false, 'sort'=>false);
+
+ if(isset($_GET['by']))
+ {
+ if(isset($sort_array[$_GET['by']]))
+ {
+ $sort_by = $sort_array[$_GET['by']];
+ }
+ }
+
if(empty($term))
{
@@ -98,7 +105,7 @@ function search($code=false, $page = 0)
else
{
- $data['page_title'] = 'Search';
+ $data['page_title'] = lang('search');
$data['gift_cards_enabled'] = $this->gift_cards_enabled;
//set up pagination
@@ -106,8 +113,31 @@ function search($code=false, $page = 0)
$config['base_url'] = base_url().'cart/search/'.$code.'/';
$config['uri_segment'] = 4;
$config['per_page'] = 20;
-
- $result = $this->Product_model->search_products($term, $config['per_page'], $page);
+
+ $config['first_link'] = 'First';
+ $config['first_tag_open'] = '';
+ $config['first_tag_close'] = '';
+ $config['last_link'] = 'Last';
+ $config['last_tag_open'] = '';
+ $config['last_tag_close'] = '';
+
+ $config['full_tag_open'] = '';
+ $config['cur_tag_open'] = '';
+ $config['cur_tag_close'] = '';
+
+ $config['num_tag_open'] = '';
+ $config['num_tag_close'] = '';
+
+ $config['prev_link'] = '«';
+ $config['prev_tag_open'] = '';
+ $config['prev_tag_close'] = '';
+
+ $config['next_link'] = '»';
+ $config['next_tag_open'] = '';
+ $config['next_tag_close'] = '';
+
+ $result = $this->Product_model->search_products($term, $config['per_page'], $page, $sort_by['by'], $sort_by['sort']);
$config['total_rows'] = $result['count'];
$this->pagination->initialize($config);
@@ -121,9 +151,8 @@ function search($code=false, $page = 0)
}
}
- function category($id, $page=0)
+ function category($id)
{
-
//get the category
$data['category'] = $this->Category_model->get_category($id);
@@ -132,24 +161,82 @@ function category($id, $page=0)
show_404();
}
+ //set up pagination
+ $segments = $this->uri->total_segments();
+ $base_url = $this->uri->segment_array();
+
+ if($data['category']->slug == $base_url[count($base_url)])
+ {
+ $page = 0;
+ $segments++;
+ }
+ else
+ {
+ $page = array_splice($base_url, -1, 1);
+ $page = $page[0];
+ }
+
+ $data['base_url'] = $base_url;
+ $base_url = implode('/', $base_url);
+
$data['subcategories'] = $this->Category_model->get_categories($data['category']->id);
$data['product_columns'] = $this->config->item('product_columns');
$data['gift_cards_enabled'] = $this->gift_cards_enabled;
$data['meta'] = $data['category']->meta;
- $data['seo_title'] = $data['category']->seo_title;
-
+ $data['seo_title'] = (!empty($data['category']->seo_title))?$data['category']->seo_title:$data['category']->name;
$data['page_title'] = $data['category']->name;
+
+ $sort_array = array(
+ 'name/asc' => array('by' => 'products.name', 'sort'=>'ASC'),
+ 'name/desc' => array('by' => 'products.name', 'sort'=>'DESC'),
+ 'price/asc' => array('by' => 'products.price', 'sort'=>'ASC'),
+ 'price/desc' => array('by' => 'products.price', 'sort'=>'DESC'),
+ );
+ $sort_by = array('by'=>'sequence', 'sort'=>'ASC');
+
+ if(isset($_GET['by']))
+ {
+ if(isset($sort_array[$_GET['by']]))
+ {
+ $sort_by = $sort_array[$_GET['by']];
+ }
+ }
+
//set up pagination
$this->load->library('pagination');
- $config['base_url'] = base_url().$data['category']->slug.'/';
- $config['uri_segment'] = 2;
- $config['per_page'] = 20;
+ $config['base_url'] = site_url($base_url);
+ $config['uri_segment'] = $segments;
+ $config['per_page'] = 24;
$config['total_rows'] = $this->Product_model->count_products($data['category']->id);
+
+ $config['first_link'] = 'First';
+ $config['first_tag_open'] = '';
+ $config['first_tag_close'] = '';
+ $config['last_link'] = 'Last';
+ $config['last_tag_open'] = '';
+ $config['last_tag_close'] = '';
+
+ $config['full_tag_open'] = '';
+ $config['cur_tag_open'] = '';
+ $config['cur_tag_close'] = '';
+
+ $config['num_tag_open'] = '';
+ $config['num_tag_close'] = '';
+
+ $config['prev_link'] = '«';
+ $config['prev_tag_open'] = '';
+ $config['prev_tag_close'] = '';
+
+ $config['next_link'] = '»';
+ $config['next_tag_open'] = '';
+ $config['next_tag_close'] = '';
+
$this->pagination->initialize($config);
//grab the products using the pagination lib
- $data['products'] = $this->Product_model->get_products($data['category']->id, $config['per_page'], $page);
+ $data['products'] = $this->Product_model->get_products($data['category']->id, $config['per_page'], $page, $sort_by['by'], $sort_by['sort']);
foreach ($data['products'] as &$p)
{
$p->images = (array)json_decode($p->images);
@@ -164,33 +251,29 @@ function product($id)
//get the product
$data['product'] = $this->Product_model->get_product($id);
- if(!$data['product'])
+
+ if(!$data['product'] || $data['product']->enabled==0)
{
show_404();
}
-
+
+ $data['base_url'] = $this->uri->segment_array();
+
+ // load the digital language stuff
+ $this->lang->load('digital_product');
+
$data['options'] = $this->Option_model->get_product_options($data['product']->id);
-
- $related = (array)json_decode($data['product']->related_products);
+
+ $related = $data['product']->related_products;
$data['related'] = array();
- foreach($related as $r)
- {
- $r = $this->Product_model->get_product($r);
- if($r)
- {
- $r->images = (array)json_decode($r->images);
- $r->options = $this->Option_model->get_product_options($r->id);
- $data['related'][] = $r;
- }
-
- }
- $data['posted_options'] = $this->session->flashdata('option_values');
-
+
+ $data['posted_options'] = $this->session->flashdata('option_values');
+
$data['page_title'] = $data['product']->name;
$data['meta'] = $data['product']->meta;
- $data['seo_title'] = $data['product']->seo_title;
+ $data['seo_title'] = (!empty($data['product']->seo_title))?$data['product']->seo_title:$data['product']->name;
if($data['product']->images == 'false')
{
@@ -213,11 +296,37 @@ function add_to_cart()
$product_id = $this->input->post('id');
$quantity = $this->input->post('quantity');
$post_options = $this->input->post('option');
- $cartkey = $this->input->post('cartkey');
// Get a cart-ready product array
$product = $this->Product_model->get_cart_ready_product($product_id, $quantity);
+ //if out of stock purchase is disabled, check to make sure there is inventory to support the cart.
+ if(!$this->config->item('allow_os_purchase') && (bool)$product['track_stock'])
+ {
+ $stock = $this->Product_model->get_product($product_id);
+
+ //loop through the products in the cart and make sure we don't have this in there already. If we do get those quantities as well
+ $items = $this->go_cart->contents();
+ $qty_count = $quantity;
+ foreach($items as $item)
+ {
+ if(intval($item['id']) == intval($product_id))
+ {
+ $qty_count = $qty_count + $item['quantity'];
+ }
+ }
+
+ if($stock->quantity < $qty_count)
+ {
+ //we don't have this much in stock
+ $this->session->set_flashdata('error', sprintf(lang('not_enough_stock'), $stock->name, $stock->quantity));
+ $this->session->set_flashdata('quantity', $quantity);
+ $this->session->set_flashdata('option_values', $post_options);
+
+ redirect($this->Product_model->get_slug($product_id));
+ }
+ }
+
// Validate Options
// this returns a status array, with product item array automatically modified and options added
// Warning: this method receives the product by reference
@@ -226,11 +335,9 @@ function add_to_cart()
// don't add the product if we are missing required option values
if( ! $status['validated'])
{
- //if the cartkey does not exist, this will simply be blank
- $this->session->set_flashdata('cartkey', $cartkey);
$this->session->set_flashdata('quantity', $quantity);
$this->session->set_flashdata('error', $status['message']);
- $this->session->set_flashdata('option_values', $post_options);
+ $this->session->set_flashdata('option_values', $post_options);
redirect($this->Product_model->get_slug($product_id));
@@ -238,8 +345,10 @@ function add_to_cart()
//Add the original option vars to the array so we can edit it later
$product['post_options'] = $post_options;
- $product['cartkey'] = $cartkey;
-
+
+ //is giftcard
+ $product['is_gc'] = false;
+
// Add the product item to the cart, also updates coupon discounts automatically
$this->go_cart->insert($product);
@@ -257,17 +366,107 @@ function view_cart()
$this->load->view('view_cart', $data);
}
+ function remove_item($key)
+ {
+ //drop quantity to 0
+ $this->go_cart->update_cart(array($key=>0));
+
+ redirect('cart/view_cart');
+ }
+
function update_cart($redirect = false)
{
+ //if redirect isn't provided in the URL check for it in a form field
+ if(!$redirect)
+ {
+ $redirect = $this->input->post('redirect');
+ }
+
// see if we have an update for the cart
$item_keys = $this->input->post('cartkey');
$coupon_code = $this->input->post('coupon_code');
$gc_code = $this->input->post('gc_code');
+
+ //get the items in the cart and test their quantities
+ $items = $this->go_cart->contents();
+ $new_key_list = array();
+ //first find out if we're deleting any products
+ foreach($item_keys as $key=>$quantity)
+ {
+ if(intval($quantity) === 0)
+ {
+ //this item is being removed we can remove it before processing quantities.
+ //this will ensure that any items out of order will not throw errors based on the incorrect values of another item in the cart
+ $this->go_cart->update_cart(array($key=>$quantity));
+ }
+ else
+ {
+ //create a new list of relevant items
+ $new_key_list[$key] = $quantity;
+ }
+ }
+ $response = array();
+ foreach($new_key_list as $key=>$quantity)
+ {
+ $product = $this->go_cart->item($key);
+ //if out of stock purchase is disabled, check to make sure there is inventory to support the cart.
+ if(!$this->config->item('allow_os_purchase') && (bool)$product['track_stock'])
+ {
+ $stock = $this->Product_model->get_product($product['id']);
+
+ //loop through the new quantities and tabluate any products with the same product id
+ $qty_count = $quantity;
+ foreach($new_key_list as $item_key=>$item_quantity)
+ {
+ if($key != $item_key)
+ {
+ $item = $this->go_cart->item($item_key);
+ //look for other instances of the same product (this can occur if they have different options) and tabulate the total quantity
+ if($item['id'] == $stock->id)
+ {
+ $qty_count = $qty_count + $item_quantity;
+ }
+ }
+ }
+ if($stock->quantity < $qty_count)
+ {
+ if(isset($response['error']))
+ {
+ $response['error'] .= ''.sprintf(lang('not_enough_stock'), $stock->name, $stock->quantity).'
';
+ }
+ else
+ {
+ $response['error'] = ''.sprintf(lang('not_enough_stock'), $stock->name, $stock->quantity).'
';
+ }
+ }
+ else
+ {
+ //this one works, we can update it!
+ //don't update the coupons yet
+ $this->go_cart->update_cart(array($key=>$quantity));
+ }
+ }
+ else
+ {
+ $this->go_cart->update_cart(array($key=>$quantity));
+ }
+ }
+
+ //if we don't have a quantity error, run the update
+ if(!isset($response['error']))
+ {
+ //update the coupons and gift card code
+ $response = $this->go_cart->update_cart(false, $coupon_code, $gc_code);
+ // set any messages that need to be displayed
+ }
+ else
+ {
+ $response['error'] = ''.lang('error_updating_cart').'
'.$response['error'];
+ }
- $response = $this->go_cart->update_cart($item_keys, $coupon_code, $gc_code);
- // set any messages that need to be displayed
+ //check for errors again, there could have been a new error from the update cart function
if(isset($response['error']))
{
$this->session->set_flashdata('error', $response['error']);
@@ -295,7 +494,6 @@ function update_cart($redirect = false)
function giftcard()
{
-
if(!$this->gift_cards_enabled) redirect('/');
// Load giftcard settings
@@ -308,20 +506,20 @@ function giftcard()
if($data['allow_custom_amount'])
{
- $this->form_validation->set_rules('custom_amount', 'Custom Amount', 'numeric');
+ $this->form_validation->set_rules('custom_amount', 'lang:custom_amount', 'numeric');
}
- $this->form_validation->set_rules('amount', 'Amount', 'required');
- $this->form_validation->set_rules('preset_amount', 'Preset Amount', 'numeric');
- $this->form_validation->set_rules('gc_to_name', 'Recipient Name', 'trim|required');
- $this->form_validation->set_rules('gc_to_email', 'Recipient Email', 'trim|required|valid_email');
- $this->form_validation->set_rules('gc_from', 'Sender Name', 'trim|required');
- $this->form_validation->set_rules('message', 'Custom Greeting Message', 'trim|required');
+ $this->form_validation->set_rules('amount', 'lang:amount', 'required');
+ $this->form_validation->set_rules('preset_amount', 'lang:preset_amount', 'numeric');
+ $this->form_validation->set_rules('gc_to_name', 'lang:recipient_name', 'trim|required');
+ $this->form_validation->set_rules('gc_to_email', 'lang:recipient_email', 'trim|required|valid_email');
+ $this->form_validation->set_rules('gc_from', 'lang:sender_email', 'trim|required');
+ $this->form_validation->set_rules('message', 'lang:custom_greeting', 'trim|required');
if ($this->form_validation->run() == FALSE)
{
$data['error'] = validation_errors();
- $data['page_title'] = "Gift Card";
+ $data['page_title'] = lang('giftcard');
$data['gift_cards_enabled'] = $this->gift_cards_enabled;
$this->load->view('giftcards', $data);
}
@@ -332,17 +530,19 @@ function giftcard()
$card['price'] = set_value(set_value('amount'));
- $card['id'] = -1; // just a placeholder
- $card['sku'] = 'GiftCard';
- $card['base_price'] = $card['price']; // price gets modified by options, show the baseline still...
- $card['name'] = 'Gift Card';
- $card['code'] = $this->Gift_card_model->generate_password();
- $card['excerpt'] = 'Gift Card for a Friend
To: '.set_value('gc_to_name');
- $card['weight'] = 0;
- $card['no_quantity'] = true; // prevent quantity change.. since it wouldn't make sense
- $card['quantity'] = 1;
- $card['shippable'] = false;
- $card['is_gc'] = true; // !Important
+ $card['id'] = -1; // just a placeholder
+ $card['sku'] = lang('giftcard');
+ $card['base_price'] = $card['price']; // price gets modified by options, show the baseline still...
+ $card['name'] = lang('giftcard');
+ $card['code'] = generate_code(); // from the string helper
+ $card['excerpt'] = sprintf(lang('giftcard_excerpt'), set_value('gc_to_name'));
+ $card['weight'] = 0;
+ $card['quantity'] = 1;
+ $card['shippable'] = false;
+ $card['taxable'] = 0;
+ $card['fixed_quantity'] = true;
+ $card['is_gc'] = true; // !Important
+ $card['track_stock'] = false; // !Imporortant
$card['gc_info'] = array("to_name" => set_value('gc_to_name'),
"to_email" => set_value('gc_to_email'),
diff --git a/gocart/controllers/checkout.php b/gocart/controllers/checkout.php
old mode 100755
new mode 100644
index 083af90d..18f07040
--- a/gocart/controllers/checkout.php
+++ b/gocart/controllers/checkout.php
@@ -1,412 +1,510 @@
load->helper(array('formatting_helper', 'form_helper'));
- $this->load->model(array('Page_model', 'Settings_model', 'Location_model'));
- $this->load->library('Go_cart');
-
- //make sure the cart isn't empty
+
+ /*make sure the cart isnt empty*/
if($this->go_cart->total_items()==0)
{
redirect('cart/view_cart');
}
-
- //fill in our variables
- $this->categories = $this->Category_model->get_categories_tierd(0);
- $this->pages = $this->Page_model->get_pages();
- $this->header_text = $this->Page_model->get_page(142);
- $gc_setting = $this->Settings_model->get_settings('gift_cards');
-
- if($gc_setting['enabled']==1)
- {
- $this->gift_cards_enabled = true;
- }
-
- if ($this->config->item('require_login'))
+
+ /*is the user required to be logged in?*/
+ if (config_item('require_login'))
{
$this->Customer_model->is_logged_in('checkout');
}
- }
- function index()
- {
-
- //everytime they try to checkout, see if they have something in their cart
- //this will redirect them to the empty cart page if they have already confirmed their order, and had their cart wiped from the session
- if ($this->go_cart->total_items()==0){
- redirect('cart/view_cart');
+ if(!config_item('allow_os_purchase') && config_item('inventory_enabled'))
+ {
+ /*double check the inventory of each item before proceeding to checkout*/
+ $inventory_check = $this->go_cart->check_inventory();
+
+ if($inventory_check)
+ {
+ /*
+ OOPS we have an error. someone else has gotten the scoop on our customer and bought products out from under them!
+ we need to redirect them to the view cart page and let them know that the inventory is no longer there.
+ */
+ $this->session->set_flashdata('error', $inventory_check);
+ redirect('cart/view_cart');
+ }
}
- //this hides the left column
- $data['hide_menu'] = true;
-
- $this->load->model('Customer_model');
-
- $data['gift_cards_enabled'] = $this->gift_cards_enabled;
- $data['page_title'] = 'Check Out';
-
-
- $data['customer'] = $this->go_cart->customer();
-
-
- // load other page content
- //$this->load->model('banner_model');
- $this->load->helper('directory');
+ /* Set no caching
- //if they want to limit to the top 5 banners and use the enable/disable on dates, add true to the get_banners function
- //$data['banners'] = $this->banner_model->get_banners();
- //$data['ads'] = $this->banner_model->get_banners(true);
- $data['categories'] = $this->Category_model->get_categories_tierd(0);
-
- $this->load->view('checkout/checkout', $data);
- }
+ header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+ header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+ header("Cache-Control: no-store, no-cache, must-revalidate");
+ header("Cache-Control: post-check=0, pre-check=0", false);
+ header("Pragma: no-cache");
- function login()
- {
- $this->Customer_model->is_logged_in('checkout');
+ */
+ $this->load->library('form_validation');
}
-
- function register()
+
+ function index()
{
- $this->Customer_model->is_logged_in('checkout', 'secure/register');
+ /*show address first*/
+ $this->step_1();
}
-
- function shipping_payment_methods()
+
+ function step_1()
{
-
- //load the shipping modules
- $shipping_methods = array();
- foreach ($this->Settings_model->get_settings('shipping_modules') as $shipping_method=>$order)
+ $data['customer'] = $this->go_cart->customer();
+
+ if(isset($data['customer']['id']))
{
- //eventually, we will sort by order, but I'm not concerned with that at the moment
- $this->load->library('shipping/'.$shipping_method.'/'.$shipping_method);
-
- $shipping_methods = array_merge($shipping_methods, $this->$shipping_method->rates());
+ $data['customer_addresses'] = $this->Customer_model->get_address_list($data['customer']['id']);
}
-
-
- // Free shipping coupon applied ?
- if($this->go_cart->is_free_shipping())
+
+ /*require a billing address*/
+ $this->form_validation->set_rules('address_id', 'Billing Address ID', 'numeric');
+ $this->form_validation->set_rules('firstname', 'First Name', 'trim|required|max_length[32]');
+ $this->form_validation->set_rules('lastname', 'Last Name', 'trim|required|max_length[32]');
+ $this->form_validation->set_rules('email', 'Email', 'trim|required|valid_email|max_length[128]');
+ $this->form_validation->set_rules('phone', 'Phone', 'trim|required|max_length[32]');
+ $this->form_validation->set_rules('company', 'Company', 'trim|max_length[128]');
+ $this->form_validation->set_rules('address1', 'Address 1', 'trim|required|max_length[128]');
+ $this->form_validation->set_rules('address2', 'Address 2', 'trim|max_length[128]');
+ $this->form_validation->set_rules('city', 'City', 'trim|required|max_length[128]');
+ $this->form_validation->set_rules('country_id', 'Country', 'trim|required|numeric');
+ $this->form_validation->set_rules('zone_id', 'State', 'trim|required|numeric');
+
+ /*if there is post data, get the country info and see if the zip code is required*/
+ if($this->input->post('country_id'))
{
- // add free shipping as an option, but leave other options in case they want to upgrade
- $shipping_methods["Free Shipping (basic)"] = "0.00";
+ $country = $this->Location_model->get_country($this->input->post('country_id'));
+ if((bool)$country->postcode_required)
+ {
+ $this->form_validation->set_rules('zip', 'Zip', 'trim|required|max_length[10]');
+ }
}
-
- // format the values for currency display
- foreach($shipping_methods as &$method)
+ else
{
- // convert numeric values into an array containing numeric & formatted values
- $method = array('num'=>$method,'str'=>format_currency($method));
+ $this->form_validation->set_rules('zip', 'Zip', 'trim|max_length[10]');
}
-
- $ship['shipping_methods'] = $shipping_methods;
-
-
-
- //load the payment modules
- $pay['payment_methods'] = array();
-
- foreach ($this->Settings_model->get_settings('payment_modules') as $payment_method=>$order)
+
+ if ($this->form_validation->run() == false)
{
- $this->load->library('payment/'.$payment_method.'/'.$payment_method);
-
- $payment_form = $this->$payment_method->checkout_form();
- if(!empty($payment_form))
+ $data['address_form_prefix'] = 'bill';
+ $this->view('checkout/address_form', $data);
+ }
+ else
+ {
+ /*load any customer data to get their ID (if logged in)*/
+ $customer = $this->go_cart->customer();
+
+ $customer['bill_address']['company'] = $this->input->post('company');
+ $customer['bill_address']['firstname'] = $this->input->post('firstname');
+ $customer['bill_address']['lastname'] = $this->input->post('lastname');
+ $customer['bill_address']['email'] = $this->input->post('email');
+ $customer['bill_address']['phone'] = $this->input->post('phone');
+ $customer['bill_address']['address1'] = $this->input->post('address1');
+ $customer['bill_address']['address2'] = $this->input->post('address2');
+ $customer['bill_address']['city'] = $this->input->post('city');
+ $customer['bill_address']['zip'] = $this->input->post('zip');
+
+ /* get zone / country data using the zone id submitted as state*/
+ $country = $this->Location_model->get_country(set_value('country_id'));
+ $zone = $this->Location_model->get_zone(set_value('zone_id'));
+
+ $customer['bill_address']['zone'] = $zone->code; /* save the state for output formatted addresses */
+ $customer['bill_address']['country'] = $country->name; /* some shipping libraries require country name */
+ $customer['bill_address']['country_code'] = $country->iso_code_2; /* some shipping libraries require the code */
+ $customer['bill_address']['zone_id'] = $this->input->post('zone_id'); /* use the zone id to populate address state field value */
+ $customer['bill_address']['country_id'] = $this->input->post('country_id');
+
+ /* for guest customers, load the billing address data as their base info as well */
+ if(empty($customer['id']))
{
- $pay['payment_methods'][$payment_method] = array_merge($pay['payment_methods'], $payment_form);
+ $customer['company'] = $customer['bill_address']['company'];
+ $customer['firstname'] = $customer['bill_address']['firstname'];
+ $customer['lastname'] = $customer['bill_address']['lastname'];
+ $customer['phone'] = $customer['bill_address']['phone'];
+ $customer['email'] = $customer['bill_address']['email'];
+ }
+
+ if(!isset($customer['group_id']))
+ {
+ $customer['group_id'] = 1; /* default group */
}
+
+ /*if there is no address set then return blank*/
+ if(empty($customer['ship_address']))
+ {
+ $customer['ship_address'] = $customer['bill_address'];
+ }
+
+ /* save customer details*/
+ $this->go_cart->save_customer($customer);
+
+ /*send to the next form*/
+ redirect('checkout/step_2');
}
-
- //Load additional details
- $details = $this->go_cart->additional_details();
- //deadline content
- $this->load->model('Page_model');
- $details['deadline_content'] = $this->Page_model->get_page(144);
-
- $this->load->view('checkout/additional_details_form', $details);
- $this->load->view('checkout/shipping_form', $ship);
- $this->load->view('checkout/payment_form', $pay);
- }
-
- function save_additional_details()
- {
- //run everything through the XSS filter
- $this->go_cart->set_additional_details($this->input->post(null, true));
-
-
- print_r($this->input->post(null, true));
-
- //$this->session->set_flashdata('message', 'Your additional Details have been saved!');
-
- //redirect('checkout');
}
-
- function customer_details()
- {
- $this->load->view('checkout/customer_details_static', array('customer'=>$this->go_cart->customer()));
- }
-
- function customer_form()
+
+ function shipping_address()
{
- //clear shipping if showing the customer form
- $this->go_cart->clear_shipping();
-
$data['customer'] = $this->go_cart->customer();
+
if(isset($data['customer']['id']))
{
$data['customer_addresses'] = $this->Customer_model->get_address_list($data['customer']['id']);
}
-
- if(@$data['customer']['ship_address'] == @$data['customer']['bill_address'])
+
+ /*require a shipping address*/
+ $this->form_validation->set_rules('address_id', 'Billing Address ID', 'numeric');
+ $this->form_validation->set_rules('firstname', 'lang:address_firstname', 'trim|required|max_length[32]');
+ $this->form_validation->set_rules('lastname', 'lang:address_lastname', 'trim|required|max_length[32]');
+ $this->form_validation->set_rules('email', 'lang:address_email', 'trim|required|valid_email|max_length[128]');
+ $this->form_validation->set_rules('phone', 'lang:address_phone', 'trim|required|max_length[32]');
+ $this->form_validation->set_rules('company', 'lang:address_company', 'trim|max_length[128]');
+ $this->form_validation->set_rules('address1', 'lang:address1', 'trim|required|max_length[128]');
+ $this->form_validation->set_rules('address2', 'lang:address2', 'trim|max_length[128]');
+ $this->form_validation->set_rules('city', 'lang:address_city', 'trim|required|max_length[128]');
+ $this->form_validation->set_rules('country_id', 'lang:address_country', 'trim|required|numeric');
+ $this->form_validation->set_rules('zone_id', 'lang:address_state', 'trim|required|numeric');
+
+ /* if there is post data, get the country info and see if the zip code is required */
+ if($this->input->post('country_id'))
{
- $data['customer']['ship_to_bill_address'] = true;
+ $country = $this->Location_model->get_country($this->input->post('country_id'));
+ if((bool)$country->postcode_required)
+ {
+ $this->form_validation->set_rules('zip', 'lang:address_postcode', 'trim|required|max_length[10]');
+ }
}
else
{
- $data['customer']['ship_to_bill_address'] = false;
+ $this->form_validation->set_rules('zip', 'lang:address_postcode', 'trim|max_length[10]');
}
- $this->load->view('checkout/customer_details', $data);
- }
-
- // Validate & Save guest (non-logged in) customer address information
- function save_customer()
- {
- $this->load->library('form_validation');
- // only necessary if we need a separate shipping address
- if($this->input->post('ship_to_bill_address')!='yes')
- {
- $this->form_validation->set_rules('bill_address_id', 'Billing Address ID', 'numeric');
- $this->form_validation->set_rules('bill_firstname', 'Billing First Name', 'trim|required|max_length[32]');
- $this->form_validation->set_rules('bill_lastname', 'Billing Last Name', 'trim|required|max_length[32]');
- $this->form_validation->set_rules('bill_email', 'Billing Email', 'trim|required|valid_email|max_length[128]');
- $this->form_validation->set_rules('bill_phone', 'Billing Phone', 'trim|required|max_length[32]');
- $this->form_validation->set_rules('bill_company', 'Billing Company', 'trim|max_length[128]');
- $this->form_validation->set_rules('bill_address1', 'Billing Address 1', 'trim|required|max_length[128]');
- $this->form_validation->set_rules('bill_address2', 'Billing Address 2', 'trim|max_length[128]');
- $this->form_validation->set_rules('bill_city', 'Billing City', 'trim|required|max_length[128]');
- $this->form_validation->set_rules('bill_country_id', 'Billing Country', 'trim|required|numeric');
- $this->form_validation->set_rules('bill_zone_id', 'Billing State', 'trim|required|numeric');
- $this->form_validation->set_rules('bill_zip', 'Billing Zip', 'trim|required|max_length[10]');
+
+ if ($this->form_validation->run() == false)
+ {
+ /* show the address form but change it to be for shipping */
+ $data['address_form_prefix'] = 'ship';
+ $this->view('checkout/address_form', $data);
}
-
- $this->form_validation->set_rules('ship_address_id', 'Shipping Address ID', 'numeric');
- $this->form_validation->set_rules('ship_firstname', 'Shipping First Name', 'trim|required|max_length[32]');
- $this->form_validation->set_rules('ship_lastname', 'Shipping Last Name', 'trim|required|max_length[32]');
- $this->form_validation->set_rules('ship_email', 'Shipping Email', 'trim|required|valid_email|max_length[128]');
- $this->form_validation->set_rules('ship_phone', 'Shipping Phone', 'trim|required|max_length[32]');
- $this->form_validation->set_rules('ship_company', 'Shipping Company', 'trim|max_length[128]');
- $this->form_validation->set_rules('ship_address1', 'Shipping Address 1', 'trim|required|max_length[128]');
- $this->form_validation->set_rules('ship_address2', 'Shipping Address 2', 'trim|max_length[128]');
- $this->form_validation->set_rules('ship_city', 'Shipping City', 'trim|required|max_length[128]');
- $this->form_validation->set_rules('ship_country_id', 'Shipping Country', 'trim|required|numeric');
- $this->form_validation->set_rules('ship_zone_id', 'Shipping State', 'trim|required|numeric');
- $this->form_validation->set_rules('ship_zip', 'Shipping Zip', 'trim|required|max_length[10]');
-
-
-
- if ($this->form_validation->run())
+ else
{
- //load any customer data to get their ID (if logged in)
+ /* load any customer data to get their ID (if logged in) */
$customer = $this->go_cart->customer();
-
- $customer['ship_to_bill_address'] = 'false';
- $customer['ship_address']['firstname'] = $this->input->post('ship_firstname');
- $customer['ship_address']['lastname'] = $this->input->post('ship_lastname');
- $customer['ship_address']['email'] = $this->input->post('ship_email');
- $customer['ship_address']['phone'] = $this->input->post('ship_phone');
- $customer['ship_address']['company'] = $this->input->post('ship_company');
- $customer['ship_address']['address1'] = $this->input->post('ship_address1');
- $customer['ship_address']['address2'] = $this->input->post('ship_address2');
- $customer['ship_address']['city'] = $this->input->post('ship_city');
- $customer['ship_address']['zip'] = $this->input->post('ship_zip');
-
-
- // get zone / country data using the zone id submitted as state
- $ship_country = $this->Location_model->get_country($this->input->post('ship_country_id'));
- $ship_zone = $this->Location_model->get_zone($this->input->post('ship_zone_id'));
-
- $customer['ship_address']['zone'] = $ship_zone->code; // save the state for output formatted addresses
- $customer['ship_address']['country'] = $ship_country->name; // some shipping libraries require country name
- $customer['ship_address']['country_code'] = $ship_country->iso_code_2; // some shipping libraries require the code
- $customer['ship_address']['zone_id'] = $this->input->post('ship_zone_id'); // use the id's to populate address forms
- $customer['ship_address']['country_id'] = $this->input->post('ship_country_id');
-
- // Remember the chosen address ID for logged in customers, use as default in the future
- if(empty($customer['default_shipping_address']) && set_value('ship_address_id')!='')
- {
- $customer['default_shipping_address'] = set_value('ship_address_id');
- }
-
- if($this->input->post('ship_to_bill_address')=='yes')
- {
- $customer['ship_to_bill_address'] = 'true';
- $customer['bill_address'] = $customer['ship_address'];
-
- $customer['default_billing_address'] = @$customer['default_shipping_address'];
- }
- else
- {
-
- $customer['bill_address']['firstname'] = set_value('bill_firstname');
- $customer['bill_address']['lastname'] = set_value('bill_lastname');
- $customer['bill_address']['email'] = set_value('bill_email');
- $customer['bill_address']['phone'] = set_value('bill_phone');
- $customer['bill_address']['company'] = set_value('bill_company');
- $customer['bill_address']['address1'] = set_value('bill_address1');
- $customer['bill_address']['address2'] = set_value('bill_address2');
- $customer['bill_address']['city'] = set_value('bill_city');
- $customer['bill_address']['zip'] = set_value('bill_zip');
-
-
- // get zone / country data using the zone id submitted as state
- $bill_country = $this->Location_model->get_country(set_value('bill_country_id'));
- $bill_zone = $this->Location_model->get_zone(set_value('bill_zone_id'));
-
- $customer['bill_address']['zone'] = $bill_zone->code; // save the state for output formatted addresses
- $customer['bill_address']['country'] = $bill_country->name; // some shipping libraries require country name
- $customer['bill_address']['country_code'] = $bill_country->iso_code_2; // some shipping libraries require the code
- $customer['bill_address']['zone_id'] = set_value('bill_zone_id'); // use the zone id to populate address state field value
- $customer['bill_address']['country_id'] = set_value('bill_country_id');
-
- // Remember chosen ID
- if(empty($customer['default_billing_address']) && set_value('bill_address_id')!='')
- {
- $customer['default_billing_address'] = set_value('bill_address_id');
- }
-
- }
-
- // for guest customers, load the billing address data as their base info as well
+
+ $customer['ship_address']['company'] = $this->input->post('company');
+ $customer['ship_address']['firstname'] = $this->input->post('firstname');
+ $customer['ship_address']['lastname'] = $this->input->post('lastname');
+ $customer['ship_address']['email'] = $this->input->post('email');
+ $customer['ship_address']['phone'] = $this->input->post('phone');
+ $customer['ship_address']['address1'] = $this->input->post('address1');
+ $customer['ship_address']['address2'] = $this->input->post('address2');
+ $customer['ship_address']['city'] = $this->input->post('city');
+ $customer['ship_address']['zip'] = $this->input->post('zip');
+
+ /* get zone / country data using the zone id submitted as state */
+ $country = $this->Location_model->get_country(set_value('country_id'));
+ $zone = $this->Location_model->get_zone(set_value('zone_id'));
+
+ $customer['ship_address']['zone'] = $zone->code;
+ $customer['ship_address']['country'] = $country->name;
+ $customer['ship_address']['country_code'] = $country->iso_code_2;
+ $customer['ship_address']['zone_id'] = $this->input->post('zone_id');
+ $customer['ship_address']['country_id'] = $this->input->post('country_id');
+
+ /* for guest customers, load the shipping address data as their base info as well */
if(empty($customer['id']))
{
- $customer['company'] = $customer['bill_address']['company'];
- $customer['firstname'] = $customer['bill_address']['firstname'];
- $customer['lastname'] = $customer['bill_address']['lastname'];
- $customer['phone'] = $customer['bill_address']['phone'];
- $customer['email'] = $customer['bill_address']['email'];
+ $customer['company'] = $customer['ship_address']['company'];
+ $customer['firstname'] = $customer['ship_address']['firstname'];
+ $customer['lastname'] = $customer['ship_address']['lastname'];
+ $customer['phone'] = $customer['ship_address']['phone'];
+ $customer['email'] = $customer['ship_address']['email'];
}
-
+
if(!isset($customer['group_id']))
{
- $customer['group_id'] = 1; // default group
+ $customer['group_id'] = 1; /* default group */
}
-
- // save customer details
+
+ /* save customer details */
$this->go_cart->save_customer($customer);
-
- $return = array('status'=>'success');
-
- //customer details
- $return['view'] = $this->load->view('checkout/customer_details_static', array('customer'=>$customer), true);
-
- //shipping/payment information
- echo json_encode($return);
+
+ /* send to the next form */
+ redirect('checkout/step_2');
}
+ }
+
+ function step_2()
+ {
+ /* where to next? Shipping? */
+ $shipping_methods = $this->_get_shipping_methods();
+
+ if($shipping_methods)
+ {
+ $this->shipping_form($shipping_methods);
+ }
+ /* now where? continue to step 3 */
else
{
- echo json_encode(array('status'=>'error', 'error'=>validation_errors()));
+ $this->step_3();
}
}
-
- // this is here for ajax use
- function get_formatted_currency()
+
+ protected function shipping_form($shipping_methods)
{
- $value = $this->input->post('value');
- echo format_currency($value);
+ $data['customer'] = $this->go_cart->customer();
+
+ /* do we have a selected shipping method already? */
+ $shipping = $this->go_cart->shipping_method();
+ $data['shipping_code'] = $shipping['code'];
+ $data['shipping_methods'] = $shipping_methods;
+
+ $this->form_validation->set_rules('shipping_notes', 'lang:shipping_information', 'trim|xss_clean');
+ $this->form_validation->set_rules('shipping_method', 'lang:shipping_method', 'trim|callback_validate_shipping_option');
+
+ if($this->form_validation->run() == false)
+ {
+ $this->view('checkout/shipping_form', $data);
+ }
+ else
+ {
+ /* we have shipping details! */
+ $this->go_cart->set_additional_detail('shipping_notes', $this->input->post('shipping_notes'));
+
+ /* parse out the shipping information */
+ $shipping_method = json_decode($this->input->post('shipping_method'));
+ $shipping_code = md5($this->input->post('shipping_method'));
+
+ /* set shipping info */
+ $this->go_cart->set_shipping($shipping_method[0], $shipping_method[1]->num, $shipping_code);
+
+ redirect('checkout/step_3');
+ }
}
-
- function save_shipping_method()
+
+ /*
+ callback for shipping form
+ if callback is true then it's being called for form_Validation
+ In that case, set the message otherwise just return true or false
+ */
+ function validate_shipping_option($str, $callback=true)
{
- $shipping = $this->input->post('shipping');
- $shipping = spliti(':', $shipping);
-
- $this->go_cart->set_shipping( $shipping[0], $shipping[1]);
-
- echo "1";
+ $shipping_methods = $this->_get_shipping_methods();
+
+ if($shipping_methods)
+ {
+ foreach($shipping_methods as $key=>$val)
+ {
+ $check = json_encode(array($key, $val));
+ if($str == md5($check))
+ {
+ return $check;
+ }
+ }
+ }
+
+ /* if we get there there is no match and they have submitted an invalid option */
+ $this->form_validation->set_message('validate_shipping_option', lang('error_invalid_shipping_method'));
+ return FALSE;
+
}
-
- function order_summary()
+
+ private function _get_shipping_methods()
{
- $this->load->view('checkout/summary');
+ $shipping_methods = array();
+ /* do we need shipping? */
+
+ if(config_item('require_shipping'))
+ {
+ /* do the cart contents require shipping? */
+ if($this->go_cart->requires_shipping())
+ {
+ /* ok so lets grab some shipping methods. If none exists, then we know that shipping isn't going to happen! */
+ foreach ($this->Settings_model->get_settings('shipping_modules') as $shipping_method=>$order)
+ {
+ $this->load->add_package_path(APPPATH.'packages/shipping/'.$shipping_method.'/');
+ /* eventually, we will sort by order, but I'm not concerned with that at the moment */
+ $this->load->library($shipping_method);
+
+ $shipping_methods = array_merge($shipping_methods, $this->$shipping_method->rates());
+ }
+
+ /* Free shipping coupon applied ? */
+ if($this->go_cart->is_free_shipping())
+ {
+ /* add free shipping as an option, but leave other options in case they want to upgrade */
+ $shipping_methods[lang('free_shipping_basic')] = "0.00";
+ }
+
+ /* format the values for currency display */
+ foreach($shipping_methods as &$method)
+ {
+ /* convert numeric values into an array containing numeric & formatted values */
+ $method = array('num'=>$method,'str'=>format_currency($method));
+ }
+ }
+ }
+ if(!empty($shipping_methods))
+ {
+ /* everything says that shipping is required! */
+ return $shipping_methods;
+ }
+ else
+ {
+ return false;
+ }
}
-
- function save_payment_method()
+
+ function step_3()
{
- $module = $this->input->post('module');
-
- if($module)
- {
- $this->load->library('payment/'.$module.'/'.$module);
-
- $check = $this->$module->checkout_check();
- if(!$check)
+ /*
+ Some error checking
+ see if we have the billing address
+ */
+ $customer = $this->go_cart->customer();
+ if(empty($customer['bill_address']))
+ {
+ redirect('checkout/step_1');
+ }
+
+ /* see if shipping is required and set. */
+ if(config_item('require_shipping') && $this->go_cart->requires_shipping() && $this->_get_shipping_methods())
+ {
+ $code = $this->validate_shipping_option($this->go_cart->shipping_code());
+
+ if(!$code)
{
- $this->go_cart->set_payment($module, $this->$module->description() );
-
- echo json_encode(array('status'=>'success'));
+ redirect('checkout/step_2');
}
- else
+ }
+
+
+ if($payment_methods = $this->_get_payment_methods())
+ {
+ $this->payment_form($payment_methods);
+ }
+ /* now where? continue to step 4 */
+ else
+ {
+ $this->step_4();
+ }
+ }
+
+ protected function payment_form($payment_methods)
+ {
+ /* find out if we need to display the shipping */
+ $data['customer'] = $this->go_cart->customer();
+ $data['shipping_method'] = $this->go_cart->shipping_method();
+
+ /* are the being bounced back? */
+ $data['payment_method'] = $this->go_cart->payment_method();
+
+ /* pass in the payment methods */
+ $data['payment_methods'] = $payment_methods;
+
+ /* require that a payment method is selected */
+ $this->form_validation->set_rules('module', 'lang:payment_method', 'trim|required|xss_clean|callback_check_payment');
+
+ $module = $this->input->post('module');
+ if($module)
+ {
+ $this->load->add_package_path(APPPATH.'packages/payment/'.$module.'/');
+ $this->load->library($module);
+ }
+
+ if($this->form_validation->run() == false)
+ {
+ $this->view('checkout/payment_form', $data);
+ }
+ else
+ {
+ $this->go_cart->set_payment( $module, $this->$module->description() );
+ redirect('checkout/step_4');
+ }
+ }
+ /* callback that lets the payment method return an error if invalid */
+ function check_payment($module)
+ {
+ $check = $this->$module->checkout_check();
+
+ if(!$check)
+ {
+ return true;
+ }
+ else
+ {
+ $this->form_validation->set_message('check_payment', $check);
+ }
+ }
+
+ private function _get_payment_methods()
+ {
+ $payment_methods = array();
+ if($this->go_cart->total() != 0)
+ {
+ foreach ($this->Settings_model->get_settings('payment_modules') as $payment_method=>$order)
{
- // send back the errors
- echo json_encode(array('status'=>'error', 'error'=>$check));
+ $this->load->add_package_path(APPPATH.'packages/payment/'.$payment_method.'/');
+ $this->load->library($payment_method);
+
+ $payment_form = $this->$payment_method->checkout_form();
+
+ if(!empty($payment_form))
+ {
+ $payment_methods[$payment_method] = $payment_form;
+ }
}
}
+ if(!empty($payment_methods))
+ {
+ return $payment_methods;
+ }
+ else
+ {
+ return false;
+ }
}
-
- function confirmation_contents()
+
+ function step_4()
{
- $data['customer'] = $this->go_cart->customer();
- $data['shipping'] = $this->go_cart->shipping_method();
- $data['payment'] = $this->go_cart->payment_method();
-
- $this->load->view('checkout/sconfirm', $data);
+ /* get addresses */
+ $data['customer'] = $this->go_cart->customer();
+
+ $data['shipping_method'] = $this->go_cart->shipping_method();
+
+ $data['payment_method'] = $this->go_cart->payment_method();
+
+
+ /* Confirm the sale */
+ $this->view('checkout/confirm', $data);
}
-
+
+ function login()
+ {
+ $this->Customer_model->is_logged_in('checkout');
+ }
+
+ function register()
+ {
+ $this->Customer_model->is_logged_in('checkout', 'secure/register');
+ }
+
function place_order()
{
-
// retrieve the payment method
- $payment = $this->go_cart->payment_method();
- //die(var_dump($payment));
-
- // verify that we intend to place the order
- if( ! $this->input->post('process_order') && !isset($payment['confirmed']))
- {
- redirect('/'); // otherwise, send them packing
- }
+ $payment = $this->go_cart->payment_method();
+ $payment_methods = $this->_get_payment_methods();
//make sure they're logged in if the config file requires it
if($this->config->item('require_login'))
{
$this->Customer_model->is_logged_in();
}
-
// are we processing an empty cart?
$contents = $this->go_cart->contents();
@@ -414,49 +512,78 @@ function place_order()
{
redirect('cart/view_cart');
} else {
- // do some secondary validation on cart contents before we continue
-
// - check to see if we have a payment method set, if we need one
- if(empty($payment) && $this->go_cart->total()>0)
+ if(empty($payment) && $this->go_cart->total() > 0 && (bool)$payment_methods == true)
{
- redirect('checkout');
+ redirect('checkout/step_3');
}
}
- // Is payment bypassed? (total is zero, or processed flag is set)
- if($this->go_cart->total() > 0 && ! isset($payment['confirmed'])) {
-
- //lost the payment module
- $this->load->library('payment/'.$payment['module'].'/'.$payment['module']);
-
- //run the payment
- $error_status = $this->$payment['module']->process_payment();
- if($error_status !== false)
- {
- // send them back to the checkout page with the error
- $this->session->set_flashdata('error', $error_status);
- redirect('checkout');
+ if(!empty($payment) && (bool)$payment_methods == true)
+ {
+ //load the payment module
+ $this->load->add_package_path(APPPATH.'packages/payment/'.$payment['module'].'/');
+ $this->load->library($payment['module']);
+
+ // Is payment bypassed? (total is zero, or processed flag is set)
+ if($this->go_cart->total() > 0 && ! isset($payment['confirmed'])) {
+ //run the payment
+ $error_status = $this->$payment['module']->process_payment();
+ if($error_status !== false)
+ {
+ // send them back to the payment page with the error
+ $this->session->set_flashdata('error', $error_status);
+ redirect('checkout/step_3');
+ }
}
-
}
+
- //// save the order
+ // save the order
$order_id = $this->go_cart->save_order();
$data['order_id'] = $order_id;
$data['shipping'] = $this->go_cart->shipping_method();
$data['payment'] = $this->go_cart->payment_method();
$data['customer'] = $this->go_cart->customer();
- $data['additional_details'] = $this->go_cart->additional_details();
- $data['hide_menu'] = true;
+ $data['shipping_notes'] = $this->go_cart->get_additional_detail('shipping_notes');
+ $data['referral'] = $this->go_cart->get_additional_detail('referral');
+ $order_downloads = $this->go_cart->get_order_downloads();
+ $data['hide_menu'] = true;
+
+ // run the complete payment module method once order has been saved
+ if(!empty($payment))
+ {
+ if(method_exists($this->$payment['module'], 'complete_payment'))
+ {
+ $this->$payment['module']->complete_payment($data);
+ }
+ }
+
// Send the user a confirmation email
// - get the email template
$this->load->model('messages_model');
$row = $this->messages_model->get_message(7);
+ $download_section = '';
+ if( ! empty($order_downloads))
+ {
+ // get the download link segment to insert into our confirmations
+ $downlod_msg_record = $this->messages_model->get_message(8);
+
+ if(!empty($data['customer']['id']))
+ {
+ // they can access their downloads by logging in
+ $download_section = str_replace('{download_link}', anchor('secure/my_downloads', lang('download_link')),$downlod_msg_record['content']);
+ } else {
+ // non regs will receive a code
+ $download_section = str_replace('{download_link}', anchor('secure/my_downloads/'.$order_downloads['code'], lang('download_link')), $downlod_msg_record['content']);
+ }
+ }
+
$row['content'] = html_entity_decode($row['content']);
// set replacement values for subject & body
@@ -474,6 +601,9 @@ function place_order()
// {order_summary}
$row['content'] = str_replace('{order_summary}', $this->load->view('order_email', $data, true), $row['content']);
+
+ // {download_section}
+ $row['content'] = str_replace('{download_section}', $download_section, $row['content']);
$this->load->library('email');
@@ -490,6 +620,7 @@ function place_order()
{
$this->email->to($data['customer']['ship_address']['email']);
}
+
//email the admin
$this->email->bcc($this->config->item('email'));
@@ -500,10 +631,24 @@ function place_order()
$data['page_title'] = 'Thanks for shopping with '.$this->config->item('company_name');
$data['gift_cards_enabled'] = $this->gift_cards_enabled;
- // show final confirmation page
- $this->load->view('order_placed', $data);
-
- //remove the cart from the session
+ $data['download_section'] = $download_section;
+
+
+ /* get all cart information before destroying the cart session info */
+ $data['go_cart']['group_discount'] = $this->go_cart->group_discount();
+ $data['go_cart']['subtotal'] = $this->go_cart->subtotal();
+ $data['go_cart']['coupon_discount'] = $this->go_cart->coupon_discount();
+ $data['go_cart']['order_tax'] = $this->go_cart->order_tax();
+ $data['go_cart']['discounted_subtotal'] = $this->go_cart->discounted_subtotal();
+ $data['go_cart']['shipping_cost'] = $this->go_cart->shipping_cost();
+ $data['go_cart']['gift_card_discount'] = $this->go_cart->gift_card_discount();
+ $data['go_cart']['total'] = $this->go_cart->total();
+ $data['go_cart']['contents'] = $this->go_cart->contents();
+
+ /* remove the cart from the session */
$this->go_cart->destroy();
+
+ /* show final confirmation page */
+ $this->load->view('order_placed', $data);
}
}
\ No newline at end of file
diff --git a/gocart/controllers/pp_gate.php b/gocart/controllers/pp_gate.php
index 97e3e7f9..4d5a6826 100644
--- a/gocart/controllers/pp_gate.php
+++ b/gocart/controllers/pp_gate.php
@@ -5,8 +5,8 @@ class pp_gate extends CI_Controller {
function __construct()
{
parent::__construct();
-
- $this->load->library(array('payment/paypal_express/paypal', 'payment/paypal_express/httprequest', 'go_cart'));
+ $this->load->add_package_path(APPPATH.'packages/payment/paypal_express/');
+ $this->load->library(array('paypal', 'httprequest', 'go_cart'));
$this->load->helper('form_helper');
}
@@ -37,12 +37,12 @@ function pp_return()
// send them back to the cart payment page to finish the order
// the confirm flag will bypass payment processing and save up
- redirect('scheckout/place_order/');
+ redirect('checkout/place_order/');
} else {
// Possible fake request; was not verified by paypal. Could be due to a double page-get, should never happen under normal circumstances
$this->session->set_flashdata('message', "Paypal did not validate your order. Either it has been processed already, or something else went wrong. If you believe there has been a mistake, please contact us.
");
- redirect('scheckout');
+ redirect('checkout');
}
}
@@ -61,7 +61,7 @@ function pp_cancel()
// User canceled using paypal, send them back to the payment page
$cart = $this->session->userdata('cart');
$this->session->set_flashdata('message', "Paypal transaction canceled, select another payment method
");
- redirect('scheckout');
+ redirect('checkout');
}
}
\ No newline at end of file
diff --git a/gocart/controllers/secure.php b/gocart/controllers/secure.php
old mode 100755
new mode 100644
index 1b485e1a..7816acef
--- a/gocart/controllers/secure.php
+++ b/gocart/controllers/secure.php
@@ -1,52 +1,23 @@
load->library('Go_cart');
- $this->load->model(array('Page_model', 'Product_model', 'Option_model','location_model'));
- $this->load->helper('form_helper');
+ $this->load->model(array('location_model'));
$this->customer = $this->go_cart->customer();
-
- //fill up our categories variable
- $this->categories = $this->Category_model->get_categories_tierd(0);
- $this->pages = $this->Page_model->get_pages(0, array(138));
- $this->header_text = $this->Page_model->get_page(142);
- $gc_setting = $this->Settings_model->get_settings('gift_cards');
- if(!empty($gc_setting['enabled']) && $gc_setting['enabled']==1) $this->gift_cards_enabled = true;
}
function index()
{
- //we don't have a default landing page for secure
- redirect('');
+ show_404();
}
function login($ajax = false)
@@ -103,7 +74,7 @@ function login($ajax = false)
else
{
$this->session->set_flashdata('redirect', $redirect);
- $this->session->set_flashdata('error', 'Authentication Failed!');
+ $this->session->set_flashdata('error', lang('login_failed'));
redirect('secure/login');
}
@@ -149,7 +120,7 @@ function register()
*/
$data['redirect'] = $this->session->flashdata('redirect');
- $data['page_title'] = 'Account Registration';
+ $data['page_title'] = lang('account_registration');
$data['gift_cards_enabled'] = $this->gift_cards_enabled;
//default values are empty if the customer is new
@@ -198,15 +169,15 @@ function register()
$save['id'] = false;
- $save['firstname'] = set_value('firstname');
- $save['lastname'] = set_value('lastname');
- $save['email'] = set_value('email');
- $save['phone'] = set_value('phone');
- $save['company'] = set_value('company');
+ $save['firstname'] = $this->input->post('firstname');
+ $save['lastname'] = $this->input->post('lastname');
+ $save['email'] = $this->input->post('email');
+ $save['phone'] = $this->input->post('phone');
+ $save['company'] = $this->input->post('company');
$save['active'] = $this->config->item('new_customer_status');
- $save['email_subscribe'] = set_value('email_subscribe');
+ $save['email_subscribe'] = intval((bool)$this->input->post('email_subscribe'));
- $save['password'] = set_value('password');
+ $save['password'] = $this->input->post('password');
$redirect = $this->input->post('redirect');
@@ -227,8 +198,8 @@ function register()
// set replacement values for subject & body
// {customer_name}
- $row['subject'] = str_replace('{customer_name}', set_value('firstname').' '. set_value('lastname'), $row['subject']);
- $row['content'] = str_replace('{customer_name}', set_value('firstname').' '. set_value('lastname'), $row['content']);
+ $row['subject'] = str_replace('{customer_name}', $this->input->post('firstname').' '. $this->input->post('lastname'), $row['subject']);
+ $row['content'] = str_replace('{customer_name}', $this->input->post('firstname').' '. $this->input->post('lastname'), $row['content']);
// {url}
$row['subject'] = str_replace('{url}', $this->config->item('base_url'), $row['subject']);
@@ -252,10 +223,10 @@ function register()
$this->email->send();
- $this->session->set_flashdata('message', 'Thanks for registering '.set_value('firstname').'!');
+ $this->session->set_flashdata('message', sprintf( lang('registration_thanks'), $this->input->post('firstname') ) );
//lets automatically log them in
- $this->Customer_model->login($save['email'], set_value('confirm'));
+ $this->Customer_model->login($save['email'], $this->input->post('confirm'));
//we're just going to make this secure regardless, because we don't know if they are
//wanting to redirect to an insecure location, if it needs to be secured then we can use the secure redirect in the controller
@@ -277,7 +248,7 @@ function check_email($str)
if ($email)
{
- $this->form_validation->set_message('check_email', 'The requested email is already in use.');
+ $this->form_validation->set_message('check_email', lang('error_email'));
return FALSE;
}
else
@@ -288,7 +259,7 @@ function check_email($str)
function forgot_password()
{
- $data['page_title'] = 'Forgot Password';
+ $data['page_title'] = lang('forgot_password');
$data['gift_cards_enabled'] = $this->gift_cards_enabled;
$submitted = $this->input->post('submitted');
if ($submitted)
@@ -300,11 +271,11 @@ function forgot_password()
if ($reset)
{
- $this->session->set_flashdata('message', 'A new password has been generated and sent to your email.');
+ $this->session->set_flashdata('message', lang('message_new_password'));
}
else
{
- $this->session->set_flashdata('message', 'There is no record of your account.');
+ $this->session->set_flashdata('error', lang('error_no_account_record'));
}
redirect('secure/forgot_password');
}
@@ -329,7 +300,7 @@ function my_account($offset=0)
$data['gift_cards_enabled'] = $this->gift_cards_enabled;
- $data['customer'] = $this->go_cart->customer();
+ $data['customer'] = (array)$this->Customer_model->get_customer($this->customer['id']);
$data['addresses'] = $this->Customer_model->get_address_list($this->customer['id']);
@@ -351,10 +322,32 @@ function my_account($offset=0)
// paginate the orders
$this->load->library('pagination');
- $config['base_url'] = base_url().'secure/my_account';
+ $config['base_url'] = site_url('secure/my_account');
$config['total_rows'] = $this->order_model->count_customer_orders($this->customer['id']);
$config['per_page'] = '15';
+ $config['first_link'] = 'First';
+ $config['first_tag_open'] = '';
+ $config['first_tag_close'] = '';
+ $config['last_link'] = 'Last';
+ $config['last_tag_open'] = '';
+ $config['last_tag_close'] = '';
+
+ $config['full_tag_open'] = '';
+ $config['cur_tag_open'] = '';
+ $config['cur_tag_close'] = '';
+
+ $config['num_tag_open'] = '';
+ $config['num_tag_close'] = '';
+
+ $config['prev_link'] = '«';
+ $config['prev_tag_open'] = '';
+ $config['prev_tag_close'] = '';
+
+ $config['next_link'] = '»';
+ $config['next_tag_open'] = '';
+ $config['next_tag_close'] = '';
$this->pagination->initialize($config);
@@ -398,35 +391,76 @@ function my_account($offset=0)
else
{
$customer = array();
- $customer['id'] = $this->customer['id'];
- $customer['company'] = set_value('company');
- $customer['firstname'] = set_value('firstname');
- $customer['lastname'] = set_value('lastname');
- $customer['email'] = set_value('email');
- $customer['phone'] = set_value('phone');
- $customer['email_subscribe'] = set_value('email_subscribe');
+ $customer['id'] = $this->customer['id'];
+ $customer['company'] = $this->input->post('company');
+ $customer['firstname'] = $this->input->post('firstname');
+ $customer['lastname'] = $this->input->post('lastname');
+ $customer['email'] = $this->input->post('email');
+ $customer['phone'] = $this->input->post('phone');
+ $customer['email_subscribe'] = intval((bool)$this->input->post('email_subscribe'));
if($this->input->post('password') != '')
{
- $customer['password'] = set_value('password');
+ $customer['password'] = $this->input->post('password');
}
- $this->customer['company'] = set_value('company');
- $this->customer['firstname'] = set_value('firstname');
- $this->customer['lastname'] = set_value('lastname');
- $this->customer['email'] = set_value('email');
- $this->customer['phone'] = set_value('phone');
- $this->customer['email_subscribe'] = set_value('email_subscribe');
-
+
$this->go_cart->save_customer($this->customer);
$this->Customer_model->save($customer);
- $this->session->set_flashdata('message', 'Your account has been updated');
+ $this->session->set_flashdata('message', lang('message_account_updated'));
redirect('secure/my_account');
- //$this->load->view('my_account', $data);
}
}
+
+ function my_downloads($code=false)
+ {
+
+ if($code!==false)
+ {
+ $data['downloads'] = $this->Digital_Product_model->get_downloads_by_code($code);
+ } else {
+ $this->Customer_model->is_logged_in();
+
+ $customer = $this->go_cart->customer();
+
+ $data['downloads'] = $this->Digital_Product_model->get_user_downloads($customer['id']);
+ }
+
+ $data['gift_cards_enabled'] = $this->gift_cards_enabled;
+
+ $data['page_title'] = lang('my_downloads');
+
+ $this->load->view('my_downloads', $data);
+ }
+
+
+ function download($link)
+ {
+ $filedata = $this->Digital_Product_model->get_file_info_by_link($link);
+
+ // missing file (bad link)
+ if(!$filedata)
+ {
+ show_404();
+ }
+
+ // validate download counter
+ if(intval($filedata->downloads) >= intval($filedata->max_downloads))
+ {
+ show_404();
+ }
+
+ // increment downloads counter
+ $this->Digital_Product_model->touch_download($link);
+
+ // Deliver file
+ $this->load->helper('download');
+ force_download('uploads/digital_uploads/', $filedata->filename);
+ }
+
+
function set_default_address()
{
$id = $this->input->post('id');
@@ -557,15 +591,15 @@ function address_form($id = 0)
$a = array();
$a['id'] = ($id==0) ? '' : $id;
$a['customer_id'] = $this->customer['id'];
- $a['field_data']['company'] = set_value('company');
- $a['field_data']['firstname'] = set_value('firstname');
- $a['field_data']['lastname'] = set_value('lastname');
- $a['field_data']['email'] = set_value('email');
- $a['field_data']['phone'] = set_value('phone');
- $a['field_data']['address1'] = set_value('address1');
- $a['field_data']['address2'] = set_value('address2');
- $a['field_data']['city'] = set_value('city');
- $a['field_data']['zip'] = set_value('zip');
+ $a['field_data']['company'] = $this->input->post('company');
+ $a['field_data']['firstname'] = $this->input->post('firstname');
+ $a['field_data']['lastname'] = $this->input->post('lastname');
+ $a['field_data']['email'] = $this->input->post('email');
+ $a['field_data']['phone'] = $this->input->post('phone');
+ $a['field_data']['address1'] = $this->input->post('address1');
+ $a['field_data']['address2'] = $this->input->post('address2');
+ $a['field_data']['city'] = $this->input->post('city');
+ $a['field_data']['zip'] = $this->input->post('zip');
// get zone / country data using the zone id submitted as state
$country = $this->location_model->get_country(set_value('country_id'));
@@ -575,41 +609,16 @@ function address_form($id = 0)
$a['field_data']['zone'] = $zone->code; // save the state for output formatted addresses
$a['field_data']['country'] = $country->name; // some shipping libraries require country name
$a['field_data']['country_code'] = $country->iso_code_2; // some shipping libraries require the code
- $a['field_data']['country_id'] = set_value('country_id');
- $a['field_data']['zone_id'] = set_value('zone_id');
+ $a['field_data']['country_id'] = $this->input->post('country_id');
+ $a['field_data']['zone_id'] = $this->input->post('zone_id');
}
$this->Customer_model->save_address($a);
- $this->session->set_flashdata('message', 'Your address has been saved!');
+ $this->session->set_flashdata('message', lang('message_address_saved'));
echo 1;
}
}
- // address management functions
- /*
- function save_address()
- {
- $data = $this->input->post('address');
- if($data)
- {
- $customer = $this->go_cart->customer();
- $data['customer_id'] = $customer['id'];
-
- // get zone / country data using the zone id submitted as state
- $country = $this->location_model->get_country_by_zone_id(set_value('state'));
- if(!empty($country))
- {
- $data['field_data']['state'] = $country->code; // save the state for output formatted addresses
- $data['field_data']['country'] = $country->c_name; // some shipping libraries require country name
- $data['field_data']['country_code'] = $country->iso_code_2; // some shipping libraries require the code
- $data['field_data']['zone_id'] = set_value('state'); // use the zone id to populate address state field value
- }
-
- echo json_encode(array('id'=>$this->Customer_model->save_address($data)));
- }
- }
- */
-
function delete_address()
{
$id = $this->input->post('id');
@@ -618,32 +627,4 @@ function delete_address()
$this->Customer_model->delete_address($id, $customer['id']);
echo $id;
}
-
- function send_email_comments()
- {
-
- if(!$this->input->post('submitted'))
- {
- $this->load->view('email_comments');
-
- } else {
-
- $this->load->library('email');
-
- $config['mailtype'] = 'html';
-
- $this->email->initialize($config);
-
- $this->email->from($this->input->post('email'), $this->input->post('name'));
- $this->email->to($this->config->item('email'));
-
- $this->email->subject('New comments submitted from '.$this->config->item('company_name'));
- $this->email->message($this->input->post('comments'));
-
- $this->email->send();
-
- // load to close the iframe
- $this->load->view('email_comments', array('finished'=>true));
- }
- }
}
\ No newline at end of file
diff --git a/gocart/core/MY_Controller.php b/gocart/core/MY_Controller.php
new file mode 100644
index 00000000..e655d06d
--- /dev/null
+++ b/gocart/core/MY_Controller.php
@@ -0,0 +1,125 @@
+load->library('migration');
+
+ // Migrate to the latest migration file found
+ if ( ! $this->migration->latest())
+ {
+ log_message('error', 'The migration failed');
+ }
+
+ }//end __construct()
+
+}//end Base_Controller
+
+class Front_Controller extends Base_Controller
+{
+
+ //we collect the categories automatically with each load rather than for each function
+ //this just cuts the codebase down a bit
+ var $categories = '';
+
+ //load all the pages into this variable so we can call it from all the methods
+ var $pages = '';
+
+ // determine whether to display gift card link on all cart pages
+ // This is Not the place to enable gift cards. It is a setting that is loaded during instantiation.
+ var $gift_cards_enabled;
+
+ function __construct(){
+
+ parent::__construct();
+
+ //load GoCart library
+ $this->load->library('Go_cart');
+
+ //load needed models
+ $this->load->model(array('Page_model', 'Product_model', 'Digital_Product_model', 'Gift_card_model', 'Option_model', 'Order_model', 'Settings_model'));
+
+ //load helpers
+ $this->load->helper(array('form_helper', 'formatting_helper'));
+
+ //fill in our variables
+ $this->categories = $this->Category_model->get_categories_tierd(0);
+ $this->pages = $this->Page_model->get_pages();
+
+ // check if giftcards are enabled
+ $gc_setting = $this->Settings_model->get_settings('gift_cards');
+ if(!empty($gc_setting['enabled']) && $gc_setting['enabled']==1)
+ {
+ $this->gift_cards_enabled = true;
+ }
+ else
+ {
+ $this->gift_cards_enabled = false;
+ }
+
+ //load the theme package
+ $this->load->add_package_path(APPPATH.'themes/'.$this->config->item('theme').'/');
+ }
+
+ /*
+ This works exactly like the regular $this->load->view()
+ The difference is it automatically pulls in a header and footer.
+ */
+ function view($view, $vars = array(), $string=false)
+ {
+ if($string)
+ {
+ $result = $this->load->view('header', $vars, true);
+ $result .= $this->load->view($view, $vars, true);
+ $result .= $this->load->view('footer', $vars, true);
+
+ return $result;
+ }
+ else
+ {
+ $this->load->view('header', $vars);
+ $this->load->view($view, $vars);
+ $this->load->view('footer', $vars);
+ }
+ }
+
+ /*
+ This function simple calls $this->load->view()
+ */
+ function partial($view, $vars = array(), $string=false)
+ {
+ if($string)
+ {
+ return $this->load->view($view, $vars, true);
+ }
+ else
+ {
+ $this->load->view($view, $vars);
+ }
+ }
+}
+
+class Admin_Controller extends Base_Controller
+{
+ function __construct()
+ {
+
+ parent::__construct();
+
+ $this->load->library('auth');
+ $this->auth->is_logged_in(uri_string());
+
+ //load the base language file
+ $this->lang->load('admin_common');
+ $this->lang->load('goedit');
+ }
+}
\ No newline at end of file
diff --git a/gocart/core/MY_Router.php b/gocart/core/MY_Router.php
new file mode 100644
index 00000000..d3433d5c
--- /dev/null
+++ b/gocart/core/MY_Router.php
@@ -0,0 +1,112 @@
+uri->segments;
+
+ // Turn the segment array into a URI string
+ $uri = implode('/', $segments);
+
+ // Is there a literal match? If so we're done
+ if (isset($this->routes[$uri]))
+ {
+ return $this->_set_request(explode('/', $this->routes[$uri]));
+ }
+
+ // Loop through the route array looking for wild-cards
+ foreach ($this->routes as $key => $val)
+ {
+ // Convert wild-cards to RegEx
+ $key = str_replace(':any', '.+', str_replace(':num', '[0-9]+', $key));
+
+ // Does the RegEx match?
+ if (preg_match('#^'.$key.'$#', $uri))
+ {
+ // Do we have a back-reference?
+ if (strpos($val, '$') !== FALSE AND strpos($key, '(') !== FALSE)
+ {
+ $val = preg_replace('#^'.$key.'$#', $val, $uri);
+ }
+
+ return $this->_set_request(explode('/', $val));
+ }
+ }
+
+ // now try the GoCart specific routing
+ $segments = array_splice($segments, -2, 2);
+
+ // Turn the segment array into a URI string
+ $uri = implode('/', $segments);
+
+ //look through the database for a route that matches and apply the same logic as above :-)
+ //load the database connection information
+ require_once BASEPATH.'database/DB'.EXT;
+
+ if(count($segments) == 1)
+ {
+ $row = $this->_get_db_route($segments[0]);
+
+ if(!empty($row))
+ {
+ return $this->_set_request(explode('/', $row['route']));
+ }
+ }
+ else
+ {
+ $segments = array_reverse($segments);
+ //start with the end just to make sure we're not a multi-tiered category or category/product combo before moving to the second segment
+ //we could stop people from naming products or categories after numbers, but that would be limiting their use.
+ $row = $this->_get_db_route($segments[0]);
+ //set a pagination flag. If this is set true in the next if statement we'll know that the first row is segment is possibly a page number
+ $page_flag = false;
+ if($row)
+ {
+ return $this->_set_request(explode('/', $row['route']));
+ }
+ else
+ {
+ //this is the second go
+ $row = $this->_get_db_route($segments[1]);
+ $page_flag = true;
+ }
+
+ //we have a hit, continue down the path!
+ if($row)
+ {
+ if(!$page_flag)
+ {
+ return $this->_set_request(explode('/', $row['route']));
+ }
+ else
+ {
+ $key = $row['slug'].'/([0-9]+)';
+
+ //pages can only be numerical. This could end in a mighty big error!!!!
+ if (preg_match('#^'.$key.'$#', $uri))
+ {
+ $row['route'] = preg_replace('#^'.$key.'$#', $row['route'],$uri);
+ return $this->_set_request(explode('/', $row['route']));
+ }
+ }
+ }
+ }
+
+ // If we got this far it means we didn't encounter a
+ // matching route so we'll set the site default route
+ $this->_set_request($this->uri->segments);
+ }
+
+ function _get_db_route($slug)
+ {
+ return DB()->where('slug',$slug)->get('routes')->row_array();
+ }
+}
\ No newline at end of file
diff --git a/gocart/helpers/MY_date_helper.php b/gocart/helpers/MY_date_helper.php
index bc2ea917..9b7bfcd8 100644
--- a/gocart/helpers/MY_date_helper.php
+++ b/gocart/helpers/MY_date_helper.php
@@ -27,42 +27,42 @@ function format_date($date){
}
}
-function format_datetime($datetime)
+function reverse_format($date)
{
- $d = explode(' ', format_date($datetime));
-
- $t = $d[2];
-
- $t = explode(':', $t);
-
- $ap = 'am';
- if($t[0] > 12)
+ if(empty($date))
{
- $t[0] = $t[0]-12;
- $ap = 'pm';
+ return;
}
- elseif($t[0] == 0)
+
+ $d = explode('-', $date);
+
+ return "{$d[1]}-{$d[2]}-{$d[0]}";
+}
+
+function format_ymd($date)
+{
+ if(empty($date) || $date == '00-00-0000')
{
- $t[0] = 12;
+ return '';
}
- elseif ($t[0] == 12)
+ else
{
- $ap = 'pm';
+ $d = explode('-', $date);
+ return $d[2].'-'.$d[0].'-'.$d[1];
}
-
- return $d[0].' '.$d[1].', '.$d[3].' at '.$t[0].':'.$t[1].$ap;
}
-function reverse_format($date)
+function format_mdy($date)
{
- if(empty($date))
+ if(empty($date) || $date == '0000-00-00')
{
- return;
+ return '';
+ }
+ else
+ {
+ return date('m-d-Y', strtotime($date));
}
- $d = explode('-', $date);
-
- return "{$d[1]}-{$d[2]}-{$d[0]}";
}
diff --git a/gocart/helpers/MY_download_helper.php b/gocart/helpers/MY_download_helper.php
new file mode 100644
index 00000000..8754c647
--- /dev/null
+++ b/gocart/helpers/MY_download_helper.php
@@ -0,0 +1,118 @@
+config->config['base_url'] = str_replace('http://', 'https://', $CI->config->config['base_url']);
- if (ssl_support() && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off' || $_SERVER['SERVER_PORT'] != 80))
+ if (ssl_support() && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off'))
{
+ $CI =& get_instance();
+ $CI->config->config['base_url'] = str_replace('http://', 'https://', $CI->config->config['base_url']);
redirect($CI->uri->uri_string());
}
}
@@ -23,12 +23,61 @@ function force_ssl()
if ( ! function_exists('remove_ssl'))
{
function remove_ssl()
- {
- $CI =& get_instance();
- $CI->config->config['base_url'] = str_replace('https://', 'http://', $CI->config->config['base_url']);
- if ($_SERVER['SERVER_PORT'] != 80 || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on'))
+ {
+ if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on')
{
+ $CI =& get_instance();
+ $CI->config->config['base_url'] = str_replace('https://', 'http://', $CI->config->config['base_url']);
+
redirect($CI->uri->uri_string());
}
}
+}
+
+function theme_url($uri)
+{
+ $CI =& get_instance();
+ return $CI->config->base_url('gocart/themes/'.$CI->config->item('theme').'/'.$uri);
+}
+
+//to generate an image tag, set tag to true. you can also put a string in tag to generate the alt tag
+function theme_img($uri, $tag=false)
+{
+ if($tag)
+ {
+ return '.')
';
+ }
+ else
+ {
+ return theme_url('assets/img/'.$uri);
+ }
+
+}
+
+function theme_js($uri, $tag=false)
+{
+ if($tag)
+ {
+ return '';
+ }
+ else
+ {
+ return theme_url('assets/js/'.$uri);
+ }
+}
+
+//you can fill the tag field in to spit out a link tag, setting tag to a string will fill in the media attribute
+function theme_css($uri, $tag=false)
+{
+ if($tag)
+ {
+ $media=false;
+ if(is_string($tag))
+ {
+ $media = 'media="'.$tag.'"';
+ }
+ return '';
+ }
+
+ return theme_url('assets/css/'.$uri);
}
\ No newline at end of file
diff --git a/gocart/helpers/credit_card_helper.php b/gocart/helpers/credit_card_helper.php
index 2eeea239..71e7687b 100644
--- a/gocart/helpers/credit_card_helper.php
+++ b/gocart/helpers/credit_card_helper.php
@@ -52,9 +52,10 @@
* @param string The card number to truncate.
* @return string The truncated card number.
*/
-function truncate_card($card_num) {
- $padsize = (strlen($card_num) < 7 ? 0 : strlen($card_num) - 7);
- return substr($card_num, 0, 4) . str_repeat('X', $padsize). substr($card_num, -3);
+function truncate_card($card_num)
+{
+ $padsize = (strlen($card_num) < 7 ? 0 : strlen($card_num) - 7);
+ return substr($card_num, 0, 4) . str_repeat('X', $padsize). substr($card_num, -3);
}
@@ -68,9 +69,10 @@ function truncate_card($card_num) {
* @param integer The expiry year printed on the card.
* @return boolean Returns true if the card is still valid, false if it has expired.
*/
-function card_expiry_valid($month, $year) {
- $expiry_date = mktime(0, 0, 0, ($month + 1), 1, (int) $year);
- return ($expiry_date > time());
+function card_expiry_valid($month, $year)
+{
+ $expiry_date = mktime(0, 0, 0, ($month + 1), 1, (int) $year);
+ return ($expiry_date > time());
}
@@ -80,8 +82,10 @@ function card_expiry_valid($month, $year) {
* @param string The card number to clean up.
* @return string The stripped down card number.
*/
-function card_number_clean($number) {
- return ereg_replace("[^0-9]", "", $number);
+function card_number_clean($number)
+{
+ //updated 11-28-2011 to remove the depreciated ereg function
+ return preg_replace('#[^\d]#', "", $number);
}
@@ -93,25 +97,27 @@ function card_number_clean($number) {
* @return boolean True if valid according to the Luhn algorith, false otherwise.
*/
function card_number_valid ($card_number) {
- $card_number = strrev(card_number_clean($card_number));
- $sum = 0;
+ $card_number = strrev(card_number_clean($card_number));
+ $sum = 0;
- for ($i = 0; $i < strlen($card_number); $i++) {
- $digit = substr($card_number, $i, 1);
-
- // Double every second digit
- if ($i % 2 == 1) {
- $digit *= 2;
- }
-
- // Add digits of 2-digit numbers together
- if ($digit > 9) {
- $digit = ($digit % 10) + floor($digit / 10);
- }
-
- $sum += $digit;
- }
-
- // If the total has no remainder it's OK
- return ($sum % 10 == 0);
+ for ($i = 0; $i < strlen($card_number); $i++)
+ {
+ $digit = substr($card_number, $i, 1);
+
+ // Double every second digit
+ if ($i % 2 == 1) {
+ $digit *= 2;
+ }
+
+ // Add digits of 2-digit numbers together
+ if ($digit > 9)
+ {
+ $digit = ($digit % 10) + floor($digit / 10);
+ }
+
+ $sum += $digit;
+ }
+
+ // If the total has no remainder it's OK
+ return ($sum % 10 == 0);
}
\ No newline at end of file
diff --git a/gocart/helpers/formatting_helper.php b/gocart/helpers/formatting_helper.php
index cd748ee2..963ad9dd 100644
--- a/gocart/helpers/formatting_helper.php
+++ b/gocart/helpers/formatting_helper.php
@@ -1,5 +1,5 @@
address_format))
{
- $formatted = $default;
+ $formatted = $default;
} else {
- $formatted = $c_data->address_format;
+ $formatted = $c_data->address_format;
}
- $formatted = str_replace('{firstname}', $fields['firstname'], $formatted);
- $formatted = str_replace('{lastname}', $fields['lastname'], $formatted);
- $formatted = str_replace('{company}', $fields['company'], $formatted);
+ $formatted = str_replace('{firstname}', $fields['firstname'], $formatted);
+ $formatted = str_replace('{lastname}', $fields['lastname'], $formatted);
+ $formatted = str_replace('{company}', $fields['company'], $formatted);
- $formatted = str_replace('{address_1}', $fields['address1'], $formatted);
- $formatted = str_replace('{address_2}', $fields['address2'], $formatted);
- $formatted = str_replace('{city}', $fields['city'], $formatted);
- $formatted = str_replace('{zone}', $fields['zone'], $formatted);
- $formatted = str_replace('{postcode}', $fields['zip'], $formatted);
- $formatted = str_replace('{country}', $fields['country'], $formatted);
+ $formatted = str_replace('{address_1}', $fields['address1'], $formatted);
+ $formatted = str_replace('{address_2}', $fields['address2'], $formatted);
+ $formatted = str_replace('{city}', $fields['city'], $formatted);
+ $formatted = str_replace('{zone}', $fields['zone'], $formatted);
+ $formatted = str_replace('{postcode}', $fields['zip'], $formatted);
+ $formatted = str_replace('{country}', $fields['country'], $formatted);
// remove any extra new lines resulting from blank company or address line
- $formatted = preg_replace('`[\r\n]+`',"\n",$formatted);
-
- return $formatted;
-
-}
-
-
-// Same as above, except it includes characters used by the jquery selectmenu address selector,
-// also adds email address and phone number to the formatted return string
-function format_address_for_selector($fields)
-{
- if(empty($fields))
+ $formatted = preg_replace('`[\r\n]+`',"\n",$formatted);
+ if($br)
{
- return ;
+ $formatted = nl2br($formatted);
}
+ return $formatted;
- // Default format
- $default = "{firstname} {lastname}\n{company}\n{address_1}\n{address_2}\n{city}, {zone} {postcode}\n{country}";
-
- // Fetch country record to determine which format to use
- $CI = &get_instance();
- $CI->load->model('location_model');
- $c_data = $CI->location_model->get_country($fields['country_id']);
-
- if(empty($c_data->address_format))
- {
- $formatted = $default;
- } else {
- $formatted = $c_data->address_format;
- }
-
- $formatted = str_replace('{firstname}', $fields['firstname'], $formatted);
- $formatted = str_replace("{lastname}\n", $fields['lastname'] . ' - ', $formatted);
- $formatted = str_replace('{company}', $fields['company'], $formatted);
-
- $formatted = str_replace('{address_1}', $fields['address1'], $formatted);
- $formatted = str_replace('{address_2}', $fields['address2'], $formatted);
- $formatted = str_replace('{city}', $fields['city'], $formatted);
- $formatted = str_replace('{zone}', $fields['zone'], $formatted);
- $formatted = str_replace('{postcode}', $fields['zip'], $formatted);
- $formatted = str_replace('{country}', $fields['country'], $formatted);
- // tack on the phone number
- $formatted .= "\n".'('. $fields['phone'] .')';
-
- // remove any extra new lines resulting from blank company or address line
- $formatted = preg_replace('`[\r\n]+`',"\n",$formatted);
-
- // take out the last newline character, but only the last one
- // (I don't like all this reversing, unreversing, but if you can find a better way to replace right-to-left, let me know)
- $formatted = strrev($formatted);
- $formatted = str_replace_once("\n", ' ', $formatted);
- $formatted = strrev($formatted);
-
- // convert new lines to pipe char
- $formatted = str_replace("\n", ' | ', $formatted);
-
- return $formatted;
-}
-
-function str_replace_once($search, $replace, $subject) {
- $firstChar = strpos($subject, $search);
- if($firstChar !== false) {
- $beforeStr = substr($subject,0,$firstChar);
- $afterStr = substr($subject, $firstChar + strlen($search));
- return $beforeStr.$replace.$afterStr;
- } else {
- return $subject;
- }
}
-
function format_currency($value, $symbol=true)
{
- // locale information must be set up for this to return a proper value
- // return money_format(!%i, $value);
-
+
if(!is_numeric($value))
{
return;
@@ -123,14 +59,24 @@ function format_currency($value, $symbol=true)
$neg = '';
}
- $formatted = number_format(abs($value), 2, '.', ',');
-
if($symbol)
{
- $formatted = $neg.$CI->config->item('currency_symbol').$formatted;
+ $formatted = number_format(abs($value), 2, $CI->config->item('currency_decimal'), $CI->config->item('currency_thousands_separator'));
+
+ if($CI->config->item('currency_symbol_side') == 'left')
+ {
+ $formatted = $neg.$CI->config->item('currency_symbol').$formatted;
+ }
+ else
+ {
+ $formatted = $neg.$formatted.$CI->config->item('currency_symbol');
+ }
+ }
+ else
+ {
+ //traditional number formatting
+ $formatted = number_format(abs($value), 2, '.', ',');
}
return $formatted;
-
-}
-
+}
\ No newline at end of file
diff --git a/gocart/helpers/utility_helper.php b/gocart/helpers/utility_helper.php
deleted file mode 100644
index fc8936ec..00000000
--- a/gocart/helpers/utility_helper.php
+++ /dev/null
@@ -1,52 +0,0 @@
-0)
- {
- foreach(array_keys($array) as $key)
- $temp[$key]=$array[$key][$index];
- if(!$natsort)
- ($order=='asc')? asort($temp) : arsort($temp);
- else
- {
- ($case_sensitive)? natsort($temp) : natcasesort($temp);
- if($order!='asc')
- $temp=array_reverse($temp,TRUE);
- }
- foreach(array_keys($temp) as $key)
- (is_numeric($key))? $sorted[]=$array[$key] : $sorted[$key]=$array[$key];
- return $sorted;
- }
- return $array;
-}
-
-//this tests for IE < 9 since IE9 supports the Canvas tag properly
-function is_ie($version = 9)
-{
- if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)
- {
- $browser = explode(';', $_SERVER['HTTP_USER_AGENT']);
- foreach ($browser as $b)
- {
- if (strpos($b, 'MSIE') !== false)
- {
- $test = explode(' ', $b);
- }
- }
-
- if($test[2] < $version)
- {
- return true;
- }
- else
- {
- return false;
- }
-
- }
- else
- {
- return false;
- }
-}
\ No newline at end of file
diff --git a/gocart/language/english/admin_common_lang.php b/gocart/language/english/admin_common_lang.php
new file mode 100644
index 00000000..00725fde
--- /dev/null
+++ b/gocart/language/english/admin_common_lang.php
@@ -0,0 +1,40 @@
+You did not select a file to upload.
'; //important. This must match the same error as generated by the file upload script of your language.
+$lang['message_delete_category'] = 'The category has been deleted.';
+$lang['current_file'] = 'Current File';
+$lang['confirm_delete_category'] = 'Are you sure you want to delete this category?';
+$lang['add_new_category'] = 'Add New Category';
+$lang['no_categories'] = 'There are currently no categories';
+$lang['attributes'] = 'Attributes';
+$lang['seo'] = 'SEO';
+$lang['parent'] = 'Parent';
+$lang['meta_data_description'] = 'ex. <meta name="description" content="We sell products that help you" />';
+$lang['drag_and_drop'] = 'Drag and drop the products in the order you would like them to appear.';
+$lang['sku'] = 'SKU';
+$lang['price'] = 'Price';
+$lang['sale'] = 'Sale';
+$lang['max_file_size'] = 'Max File Size';
\ No newline at end of file
diff --git a/gocart/language/english/common_lang.php b/gocart/language/english/common_lang.php
new file mode 100644
index 00000000..bc72a5ef
--- /dev/null
+++ b/gocart/language/english/common_lang.php
@@ -0,0 +1,251 @@
+To: %s';
+
+$lang['email'] = 'Email';
+$lang['password'] = 'Password';
+$lang['return_to_login'] = 'Return to Login';
+$lang['forgot_password'] = 'Forgot Password';
+$lang['keep_me_logged_in'] = 'Keep me logged in!';
+$lang['register'] = 'Register';
+$lang['login_failed'] = 'Authentication Failed!';
+$lang['go_to_login'] = 'Go to Login';
+
+$lang['account_registration'] = 'Account Registration';
+$lang['registration_thanks'] = 'Thanks for registering %s!';
+$lang['error_email'] = 'The requested email is already in use.';
+$lang['error_no_account_record'] = 'There is no record of your account.';
+$lang['message_new_password'] = 'A new password has been generated and sent to your email.';
+$lang['message_account_updated'] = 'Your account has been updated';
+
+$lang['error_invalid_shipping_method'] = 'Please select a valid shipping method.';
+$lang['delete_address_confirmation'] = 'Are you sure you want to delete this address?';
+$lang['error_must_have_address'] = 'You Must leave at least 1 address in the Address Manager.';
+$lang['account_information'] = 'Account Information';
+$lang['account_company'] = 'Company';
+$lang['account_firstname'] = 'First Name';
+$lang['account_lastname'] = 'Last Name';
+$lang['account_email'] = 'Email';
+$lang['account_phone'] = 'Phone';
+$lang['account_password'] = 'Password';
+$lang['account_confirm'] = 'Confirm Password';
+$lang['account_newsletter_subscribe'] = 'Subscribe to our email list';
+$lang['account_password_instructions'] = 'If you do not wish to change your
password, leave both fields blank.';
+$lang['default_billing'] = 'Default Billing';
+$lang['default_shipping'] = 'Default Shipping';
+$lang['order_history'] = 'Order History';
+$lang['order_date'] = 'Ordered On';
+$lang['order_number'] = 'Order Number';
+$lang['order_status'] = 'Status';
+$lang['add_address'] = 'Add Address';
+$lang['no_order_history'] = 'You have no orders in your account history.';
+
+//cart library messages
+$lang['coupon_not_apply'] = 'The coupon code you entered does not apply to any products in your cart.';
+$lang['coupon_applied'] = 'The coupon has been applied to your products.';
+$lang['coupon_invalid'] = 'Sorry, but the coupon you entered is not valid at this time.';
+$lang['coupon_already_applied'] = 'That coupon code has already been applied to your items.';
+$lang['invalid_coupon_code'] = 'There was no coupon with that code. Check to make sure you entered it correctly.';
+$lang['giftcard_balance_applied'] = 'You should see your card balance displayed.';
+$lang['giftcard_zero_balance'] = 'Sorry, but the gift card you entered is expired or has a zero balance.';
+$lang['giftcard_not_exist'] = 'The gift card code you entered does not exist.';
+$lang['giftcard_already_applied'] = 'Your gift card is already applied';
+$lang['error_updating_cart'] = 'There was an error updating the cart!';
+$lang['not_enough_stock'] = 'The quantity requested for the "%s" product could not be added. We only have %d item(s) in stock.';
+$lang['remove_item'] = 'Are you sure you want to remove this item from your cart?';
diff --git a/gocart/language/english/coupon_lang.php b/gocart/language/english/coupon_lang.php
new file mode 100644
index 00000000..790a5b7d
--- /dev/null
+++ b/gocart/language/english/coupon_lang.php
@@ -0,0 +1,36 @@
+
+* @link http://www.everlon.com.br
+* @version 1.0 (em desenvolvimento)
+* @copyright 2013
+*/
+
+/******************************************
+Português brasileiro
+Admin Common Language
+******************************************/
+
+//header
+$lang['common_sales'] = 'Vendas';
+$lang['common_orders'] = 'Pedidos';
+$lang['common_customers'] = 'Clientes';
+$lang['common_groups'] = 'Grupos';
+$lang['common_reports'] = 'Relatórios';
+$lang['common_coupons'] = 'Cupons';
+$lang['common_giftcards'] = 'Vale Presente';
+$lang['common_catalog'] = 'Catalogo';
+$lang['common_categories'] = 'Categorias';
+$lang['common_products'] = 'Produtos';
+$lang['common_digital_products'] = 'Produtos Digitais';
+$lang['common_content'] = 'Conteúdo';
+$lang['common_banners'] = 'Banners';
+$lang['common_boxes'] = 'Caixas de Informação';
+$lang['common_pages'] = 'Paginas';
+$lang['common_administrative'] = 'Administrativo';
+$lang['common_settings'] = 'Configurações';
+$lang['common_locations'] = 'Localizações';
+$lang['common_administrators'] = 'Administradores';
+$lang['common_note'] = 'Notas';
+$lang['common_alert'] = 'Alerta';
+$lang['common_log_out'] = 'Sair';
+$lang['common_front_end'] = 'Frente da Loja';
+$lang['common_dashboard'] = 'Painel de Controle';
+$lang['common_home'] = 'Home';
+$lang['common_actions'] = 'Ações';
+
+//buttons
+$lang['save'] = 'Salvar';
+$lang['edit'] = 'Editar';
+$lang['delete'] = 'Apagar';
+$lang['search'] = 'Procurar';
+$lang['toggle_wysiwyg'] = 'Editor de texto';
\ No newline at end of file
diff --git a/gocart/language/pt-br/admin_lang.php b/gocart/language/pt-br/admin_lang.php
new file mode 100644
index 00000000..2fd35d5a
--- /dev/null
+++ b/gocart/language/pt-br/admin_lang.php
@@ -0,0 +1,29 @@
+
+* @link http://www.everlon.com.br
+* @version 1.0 (em desenvolvimento)
+* @copyright 2013
+*/
+
+/******************************************
+Português brasileiros
+Admin Administrator Management Language
+******************************************/
+
+$lang['admins'] = 'Administradores';
+$lang['admin_form'] = 'Formulário de Administradores';
+$lang['add_new_admin'] = 'Adicionar um Administrador';
+$lang['error_self_delete'] = 'Não pode apagar você mesmo';
+$lang['admin_not_found'] = 'O administrador solicitado não pôde ser encontrado';
+$lang['firstname'] = 'Primeiro nome';
+$lang['lastname'] = 'Sobrenome';
+$lang['email'] = 'E-mail';
+$lang['access'] = 'Acesso';
+$lang['password'] = 'Senha';
+$lang['confirm_password'] = 'Confirmar senha';
+$lang['message_user_saved'] = 'O administrador foi salvo!';
+$lang['message_user_deleted'] = 'O administrador foi apagado.';
+$lang['error_email_taken'] = 'O e-mail solicitado já está em uso.';
+$lang['information'] = 'Informação';
+$lang['confirm_delete'] = 'Você tem certeza que quer apagar este administrador?';
\ No newline at end of file
diff --git a/gocart/language/pt-br/banner_lang.php b/gocart/language/pt-br/banner_lang.php
new file mode 100644
index 00000000..d422cdcf
--- /dev/null
+++ b/gocart/language/pt-br/banner_lang.php
@@ -0,0 +1,30 @@
+
+* @link http://www.everlon.com.br
+* @version 1.0 (em desenvolvimento)
+* @copyright 2013
+*/
+
+/******************************************
+Português brasileiro
+Admin Banner Language
+******************************************/
+
+$lang['banners'] = 'Banners';
+$lang['title'] = 'Titulo';
+$lang['link'] = 'Link';
+$lang['enable_on'] = 'Inicio da publicação';
+$lang['disable_on'] = 'Fim da publicação';
+$lang['new_window'] = 'Pop-up';
+$lang['image'] = 'Imagem';
+$lang['current_file'] = 'Arquivo atual';
+$lang['confirm_delete_banner'] = 'Tem certeza que quer apagar este banner?';
+$lang['add_new_banner'] = 'Adicionar novo Banner';
+$lang['no_banners'] = 'Sem banners cadastrados';
+$lang['message_banner_saved'] = 'O banner foi salvo!';
+$lang['date_error'] = 'A data de "Fim da publicação" não pode ser anterior a data de "Inicio da publicação.';
+$lang['banner_form'] = 'Formulário de Banner';
+$lang['message_delete_banner'] = 'O banner foi excluÃdo.';
+$lang['sort'] = 'Ordem';
+$lang['sort_banners'] = 'Os Banners foram ordenados! Basta arrastar e soltá-los na ordem que você gostaria que eles apareçam.';
\ No newline at end of file
diff --git a/gocart/language/pt-br/boxes_lang.php b/gocart/language/pt-br/boxes_lang.php
new file mode 100644
index 00000000..934984c7
--- /dev/null
+++ b/gocart/language/pt-br/boxes_lang.php
@@ -0,0 +1,31 @@
+
+* @link http://www.everlon.com.br
+* @version 1.0 (em desenvolvimento)
+* @copyright 2013
+*/
+
+/******************************************
+Português brasileiro
+Admin Boxes Language
+******************************************/
+
+$lang['boxes'] = 'Caixas de Informação';
+$lang['box_info'] = 'Caixa de Informação';
+$lang['title'] = 'TÃtulo';
+$lang['link'] = 'Link';
+$lang['enable_on'] = 'Inicio da publicação';
+$lang['disable_on'] = 'Fim da publicação';
+$lang['new_window'] = 'Pop-up';
+$lang['image'] = 'Imagem';
+$lang['current_file'] = 'Arquivo atual';
+$lang['confirm_delete_box'] = 'Você tem certeza que quer apagar esta caixa?';
+$lang['add_new_box'] = 'Adicionar nova Caixa';
+$lang['no_boxes'] = 'Não existe caixas cadastrados';
+$lang['message_box_saved'] = 'A caixa foi salva!';
+$lang['date_error'] = 'A data de "Fim da publicação" não pode ser anterior a data de "Inicio da publicação.';
+$lang['box_form'] = 'Formulário de Caixa de Informação';
+$lang['message_delete_box'] = 'A caixa foi excluÃda.';
+$lang['sort'] = 'Ordem';
+$lang['sort_boxes'] = 'As Boxes foram ordenados! Basta arrastar e soltá-los na ordem que você gostaria que eles apareçam.';
\ No newline at end of file
diff --git a/gocart/language/pt-br/category_lang.php b/gocart/language/pt-br/category_lang.php
new file mode 100644
index 00000000..e2ee9ece
--- /dev/null
+++ b/gocart/language/pt-br/category_lang.php
@@ -0,0 +1,44 @@
+
+* @link http://www.everlon.com.br
+* @version 1.0 (em desenvolvimento)
+* @copyright 2013
+*/
+
+/******************************************
+Português brasileiro
+Admin Category Language
+******************************************/
+
+$lang['categories'] = 'Categorias';
+$lang['error_must_select'] = 'Você deve selecionar uma categoria para organizar';
+$lang['error_not_found'] = 'A categoria solicitada não pôde ser encontrado.';
+$lang['organize_category'] = 'Organize "%s" Categoria';
+$lang['organize'] = 'Organize';
+$lang['category_id'] = 'ID';
+$lang['category_form'] = 'Formulário da Categoria';
+$lang['name'] = 'Nome';
+$lang['slug'] = 'Amigável';
+$lang['description'] = 'Descrição';
+$lang['excerpt'] = 'Resumo';
+$lang['sequence'] = 'Sequência';
+$lang['image'] = 'Imagem';
+$lang['seo_title'] = 'TÃtulo SEO';
+$lang['meta'] = 'Meta Data';
+$lang['message_category_saved'] = 'A categoria foi salva!';
+$lang['error_file_upload'] = 'Você não selecionou um arquivo para Envio.
'; # Importante! Isso deve corresponder o mesmo erro gerado pelo script de upload de arquivos do seu idioma.
+$lang['message_delete_category'] = 'A categoria foi excluÃda.';
+$lang['current_file'] = 'Arquivo corrente.';
+$lang['confirm_delete_category'] = 'Tem certeza de que deseja apagar esta categoria?';
+$lang['add_new_category'] = 'Adicionar nova Categoria';
+$lang['no_categories'] = 'Atualmente não existem categorias';
+$lang['attributes'] = 'Atributos';
+$lang['seo'] = 'SEO';
+$lang['parent'] = 'Parentesco';
+$lang['meta_data_description'] = 'ex. <meta name="descrição" content="Nós vendemos produtos para ajudar você." />';
+$lang['drag_and_drop'] = 'Arraste e solte os produtos na ordem que você gostaria que eles apareçam.';
+$lang['sku'] = 'Cod.';
+$lang['price'] = 'Preço';
+$lang['sale'] = 'Venda';
+$lang['max_file_size'] = 'Tamanho máximo do arquivo';
\ No newline at end of file
diff --git a/gocart/language/pt-br/common_lang.php b/gocart/language/pt-br/common_lang.php
new file mode 100644
index 00000000..0bab7b11
--- /dev/null
+++ b/gocart/language/pt-br/common_lang.php
@@ -0,0 +1,257 @@
+
+* @link http://www.everlon.com.br
+* @version 1.0 (em desenvolvimento)
+* @copyright 2013
+*/
+
+/******************************************
+
+Português brasileiro
+Common Language
+
+******************************************/
+
+
+
+
+/*******************
+
+Frente da Loja
+
+*******************/
+
+//common terms
+$lang['login'] = 'Login';
+$lang['logout'] = 'Sair';
+$lang['my_account'] = 'Minha Conta';
+$lang['my_downloads'] = 'Meus Downloads';
+$lang['enabled'] = 'Habilitado';
+$lang['disabled'] = 'Desabilitado';
+$lang['mode'] = 'Modo';
+$lang['currency'] = 'Moeda';
+$lang['active'] = 'Ativo';
+$lang['yes'] = 'Sim';
+$lang['no'] = 'Não';
+$lang['download_link'] = 'Clique aqui para acessar seus downloads!';
+$lang['catalog'] = 'Catálogo';
+$lang['account'] = 'Conta';
+$lang['close'] = 'Fechar';
+
+$lang['empty_cart'] = 'Seu carrinho esta vazio';
+$lang['single_item'] = 'Existe %d item no seu carrinho';
+$lang['multiple_items'] = 'Existem %d itens no seu carrinho';
+$lang['empty_view_cart'] = 'Não tem nenhum item seu carrinho!';
+$lang['your_cart'] = 'Seu carrinho de compra';
+
+$lang['on_sale'] = 'Por';
+$lang['related_products_title'] = 'Você também pode gostar...';
+$lang['form_submit'] = 'Enviar';
+$lang['form_register'] = 'Cadastrar';
+$lang['form_login'] = 'Login';
+$lang['reset_password'] = 'Restaurar senha';
+$lang['form_search'] = 'Encontre';
+$lang['form_cancel'] = 'Cancela';
+$lang['form_add_to_cart'] = 'Adicionar ao carrinho';
+$lang['form_update_cart'] = 'Atualizar carrinho';
+$lang['form_checkout'] = 'Confira';
+$lang['form_continue'] = 'Continue';
+$lang['form_choose'] = 'Escolher';
+$lang['form_edit'] = 'Editar';
+$lang['form_delete'] = 'Excluir';
+$lang['form_search'] = 'Buscar';
+$lang['form_view'] = 'Visualizar';
+$lang['form_save'] = 'Salvar';
+$lang['form_from'] = 'De';
+$lang['form_to'] = 'para';
+
+$lang['step_1'] = 'Primeiro passo';
+$lang['step_2'] = 'Segundo passo';
+$lang['free_shipping_basic'] = 'Frete Grátis (básico)';
+
+$lang['search'] = 'Encontrar';
+$lang['search_error'] = 'Não foi possÃvel encontrar com o termo usado!';
+$lang['amount'] = 'Quantidade';
+$lang['custom_amount'] = 'Personalizar quantidade';
+$lang['preset_amount'] = 'Quantidade atual';
+$lang['recipient_name'] = 'Nome do destinatário';
+$lang['recipient_email'] = 'E-mail do destinatário';
+$lang['sender_email'] = 'E-mail remetente';
+$lang['custom_greeting'] = 'Saudação personalizada';
+$lang['check_out'] = 'Confira';
+
+$lang['sort_by_name_asc'] = 'Ordenar por nome A a Z';
+$lang['sort_by_name_desc'] = 'Ordenar por nome Z a A';
+$lang['sort_by_price_asc'] = 'Ordenar por menor preço';
+$lang['sort_by_price_desc'] = 'Ordenar por maior preço';
+
+$lang['products'] = 'Produtos';
+$lang['out_of_stock'] = 'Fora de estoque';
+$lang['no_products'] = 'Não existem produtos ainda nesta categoria.';
+$lang['no_image_available'] = 'Sem imagem relacionada';
+$lang['product_reg'] = 'de ';
+$lang['product_price'] = 'Preço:';
+$lang['product_sale'] = 'Somente ';
+$lang['available_options'] = 'Opções disponÃveis';
+$lang['choose_option'] = 'Escolha uma opção';
+$lang['tab_description'] = 'Descrição';
+$lang['tab_related_products'] = 'Produtos relacionados';
+$lang['subcategories'] = 'Sub-categorias';
+
+$lang['loading'] = 'Carregando…';
+$lang['coupon_label'] = 'Se você tem um cupom, digite o código aqui:';
+$lang['gift_card_label'] = 'Se você tem um vale presente, digite o código aqui:';
+$lang['apply_gift_card'] = 'Usar vale presente';
+$lang['apply_coupon'] = 'Usar cupom de desconto';
+$lang['customer_information'] = 'Informação ao Cliente';
+$lang['error_save_payment'] = 'Houve um problema em salvar o seu método de pagamento';
+$lang['error_choose_payment'] = 'Por favor escolha uma forma de pagamento';
+$lang['error_choose_shipping'] = 'Por favor escolha um método de envio';
+$lang['continue_shopping'] = 'Continuar comprando';
+$lang['register_now'] = 'Registre-se';
+$lang['submit_order'] = 'Finalizar compra';
+$lang['edit_customer_information'] = 'Editar Informações ao Cliente';
+$lang['communication_error'] = 'Houve um problema inesperado comunicação com o servidor.';
+$lang['no_payment_needed'] = 'Não há pagamento necessário.';
+$lang['choose_payment_method'] = 'Escolha o modo de pagamento';
+$lang['shipping_method'] = 'Método de envio';
+$lang['no_shipping_needed'] = 'Seu pedido não inclui todos os itens que necessitam de transporte.';
+$lang['payment_information'] = 'Informações sobre pagamento';
+$lang['payment_method'] = 'Forma de Pagamento';
+$lang['submit_payment_method'] = 'Enviar forma de pagamento';
+$lang['product_information'] = 'Informação do produto';
+$lang['price_and_quantity'] = 'Preço & Quantidade';
+$lang['sku'] = 'Cod.';
+$lang['name'] = 'Nome';
+$lang['price'] = 'Preço';
+$lang['description'] = 'Descrição';
+$lang['quantity'] = 'Quantidade';
+$lang['totals'] = 'Totais';
+$lang['group_discount'] = 'Desconto para Grupos';
+$lang['subtotal'] = 'Subtotal';
+$lang['cart_total'] = 'Total';
+$lang['coupon_discount'] = 'Cupom de desconto';
+$lang['gift_card_discount'] = 'Vale-presente';
+$lang['discounted_subtotal'] = 'Desconto Subtotal';
+$lang['shipping'] = 'Frete';
+$lang['tax'] = 'Imposto';
+$lang['taxes'] = 'Impostos';
+$lang['grand_total'] = 'Valor final';
+$lang['address_manager'] = 'Endereço principal';
+$lang['address_form'] = 'Formulário de endereço';
+$lang['your_addresses'] = 'Seu endereço';
+$lang['address_button'] = 'Mudar endereço';
+$lang['shipping_address_button'] = 'Alterar endereço de entrega';
+$lang['billing_address_button'] = 'Alterar endereço de cobrança';
+$lang['shipping_method_button'] = 'Alterar método de envio';
+$lang['billing_method_button'] = 'Alterar método de cobrança';
+$lang['shipping_and_billing'] = 'Informações de Frete & Cobrança';
+$lang['billing_address'] = 'Endereço de cobrança';
+$lang['choose_billing_address'] = 'Escolha seu endereço de cobrança';
+$lang['use_address_for_shipping'] = 'Utilize este endereço para envio';
+$lang['shipping_address'] = 'Endereço para envio';
+$lang['shipping_information'] = 'Informações de Envio';
+$lang['billing_information'] = 'Informações de cobrança';
+$lang['choose_shipping_address'] = 'Escolha seu endereço de entrega';
+$lang['choose_address'] = 'Escolha o endereço';
+$lang['ship_to_address'] = 'Enviar para este endereço';
+$lang['contact_info'] = 'Informações de contato';
+$lang['address_company'] = 'Empresa';
+$lang['address'] = 'Endereço';
+$lang['address1'] = 'Endereço 1';
+$lang['address2'] = 'Endereço 2';
+$lang['address_firstname'] = 'Primeiro nome';
+$lang['address_lastname'] = 'Sobrenome';
+$lang['address_email'] = 'E-mail';
+$lang['address_phone'] = 'Telefone / Celular';
+$lang['address_city'] = 'Cidade';
+$lang['address_postcode'] = 'CEP';
+$lang['address_country'] = 'PaÃs';
+$lang['address_state'] = 'Estado';
+$lang['message_address_saved'] = 'Seu endereço foi salvo com sucesso!';
+
+$lang['default'] = 'Padrão';
+$lang['additional_order_details'] = 'Detalhes adicionais do pedido';
+$lang['additional_details'] = 'Detalhes adicionais';
+$lang['heard_about'] = 'Como você ficou sabendo sobre nós?';
+$lang['shipping_instructions'] = 'Informação de frete';
+
+//checkout confirmation
+$lang['thank_you'] = 'Obrigado pela sua compra! '; // terminates with company/site name, defined in gocart config as 'company_name'
+
+//authorize.net library messages
+$lang['please_fix_errors'] = 'Por favor, corrija os seguintes erros:';
+$lang['enter_card_name'] = 'Digite seu nome como aparece no cartão';
+$lang['invalid_card_exp'] = 'A data de validade não parece ser válido';
+$lang['invalid_card_num'] = 'O número do cartão que você digitou não é um número válido de cartão de crédito';
+$lang['enter_card_code'] = 'Por favor insira o código de segurança de três dÃgitos no verso do cartão';
+$lang['transaction_declined'] = 'Transação recusada. Por favor, verifique as informações do cartão e tente novamente.';
+$lang['enter_test_mode_credentials'] = 'Você deve digitar os valores de login para o modo TESTE';
+$lang['enter_live_mode_credentials'] = 'Você deve digitar os valores de login para o modo LIVE';
+$lang['all_required_fields'] = 'Por favor, preencha todos os campos obrigatórios.';
+$lang['card_number'] = 'Número do Cartão de Crédito';
+$lang['expires_on'] = 'Validade';
+$lang['cvv_code'] = 'Código CVV';
+
+//giftcards
+$lang['giftcard'] = 'Vale-presente';
+$lang['giftcard_choose_amount'] = 'Escolha a quantidade de Vale-presente';
+$lang['giftcard_custom_amount'] = 'Personalizar quantidade';
+$lang['giftcard_to'] = 'Para (Nome)';
+$lang['giftcard_email'] = 'Para (E-mail)';
+$lang['giftcard_from'] = 'De';
+$lang['giftcard_message'] = 'Mensagem personalizada';
+$lang['giftcard_excerpt'] = 'Vale-presente para um amigo(a)
Para: %s';
+
+$lang['email'] = 'E-mail';
+$lang['password'] = 'Senha';
+$lang['return_to_login'] = 'Voltar ao Login';
+$lang['forgot_password'] = 'Esqueci minha senha';
+$lang['keep_me_logged_in'] = 'Mantenha-me conectado!';
+$lang['register'] = 'Registrar';
+$lang['login_failed'] = 'Erro ao entrar!';
+$lang['go_to_login'] = 'Vá ao Login';
+
+$lang['account_registration'] = 'Cadastro';
+$lang['registration_thanks'] = 'Obrigado por se cadastrar %s!';
+$lang['error_email'] = 'O e-mail solicitado já está em uso.';
+$lang['error_no_account_record'] = 'Não há registro de sua conta.';
+$lang['message_new_password'] = 'Uma nova senha foi gerada e enviada para o seu e-mail.';
+$lang['message_account_updated'] = 'Sua conta foi atualizada';
+
+$lang['error_invalid_shipping_method'] = 'Por favor selecione um método de envio válido.';
+$lang['delete_address_confirmation'] = 'Tem certeza de que quer apagar este endereço?';
+$lang['error_must_have_address'] = 'Você deve deixar pelo menos um endereço no Endereço principal.';
+$lang['account_information'] = 'Informações da Conta';
+$lang['account_company'] = 'Empresa';
+$lang['account_firstname'] = 'Primeiro nome';
+$lang['account_lastname'] = 'Sobrenome';
+$lang['account_email'] = 'E-mail';
+$lang['account_phone'] = 'Telefone / Celular';
+$lang['account_password'] = 'Senha';
+$lang['account_confirm'] = 'confirme sua senha';
+$lang['account_newsletter_subscribe'] = 'Assine nossa lista de E-mail';
+$lang['account_password_instructions'] = 'Se você não quiser alterar sua senha
, deixar ambos os campos em branco.';
+$lang['default_billing'] = 'Pagamento padrão';
+$lang['default_shipping'] = 'Envio padrão';
+$lang['order_history'] = 'Histórico de pedidos';
+$lang['order_date'] = 'Solicitado em';
+$lang['order_number'] = 'Numero de pedido';
+$lang['order_status'] = 'Situação';
+$lang['add_address'] = 'Adicionar endereço';
+$lang['no_order_history'] = 'Você não tem pedidos em seu histórico de conta.';
+
+//cart library messages
+$lang['coupon_not_apply'] = 'O código de cupom que você digitou não se aplica a quaisquer produtos em seu carrinho.';
+$lang['coupon_applied'] = 'O cupom foi aplicado em seus produtos.';
+$lang['coupon_invalid'] = 'Desculpe, mas o cupom que você digitou não é válido neste momento.';
+$lang['coupon_already_applied'] = 'Esse código de cupom já foi aplicada aos seus itens.';
+$lang['invalid_coupon_code'] = 'Não houve cupom com esse código. Verifique se você digitou corretamente.';
+$lang['giftcard_balance_applied'] = 'Você deve consultar o seu saldo do cartão exibido.';
+$lang['giftcard_zero_balance'] = 'Desculpe, mas o vale-presente está expirado ou tem um saldo zero.';
+$lang['giftcard_not_exist'] = 'O código de vale-presente que você digitou não existe.';
+$lang['giftcard_already_applied'] = 'O seu vale-presente já foi usado';
+$lang['error_updating_cart'] = 'Houve um erro ao atualizar o carrinho!';
+$lang['not_enough_stock'] = 'A quantidade solicitada para o produto "%s" não pode ser adicionado. Nós só temos %d item (s) em estoque.';
+$lang['remove_item'] = 'Tem certeza de que deseja remover este item do seu carrinho?';
diff --git a/gocart/language/pt-br/coupon_lang.php b/gocart/language/pt-br/coupon_lang.php
new file mode 100644
index 00000000..f76ca959
--- /dev/null
+++ b/gocart/language/pt-br/coupon_lang.php
@@ -0,0 +1,43 @@
+
+* @link http://www.everlon.com.br
+* @version 1.0 (em desenvolvimento)
+* @copyright 2013
+*/
+
+/******************************************
+Português brasileiro
+Admin Coupon Language
+******************************************/
+
+$lang['coupons'] = 'Cupons';
+$lang['coupon_form'] = 'Formulário de Cupons';
+$lang['error_not_found'] = 'O cupom solicitada não pôde ser encontrado.';
+$lang['no_coupons'] = 'Atualmente não existem cupons.';
+$lang['confirm_delete_coupon'] = 'Tem certeza de que deseja excluir este cupom?';
+$lang['add_new_coupon'] = 'Adicionar novo cupom';
+$lang['code'] = 'Código';
+$lang['max_uses'] = 'Uso máximo';
+$lang['whole_order_discount'] = 'Desconto na compra toda?';
+$lang['reduction_target'] = 'Meta de redução';
+$lang['reduction_type'] = 'Tipo de redução';
+$lang['reduction_amount'] = 'Quantidade de redução';
+$lang['start_date'] = 'Data de inicio';
+$lang['end_date'] = 'Data final';
+$lang['message_saved_coupon'] = 'O cupom foi salvo!';
+$lang['error_already_used'] = 'O código de cupom solicitado já está em uso!';
+$lang['message_coupon_deleted'] = 'O cupom foi apagado com sucesso.';
+$lang['attributes'] = 'Atributos';
+$lang['applies_to'] = 'Aplicado a';
+$lang['coupon_code'] = 'Código do cupom';
+$lang['times_used'] = 'Este cupom foi usado %d vezes.';
+$lang['limit_per_order'] = 'Limite por compra';
+$lang['enable_on'] = 'Data inicio';
+$lang['disable_on'] = 'Data final';
+$lang['coupon_type'] = 'Tipo de cupom';
+$lang['price_discount'] = 'Valor do desconto';
+$lang['free_shipping'] = 'Frete grátis';
+$lang['apply_to_whole_order'] = 'Aplicar cupom de toda compra';
+$lang['apply_to_select_items'] = 'Aplicar cupom nos itens selecionados';
+$lang['usage'] = 'Usado';
\ No newline at end of file
diff --git a/gocart/language/pt-br/customer_lang.php b/gocart/language/pt-br/customer_lang.php
new file mode 100644
index 00000000..7f9a7ea4
--- /dev/null
+++ b/gocart/language/pt-br/customer_lang.php
@@ -0,0 +1,65 @@
+
+* @link http://www.everlon.com.br
+* @version 1.0 (em desenvolvimento)
+* @copyright 2013
+*/
+
+/******************************************
+Português brasileiro
+Admin Customer Language
+******************************************/
+
+$lang['customers'] = 'Clientes';
+$lang['customer_form'] = 'Formulário de cliente';
+$lang['firstname'] = 'Primeiro nome';
+$lang['lastname'] = 'Sobrenome';
+$lang['email'] = 'E-mail';
+$lang['phone'] = 'Telefone / Celular';
+$lang['contact'] = 'Contato';
+$lang['locality'] = 'Localização';
+$lang['company'] = 'Empresa';
+$lang['active'] = 'Ativo';
+$lang['email_subscribed'] = 'E-mail inscrito';
+$lang['password'] = 'Senha';
+$lang['confirm_password'] = 'Confirma senha';
+$lang['confirm'] = 'Confirma';
+$lang['group_name'] = 'Nome do grupo';
+$lang['discount'] = 'Desconto';
+$lang['discount_type'] = 'Tipo de desconto';
+$lang['address'] = 'Endereço';
+$lang['city'] = 'Cidade';
+$lang['country'] = 'PaÃs';
+$lang['state'] = 'Estado';
+$lang['postcode'] = 'CEP';
+$lang['address_information'] = 'Informação de endereço';
+$lang['customer_information'] = 'Outras informações';
+$lang['addresses_for'] = 'Endereço para %s';
+$lang['addresses'] = 'Endereços';
+$lang['customer_groups'] = 'Grupo de clientes';
+$lang['group'] = 'Grupo';
+$lang['group_name'] = 'Nome do grupo';
+$lang['customer_group_form'] = 'Formulário de Grupos de clientes';
+$lang['address_form'] = 'Formulário de endereço';
+$lang['attributes'] = 'Atributos';
+$lang['xml_download'] = 'Exportar clientes (XML)';
+$lang['subscriber_download'] = 'Lista dos E-mails (CSV)';
+$lang['no_addresses'] = 'Atualmente não existem endereços para este cliente.';
+$lang['no_customers'] = 'Atualmente não há cliente.';
+$lang['message_saved_group'] = 'O grupo de clientes foi salvo.';
+$lang['message_saved_customer'] = 'O cliente foi salvo.';
+$lang['message_saved_address'] = 'O endereço foi salvo.';
+$lang['message_customer_deleted'] = 'O cliente foi excluÃdo.';
+$lang['message_address_deleted'] = 'O endereço foi excluÃdo.';
+
+$lang['error_not_found'] = 'O cliente solicitado não pôde ser encontrado.';
+$lang['error_address_not_found'] = 'O endereço solicitado não pôde ser encontrado.';
+$lang['error_email_in_use'] = 'O e-mail solicitado já está em uso.';
+
+$lang['confirm_delete_address'] = 'Tem certeza de que quer apagar este endereço?';
+$lang['confirm_delete_group'] = 'Tem certeza de que deseja excluir este grupo?';
+$lang['confirm_delete_customer'] = 'Tem certeza de que deseja excluir este cliente?';
+$lang['add_new_address'] = 'Adicionar novo endereço';
+$lang['add_new_group'] = 'Adicionar novo grupo';
+$lang['add_new_customer'] = 'Adicionar um novo cliente';
diff --git a/gocart/language/pt-br/dashboard_lang.php b/gocart/language/pt-br/dashboard_lang.php
new file mode 100644
index 00000000..b6d6b50b
--- /dev/null
+++ b/gocart/language/pt-br/dashboard_lang.php
@@ -0,0 +1,32 @@
+
+* @link http://www.everlon.com.br
+* @version 1.0 (em desenvolvimento)
+* @copyright 2013
+*/
+
+/******************************************
+Português brasileiro
+Admin Dashboard Language
+******************************************/
+
+$lang['dashboard'] = 'Painel';
+$lang['order_number'] = 'Número de pedidos';
+$lang['bill_to'] = 'Cobrança para';
+$lang['ship_to'] = 'Enviar para';
+$lang['ordered_on'] = 'Solicitado em';
+$lang['status'] = 'Situação';
+$lang['firstname'] = 'Nome';
+$lang['lastname'] = 'Sobrenome';
+$lang['email'] = 'E-mail';
+$lang['active'] = 'Ativo';
+$lang['yes'] = 'Sim';
+$lang['no'] = 'Não';
+$lang['recent_orders'] = 'Pedidos recentes';
+$lang['recent_customers'] = 'Clientes recentes';
+$lang['view_all_orders'] = 'Ver todos os pedidos';
+$lang['view_all_customers'] = 'Ver todos os clientes';
+
+$lang['no_shipping_module_installed'] = 'Não há nenhum módulo de transporte atualmente instalada. Isso impede que os clientes comprem corretamente.';
+$lang['no_payment_module_installed'] = 'Não há módulo de pagamento instalado atualmente. Isso impede que os clientes comprem corretamente.';
\ No newline at end of file
diff --git a/gocart/language/pt-br/digital_product_lang.php b/gocart/language/pt-br/digital_product_lang.php
new file mode 100644
index 00000000..54b95611
--- /dev/null
+++ b/gocart/language/pt-br/digital_product_lang.php
@@ -0,0 +1,41 @@
+
+* @link http://www.everlon.com.br
+* @version 1.0 (em desenvolvimento)
+* @copyright 2013
+*/
+
+/******************************************
+Português brasileiro
+Admin Dashboard Language
+******************************************/
+
+$lang['dgtl_pr_header'] = 'Arquivo de Produtos Digitais';
+
+$lang['confirm_delete_file'] = 'Aviso: A exclusão de um arquivo que está associado a um produto ativo irá desativar automaticamente sua disponibilidade.';
+$lang['path_error'] = 'Seu caminho de envio do arquivo não é gravável. Por favor, verifique as permissões da sua pasta antes que você pode fazer upload de qualquer coisa.';
+$lang['message_deleted_file'] = 'O arquivo foi apagado.';
+
+$lang['add_file'] = 'Adicionar arquivo';
+$lang['digital_products_form'] = 'Formulário de Produtos Digitais';
+$lang['file_label'] = 'Escolha o arquivo';
+$lang['version'] = 'Versão';
+$lang['max_downloads'] = 'Máximo de Downloads';
+$lang['max_downloads_note'] = '(Downloads máximo por compra - 0 para ilimitado)';
+$lang['filename'] = 'Nome do arquivo';
+$lang['title'] = 'TÃtulo';
+$lang['size'] = 'Tamanho do arquivo';
+$lang['avail'] = 'Avaliado';
+$lang['no_files'] = 'Não há arquivos';
+
+$lang['download_limit'] = 'Downloads restante(s)';
+$lang['no_downloads'] = 'Você não tem downloads disponÃveis.';
+$lang['no_max'] = 'N/A';
+$lang['max_exceeded'] = 'Downloads máximo excedido';
+
+$lang['download_btn'] = 'Download';
+
+$lang['attributes'] = 'Atributos';
+
+$lang['missing_file_msg'] = 'Este arquivo não esta disponÃvel para Download no momento. Retorne mais tarde.';
\ No newline at end of file
diff --git a/gocart/language/pt-br/form_validation_lang.php b/gocart/language/pt-br/form_validation_lang.php
new file mode 100644
index 00000000..e69de29b
diff --git a/gocart/language/pt-br/giftcard_lang.php b/gocart/language/pt-br/giftcard_lang.php
new file mode 100644
index 00000000..8888ab08
--- /dev/null
+++ b/gocart/language/pt-br/giftcard_lang.php
@@ -0,0 +1,44 @@
+
+* @link http://www.everlon.com.br
+* @version 1.0 (em desenvolvimento)
+* @copyright 2013
+*/
+
+/******************************************
+Português brasileiro
+Admin Giftcard Language
+******************************************/
+
+$lang['giftcards'] = 'Vale-presentes';
+$lang['giftcard_settings'] = 'Configurações Vale-presentes';
+$lang['recipient_email'] = 'E-mail beneficiário';
+$lang['recipient_name'] = 'Nome beneficiário';
+$lang['sender_name'] = 'Nome do doador';
+$lang['personal_message'] = 'Mensagem personalizada';
+$lang['amount'] = 'Valores';
+$lang['send_notification'] = 'Mandar e-mail de notificação';
+$lang['predefined_card_amounts'] = 'Valor pre-definido';
+$lang['predefined_examples'] = '(ex. 10,20,30)';
+$lang['allow_custom_amounts'] = 'Permitir Valores personalizados';
+$lang['add_giftcard'] = 'Adicionar Vale-presente';
+$lang['attributes'] = 'Atributos';
+$lang['settings'] = 'Configurações';
+$lang['yes'] = 'Sim';
+$lang['no'] = 'Não';
+$lang['code'] = 'Código';
+$lang['disable_giftcards'] = 'Desabilitar Vale-presente';
+$lang['enable_giftcards'] = 'Habilitar Vale-presente';
+$lang['to'] = 'Para';
+$lang['from'] = 'De';
+$lang['total'] = 'Total';
+$lang['used'] = 'Usado';
+$lang['remaining'] = 'Restando';
+
+$lang['no_giftcards'] = 'Atualmente não há Vale-presentes.';
+$lang['message_saved_settings'] = 'As configurações do Vale-presente foram salvas.';
+$lang['message_saved_giftcard'] = 'O Vale-presente foi salvo.';
+$lang['message_activated_giftcard'] = 'O Vale-presente foi ativado.';
+$lang['message_deleted_giftcard'] = 'O Vale-presente foi excluÃdo.';
+$lang['confirm_delete_giftcard'] = 'Tem certeza de que deseja excluir este Vale-presente?';
\ No newline at end of file
diff --git a/gocart/language/pt-br/goedit_lang.php b/gocart/language/pt-br/goedit_lang.php
new file mode 100644
index 00000000..6492320a
--- /dev/null
+++ b/gocart/language/pt-br/goedit_lang.php
@@ -0,0 +1,38 @@
+
+* @link http://www.everlon.com.br
+* @version 1.0 (em desenvolvimento)
+* @copyright 2013
+*/
+
+/******************************************
+Português brasileiro
+GoEdit Language
+
+@TODO
+Verificar onde fica essas traduções
+******************************************/
+
+$lang['goedit_toggle_editor'] = 'Editor HTML';
+$lang['goedit_url'] = 'URL';
+$lang['goedit_target'] = 'Target';
+$lang['goedit_self'] = 'Self';
+$lang['goedit_new_window'] = 'Nova janela';
+$lang['goedit_class'] = 'Class';
+$lang['goedit_insert_link'] = 'Insert Link';
+$lang['goedit_root'] = 'Root';
+$lang['goedit_upload'] = 'Upload';
+$lang['goedit_loading'] = 'Loading';
+$lang['goedit_rename'] = 'Rename';
+$lang['goedit_warning'] = 'Warning!';
+$lang['goedit_warning_text'] = 'Deleting a folder will result in the deletion of all it\'s contents. Are you sure you want to perform this action?';
+$lang['goedit_delete_button'] = 'Yes, Delete it!';
+$lang['goedit_image_details'] = 'Image Details';
+$lang['goedit_alt'] = 'Alt';
+$lang['goedit_width'] = 'Width';
+$lang['goedit_height'] = 'Height';
+$lang['goedit_title'] = 'Title';
+$lang['goedit_insert_image'] = 'Insert Image';
+$lang['goedit_update_image'] = 'Update Image';
+$lang['goedit_folder_name'] = 'Folder Name';
\ No newline at end of file
diff --git a/gocart/third_party/index.html b/gocart/language/pt-br/index.html
similarity index 100%
rename from gocart/third_party/index.html
rename to gocart/language/pt-br/index.html
diff --git a/gocart/language/pt-br/location_lang.php b/gocart/language/pt-br/location_lang.php
new file mode 100644
index 00000000..fe37f94b
--- /dev/null
+++ b/gocart/language/pt-br/location_lang.php
@@ -0,0 +1,55 @@
+
+* @link http://www.everlon.com.br
+* @version 1.0 (em desenvolvimento)
+* @copyright 2013
+*/
+
+/******************************************
+Português brasileiro
+Admin Location Language
+******************************************/
+
+$lang['country'] = 'PaÃs';
+$lang['countries'] = 'Paises';
+$lang['zone_areas'] = 'Região';
+$lang['country_zones'] = '%s Estado';
+$lang['zone_areas_for'] = 'Região para %s';
+$lang['zone_area_form'] = 'Região de %s';
+$lang['country_form'] = 'PaÃs para';
+$lang['zone_form'] = 'Formulário de Estado';
+$lang['zones'] = 'Estados';
+$lang['name'] = 'Nome';
+$lang['code'] = 'Código';
+$lang['iso_code_2'] = 'Código ISO 2';
+$lang['iso_code_3'] = 'Código ISO 3';
+$lang['address_format'] = 'Formato de endereço';
+$lang['require_postcode'] = 'CEP obrigatório';
+$lang['tax'] = 'Imposto';
+$lang['status'] = 'Situação';
+$lang['sort_countries'] = 'PaÃses são ordenáveis! Basta arrastar e soltá-los na ordem que você gostaria que eles apareçam.';
+$lang['add_new_country'] = 'Adicionar novo paÃs';
+$lang['add_new_zone'] = 'Adicionar novo estado';
+$lang['add_new_zone_area'] = 'Adicionar nova região';
+$lang['details'] = 'Detalhes';
+$lang['enabled'] = 'Habilitado';
+$lang['sort'] = 'Ordem';
+
+$lang['error_country_not_found'] = 'O paÃs solicitado não pôde ser encontrado.';
+$lang['message_saved_country'] = 'O paÃs foi salvo.';
+$lang['message_deleted_country'] = 'O paÃs foi excluÃdo.';
+$lang['confirm_delete_country'] = 'Tem certeza de que deseja excluir este paÃs?';
+$lang['no_countries'] = 'Atualmente não existem paÃses cadastrados.';
+
+$lang['error_zone_not_found'] = 'O Estado solicitado não pôde ser encontrado.';
+$lang['message_saved_zone'] = 'O Estado foi salvo.';
+$lang['message_deleted_zone'] = 'O Estado foi excluÃdo.';
+$lang['confirm_delete_zone'] = 'Tem certeza de que deseja excluir este Estado?';
+$lang['no_zones'] = 'Atualmente não existem Estados cadastrados.';
+
+$lang['error_zone_area_not_found'] = 'A região solicitada não pôde ser encontrada.';
+$lang['message_saved_zone_area'] = 'A região foi salva.';
+$lang['message_deleted_zone_area'] = 'A região foi excluÃda.';
+$lang['confirm_delete_zone_area'] = 'Tem certeza de que deseja excluir esta região?';
+$lang['no_zone_areas'] = 'Atualmente não existem regiões cadastradas.';
\ No newline at end of file
diff --git a/gocart/language/pt-br/login_lang.php b/gocart/language/pt-br/login_lang.php
new file mode 100644
index 00000000..a5291436
--- /dev/null
+++ b/gocart/language/pt-br/login_lang.php
@@ -0,0 +1,20 @@
+
+* @link http://www.everlon.com.br
+* @version 1.0 (em desenvolvimento)
+* @copyright 2013
+*/
+
+/******************************************
+Português brasileiro
+Admin login Language
+******************************************/
+
+$lang['error_authentication_failed'] = 'Erro ao Logar!';
+$lang['message_logged_out'] = 'Você foi desconectado.';
+$lang['gocart_login'] = 'Loja Virtual login';
+$lang['login'] = 'Login';
+$lang['password'] = 'Senha';
+$lang['email'] = 'E-mail';
+$lang['stay_logged_in'] = 'Manter-me conectado';
\ No newline at end of file
diff --git a/gocart/language/pt-br/migration_lang.php b/gocart/language/pt-br/migration_lang.php
new file mode 100644
index 00000000..e69de29b
diff --git a/gocart/language/pt-br/order_lang.php b/gocart/language/pt-br/order_lang.php
new file mode 100644
index 00000000..740e3bf1
--- /dev/null
+++ b/gocart/language/pt-br/order_lang.php
@@ -0,0 +1,77 @@
+
+* @link http://www.everlon.com.br
+* @version 1.0 (em desenvolvimento)
+* @copyright 2013
+*/
+
+/******************************************
+Português brasileiro
+Admin Order Language
+******************************************/
+
+$lang['orders'] = 'Pedidos';
+$lang['view_order'] = 'Visualizar pedido';
+$lang['notes'] = 'Notas';
+$lang['status'] = 'Situação';
+$lang['giftcard_is_active'] = 'Vale-presente ativo';
+$lang['activate'] = 'Ativo';
+$lang['order'] = 'Pedido';
+$lang['bill_to'] = 'Cobrança para';
+$lang['ship_to'] = 'Envio para';
+$lang['ordered_on'] = 'Solicitado em';
+$lang['from' ] = 'De';
+$lang['to'] = 'Para';
+$lang['term'] = 'Procurar termo';
+$lang['xml_export'] = 'Exportar para XML';
+
+$lang['no_orders'] = 'Atualmente não existem pedidos.';
+$lang['message_order_updated'] = 'O pedido foi atualizado.';
+$lang['message_orders_deleted'] = 'Os pedidos selecionados foram apagados';
+$lang['error_no_orders_selected'] = 'Você não selecionou nenhum pedido para apagar';
+$lang['confirm_delete_order'] = 'Tem certeza de que deseja excluir os pedidos selecionados?';
+$lang['sent_notification_message'] = 'Notificação de e-mail foi enviado!';
+
+$lang['send_email_notification'] = 'Enviar e-mail de notificação';
+$lang['packing_slip'] = 'Embalagem para presente';
+$lang['account_info'] = 'informações da Conta';
+$lang['billing_address'] = 'Endereço de cobrança';
+$lang['shipping_address'] = 'Endereço para envio';
+$lang['order_details'] = 'Detalhes da encomenda';
+$lang['payment_method'] = 'Forma de Pagamento';
+$lang['shipping_details'] = 'Detalhes de envio';
+$lang['shipping_notes'] = 'Informação adicional de Frete';
+$lang['referral'] = 'encaminhamento';
+$lang['is_gift'] = 'Este é um presente.';
+$lang['gift_note'] = 'Nota presente';
+$lang['admin_notes'] = 'Notas de Admin';
+$lang['update_order'] = 'Atualize Ordem';
+$lang['name'] = 'nome';
+$lang['description'] = 'descrição';
+$lang['price'] = 'preço';
+$lang['quantity'] = 'quantidade';
+$lang['qty'] = 'qnt.';
+$lang['total'] = 'total';
+$lang['sku'] = 'SKU';
+
+$lang['coupon_discount'] = 'cupom de desconto';
+$lang['goftcard_discount'] = 'Desconto Vale-presente';
+$lang['subtotal'] = 'subtotal';
+$lang['shipping'] = 'frete';
+$lang['tax'] = 'imposto';
+$lang['total'] = 'total';
+$lang['search_returned'] = 'Sua busca retornou %d resultado(s)';
+$lang['message_templates'] = "modelos de mensagens";
+$lang['select_canned_message'] = '- Selecione uma Mensagem -';
+$lang['message'] = 'mensagem';
+$lang['send_message'] = 'enviar Mensagem';
+$lang['subject'] = 'assunto';
+$lang['account_main_email'] = 'E-mail da conta principal';
+$lang['shipping_email'] = 'E-mail do destinatário';
+$lang['billing_email'] = 'E-mail de cobrança';
+$lang['recipient'] = 'beneficiário';
+$lang['packing_is_gift'] = 'é presente';
+$lang['ship_to_address'] = 'Endereço de entrega';
+$lang['bill_to_address'] = 'Endereço de cobrança';
+$lang['saving'] = 'Saving';
\ No newline at end of file
diff --git a/gocart/language/pt-br/page_lang.php b/gocart/language/pt-br/page_lang.php
new file mode 100644
index 00000000..aebfa822
--- /dev/null
+++ b/gocart/language/pt-br/page_lang.php
@@ -0,0 +1,45 @@
+
+* @link http://www.everlon.com.br
+* @version 1.0 (em desenvolvimento)
+* @copyright 2013
+*/
+
+/******************************************
+Português brasileiro
+Admin Page Language
+******************************************/
+
+$lang['link_information'] = 'Link Information';
+$lang['add_new_page'] = 'Adicionar uma nova página';
+$lang['add_new_link'] = 'Adicionar um novo link';
+$lang['pages'] = 'Páginas';
+$lang['attributes'] = 'Atributos';
+$lang['seo'] = 'SEO';
+$lang['page_form'] = 'Formulário de Página';
+$lang['link_form'] = 'Formulário de Link';
+$lang['title'] = 'TÃtulo';
+$lang['url'] = 'URL';
+$lang['url_example'] = '(ex. http://www.everlon.com.br)';
+$lang['menu_title'] = 'TÃtulo do menu';
+$lang['slug'] = 'Slug';
+$lang['seo_title'] = 'TÃtulo SEO';
+$lang['meta'] = 'Meta Data';
+$lang['sequence'] = 'Sequência';
+$lang['parent_id'] = 'Parentesco';
+$lang['new_window'] = 'Nova janela';
+$lang['open_in_new_window'] = 'Abra esse link em uma nova janela';
+$lang['content'] = 'Conteúdo';
+$lang['top_level'] = 'Principal';
+$lang['follow_link'] = 'Follow Link';
+$lang['go_to_page'] = 'Ir para página';
+
+$lang['no_pages_or_links'] = 'Atualmente não existem páginas ou links.';
+$lang['error_page_not_found'] = 'A página solicitada não pôde ser encontrado.';
+$lang['error_link_not_found'] = 'O link solicitado não pôde ser encontrado.';
+$lang['message_saved_page'] = 'A página foi salva.';
+$lang['message_saved_link'] = 'O link foi salvo.';
+$lang['message_deleted_page'] = 'A página foi excluÃda.';
+$lang['message_deleted_link'] = 'O link foi apagado.';
+$lang['confirm_delete'] = 'Tem certeza de que quer apagar esta página / link?';
diff --git a/gocart/language/pt-br/product_lang.php b/gocart/language/pt-br/product_lang.php
new file mode 100644
index 00000000..958179b7
--- /dev/null
+++ b/gocart/language/pt-br/product_lang.php
@@ -0,0 +1,106 @@
+
+* @link http://www.everlon.com.br
+* @version 1.0 (em desenvolvimento)
+* @copyright 2013
+*/
+
+/******************************************
+Português brasileiro
+Admin Product Language
+******************************************/
+
+$lang['products'] = 'Produtos';
+$lang['search_term'] = 'Buscar termo';
+$lang['product_form'] = 'Formulário de produtos';
+$lang['sku'] = 'SKU';
+$lang['value'] = 'Valor';
+$lang['limit'] = 'Limite';
+$lang['seo_title'] = 'TÃtulo Tag';
+$lang['meta'] = 'Meta Tags';
+$lang['name'] = 'Nome';
+$lang['slug'] = 'URL Keyword';
+$lang['description'] = 'Descrição';
+$lang['details'] = 'Detalhes';
+$lang['enabled'] = 'Habilitado';
+$lang['disabled'] = 'Desabilitado';
+$lang['excerpt'] = 'Resumo';
+$lang['price'] = 'Preço';
+$lang['saleprice'] = 'Preço de venda';
+$lang['weight'] = 'Peso';
+$lang['attributes'] = 'Atributos';
+$lang['categories'] = 'Categorias';
+$lang['add_category'] = 'Adicionar categoria';
+$lang['header_information'] = 'Informação SEO';
+$lang['options'] = 'Opções';
+$lang['related_products'] = 'Produtos relacionados';
+$lang['images'] = 'Imagens';
+$lang['meta_example'] = 'ex. <meta name="description" content="Nós vendemos produtos que ajudam você" />';
+$lang['bulk_save'] = 'Salvar selecionados';
+$lang['add_new_product'] = 'Adicionar novo produto';
+$lang['no_products'] = 'Atualmente não existem produtos cadastrados.';
+$lang['track_stock'] = 'Baixar Estoque';
+$lang['do_not_track_stock'] = 'Não baixar Estoque';
+$lang['out_of_stock'] = 'Fora de estoque';
+$lang['shippable'] = 'Entregável';
+$lang['not_shippable'] = 'Não entregável';
+$lang['taxable'] = 'Com imposto';
+$lang['not_taxable'] = 'Sem importo';
+$lang['fixed_quantity'] = 'Quantidade fixa';
+$lang['quantity'] = 'Quantidade disponÃvel';
+$lang['copy'] = 'Copiar';
+$lang['upload'] = 'Upload';
+$lang['digital_content'] = 'Conteúdo digital';
+$lang['digital_products_desc'] = 'Quantidade disponÃvel.';
+$lang['fixed_quantity_note'] = '(Isso restringe alguém de adicionar várias cópias do item ao seu carrinho.)';
+$lang['quantity_in_stock_note'] = '(Este número só será usado se o produto é marcado "Baixar Estoque")';
+$lang['filter_by_category'] = 'Filtrar por categoria';
+$lang['select_a_category'] = 'Buscar uma categoria';
+$lang['inventory'] = 'Estoque';
+
+//option form elements
+$lang['checklist'] = 'Checklist';
+$lang['radiolist'] = 'Radiolist';
+$lang['droplist'] = 'Droplist';
+$lang['textfield'] = 'Frase';
+$lang['textarea'] = 'Bloco de texto';
+$lang['add_option'] = 'Adicionar opção';
+$lang['select_option_type'] = 'Selecione uma opção';
+
+//option form portion
+$lang['option_name'] = 'Nome da opção';
+$lang['required'] = 'Obrigatória';
+$lang['add_item'] = 'Adicionar novo item';
+
+//related products
+$lang['select_a_product'] = 'Busca por produtos relacionado.';
+$lang['add_related_product'] = 'Adicionar produto relacionado';
+$lang['product_name'] = 'Nome do produto';
+
+//product images
+$lang['primary'] = 'Imagem principal';
+$lang['remove'] = 'Remover';
+$lang['alt_tag'] = 'Texto alternativo';
+$lang['caption'] = 'Descrição';
+
+//confirmations
+$lang['confirm_remove_image'] = 'Tem certeza que deseja remover esta imagem?';
+$lang['confirm_remove_value'] = 'Tem certeza que deseja remover este valor?';
+$lang['confirm_remove_option'] = 'Tem certeza que deseja remover esta opção?';
+$lang['confirm_remove_related'] = 'Tem certeza que deseja remover este item relacionado?';
+$lang['confirm_remove_category'] = 'Tem certeza que deseja remover esta categoria?';
+$lang['confirm_delete_product'] = 'Tem certeza que deseja excluir este produto?';
+
+//alerts
+$lang['alert_must_name_option'] = 'Você deve dar um nome esta opção.';
+$lang['alert_product_related'] = 'Este produto está já relacionado.';
+$lang['alert_select_product'] = 'Selecione um produto para adicionar primeiro.';
+
+//messages & errors
+$lang['message_saved_product'] = 'O produto foi salva.';
+$lang['message_bulk_update'] = 'Seus produtos foram atualizados.';
+$lang['message_deleted_product'] = 'O produto foi excluÃdo.';
+$lang['error_not_found'] = 'O produto solicitado não pôde ser encontrado.';
+$lang['error_bulk_no_products'] = 'Não há produtos selecionados para atualização';
+$lang['search_returned'] = 'Sua busca retornou %d resultado(s)';
\ No newline at end of file
diff --git a/gocart/language/pt-br/report_lang.php b/gocart/language/pt-br/report_lang.php
new file mode 100644
index 00000000..1186e5a8
--- /dev/null
+++ b/gocart/language/pt-br/report_lang.php
@@ -0,0 +1,44 @@
+
+* @link http://www.everlon.com.br
+* @version 1.0 (em desenvolvimento)
+* @copyright 2013
+*/
+
+/******************************************
+Português brasileiro
+Admin report Language
+******************************************/
+
+$lang['reports'] = 'Relatórios';
+$lang['best_sellers'] = 'Mais vendidos';
+$lang['sales'] = 'Vendas';
+$lang['from'] = 'De';
+$lang['to'] = 'Para';
+$lang['sku'] = 'SKU';
+$lang['name'] = 'Nome';
+$lang['quantity'] = 'Quantidade';
+$lang['date'] = 'Mês/Ano';
+$lang['january'] = 'Janeiro';
+$lang['february'] = 'Fevereiro';
+$lang['march'] = 'Março';
+$lang['april'] = 'Abril';
+$lang['may'] = 'Maio';
+$lang['june'] = 'Junho';
+$lang['july'] = 'Julho';
+$lang['august'] = 'Agosto';
+$lang['september'] = 'Setembro';
+$lang['october'] = 'Outubro';
+$lang['november'] = 'Novembro';
+$lang['december'] = 'Dezembro';
+
+$lang['get_best_sellers'] = 'Obter Melhores vendedores';
+$lang['get_monthly_sales'] = 'Obter Vendas Mensais';
+$lang['coupon_discounts'] = 'Cupom de Descontos';
+$lang['gift_card_discounts'] = 'Descontos de Vale-presentes';
+$lang['products'] = 'produtos';
+$lang['shipping'] = 'Frete';
+$lang['tax'] = 'Imposto';
+$lang['grand_total'] = 'Total';
+$lang['loading'] = 'Loading';
\ No newline at end of file
diff --git a/gocart/language/pt-br/settings_lang.php b/gocart/language/pt-br/settings_lang.php
new file mode 100644
index 00000000..c09aa24b
--- /dev/null
+++ b/gocart/language/pt-br/settings_lang.php
@@ -0,0 +1,37 @@
+
+* @link http://www.everlon.com.br
+* @version 1.0 (em desenvolvimento)
+* @copyright 2013
+*/
+
+/******************************************
+Português brasileiro
+Admin Settings Language
+******************************************/
+
+$lang['settings'] = 'Configurações';
+$lang['message_name'] = 'Nome da mensagem';
+$lang['subject'] = 'Assunto';
+$lang['message_content'] = 'Conteúdo da mensagem';
+$lang['canned_messages'] = 'Mensagens Fixas';
+$lang['canned_message_form'] = 'Formulário de Mensagens Fixas';
+$lang['settings_updated'] = '"%s" configurações foram atualizadas.';
+$lang['payment_settings'] = '"%s" configurações de pagamento.';
+$lang['shipping_settings'] = '"%s" configurações de frete.';
+$lang['payment_settings_title'] = 'Configurações de Pagamento';
+$lang['shipping_settings_title'] = 'Configurações de Frete';
+$lang['add_canned_message'] = 'Adicionar mensagem';
+$lang['payment_modules'] = "Modulos de Pagamentos";
+$lang['shipping_modules'] = "Modulos de Frete";
+$lang['uninstall'] = 'Desinstalar';
+$lang['install'] = 'Instalar';
+$lang['confirm_are_you_sure'] = 'Tem certeza de que quer fazer isto?';
+$lang['message_saved_message'] = 'A mensagem foi salva.';
+$lang['message_deleted_message'] = 'A mensagem foi apagada.';
+
+$lang['save_canned_message'] = 'Salvar mensagem';
+$lang['tab_canned_info'] = 'Informações da mensagem';
+$lang['label_canned_name'] = 'Nome';
+$lang['label_canned_subject'] = 'Assunto';
\ No newline at end of file
diff --git a/gocart/libraries/Auth.php b/gocart/libraries/Auth.php
index 255d2368..60933544 100644
--- a/gocart/libraries/Auth.php
+++ b/gocart/libraries/Auth.php
@@ -12,7 +12,13 @@ function __construct()
$this->CI =& get_instance();
$this->CI->load->database();
$this->CI->load->library('encrypt');
- $this->CI->load->library('session');
+
+ $admin_session_config = array(
+ 'sess_cookie_name' => 'admin_session_config',
+ 'sess_expiration' => 0
+ );
+ $this->CI->load->library('session', $admin_session_config, 'admin_session');
+
$this->CI->load->helper('url');
}
@@ -24,7 +30,7 @@ function check_access($access, $default_redirect=false, $redirect = false)
the system will act accordingly.
*/
- $admin = $this->CI->session->userdata('admin');
+ $admin = $this->CI->admin_session->userdata('admin');
$this->CI->db->select('access');
$this->CI->db->where('id', $admin['id']);
@@ -73,18 +79,18 @@ function check_access($access, $default_redirect=false, $redirect = false)
function is_logged_in($redirect = false, $default_redirect = true)
{
- //var_dump($this->CI->session->userdata('session_id'));
+ //var_dump($this->CI->admin_session->userdata('session_id'));
//$redirect allows us to choose where a customer will get redirected to after they login
//$default_redirect points is to the login page, if you do not want this, you can set it to false and then redirect wherever you wish.
- $admin = $this->CI->session->userdata('admin');
+ $admin = $this->CI->admin_session->userdata('admin');
if (!$admin)
{
if ($redirect)
{
- $this->CI->session->set_flashdata('redirect', $redirect);
+ $this->CI->admin_session->set_flashdata('redirect', $redirect);
}
if ($default_redirect)
@@ -104,7 +110,7 @@ function is_logged_in($redirect = false, $default_redirect = true)
$this->logout();
if($redirect)
{
- $this->CI->session->set_flashdata('redirect', $redirect);
+ $this->CI->admin_session->set_flashdata('redirect', $redirect);
}
if($default_redirect)
@@ -121,7 +127,7 @@ function is_logged_in($redirect = false, $default_redirect = true)
if($admin['expire'])
{
$admin['expire'] = time()+$this->session_expire;
- $this->CI->session->set_userdata(array('admin'=>$admin));
+ $this->CI->admin_session->set_userdata(array('admin'=>$admin));
}
}
@@ -160,7 +166,7 @@ function login_admin($email, $password, $remember=false)
$admin['admin']['expire'] = false;
}
- $this->CI->session->set_userdata($admin);
+ $this->CI->admin_session->set_userdata($admin);
return true;
}
else
@@ -174,8 +180,8 @@ function login_admin($email, $password, $remember=false)
*/
function logout()
{
- $this->CI->session->unset_userdata('admin');
- $this->CI->session->sess_destroy();
+ $this->CI->admin_session->unset_userdata('admin');
+ $this->CI->admin_session->sess_destroy();
}
/*
diff --git a/gocart/libraries/Go_cart.php b/gocart/libraries/Go_cart.php
old mode 100755
new mode 100644
index b7e5212d..983f2806
--- a/gocart/libraries/Go_cart.php
+++ b/gocart/libraries/Go_cart.php
@@ -1,11 +1,13 @@
CI =& get_instance();
- $this->CI->load->model('Coupon_model');
- $this->CI->load->model('Gift_card_model');
+ $this->CI->load->model(array('Coupon_model' , 'Gift_card_model', 'Settings_model', 'Digital_Product_model'));
// Load the saved session
if ($this->CI->session->userdata('cart_contents') !== FALSE)
@@ -74,6 +76,7 @@ private function _init_properties($totals_only=false, $preserve_customer=false)
$this->_cart_contents['taxable_coupon_discount'] = 0;
$this->_cart_contents['gift_card_balance'] = 0;
$this->_cart_contents['gift_card_discount'] = 0;
+ $this->_cart_contents['downloads'] = array();
// totals
$this->_cart_contents['cart_subtotal'] = 0;
$this->_cart_contents['cp_discounted_subtotal'] = 0;
@@ -83,11 +86,10 @@ private function _init_properties($totals_only=false, $preserve_customer=false)
$this->_cart_contents['shipping_total'] = 0;
// tax
$this->_cart_contents['tax'] = 0;
-
-
// We want to preserve the cart items and properties, but reset total values when recalculating
- if( ! $totals_only) {
+ if( ! $totals_only)
+ {
// product items will live in here
$this->_cart_contents['items'] = array();
@@ -102,8 +104,9 @@ private function _init_properties($totals_only=false, $preserve_customer=false)
$this->_cart_contents['custom_charges'] = array();
// shipping details container
- $this->_cart_contents['shipping']['method'] = "No Shipping"; // defaults
- $this->_cart_contents['shipping']['price'] = 0.00;
+ $this->_cart_contents['shipping']['method'] = false; // defaults
+ $this->_cart_contents['shipping']['price'] = false;
+ $this->_cart_contents['shipping']['code'] = false;
// This is the list of gift cards that are attached to the cart
// to be applied toward a price reduction
@@ -146,6 +149,10 @@ private function _init_properties($totals_only=false, $preserve_customer=false)
private function _insert($item)
{
+ //on update clear the payments & shipping
+ $this->clear_payment();
+ $this->clear_shipping();
+
// Was any cart data passed? No? Bah...
if ( ! is_array($item) OR count($item) == 0)
{
@@ -163,7 +170,7 @@ private function _insert($item)
//record the quantity
- $quantity = $item['quantity'];
+ $quantity = ($item['fixed_quantity']==0) ? $item['quantity'] : 1;
//remove quantity from the row ID hash this will enable us to add
//the same item twice without having it appear twice due to quantity differences
@@ -205,7 +212,11 @@ private function _insert($item)
//this is for non-edited products (except for quantity)
if(isset($this->_cart_contents['items'][$newkey]))
{
- $this->_cart_contents['items'][$newkey]['quantity'] = $this->_cart_contents['items'][$newkey]['quantity'] + $item['quantity'];
+ //make sure that fixed quantity items remain fixed quantity
+ if(!(bool)$item['fixed_quantity'])
+ {
+ $this->_cart_contents['items'][$newkey]['quantity'] = $this->_cart_contents['items'][$newkey]['quantity'] + $item['quantity'];
+ }
}
else
{
@@ -246,13 +257,22 @@ private function _remove($cartkey)
private function _update($cartkey, $quantity)
{
+ //on update clear the payments & shipping
+ $this->clear_payment();
+ $this->clear_shipping();
+
if(!isset($this->_cart_contents['items'][$cartkey]))
{
return false;
}
- // update cart quantity
- $this->_cart_contents['items'][$cartkey]['quantity'] = ceil($quantity);
+ // update cart, fixed quantity items restricted to 1
+ if($this->_cart_contents['items'][$cartkey]['fixed_quantity']==0)
+ {
+ $this->_cart_contents['items'][$cartkey]['quantity'] = ceil($quantity);
+ } else {
+ $this->_cart_contents['items'][$cartkey]['quantity'] = 1;
+ }
// Update associated coupon discount data
if(isset($this->_cart_contents['items'][$cartkey]['coupon_code']))
@@ -350,7 +370,8 @@ private function _apply_coupon_to_product($cartkey, $coupon_code)
// To start, it needs to look like:
// applied_coupons[ coupon code index ][ product key index] = array list of discounts,repeated to product quantity
- for($x=0;$x<$this->_cart_contents['items'][$cartkey]['quantity'];$x++) {
+ for($x=0;$x<$this->_cart_contents['items'][$cartkey]['quantity'];$x++)
+ {
$this->_cart_contents['applied_coupons'][$coupon_code][$cartkey][] = $discount_amount;
}
@@ -386,8 +407,7 @@ private function _insert_coupon($coupon_code)
// apply coupon discount for free shipping, whole order discount, or product level
if ($coupon['reduction_target'] =="shipping") {
- //$this->_cart_contents['requires_shipping'] = false;
- // Remember what code was used for free shipping
+ // Remember what code was used for free shipping
$this->_cart_contents['free_shipping_coupon'] = $coupon_code;
$is_applied = true;
@@ -432,54 +452,55 @@ private function _insert_coupon($coupon_code)
if(!$is_applied) {
// message coupon added but not applied
- return array('message'=>'Your coupon does not apply to any products in your cart');
+ return array('message'=>lang('coupon_not_apply'));
} else {
// message coupon applied
- return array('message'=>'Your coupon has been applied to your products.');
+ return array('message'=>lang('coupon_applied'));
}
} else {
// message coupon no longer valid
- return array('error'=>'Sorry, but the coupon you entered is not valid at this time.');
+ return array('error'=>lang('coupon_invalid'));
}
} else {
// message coupon already applied
- return array('error'=>'That coupon code has already been applied to your items.');
+ return array('error'=>lang('coupon_already_applied'));
}
} else {
// invalid code error message
- return array('error'=>'There was no coupon with that code. Check to make sure you entered it correctly.');
+ return array('error'=>lang('invalid_coupon_code'));
}
}
// Calculate the best possible discount within the product instance limitations for the whole cart
// return the discount amount
- private function _calculate_coupon_discount() {
-
+ private function _calculate_coupon_discount()
+ {
$total_discount = 0;
//keep tabs on how much is taxable
$taxable_discount = 0;
// Get the sum of the product-level coupons
- if( ! empty($this->_cart_contents['applied_coupons'])) {
+ if( ! empty($this->_cart_contents['applied_coupons']))
+ {
foreach($this->_cart_contents['applied_coupons'] as $code=>$discount_list)
{
-
// The discount list is an array of arrays, indexed by cart key
// we need to prep this list for a final discount aggregation
// by collapsing this into a singular array of all product discounts
// from which we will calculate the total discount per coupon
- $collapsed = array();
- $product_index = array();
+ $collapsed = array();
+ $product_index = array();
$x = 0; // we will use this to cross-index what discounts belong to what product
// so that we can separate taxable from non-taxable amounts
foreach($discount_list as $key=>$item)
{
- foreach($item as $discount) {
- $collapsed[$x] = $discount;
- $product_index[$x] = $key;
+ foreach($item as $discount)
+ {
+ $collapsed[$x] = $discount;
+ $product_index[$x] = $key;
$x++;
}
// because each product can only have one coupon associated
@@ -494,7 +515,9 @@ private function _calculate_coupon_discount() {
if($this->_cart_contents['coupon_list'][$code]['max_product_instances'] == 0 || count($collapsed)<=$this->_cart_contents['coupon_list'][$code]['max_product_instances'])
{
$maximum = count($collapsed);
- } else {
+ }
+ else
+ {
$maximum = $this->_cart_contents['coupon_list'][$code]['max_product_instances'];
}
@@ -505,12 +528,11 @@ private function _calculate_coupon_discount() {
// store the total discount in the item details, for future reference
$this->_cart_contents['items'][$product_index[$x]]['total_coupon_discount'] += $collapsed[$x];
// taxable?
- if( $this->_cart_contents['items'][$product_index[$x]]['shippable'] == 1 )
+ if( $this->_cart_contents['items'][$product_index[$x]]['taxable'] == 1 )
{
$taxable_discount += $collapsed[$x];
}
}
-
}
}
@@ -527,19 +549,35 @@ private function _calculate_coupon_discount() {
if(is_numeric($disc))
{
$discount_amount = $disc;
- } else {
+ }
+ else
+ {
eval('$discount_amount=$subtotal'.$disc.';');
}
- if($discount_amount > $temp) {
+ if($discount_amount > $temp)
+ {
$temp = $discount_amount;
$this->_cart_contents['whole_order_discount_cp'] = $code; // track which code we use
}
}
- $total_discount = $temp;
+ // coupon discounts and whole order discounts can be cumulated
+ $total_discount += $temp;
+ $total_whole_order_discount = $temp;
+
+ // iterate products and apply calculated whole order discount % to taxable ones
+ if ($this->_cart_contents['cart_subtotal'] > 0){
+ $whole_order_discount_ratio = $total_whole_order_discount / (float)$this->_cart_contents['cart_subtotal'];
+ foreach ($this->_cart_contents['items'] as $product)
+ {
+ if ($product['taxable'] == 1)
+ {
+ $taxable_discount += $whole_order_discount_ratio * (float)$product['price'] * (int)$product['quantity'];
+ }
+ }
+ }
}
-
$this->_cart_contents['cp_discounted_subtotal'] = $this->_cart_contents['cart_subtotal'] - $total_discount;
$this->_cart_contents['coupon_discount'] = $total_discount;
// this is the portion of the discount that applies to a taxable amount
@@ -552,6 +590,10 @@ private function _calculate_coupon_discount() {
// Attach a Gift Card discount to the order
private function _attach_gift_card($gc_code)
{
+ //on when attaching a gitcard reset payments and shipping
+ $this->clear_payment();
+ $this->clear_shipping();
+
// enabled?
if( ! $this->gift_cards_enabled) return;
@@ -574,18 +616,18 @@ private function _attach_gift_card($gc_code)
$this->_cart_contents['gift_card_balance'] += $this->_cart_contents['gc_list'][$gc_code]['balance'];
// message coupon applied
- return array('message'=>'You should see your card balance displayed.');
+ return array('message'=>lang('giftcard_balance_displayed'));
} else {
// invalid card (expired or zero balance)
- return array('error'=>'Sorry, but the gift card you entered is expired or has a zero balance.');
+ return array('error'=>lang('giftcard_zero_balance'));
}
} else {
// invalid card code
- return array('error'=>'The gift card code you entered does not exist.');
+ return array('error'=>lang('giftcard_not_exist'));
}
} else {
// already applied
- return array('message'=>'Your gift card is already applied');
+ return array('message'=>lang('giftcard_already_applied'));
}
}
}
@@ -676,31 +718,34 @@ private function _save_cart($recalculate=true)
eval('$this_price=$val["price"]'. $this->_cart_contents['customer']['group_discount_formula'] .';');
// add to the total group discount
- $this->_cart_contents['group_discount'] += ($val['price'] - $this_price) * $val['quantity'];
+ $this->_cart_contents['group_discount'] += ($val['price'] - $this_price) * $val['quantity'];
} else {
// or use the regular price
$this_price = $val['price'];
}
- // Deal with non shippable vs shippable items
- if ( $val['shippable']==0 )
+ // Deal with shippable (if shipping is disabled in the config then go with that!)
+ if ( $val['shippable']== 1 )
{
- // digital product (non-taxable)
- $total += $this_price;
- } else {
- // shippable items (taxable)
- $total += ($this_price * $val['quantity']);
- $taxable += ($this_price * $val['quantity']);
// shipping insurable value & weight
$this->_cart_contents['order_insurable_value'] += $this_price;
$this->_cart_contents['order_weight'] += $val['weight']*$val['quantity'];
$this->_cart_contents['requires_shipping'] = true;
}
+ // charge tax?
+ if($val['taxable'] == 1)
+ {
+ $taxable += ($this_price * $val['quantity']);
+ }
+
+ $total += ($this_price * $val['quantity']);
+
// set product subtotal (NOT accounting for coupon discount yet)
$val['subtotal'] = ($this_price * $val['quantity']);
}
+
// total products in the cart
$this->_cart_contents['total_items'] = count($this->_cart_contents['items']);
@@ -735,11 +780,14 @@ private function _save_cart($recalculate=true)
// Shipping costs
if($this->_cart_contents['requires_shipping'])
{
- $this->_cart_contents['cart_total'] += $this->_cart_contents['shipping']['price'];
- } else {
+ $this->_cart_contents['cart_total'] += $this->_cart_contents['shipping']['price'];
+ $this->_cart_contents['taxable_total'] += $this->_cart_contents['shipping']['price'];
+ }
+ else
+ {
// placeholders
- $this->_cart_contents['shipping']['method'] = "No Shipping";
- $this->_cart_contents['shipping']['price'] = 0.00;
+ $this->_cart_contents['shipping']['method'] = false; // defaults
+ $this->_cart_contents['shipping']['price'] = false;
}
// Compute taxes AFTER shipping costs are added in ?
@@ -779,6 +827,62 @@ private function _compute_tax()
*
********************************************************/
+ /**
+ * Double check that each item has enough in stock from the database
+ *
+ * @access public
+ * @return bool
+ */
+ function check_inventory()
+ {
+ $contents = $this->contents();
+
+ //this array merges any products that share the same product id
+ $new_contents = array();
+ foreach($contents as $c)
+ {
+ // skip gift card products
+ if($c['is_gc'])
+ {
+ continue;
+ }
+
+ //combine any product id's and tabulate their quantities
+ if(array_key_exists($c['id'], $new_contents))
+ {
+ $new_contents[$c['id']] = intval($new_contents[$c['id']])+intval($c['quantity']);
+ }
+ else
+ {
+ $new_contents[$c['id']] = $c['quantity'];
+ }
+ }
+
+ $error = '';
+ $this->CI->load->model('Product_model');
+ foreach($new_contents as $product_id => $quantity)
+ {
+ $product = $this->CI->Product_model->get_product($product_id);
+
+ //make sure we're tracking stock for this product
+ if((bool)$product->track_stock)
+ {
+ if(intval($quantity) > intval($product->quantity))
+ {
+ $error .= ''.sprintf(lang('not_enough_stock'), $product->name, $product->quantity).'
';
+ }
+ }
+ }
+
+ if(!empty($error))
+ {
+ return $error;
+ }
+ else
+ {
+ return false;
+ }
+ }
/**
@@ -795,7 +899,9 @@ function insert($items = array())
{
return FALSE;
}
-
+
+ //reset payment options so they get reset if someone adds a product at a later time
+
// You can either insert a single product using a one-dimensional array,
// or multiple products using a multi-dimensional one. The way we
// determine the array type is by looking for a required array key named "id"
@@ -827,6 +933,11 @@ function insert($items = array())
if ($save_cart == TRUE)
{
$this->_save_cart();
+
+ //clear the shipping after the cart is updated.
+ //This will ensure the rates need to be reset if they would differ
+ $this->clear_shipping();
+
return TRUE;
}
@@ -844,6 +955,10 @@ function update_cart($qty_list=false, $coupon_code=false, $gc_code=false)
$error = '';
$message = '';
+ //on update clear the payments & shipping
+ $this->clear_payment();
+ $this->clear_shipping();
+
// insert any coupons that might be sent
if($coupon_code)
{
@@ -904,39 +1019,50 @@ function update_cart($qty_list=false, $coupon_code=false, $gc_code=false)
{
$this->_save_cart();
}
-
-
+
return $response;
}
- //save additional settings
- function set_additional_details($data)
+ // save / get order download list
+ function save_order_downloads($list)
+ {
+ $this->_cart_contents['downloads'] = $list;
+ }
+
+ function get_order_downloads()
+ {
+ return $this->_cart_contents['downloads'];
+ }
+
+ //save additional setting
+ function set_additional_detail($key, $data)
{
- $this->_cart_contents['additional_details'] = $data;
+ $this->_cart_contents[$key] = $data;
$this->_save_cart(false);
}
- function additional_details()
+ //grab a detail
+ function get_additional_detail($key)
{
- if(isset($this->_cart_contents['additional_details']))
+ if(isset($this->_cart_contents[$key]))
{
- return $this->_cart_contents['additional_details'];
+ return $this->_cart_contents[$key];
}
else
{
- //return the array blank
- return array('referral'=>''
- ,'shipping_notes'=>''
- );
+ return false;
}
-
}
+
// set shipping details
- function set_shipping($method, $price)
+ function set_shipping($method, $price, $code)
{
- if(!is_numeric($price)) return false;
+ if(!is_numeric($price))
+ {
+ return false;
+ }
- $this->_cart_contents['shipping'] = array('method'=>$method, 'price'=> (float) $price);
+ $this->_cart_contents['shipping'] = array('method'=>$method, 'price'=> (float) $price, 'code'=>$code);
//update cart - recalculate
$this->_save_cart();
@@ -945,12 +1071,21 @@ function set_shipping($method, $price)
//remove shipping details
function clear_shipping()
{
- $this->_cart_contents['shipping']['method'] = "No Shipping"; // defaults
- $this->_cart_contents['shipping']['price'] = 0.00;
+ $this->_cart_contents['shipping']['method'] = false;
+ $this->_cart_contents['shipping']['price'] = false;
+ $this->_cart_contents['shipping']['code'] = false;
$this->_save_cart();
}
+ function clear_payment()
+ {
+ $this->_cart_contents['payment'] = false;
+
+ // save cart - no recalculation necessary
+ $this->_save_cart(false);
+ }
+
function set_payment($module, $description)
{
$this->_cart_contents['payment'] = array('module'=>$module, 'description'=>$description);
@@ -970,15 +1105,29 @@ function set_payment_confirmed()
// This saves the confirmed order
function save_order() {
-
-
+
$this->CI->load->model('order_model');
+ $this->CI->load->model('Product_model');
//prepare our data for being inserted into the database
$save = array();
+ // Is this a non shippable order?
+ $none_shippable = true;
+ foreach ($this->_cart_contents['items'] as $item)
+ {
+ if($item['shippable']==1)
+ {
+ $none_shippable = false;
+ }
+ }
//default status comes from the config file
- $save['status'] = $this->CI->config->item('order_status');
+ if($none_shippable)
+ {
+ $save['status'] = $this->CI->config->item('nonship_status');
+ } else {
+ $save['status'] = $this->CI->config->item('order_status');
+ }
//if the id exists, then add it to the array $save array and remove it from the customer
if(isset($this->_cart_contents['customer']['id']) && $this->_cart_contents['customer']['id'] != '')
@@ -1027,8 +1176,6 @@ function save_order() {
//shipping information
$save['shipping_method'] = $this->_cart_contents['shipping']['method'];
$save['shipping'] = $this->_cart_contents['shipping']['price'];
- //I will add a shipping notes feature later
- //$data['shipping_notes'] = $this->_cart_contents['shipping_notes'];
//add in the other charges
$save['tax'] = $this->_cart_contents['tax'];
@@ -1053,9 +1200,8 @@ function save_order() {
}
//save additional details
- $details = $this->additional_details();
- $save['referral'] = $details['referral'];
- $save['shipping_notes'] = $details['shipping_notes'];
+ $save['referral'] = $this->get_additional_detail('referral');
+ $save['shipping_notes'] = $this->get_additional_detail('shipping_notes');
//ordered_on datetime stamp
$save['ordered_on'] = date('Y-m-d H:i:s');
@@ -1075,38 +1221,59 @@ function save_order() {
// dont do anything else if the order failed to save
if(!$order_id) return false;
-
- if($this->gift_cards_enabled) {
-
- $this->CI->load->model('Gift_card_model');
+
+
+ // Process any per-item operations
+ $download_package = array(); //create digital package array
+ foreach ($this->_cart_contents['items'] as $item)
+ {
- // save purchased gift cards
- foreach ($this->_cart_contents['items'] as $item)
+ // Process Gift Card purchase
+ if($this->gift_cards_enabled && isset($item['gc_info']))
{
- if(isset($item['gc_info']))
- {
- $gc_data = array();
- $gc_data['order_number'] = $order_id;
- $gc_data['beginning_amount'] = $item['price'];
- $gc_data['code'] = $item['code'];
- $gc_data= array_merge($gc_data, $item['gc_info']);
-
- $this->CI->Gift_card_model->save_card($gc_data);
-
- //send the recipient a message
- $this->CI->Gift_card_model->send_notification($gc_data);
-
- }
+ $gc_data = array();
+ $gc_data['order_number'] = $order_id;
+ $gc_data['beginning_amount'] = $item['price'];
+ $gc_data['code'] = $item['code'];
+ $gc_data= array_merge($gc_data, $item['gc_info']);
+
+ $this->CI->Gift_card_model->save_card($gc_data);
+
+ //send the recipient a message
+ $this->CI->Gift_card_model->send_notification($gc_data);
}
+
-
- // update the balance of any gift cards used to purchase the order
- if(isset($this->_cart_contents['gc_list']))
+ // Process Downloadable Products
+ if(!empty($item['file_list']))
{
- $this->CI->Gift_card_model->update_used_card_balances($this->_cart_contents['gc_list']);
+ // compile a list of all the items that can be downloaded for this order
+ $download_package[] = $item['file_list'];
}
+ //deduct any quantities from the database
+ if(!$item['is_gc'])
+ {
+ $product = $this->CI->Product_model->get_product($item['id']);
+ $new_quantity = intval($product->quantity) - intval($item['quantity']);
+ $product_quantity = array('id'=>$product->id, 'quantity'=>$new_quantity);
+ $this->CI->Product_model->save($product_quantity);
+ }
}
+ //add the digital packages to the database
+ if(!empty($download_package))
+ {
+ // create the record, send the email
+ $this->CI->Digital_Product_model->add_download_package($download_package, $order_id);
+ }
+
+
+
+ // update the balance of any gift cards used to purchase the order
+ if($this->gift_cards_enabled && isset($this->_cart_contents['gc_list']))
+ {
+ $this->CI->Gift_card_model->update_used_card_balances($this->_cart_contents['gc_list']);
+ }
// touch any used product coupons (increment usage)
if(isset($this->_cart_contents['applied_coupons']))
@@ -1127,6 +1294,8 @@ function save_order() {
$this->CI->Coupon_model->touch_coupon($this->_cart_contents['whole_order_discount_cp']);
}
+
+
return $order_id;
}
@@ -1157,7 +1326,7 @@ function taxable_total()
function total()
{
- return $this->_cart_contents['cart_total'];
+ return round($this->_cart_contents['cart_total'], 2);
}
function subtotal()
@@ -1214,24 +1383,38 @@ function requires_shipping()
}
function is_free_shipping()
{
- if( ! $this->_cart_contents['free_shipping_coupon']) return false;
- else return true; // if the value isn't false, it must be set
+ if( ! $this->_cart_contents['free_shipping_coupon'])
+ {
+ return false;
+ }
+ else
+ {
+ return true; // if the value isn't false, it must be set
+ }
}
- // return array
- function payment_method()
- {
- return $this->_cart_contents['payment'];
- }
-
function shipping_method()
{
return $this->_cart_contents['shipping'];
}
+
function shipping_cost()
{
return $this->_cart_contents['shipping']['price'];
}
+
+ function shipping_code()
+ {
+ return $this->_cart_contents['shipping']['code'];
+ }
+
+ // return array
+ function payment_method()
+ {
+ return $this->_cart_contents['payment'];
+ }
+
+
function get_custom_charges()
{
@@ -1295,10 +1478,10 @@ function total_items()
* @access public
* @return null
*/
- function destroy($keep_login_session=true)
+ function destroy($keep_customer_data=true)
{
// reset the cart values
- $this->_init_properties(false,$keep_login_session);
+ $this->_init_properties(false,$keep_customer_data);
// save the updated cart to our session
$this->_save_cart(false);
}
diff --git a/gocart/libraries/MY_Pagination.php b/gocart/libraries/MY_Pagination.php
index cf385bb5..8e5507ec 100644
--- a/gocart/libraries/MY_Pagination.php
+++ b/gocart/libraries/MY_Pagination.php
@@ -88,24 +88,35 @@ function create_links()
$start = (($this->cur_page - $this->num_links) > 0) ? $this->cur_page - ($this->num_links - 1) : 1;
$end = (($this->cur_page + $this->num_links) < $num_pages) ? $this->cur_page + $this->num_links : $num_pages;
+ $get_sort = '';
// Is pagination being used over GET or POST? If get, add a per_page query
// string. If post, add a trailing slash to the base URL if needed
if ($this->page_query_string === TRUE)
{
$this->base_url = rtrim($this->base_url).'&'.$this->query_string_segment.'=';
+ if(!empty($_GET['by']))
+ {
+ $get_sort = '&by='.$_GET['by'];
+ }
}
else
{
$this->base_url = rtrim($this->base_url, '/') .'/';
+ if(!empty($_GET['by']))
+ {
+ $get_sort = '/?by='.$_GET['by'];
+ }
}
-
+
+
+
// And here we go...
$output = '';
-
+
// Render the "First" link
if ($this->cur_page > ($this->num_links + 1))
{
- $output .= $this->first_tag_open.''.$this->first_link.''.$this->first_tag_close;
+ $output .= $this->first_tag_open.''.$this->first_link.''.$this->first_tag_close;
}
// Render the "previous" link
@@ -113,7 +124,7 @@ function create_links()
{
$i = $uri_page_number - $this->per_page;
if ($i == 0) $i = '';
- $output .= $this->prev_tag_open.''.$this->prev_link.''.$this->prev_tag_close;
+ $output .= $this->prev_tag_open.''.$this->prev_link.''.$this->prev_tag_close;
}
// Write the digit links
@@ -130,7 +141,7 @@ function create_links()
else
{
$n = ($i == 0) ? '' : $i;
- $output .= $this->num_tag_open.''.$loop.''.$this->num_tag_close;
+ $output .= $this->num_tag_open.''.$loop.''.$this->num_tag_close;
}
}
}
@@ -138,14 +149,14 @@ function create_links()
// Render the "next" link
if ($this->cur_page < $num_pages)
{
- $output .= $this->next_tag_open.''.$this->next_link.''.$this->next_tag_close;
+ $output .= $this->next_tag_open.''.$this->next_link.''.$this->next_tag_close;
}
// Render the "Last" link
if (($this->cur_page + $this->num_links) < $num_pages)
{
$i = (($num_pages * $this->per_page) - $this->per_page);
- $output .= $this->last_tag_open.''.$this->last_link.''.$this->last_tag_close;
+ $output .= $this->last_tag_open.''.$this->last_link.''.$this->last_tag_close;
}
// Kill double slashes. Note: Sometimes we can end up with a double slash
diff --git a/gocart/libraries/payment/authorize_net/forms/admin_form.php b/gocart/libraries/payment/authorize_net/forms/admin_form.php
deleted file mode 100644
index d441ff87..00000000
--- a/gocart/libraries/payment/authorize_net/forms/admin_form.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
diff --git a/gocart/libraries/payment/paypal_express/forms/admin_form.php b/gocart/libraries/payment/paypal_express/forms/admin_form.php
deleted file mode 100644
index 0b0fbc5a..00000000
--- a/gocart/libraries/payment/paypal_express/forms/admin_form.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
diff --git a/gocart/libraries/shipping/fedex/lib_old/fedex.php b/gocart/libraries/shipping/fedex/lib_old/fedex.php
deleted file mode 100644
index e107e68d..00000000
--- a/gocart/libraries/shipping/fedex/lib_old/fedex.php
+++ /dev/null
@@ -1,189 +0,0 @@
-server = $server;
- }
-
- function setAccountNumber($accountNumber) {
- $this->accountNumber = $accountNumber;
- }
-
- function setMeterNumber($meterNumber) {
- $this->meterNumber = $meterNumber;
- }
-
- function setCarrierCode($carrierCode) {
- $this->carrierCode = $carrierCode;
- }
-
- function setDropoffType($dropoffType) {
- $this->dropoffType = $dropoffType;
- }
-
- function setService($service, $name) {
- $this->service = $service;
- $this->serviceName = $name;
- }
-
- function setPackaging($packaging) {
- $this->packaging = $packaging;
- }
-
- function setWeightUnits($units) {
- $this->weightUnits = $units;
- }
-
- function setWeight($weight) {
- $this->weight = $weight;
- }
-
- function setOriginStateOrProvinceCode($code) {
- $this->originStateOrProvinceCode = $code;
- }
-
- function setOriginPostalCode($code) {
- $this->originPostalCode = $code;
- }
-
- function setOriginCountryCode($code) {
- $this->originCountryCode = $code;
- }
-
- function setDestStateOrProvinceCode($code) {
- $this->destStateOrProvinceCode = $code;
- }
-
- function setDestPostalCode($code) {
- $this->destPostalCode = $code;
- }
-
- function setDestCountryCode($code) {
- $this->destCountryCode = $code;
- }
-
- function setPayorType($type) {
- $this->payorType = $type;
- }
-
- function getPrice() {
-
- $str = '';
- $str .= ' ';
- $str .= ' ';
- $str .= ' Express Rate';
- $str .= ' '.$this->accountNumber.'';
- $str .= ' '.$this->meterNumber.'';
- $str .= ' '.$this->carrierCode.'';
- $str .= ' ';
- $str .= ' '.$this->dropoffType.'';
- $str .= ' '.$this->service.'';
- $str .= ' '.$this->packaging.'';
- $str .= ' '.$this->weightUnits.'';
- $str .= ' '.number_format($this->weight, 1, '.', '').'';
- $str .= ' ';
- $str .= ' '.$this->originStateOrProvinceCode.'';
- $str .= ' '.$this->originPostalCode.'';
- $str .= ' '.$this->originCountryCode.'';
- $str .= ' ';
- $str .= ' ';
- $str .= ' '.$this->destStateOrProvinceCode.'';
- $str .= ' '.$this->destPostalCode.'';
- $str .= ' '.$this->destCountryCode.'';
- $str .= ' ';
- $str .= ' ';
- $str .= ' '.$this->payorType.'';
- $str .= ' ';
- $str .= ' '.ceil(bcdiv(number_format($this->weight, 1, '.', ''), '150', 3)).'';
- $str .= ' ';
- //print($str);
- $header[] = "Host: www.smart-shop.com";
- $header[] = "MIME-Version: 1.0";
- $header[] = "Content-type: multipart/mixed; boundary=----doc";
- $header[] = "Accept: text/xml";
- $header[] = "Content-length: ".strlen($str);
- $header[] = "Cache-Control: no-cache";
- $header[] = "Connection: close \r\n";
- $header[] = $str;
-
- $ch = curl_init();
- //Disable certificate check.
- // uncomment the next line if you get curl error 60: error setting certificate verify locations
- curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
- // uncommenting the next line is most likely not necessary in case of error 60
- curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
- //-------------------------
- //curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 1);
- //curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
- //curl_setopt($ch, CURLOPT_CAINFO, "c:/ca-bundle.crt");
- //-------------------------
- curl_setopt($ch, CURLOPT_URL,$this->server);
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
- curl_setopt($ch, CURLOPT_TIMEOUT, 4);
- curl_setopt($ch, CURLOPT_CUSTOMREQUEST,'POST');
- curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
-
- $data = curl_exec($ch);
- if (curl_errno($ch)) {
- $this->getPrice();
- } else {
- // close curl resource, and free up system resources
- curl_close($ch);
- $xmlParser = new xmlparser();
- $array = $xmlParser->GetXMLTree($data);
- //$xmlParser->printa($array);
- if(count($array['FDXRATEREPLY'][0]['ERROR'])) { // If it is error
- $error = new fedexError();
- $error->number = $array['FDXRATEREPLY'][0]['ERROR'][0]['CODE'][0]['VALUE'];
- $error->description = $array['FDXRATEREPLY'][0]['ERROR'][0]['MESSAGE'][0]['VALUE'];
- $error->response = $array;
- $this->error = $error;
- } else if (count($array['FDXRATEREPLY'][0]['ESTIMATEDCHARGES'][0]['DISCOUNTEDCHARGES'][0]['NETCHARGE'])) {
- $price = new fedexPrice();
- $price->rate = $array['FDXRATEREPLY'][0]['ESTIMATEDCHARGES'][0]['DISCOUNTEDCHARGES'][0]['NETCHARGE'][0]['VALUE'];
- $price->service = $this->serviceName;
- $price->response = $array;
- $this->price = $price;
- }
- //print_r($this);
- return $this;
- }
- }
-}
-class fedexError
-{
- var $number;
- var $description;
- var $response;
-}
-class fedexPrice
-{
- var $service;
- var $rate;
- var $response;
-}
-
diff --git a/gocart/libraries/shipping/fedex/lib_old/xmlparser.php b/gocart/libraries/shipping/fedex/lib_old/xmlparser.php
deleted file mode 100644
index eec9a82b..00000000
--- a/gocart/libraries/shipping/fedex/lib_old/xmlparser.php
+++ /dev/null
@@ -1,99 +0,0 @@
-GetChildren($vals, $i));
- } else {
- $children[$vals[$i]['tag']][] = $this->GetChildren($vals, $i);
- }
- break;
-
- case 'close':
- return $children;
- }
- }
- }
-
- function GetXMLTree($xml)
- {
- $data = $xml;
-
- $parser = xml_parser_create();
- xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
- xml_parse_into_struct($parser, $data, $vals, $index);
- xml_parser_free($parser);
-
- //print_r($index);
-
- $tree = array();
- $i = 0;
-
- if (isset($vals[$i]['attributes'])) {
- $tree[$vals[$i]['tag']][]['ATTRIBUTES'] = $vals[$i]['attributes'];
- $index = count($tree[$vals[$i]['tag']])-1;
- $tree[$vals[$i]['tag']][$index] = array_merge($tree[$vals[$i]['tag']][$index], $this->GetChildren($vals, $i));
- }
- else
- $tree[$vals[$i]['tag']][] = $this->GetChildren($vals, $i);
-
- return $tree;
- }
-
- function printa($obj) {
- global $__level_deep;
- if (!isset($__level_deep)) $__level_deep = array();
-
- if (is_object($obj))
- print '[obj]';
- elseif (is_array($obj)) {
- foreach(array_keys($obj) as $keys) {
- array_push($__level_deep, "[".$keys."]");
- $this->printa($obj[$keys]);
- array_pop($__level_deep);
- }
- }
- else print implode(" ",$__level_deep)." = $obj\n";
- }
-}
-?>
diff --git a/gocart/libraries/shipping/united_parcel_service/united_parcel_service.php b/gocart/libraries/shipping/united_parcel_service/united_parcel_service.php
deleted file mode 100644
index b79088d9..00000000
--- a/gocart/libraries/shipping/united_parcel_service/united_parcel_service.php
+++ /dev/null
@@ -1,270 +0,0 @@
-CI =& get_instance();
- $this->CI->load->model('Settings_model');
-
- // standard services
- $this->ups_services = array(
- '01' => 'UPS Next Day Air',
- '02' => 'UPS Second Day Air',
- '03' => 'UPS Ground',
- '07' => 'UPS Worldwide Express',
- '08' => 'UPS Worldwide Expedited',
- '11' => 'UPS Standard',
- '12' => 'UPS Three-Day Select',
- '13' => 'UPS Next Day Air Saver',
- '14' => 'UPS Next Day Air Early AM',
- '54' => 'UPS Worldwide Express Plus',
- '59' => 'UPS Second Day Air AM',
- '65' => 'UPS Saver'
- );
-
- }
-
-
- function rates( )
- {
-
- // load settings
- if($settings = $this->CI->Settings_model->get_settings('united_parcel_service')) {
- $access_key = $settings['access_key'];
- $ups_account_username = $settings['ups_account_username'];
- $ups_account_password = $settings['ups_account_password'];
- $enabled = $settings['enabled'];
- $services = explode(',', $settings['services']);
- $handling_method = $settings['handling_method'];
- $handling_amount = $settings['handling_amount'];
- } else {
- return array(); // no settings, no compute
- }
-
- $zip_code = $this->CI->config->item('zip');
- $customer = $this->CI->go_cart->customer();
- $weight = $this->CI->go_cart->order_weight();
- $currency = $this->CI->config->item('currency');
- $insured_value = $this->CI->go_cart->order_insurable_value();
-
- // shipping address will always be there
- $destination_zip = $customer['ship_address']['zip'];
-
-
- $data ="
-
- $access_key
- $ups_account_username
- $ups_account_password
-
-
-
-
-
- Rating and Service
- 1.0001
-
- Rate
- shop
-
-
- 01
-
-
-
-
- $zip_code
-
-
-
-
- $destination_zip
-
-
-
-
- 02
- Package
-
- Rate Shopping
-
- $weight
-
-
- $currency
- $insured_value
-
-
-
-
- ";
-
-
- $ch = curl_init("https://www.ups.com/ups.app/xml/Rate");
- curl_setopt($ch, CURLOPT_HEADER, 1);
- curl_setopt($ch,CURLOPT_POST,1);
- curl_setopt($ch,CURLOPT_TIMEOUT, 60);
- curl_setopt($ch,CURLOPT_RETURNTRANSFER,1);
- curl_setopt ($ch, CURLOPT_SSL_VERIFYPEER, 0);
- curl_setopt ($ch, CURLOPT_SSL_VERIFYHOST, 0);
- curl_setopt($ch,CURLOPT_POSTFIELDS,$data);
- $result=curl_exec ($ch);
-
- //die(print_r($result)); // uncomment to debug
-
- $data = strstr($result, 'Response->ResponseStatusCode == '1')
- {
- foreach($xml->RatedShipment as $shipping_choice)
- {
- // only display the ones the admin has chosen to show
- if(in_array($shipping_choice->Service->Code, $services))
- {
- $k = $this->ups_services[(string)$shipping_choice->Service->Code];
- $amount = (string)$shipping_choice->TotalCharges->MonetaryValue;
-
- if(is_numeric($handling_amount)) // valid entry?
- {
- if($handling_method=='$')
- {
- $amount += $handling_amount;
- }
- elseif($handling_method=='%')
- {
- $amount += $amount * ($handling_amount/100);
- }
- }
-
- $shipping_choices[$k] = $amount;
- }
- }
- return $shipping_choices;
- }
- else
- {
- //send back empty array on fail
- return array();
- }
- }
-
-
- function install()
- {
- $default_settings = array(
- 'access_key' => '',
- 'ups_account_username' => '',
- 'ups_account_password' => '',
- 'services' => '11',
- 'handling_method' => '$',
- 'handling_amount' => '5',
- 'enabled' => '0'
- );
- //set a default blank setting for flatrate shipping
- $this->CI->Settings_model->save_settings('united_parcel_service', $default_settings);
- }
-
- function uninstall()
- {
-
- $this->CI->Settings_model->delete_settings('united_parcel_service');
- }
-
- function form($post = false)
- {
-
- $this->CI->load->helper('form');
-
- //this same function processes the form
- if(!$post)
- {
- $settings = $this->CI->Settings_model->get_settings('united_parcel_service');
- $access_key = $settings['access_key'];
- $username = $settings['ups_account_username'];
- $password = $settings['ups_account_password'];
- $services = explode(',', $settings['services']);
- $handling_method = $settings['handling_method'];
- $handling_amount = $settings['handling_amount'];
- $enabled = $settings['enabled'];
- }
- else
- {
- $access_key = $post['access_key'];
- $username = $post['ups_account_username'];
- $password = $post['ups_account_password'];
- $services = $post['services'];
- $handling_method = $post['handling_method'];
- $handling_amount = $post['handling_amount'];
- $enabled = $post['enabled'];
- }
-
- $form = '';
- return $form;
- }
-
- function check()
- {
- $error = false;
-
- // no checking yet
-
- //count the errors
- if($error)
- {
- return $error;
- }
- else
- {
- $settings = $_POST;
- $settings['services'] = implode(',', $settings['services']);
-
- //we save the settings if it gets here
- $this->CI->Settings_model->save_settings('united_parcel_service', $settings);
-
- return false;
- }
- }
-
-}
\ No newline at end of file
diff --git a/gocart/migrations/001_gocart.php b/gocart/migrations/001_gocart.php
new file mode 100644
index 00000000..f1ebd56d
--- /dev/null
+++ b/gocart/migrations/001_gocart.php
@@ -0,0 +1,35 @@
+db->field_exists('heard_about', 'orders'))
+ {
+ $this->dbforge->drop_column('orders', 'heard_about');
+ }
+
+
+ //update the notes field to be NULL by default
+ $fields = array('notes'=>array( 'type' => 'text'
+ ,'null' => TRUE
+ )
+ );
+ $this->dbforge->modify_column('orders', $fields);
+
+ //update session ip_address to support ipv6 length
+ $fields = array('ip_address'=>array( 'type' => 'VARCHAR'
+ ,'constraint' => '45'
+ )
+ );
+ $this->dbforge->modify_column('sessions', $fields);
+
+ }
+
+ public function down()
+ {
+ //none of the changes should effect the product
+ }
+
+}
diff --git a/gocart/views/index.html b/gocart/migrations/index.html
similarity index 100%
rename from gocart/views/index.html
rename to gocart/migrations/index.html
diff --git a/gocart/models/box_model.php b/gocart/models/box_model.php
index b970cbfd..05897139 100644
--- a/gocart/models/box_model.php
+++ b/gocart/models/box_model.php
@@ -1,11 +1,6 @@
db->order_by('sequence ASC')->get('boxes')->result();
- $count = 1;
- foreach ($boxes as &$box)
+
+ $return = array();
+ foreach ($boxes as $box)
{
if ($box->enable_on == '0000-00-00')
{
@@ -49,22 +45,19 @@ function get_homepage_boxes($limit = false)
if (($enable_test && $enable_test > $curDate) || ($disable_test && $disable_test <= $curDate))
{
- unset($box);
+ //fails to make it. rewrite this if statement one day to work opposite of how it does.
}
else
{
- $count++;
+ $return[] = $box;
}
- if($limit)
+ if($limit && $limit <= count($return))
{
- if($count > $limit)
- {
- continue;
- }
+ break;
}
}
- return $boxes;
+ return $return;
}
function get_box($id)
diff --git a/gocart/models/cart_model.php b/gocart/models/cart_model.php
deleted file mode 100644
index 46822a47..00000000
--- a/gocart/models/cart_model.php
+++ /dev/null
@@ -1,78 +0,0 @@
-cart = $this->session->userdata('cart');
- }
-
- /********************************************************************
-
- ********************************************************************/
-
- function get_order($by='id', $string)
- {
- /*
- get_order() will only return the higher end order information
- it does not return order items or item options
-
- $by can be id, customer_id, or session_id
- */
- $this->db->where($id, $string);
- $result = $this->db->get('order');
- return $result->row();
- }
-
- function get_order_items($order_id)
- {
- $this->db_where('order_id', $id);
- $result = $this->db->get('order_items');
- return $result->results();
- }
-
- function get_order_item_options($item_id)
- {
- $this->db_where('item_id', $id);
- $result = $this->db->get('order_item_options');
- return $result->results();
- }
-
- function get_order_weight()
- {
- $order_weight = 0;
- foreach ($this->cart['content'] as $item)
- {
- $item_weight = $item['weight']*$item['quantity'];
- $order_weight = $order_weight + $item_weight;
- }
-
- return $order_weight;
- }
-
- function get_order_price()
- {
- $order_price = 0;
- foreach ($this->cart['content'] as $item)
- {
- $item_price = $item['price']*$item['quantity'];
- $order_price = $order_price + $item_price;
- }
-
- return $order_price;
- }
-
- function get_total()
- {
- $order_price = $this->get_order_price();
- $tax = $this->cart['taxes'];
- $shipping = $this->cart['shipping'];
- $discount = isset($this->cart['coupon_discount']) ? $this->cart['coupon_discount'] : 0;
-
- $total = ($order_price + $tax + $shipping) - $discount;
-
- return number_format($total, '2');
- }
-}
-?>
diff --git a/gocart/models/category_model.php b/gocart/models/category_model.php
index 3e572af5..121c7100 100644
--- a/gocart/models/category_model.php
+++ b/gocart/models/category_model.php
@@ -6,7 +6,7 @@ function get_categories($parent = false)
{
if ($parent !== false)
{
- $this->db->where("parent_id = $parent");
+ $this->db->where('parent_id', $parent);
}
$this->db->select('id');
$this->db->order_by('categories.sequence', 'ASC');
@@ -37,6 +37,11 @@ function get_categories_tierd($parent=0)
return $categories;
}
+ function category_autocomplete($name, $limit)
+ {
+ return $this->db->like('name', $name)->get('categories', $limit)->result();
+ }
+
function get_category($id)
{
return $this->db->get_where('categories', array('id'=>$id))->row();
diff --git a/gocart/models/customer_model.php b/gocart/models/customer_model.php
old mode 100755
new mode 100644
index fcfec269..1c4084a6
--- a/gocart/models/customer_model.php
+++ b/gocart/models/customer_model.php
@@ -3,7 +3,7 @@
{
//this is the expiration for a non-remember session
- var $session_expire = 600;
+ var $session_expire = 7200;
function __construct()
@@ -184,7 +184,7 @@ function login($email, $password, $remember=false)
$this->db->select('*');
$this->db->where('email', $email);
$this->db->where('active', 1);
- $this->db->where('password', $this->encrypt->sha1($password));
+ $this->db->where('password', sha1($password));
$this->db->limit(1);
$result = $this->db->get('customers');
$customer = $result->row_array();
@@ -290,7 +290,7 @@ function is_logged_in($redirect = false, $default_redirect = 'secure/login/')
if($default_redirect)
{
- redirect('login');
+ redirect('secure/login');
}
return false;
@@ -321,7 +321,7 @@ function reset_password($email)
$this->load->library('email');
$new_password = random_string('alnum', 8);
- $customer['password'] = $this->encrypt->sha1($new_password);
+ $customer['password'] = sha1($new_password);
$this->save($customer);
$this->email->from($this->config->item('email'), $this->config->item('site_name'));
@@ -374,6 +374,4 @@ function save_group($data)
return $this->db->insert_id();
}
}
-
-
-}
+}
\ No newline at end of file
diff --git a/gocart/models/digital_product_model.php b/gocart/models/digital_product_model.php
new file mode 100644
index 00000000..c37c0d40
--- /dev/null
+++ b/gocart/models/digital_product_model.php
@@ -0,0 +1,247 @@
+lang->load('digital_product');
+ }
+
+ // Return blank record array
+ function new_file()
+ {
+ return array(
+ 'id'=>'',
+ 'filename'=>'',
+ 'max_downloads'=>'',
+ 'title'=>'',
+ 'description'=>'',
+ 'size'=>''
+ );
+ }
+
+ // Get files list
+ function get_list()
+ {
+
+ $list = $this->db->get('digital_products')->result();
+
+ foreach($list as &$file)
+ {
+ // identify if the record is missing it's file content
+ $file->verified = $this->verify_content($file->filename);
+ }
+
+ return $list;
+ }
+
+ // Get file record
+ function get_file_info($id)
+ {
+ return $this->db->where('id', $id)->get('digital_products')->row();
+ }
+
+ // Verify upload path
+ function verify_file_path()
+ {
+ return is_writable('uploads/digital_products');
+ }
+
+ // Verify file content
+ function verify_content($filename)
+ {
+ return file_exists('uploads/digital_products'.'/'.$filename);
+ }
+
+ // Save/Update file record
+ function save($data)
+ {
+ if(isset($data['id']))
+ {
+ $this->db->where('id', $data['id'])->update('digital_products', $data);
+ return $data['id'];
+ } else {
+ $this->db->insert('digital_products', $data);
+ return $this->db->insert_id();
+ }
+ }
+
+ // Add product association
+ function associate($file_id, $product_id)
+ {
+ $this->db->insert('products_files', array('product_id'=>$product_id, 'file_id'=>$file_id));
+ }
+
+ // Remove product association (all or by product)
+ function disassociate($file_id, $product_id=false)
+ {
+
+ if($product_id)
+ {
+ $data['product_id'] = $product_id;
+ }
+ if($file_id)
+ {
+ $data['file_id'] = $file_id;
+ }
+ $this->db->where($data)->delete('products_files');
+ }
+
+ function get_associations_by_file($id)
+ {
+ return $this->db->where('file_id', $id)->get('products_files')->result();
+ }
+
+ function get_associations_by_product($product_id)
+ {
+ return $this->db->where('product_id', $product_id)->get('products_files')->result();
+ }
+
+ // Delete file record & content
+ function delete($id)
+ {
+ $this->load->model('product_model');
+
+ $info = $this->get_file_info($id);
+
+ if(!$info)
+ {
+ return false;
+ }
+
+ // remove file
+ if($this->verify_content($info->filename))
+ {
+ unlink('uploads/digital_products/'.$info->filename);
+ }
+
+ // Disable products that are associated with this file
+ // to prevent users purchasing a product with deleted media
+ $product_associations = $this->get_associations_by_file($id);
+ foreach($product_associations as $p)
+ {
+ $save['id'] = $p->product_id;
+ $save['enabled'] = 0;
+ $this->product_model->save($save);
+ }
+
+ // Remove db associations
+ $this->db->where('id', $id)->delete('digital_products');
+ $this->disassociate($id);
+ }
+
+ // Accepts an array of file lists for products purchased
+ // and sets up the list of available downloads for the customer
+ // uses customer id if available, also creates a package code
+ // that can be sent to non registered customers
+ function add_download_package($package, $order_id)
+ {
+ // get customer stuff
+ $customer = $this->go_cart->customer();
+ if(!empty($customer['id']))
+ {
+ $new_package['customer_id'] = $customer['id'];
+ } else {
+ $new_package['customer_id'] = 0;
+ }
+
+ $new_package['order_id'] = $order_id;
+ $new_package['code'] = generate_code();
+
+ // save master package record
+ $this->db->insert('download_packages',$new_package);
+
+ $package_id = $this->db->insert_id();
+
+ // save the db data here
+ $files_list = array();
+
+ // use this to prevent inserting duplicates
+ // in case a file is shared across products
+ $ids = array();
+
+ // build files records list
+ foreach($package as $product_list)
+ {
+ foreach($product_list as $f)
+ {
+ if(!isset($ids[$f->file_id]))
+ {
+ $file['package_id'] = $package_id;
+ $file['file_id'] = $f->file_id;
+ $file['link'] = md5($f->file_id . time() . $new_package['customer_id']); // create a unique download key for each file
+
+ $files_list[] = $file;
+ }
+ }
+ }
+
+ $this->db->insert_batch('download_package_files', $files_list);
+
+ // save the master record to include links in the order email
+ $this->go_cart->save_order_downloads($new_package);
+ }
+
+ // Retrieve user's download packages
+ // send back an array indexed by order number
+ function get_user_downloads($customer_id)
+ {
+ $result = $this->db->where('customer_id', $customer_id)->get('download_packages')->result();
+
+ $downloads = array();
+ foreach($result as $r)
+ {
+ $downloads[$r->order_id] = $this->get_package_files($r->id);
+ }
+
+ return $downloads;
+ }
+
+ // Retrieve non-member download by code
+ // format array exactly as by user
+ function get_downloads_by_code($code)
+ {
+ $row = $this->db->where('code', $code)->get('download_packages')->row();
+
+ if($row)
+ {
+ return array(
+ $row->order_id => $this->get_package_files($row->id)
+ );
+ }
+ }
+
+ // get the files in a package
+ function get_package_files($package_id)
+ {
+
+ return $this->db->select('*')
+ ->from('download_package_files as a')
+ ->join('digital_products as b', 'a.file_id=b.id')
+ ->where('package_id', $package_id)
+ ->get()
+ ->result();
+ }
+
+ // get file info for download by the link code
+ // increment the download counter
+ function get_file_info_by_link($link)
+ {
+
+ $record = $this->db->from('digital_products as a')
+ ->join('download_package_files as b', 'a.id=b.file_id')
+ ->where('link', $link)
+ ->get()
+ ->row();
+
+ return $record;
+
+ }
+
+
+ function touch_download($link)
+ {
+ $this->db->where('link', $link)->set('downloads','downloads+1', false)->update('download_package_files');
+ }
+}
\ No newline at end of file
diff --git a/gocart/models/gift_card_model.php b/gocart/models/gift_card_model.php
old mode 100755
new mode 100644
index 7f2e282c..6611cbdf
--- a/gocart/models/gift_card_model.php
+++ b/gocart/models/gift_card_model.php
@@ -119,26 +119,16 @@ function is_active($code)
$this->db->where('code', $code);
$res = $this->db->get('gift_cards');
$row = $res->row();
- return (bool) $row->activated;
- }
-
- // use a run-of-the-mill pw generator as a code generator
- function generate_password($length=16) {
- $vowels = '0123';
- $consonants = '456789ABCDEF';
-
- $password = '';
- $alt = time() % 2;
- for ($i = 0; $i < $length; $i++) {
- if ($alt == 1) {
- $password .= $consonants[(rand() % strlen($consonants))];
- $alt = 0;
- } else {
- $password .= $vowels[(rand() % strlen($vowels))];
- $alt = 1;
- }
+ if($row)
+ {
+ return (bool) $row->activated;
}
- return $password;
+ else
+ {
+ return false;
+ }
+
}
+
}
\ No newline at end of file
diff --git a/gocart/models/option_model.php b/gocart/models/option_model.php
old mode 100755
new mode 100644
index 883ba2e4..80c602c6
--- a/gocart/models/option_model.php
+++ b/gocart/models/option_model.php
@@ -69,6 +69,8 @@ function save_option($option, $values)
{
$value['option_id'] = $id;
$value['sequence'] = $sequence;
+ $value['weight'] = floatval($value['weight']);
+ $value['price'] = floatval($value['price']);
$sequence++;
$this->db->insert('option_values', $value);
diff --git a/gocart/models/order_model.php b/gocart/models/order_model.php
index 35eb0696..e0dbdd88 100644
--- a/gocart/models/order_model.php
+++ b/gocart/models/order_model.php
@@ -6,6 +6,37 @@ function __construct()
parent::__construct();
}
+ function get_gross_monthly_sales($year)
+ {
+ $this->db->select('SUM(coupon_discount) as coupon_discounts');
+ $this->db->select('SUM(gift_card_discount) as gift_card_discounts');
+ $this->db->select('SUM(subtotal) as product_totals');
+ $this->db->select('SUM(shipping) as shipping');
+ $this->db->select('SUM(tax) as tax');
+ $this->db->select('SUM(total) as total');
+ $this->db->select('YEAR(ordered_on) as year');
+ $this->db->select('MONTH(ordered_on) as month');
+ $this->db->group_by(array('MONTH(ordered_on)'));
+ $this->db->order_by("ordered_on", "desc");
+ $this->db->where('YEAR(ordered_on)', $year);
+
+ return $this->db->get('orders')->result();
+ }
+
+ function get_sales_years()
+ {
+ $this->db->order_by("ordered_on", "desc");
+ $this->db->select('YEAR(ordered_on) as year');
+ $this->db->group_by('YEAR(ordered_on)');
+ $records = $this->db->get('orders')->result();
+ $years = array();
+ foreach($records as $r)
+ {
+ $years[] = $r->year;
+ }
+ return $years;
+ }
+
function get_orders($search=false, $sort_by='', $sort_order='DESC', $limit=0, $offset=0)
{
if ($search)
@@ -172,7 +203,7 @@ function delete($id)
$this->db->delete('orders');
//now delete the order items
- $this->db->where('id', $id);
+ $this->db->where('order_id', $id);
$this->db->delete('order_items');
}
@@ -212,8 +243,10 @@ function save_order($data, $contents = false)
// update order items
foreach($contents as $item)
{
- $save = array();
+ $save = array();
$save['contents'] = $item;
+
+ $item = unserialize($item);
$save['product_id'] = $item['id'];
$save['quantity'] = $item['quantity'];
$save['order_id'] = $id;
@@ -225,22 +258,6 @@ function save_order($data, $contents = false)
}
- function save_item($data)
- {
- if (isset($data['id']) && $data['id'] != 0)
- {
- $this->db->where('id', $data['id']);
- $this->db->update('items', $data);
-
- return $data['id'];
- }
- else
- {
- $this->db->insert('items', $data);
- return $this->db->insert_id();
- }
- }
-
function get_best_sellers($start, $end)
{
if(!empty($start))
diff --git a/gocart/models/page_model.php b/gocart/models/page_model.php
index 0a4ca44f..2d95f77f 100644
--- a/gocart/models/page_model.php
+++ b/gocart/models/page_model.php
@@ -1,11 +1,7 @@
session->userdata('cart');
-
-
- $customer = $cart['customer'];
-
- $post_url = "https://test.authorize.net/gateway/transact.dll";
- $post_values = array(
-
- // the API Login ID and Transaction Key must be replaced with valid values
- "x_login" => $this->config->item('x_login'),
- "x_tran_key" => $this->config->item('x_tran_key'),
-
- "x_version" => "3.1",
- "x_delim_data" => "TRUE",
- "x_delim_char" => "|",
- "x_relay_response" => "FALSE",
-
- "x_type" => "AUTH_CAPTURE",
- "x_method" => "CC",
- "x_card_num" => "4111111111111111",
- "x_exp_date" => "0115",
-
- "x_amount" => "19.99",
- "x_description" => "Sample Transaction",
-
- "x_first_name" => $customer['firstname'],
- "x_last_name" => $customer['lastname'],
- "x_address" => $customer['bill_address1'].' '.$customer['bill_address2'],
- "x_state" => $customer['bill_state'],
- "x_zip" => $customer['bill_zip']
- // Additional fields can be added here as outlined in the AIM integration
- // guide at: http://developer.authorize.net
- );
- $post_string = "";
- foreach( $post_values as $key => $value )
- { $post_string .= "$key=" . urlencode( $value ) . "&"; }
- $post_string = rtrim( $post_string, "& " );
-
-
- $request = curl_init($post_url); // initiate curl object
- curl_setopt($request, CURLOPT_HEADER, 0); // set to 0 to eliminate header info from response
- curl_setopt($request, CURLOPT_RETURNTRANSFER, 1); // Returns response data instead of TRUE(1)
- curl_setopt($request, CURLOPT_POSTFIELDS, $post_string); // use HTTP POST to send form data
- curl_setopt($request, CURLOPT_SSL_VERIFYPEER, FALSE); // uncomment this line if you get no gateway response.
- $post_response = curl_exec($request); // execute curl post and store results in $post_response
- // additional options may be required depending upon your server configuration
- // you can find documentation on curl options at http://www.php.net/curl_setopt
- curl_close ($request); // close curl object
-
- // This line takes the response and breaks it into an array using the specified delimiting character
- $response_array = explode($post_values["x_delim_char"],$post_response);
- }
-}
-?>
diff --git a/gocart/models/product_model.php b/gocart/models/product_model.php
old mode 100755
new mode 100644
index 17d05745..345afbaf
--- a/gocart/models/product_model.php
+++ b/gocart/models/product_model.php
@@ -12,17 +12,104 @@ function __construct()
// check for possible group discount
$customer = $this->session->userdata('customer');
- if(isset($customer['group_discount_formula'])) $this->group_discount_formula = $customer['group_discount_formula'];
+ if(isset($customer['group_discount_formula']))
+ {
+ $this->group_discount_formula = $customer['group_discount_formula'];
+ }
}
-
- function get_products($category_id = false, $limit = false, $offset = false)
+
+ function product_autocomplete($name, $limit)
+ {
+ return $this->db->like('name', $name)->get('products', $limit)->result();
+ }
+
+ function products($data=array(), $return_count=false)
+ {
+ if(empty($data))
+ {
+ //if nothing is provided return the whole shabang
+ $this->get_all_products();
+ }
+ else
+ {
+ //grab the limit
+ if(!empty($data['rows']))
+ {
+ $this->db->limit($data['rows']);
+ }
+
+ //grab the offset
+ if(!empty($data['page']))
+ {
+ $this->db->offset($data['page']);
+ }
+
+ //do we order by something other than category_id?
+ if(!empty($data['order_by']))
+ {
+ //if we have an order_by then we must have a direction otherwise KABOOM
+ $this->db->order_by($data['order_by'], $data['sort_order']);
+ }
+
+ //do we have a search submitted?
+ if(!empty($data['term']))
+ {
+ $search = json_decode($data['term']);
+ //if we are searching dig through some basic fields
+ if(!empty($search->term))
+ {
+ $this->db->like('name', $search->term);
+ $this->db->or_like('description', $search->term);
+ $this->db->or_like('excerpt', $search->term);
+ $this->db->or_like('sku', $search->term);
+ }
+
+ if(!empty($search->category_id))
+ {
+ //lets do some joins to get the proper category products
+ $this->db->join('category_products', 'category_products.product_id=products.id', 'right');
+ $this->db->where('category_products.category_id', $search->category_id);
+ $this->db->order_by('sequence', 'ASC');
+ }
+ }
+
+ if($return_count)
+ {
+ return $this->db->count_all_results('products');
+ }
+ else
+ {
+ return $this->db->get('products')->result();
+ }
+
+ }
+ }
+
+ function get_all_products()
+ {
+ //sort by alphabetically by default
+ $this->db->order_by('name', 'ASC');
+ $result = $this->db->get('products');
+ //apply group discount
+ $return = $result->result();
+ if($this->group_discount_formula)
+ {
+ foreach($return as &$product) {
+ eval('$product->price=$product->price'.$this->group_discount_formula.';');
+ }
+ }
+ return $return;
+ }
+
+ function get_products($category_id = false, $limit = false, $offset = false, $by=false, $sort=false)
{
//if we are provided a category_id, then get products according to category
if ($category_id)
{
- $this->db->order_by('sequence', 'ASC');
- $result = $this->db->get_where('category_products', array('category_id'=>$category_id), $limit, $offset);
- $result = $result->result();
+ $this->db->select('category_products.*, LEAST(IFNULL(NULLIF(saleprice, 0), price), price) as sort_price', false)->from('category_products')->join('products', 'category_products.product_id=products.id')->where(array('category_id'=>$category_id, 'enabled'=>1));
+ $this->db->order_by($by, $sort);
+
+ $result = $this->db->limit($limit)->offset($offset)->get()->result();
$contents = array();
$count = 0;
@@ -50,43 +137,65 @@ function get_products($category_id = false, $limit = false, $offset = false)
}
return $return;
}
-
}
-
+
+ function count_all_products()
+ {
+ return $this->db->count_all_results('products');
+ }
+
function count_products($id)
{
- $this->db->where('category_id', $id);
- return $this->db->count_all_results('category_products');
+ return $this->db->select('product_id')->from('category_products')->join('products', 'category_products.product_id=products.id')->where(array('category_id'=>$id, 'enabled'=>1))->count_all_results();
}
- function get_product($id, $sub=true)
+ function get_product($id, $related=true)
{
$result = $this->db->get_where('products', array('id'=>$id))->row();
if(!$result)
{
return false;
}
+
+ $related = json_decode($result->related_products);
- $result->categories = $this->get_product_categories($result->id);
+ if(!empty($related))
+ {
+ //build the where
+ $where = false;
+ foreach($related as $r)
+ {
+ if(!$where)
+ {
+ $this->db->where('id', $r);
+ }
+ else
+ {
+ $this->db->or_where('id', $r);
+ }
+ $where = true;
+ }
+ $result->related_products = $this->db->get('products')->result();
+ }
+ else
+ {
+ $result->related_products = array();
+ }
+ $result->categories = $this->get_product_categories($result->id);
+
// group discount?
if($this->group_discount_formula)
{
eval('$result->price=$result->price'.$this->group_discount_formula.';');
}
+
return $result;
}
function get_product_categories($id)
{
- $cats = $this->db->where('product_id', $id)->get('category_products')->result();
-
- $categories = array();
- foreach ($cats as $c)
- {
- $categories[] = $c->category_id;
- }
- return $categories;
+ return $this->db->where('product_id', $id)->join('categories', 'category_id = categories.id')->get('category_products')->result();
}
function get_slug($id)
@@ -160,8 +269,15 @@ function save($product, $options=false, $categories=false)
//get all the categories that the product is in
$cats = $this->get_product_categories($id);
- //eliminate categories that products are no longer in
+ //generate cat_id array
+ $ids = array();
foreach($cats as $c)
+ {
+ $ids[] = $c->id;
+ }
+
+ //eliminate categories that products are no longer in
+ foreach($ids as $c)
{
if(!in_array($c, $categories))
{
@@ -172,7 +288,7 @@ function save($product, $options=false, $categories=false)
//add products to new categories
foreach($categories as $c)
{
- if(!in_array($c, $cats))
+ if(!in_array($c, $ids))
{
$this->db->insert('category_products', array('product_id'=>$id,'category_id'=>$c));
}
@@ -213,71 +329,66 @@ function add_product_to_category($product_id, $optionlist_id, $sequence)
$this->db->insert('product_categories', array('product_id'=>$product_id, 'category_id'=>$category_id, 'sequence'=>$sequence));
}
- function search_products($term, $limit=false, $offset=false)
+ function search_products($term, $limit=false, $offset=false, $by=false, $sort=false)
{
$results = array();
-
- //I know this is the round about way of doing things and is not the fastest. but it is thus far the easiest.
-
+
+ $this->db->select('*, LEAST(IFNULL(NULLIF(saleprice, 0), price), price) as sort_price', false);
//this one counts the total number for our pagination
- $this->db->like('name', $term);
- $this->db->or_like('description', $term);
- $this->db->or_like('excerpt', $term);
- $this->db->or_like('sku', $term);
+ $this->db->where('enabled', 1);
+ $this->db->where('(name LIKE "%'.$term.'%" OR description LIKE "%'.$term.'%" OR excerpt LIKE "%'.$term.'%" OR sku LIKE "%'.$term.'%")');
$results['count'] = $this->db->count_all_results('products');
+
+ $this->db->select('*, LEAST(IFNULL(NULLIF(saleprice, 0), price), price) as sort_price', false);
//this one gets just the ones we need.
- $this->db->like('name', $term);
- $this->db->or_like('description', $term);
- $this->db->or_like('excerpt', $term);
- $this->db->or_like('sku', $term);
+ $this->db->where('enabled', 1);
+ $this->db->where('(name LIKE "%'.$term.'%" OR description LIKE "%'.$term.'%" OR excerpt LIKE "%'.$term.'%" OR sku LIKE "%'.$term.'%")');
+
+ if($by && $sort)
+ {
+ $this->db->order_by($by, $sort);
+ }
+
$results['products'] = $this->db->get('products', $limit, $offset)->result();
+
return $results;
}
// Build a cart-ready product array
function get_cart_ready_product($id, $quantity=false)
{
+ $product = $this->db->get_where('products', array('id'=>$id))->row();
- $db_product = $this->get_product($id);
- if( ! $db_product)
+ //unset some of the additional fields we don't need to keep
+ if(!$product)
{
return false;
}
- $product = array();
+ $product->base_price = $product->price;
+
+ if ($product->saleprice != 0.00)
+ {
+ $product->price = $product->saleprice;
+ }
- if ($db_product->saleprice == 0.00) {
- $product['price'] = $db_product->price;
+
+ // Some products have n/a quantity, such as downloadables
+ //overwrite quantity of the product with quantity requested
+ if (!$quantity || $quantity <= 0 || $product->fixed_quantity==1)
+ {
+ $product->quantity = 1;
}
else
{
- $product['price'] = $db_product->saleprice;
+ $product->quantity = $quantity;
}
- $product['base_price'] = $product['price']; // price gets modified by options, show the baseline still...
- $product['id'] = $db_product->id;
- $product['name'] = $db_product->name;
- $product['sku'] = $db_product->sku;
- $product['excerpt'] = $db_product->excerpt;
- $product['weight'] = $db_product->weight;
- $product['shippable'] = $db_product->shippable;
- $product['in_stock'] = $db_product->in_stock;
- $product['options'] = array();
-
- // Some products have n/a quantity, such as downloadables
- if($db_product->shippable==1)
- {
- // no negs || non-shippable products qty is n/a
- if (!$quantity || $quantity <= 0)
- {
- $product['quantity'] = 1;
- } else {
- $product['quantity'] = $quantity;
- }
- } // end qty segment
+ // attach list of associated downloadables
+ $product->file_list = $this->Digital_Product_model->get_associations_by_product($id);
- return $product;
+ return (array)$product;
}
}
\ No newline at end of file
diff --git a/gocart/models/shipping_model.php b/gocart/models/shipping_model.php
deleted file mode 100644
index 2f5b0518..00000000
--- a/gocart/models/shipping_model.php
+++ /dev/null
@@ -1,64 +0,0 @@
- '85.00'
- ,'70' => '65.00'
- ,'60' => '55.00'
- ,'50' => '55.00'
- ,'40' => '45.00'
- ,'30' => '35.00'
- ,'20' => '25.00'
- ,'10' => '15.00'
- ,'0' => '5.00'
- );
-
-
- if ($method == 'weight')
- {
- $order_weight = $this->get_order_weight();
- $shipping_price = '';
- foreach ($table as $weight => $rate)
- {
- $shipping_price = $rate;
- if($weight <= $order_weight)
- {
- break;
- }
- }
- echo $order_weight;
- return $shipping_price;
- }
- elseif ($method == 'price')
- {
- $order_price = $this->get_order_price();
- $shipping_price = '';
- foreach ($table as $price => $rate)
- {
- $shipping_price = $rate;
- if($price <= $order_price)
- {
- break;
- }
- }
- return $shipping_price;
- }
- }
-}
-?>
diff --git a/gocart/models/tax_model.php b/gocart/models/tax_model.php
index 9b792327..f31c1eac 100644
--- a/gocart/models/tax_model.php
+++ b/gocart/models/tax_model.php
@@ -75,7 +75,7 @@ function get_tax_total()
$tax_total = 0;
$tax_total = $tax_total + $this->get_taxes();
- return number_format($tax_total, 2, '.', ',');
+ return number_format($tax_total, 2, '.', '');
}
function get_tax_rate()
diff --git a/gocart/third_party/.htaccess b/gocart/packages/.htaccess
similarity index 100%
rename from gocart/third_party/.htaccess
rename to gocart/packages/.htaccess
diff --git a/gocart/packages/index.html b/gocart/packages/index.html
new file mode 100644
index 00000000..c942a79c
--- /dev/null
+++ b/gocart/packages/index.html
@@ -0,0 +1,10 @@
+
+
+ 403 Forbidden
+
+
+
+Directory access is forbidden.
+
+
+
\ No newline at end of file
diff --git a/gocart/packages/payment/authorize_net/language/english/authorize_net_lang.php b/gocart/packages/payment/authorize_net/language/english/authorize_net_lang.php
new file mode 100644
index 00000000..ceb09f57
--- /dev/null
+++ b/gocart/packages/payment/authorize_net/language/english/authorize_net_lang.php
@@ -0,0 +1,29 @@
+CI =& get_instance();
$this->CI->load->helper("credit_card");
- $this->CI->load->library('session');
- $this->CI->load->library('payment/authorize_net/authorize_net_lib');
+ $this->CI->load->library('authorize_net_lib');
+ $this->CI->lang->load('authorize_net');
}
@@ -30,46 +30,43 @@ function checkout_form($post = false)
$enabled = $settings['enabled'];
$form = array();
+ $form['name'] = $this->method_name;
// Retrieve any previously stored cc data to redisplay in case of errors
$cc_data = $this->CI->session->userdata('cc_data');
if($enabled)
{
- $form['name'] = $this->method_name;
- //retrieve cc form
- ob_start();
- include(APPPATH."libraries/payment/authorize_net/forms/customer_card.php");
- $form['form'] = ob_get_contents();
- ob_end_clean();
+ $form['form'] = $this->CI->load->view('customer_card', array('cc_data'=>$cc_data), true);
+
+ return $form;
} else return array();
- return $form;
}
function checkout_check()
{
- $error_msg = "Please fix the following errors: