tienda 2.0.1 → 2.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (21) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/tienda/application.coffee +1 -57
  3. data/app/controllers/tienda/dashboard_controller.rb +2 -2
  4. data/app/controllers/tienda/product_categories_controller.rb +4 -2
  5. data/app/helpers/tienda/product_categories_helper.rb +56 -0
  6. data/app/models/tienda/product.rb +18 -4
  7. data/app/models/tienda/product_category.rb +8 -5
  8. data/app/views/layouts/tienda/application.html.haml +7 -7
  9. data/app/views/tienda/product_categories/_form.html.haml +6 -2
  10. data/app/views/tienda/product_categories/index.html.haml +2 -1
  11. data/config/initializers/assets.rb +2 -2
  12. data/db/migrate/20150605232554_add_parent_id_to_categories.rb +5 -0
  13. data/lib/tienda/version.rb +1 -1
  14. metadata +4 -9
  15. data/app/assets/javascripts/tienda/chosen.jquery.js +0 -1166
  16. data/app/assets/javascripts/tienda/custom-scripts.js +0 -182
  17. data/app/assets/javascripts/tienda/custom.js +0 -200
  18. data/app/assets/javascripts/tienda/morris.js +0 -1913
  19. data/app/assets/javascripts/tienda/mousetrap.js +0 -9
  20. data/app/assets/javascripts/tienda/raphael-2.1.0.min.js +0 -10
  21. data/app/assets/stylesheets/tienda/morris-0.4.3.min.css +0 -2
data/app/assets/javascripts/tienda/custom-scripts.js DELETED
@@ -1,182 +0,0 @@
1
- /*------------------------------------------------------
2
- Author : www.webthemez.com
3
- License: Commons Attribution 3.0
4
- http://creativecommons.org/licenses/by/3.0/
5
- --------------------------------------------------------- */
6
-
7
- (function ($) {
8
- "use strict";
9
- var mainApp = {
10
-
11
- initFunction: function () {
12
-
13
- /* MORRIS BAR CHART
14
- -----------------------------------------*/
15
- Morris.Bar({
16
- element: 'morris-bar-chart',
17
- data: [{
18
- y: '2006',
19
- a: 100
20
- }, {
21
- y: '2007',
22
- a: 75
23
- }, {
24
- y: '2008',
25
- a: 50
26
- }, {
27
- y: '2009',
28
- a: 75
29
- }, {
30
- y: '2010',
31
- a: 50
32
- }, {
33
- y: '2011',
34
- a: 75
35
- }, {
36
- y: '2012',
37
- a: 100
38
- }],
39
- xkey: 'y',
40
- ykeys: ['a'],
41
- labels: ['Orders'],
42
- hideHover: 'auto',
43
- resize: true
44
- });
45
-
46
- /* MORRIS DONUT CHART
47
- ----------------------------------------*/
48
- Morris.Donut({
49
- element: 'morris-donut-chart',
50
- data: [{
51
- label: "Download Sales",
52
- value: 12
53
- }, {
54
- label: "In-Store Sales",
55
- value: 30
56
- }, {
57
- label: "Mail-Order Sales",
58
- value: 20
59
- }],
60
- resize: true
61
- });
62
-
63
- /* MORRIS AREA CHART
64
- ----------------------------------------*/
65
-
66
- // Morris.Area({
67
- // element: 'morris-area-chart',
68
- // data: [{
69
- // period: '2010 Q1',
70
- // iphone: 2666,
71
- // ipad: null,
72
- // itouch: 2647
73
- // }, {
74
- // period: '2010 Q2',
75
- // iphone: 2778,
76
- // ipad: 2294,
77
- // itouch: 2441
78
- // }, {
79
- // period: '2010 Q3',
80
- // iphone: 4912,
81
- // ipad: 1969,
82
- // itouch: 2501
83
- // }, {
84
- // period: '2010 Q4',
85
- // iphone: 3767,
86
- // ipad: 3597,
87
- // itouch: 5689
88
- // }, {
89
- // period: '2011 Q1',
90
- // iphone: 6810,
91
- // ipad: 1914,
92
- // itouch: 2293
93
- // }, {
94
- // period: '2011 Q2',
95
- // iphone: 5670,
96
- // ipad: 4293,
97
- // itouch: 1881
98
- // }, {
99
- // period: '2011 Q3',
100
- // iphone: 4820,
101
- // ipad: 3795,
102
- // itouch: 1588
103
- // }, {
104
- // period: '2011 Q4',
105
- // iphone: 15073,
106
- // ipad: 5967,
107
- // itouch: 5175
108
- // }, {
109
- // period: '2012 Q1',
110
- // iphone: 10687,
111
- // ipad: 4460,
112
- // itouch: 2028
113
- // }, {
114
- // period: '2012 Q2',
115
- // iphone: 8432,
116
- // ipad: 5713,
117
- // itouch: 1791
118
- // }],
119
- // xkey: 'period',
120
- // ykeys: ['iphone', 'ipad', 'itouch'],
121
- // labels: ['iPhone', 'iPad', 'iPod Touch'],
122
- // pointSize: 2,
123
- // hideHover: 'auto',
124
- // resize: true
125
- // });
126
- //
127
- // /* MORRIS LINE CHART
128
- // ----------------------------------------*/
129
- // Morris.Line({
130
- // element: 'morris-line-chart',
131
- // data: [{
132
- // y: '2006',
133
- // a: 100,
134
- // b: 90
135
- // }, {
136
- // y: '2007',
137
- // a: 75,
138
- // b: 65
139
- // }, {
140
- // y: '2008',
141
- // a: 50,
142
- // b: 40
143
- // }, {
144
- // y: '2009',
145
- // a: 75,
146
- // b: 65
147
- // }, {
148
- // y: '2010',
149
- // a: 50,
150
- // b: 40
151
- // }, {
152
- // y: '2011',
153
- // a: 75,
154
- // b: 65
155
- // }, {
156
- // y: '2012',
157
- // a: 100,
158
- // b: 90
159
- // }],
160
- // xkey: 'y',
161
- // ykeys: ['a', 'b'],
162
- // labels: ['Series A', 'Series B'],
163
- // hideHover: 'auto',
164
- // resize: true
165
- // });
166
-
167
-
168
- },
169
-
170
- initialization: function () {
171
- mainApp.initFunction();
172
-
173
- }
174
-
175
- };
176
- // Initializing ///
177
-
178
- $(document).ready(function () {
179
- mainApp.initFunction();
180
- });
181
-
182
- }(jQuery));
data/app/assets/javascripts/tienda/custom.js DELETED
@@ -1,200 +0,0 @@
1
- /*------------------------------------------------------
2
- Author : www.webthemez.com
3
- License: Commons Attribution 3.0
4
- http://creativecommons.org/licenses/by/3.0/
5
- --------------------------------------------------------- */
6
-
7
- (function ($) {
8
- "use strict";
9
- var mainApp = {
10
-
11
- initFunction: function () {
12
- /*MENU
13
- ------------------------------------*/
14
- $('#main-menu').metisMenu();
15
-
16
- $(window).bind("load resize", function () {
17
- if ($(this).width() < 768) {
18
- $('div.sidebar-collapse').addClass('collapse')
19
- } else {
20
- $('div.sidebar-collapse').removeClass('collapse')
21
- }
22
- });
23
-
24
- /* MORRIS BAR CHART
25
- -----------------------------------------*/
26
- Morris.Bar({
27
- element: 'morris-bar-chart',
28
- data: [{
29
- y: '2006',
30
- a: 100,
31
- b: 90
32
- }, {
33
- y: '2007',
34
- a: 75,
35
- b: 65
36
- }, {
37
- y: '2008',
38
- a: 50,
39
- b: 40
40
- }, {
41
- y: '2009',
42
- a: 75,
43
- b: 65
44
- }, {
45
- y: '2010',
46
- a: 50,
47
- b: 40
48
- }, {
49
- y: '2011',
50
- a: 75,
51
- b: 65
52
- }, {
53
- y: '2012',
54
- a: 100,
55
- b: 90
56
- }],
57
- xkey: 'y',
58
- ykeys: ['a', 'b'],
59
- labels: ['Series A', 'Series B'],
60
- hideHover: 'auto',
61
- resize: true
62
- });
63
-
64
- /* MORRIS DONUT CHART
65
- ----------------------------------------*/
66
- Morris.Donut({
67
- element: 'morris-donut-chart',
68
- data: [{
69
- label: "Download Sales",
70
- value: 12
71
- }, {
72
- label: "In-Store Sales",
73
- value: 30
74
- }, {
75
- label: "Mail-Order Sales",
76
- value: 20
77
- }],
78
- resize: true
79
- });
80
-
81
- /* MORRIS AREA CHART
82
- ----------------------------------------*/
83
-
84
- Morris.Area({
85
- element: 'morris-area-chart',
86
- data: [{
87
- period: '2010 Q1',
88
- iphone: 2666,
89
- ipad: null,
90
- itouch: 2647
91
- }, {
92
- period: '2010 Q2',
93
- iphone: 2778,
94
- ipad: 2294,
95
- itouch: 2441
96
- }, {
97
- period: '2010 Q3',
98
- iphone: 4912,
99
- ipad: 1969,
100
- itouch: 2501
101
- }, {
102
- period: '2010 Q4',
103
- iphone: 3767,
104
- ipad: 3597,
105
- itouch: 5689
106
- }, {
107
- period: '2011 Q1',
108
- iphone: 6810,
109
- ipad: 1914,
110
- itouch: 2293
111
- }, {
112
- period: '2011 Q2',
113
- iphone: 5670,
114
- ipad: 4293,
115
- itouch: 1881
116
- }, {
117
- period: '2011 Q3',
118
- iphone: 4820,
119
- ipad: 3795,
120
- itouch: 1588
121
- }, {
122
- period: '2011 Q4',
123
- iphone: 15073,
124
- ipad: 5967,
125
- itouch: 5175
126
- }, {
127
- period: '2012 Q1',
128
- iphone: 10687,
129
- ipad: 4460,
130
- itouch: 2028
131
- }, {
132
- period: '2012 Q2',
133
- iphone: 8432,
134
- ipad: 5713,
135
- itouch: 1791
136
- }],
137
- xkey: 'period',
138
- ykeys: ['iphone', 'ipad', 'itouch'],
139
- labels: ['iPhone', 'iPad', 'iPod Touch'],
140
- pointSize: 2,
141
- hideHover: 'auto',
142
- resize: true
143
- });
144
-
145
- /* MORRIS LINE CHART
146
- ----------------------------------------*/
147
- Morris.Line({
148
- element: 'morris-line-chart',
149
- data: [{
150
- y: '2006',
151
- a: 100,
152
- b: 90
153
- }, {
154
- y: '2007',
155
- a: 75,
156
- b: 65
157
- }, {
158
- y: '2008',
159
- a: 50,
160
- b: 40
161
- }, {
162
- y: '2009',
163
- a: 75,
164
- b: 65
165
- }, {
166
- y: '2010',
167
- a: 50,
168
- b: 40
169
- }, {
170
- y: '2011',
171
- a: 75,
172
- b: 65
173
- }, {
174
- y: '2012',
175
- a: 100,
176
- b: 90
177
- }],
178
- xkey: 'y',
179
- ykeys: ['a', 'b'],
180
- labels: ['Series A', 'Series B'],
181
- hideHover: 'auto',
182
- resize: true
183
- });
184
-
185
-
186
- },
187
-
188
- initialization: function () {
189
- mainApp.initFunction();
190
-
191
- }
192
-
193
- }
194
- // Initializing ///
195
-
196
- $(document).ready(function () {
197
- mainApp.initFunction();
198
- });
199
-
200
- }(jQuery));